8f7e96e2a5
Much of this patch comes from upstream and Kitty Barnett, or is inspired from their works This commit applies the World-Minimap patches from Catznip. Catznip stuffs: - Issue 1383: Parcel lines on mini map - Show parcels on the minimap - Minimap menu: "Show" submenu: "Property Lines" "Parcels for Sale" - Option to have world map textures on the minimap - Minimap menu: "World Map Textures" - Singular touch: Made this comply with hypergridding. The minimap will now scroll zoom based on where your mouse is if centering on camera is off. A lot of cruft was cleaned up in this merge, a lot of gSavedSettings lookups in draw were converted to LLCachedControls, some license updates were performed. Finally: By myself, but inspired by upstream and requested in the group before: - Option to show tracking circles around people selected on the radar while the radar is visible - Minimap menu: "Show" submenu: "Radar Tracking Circles"
141 lines
4.3 KiB
C++
141 lines
4.3 KiB
C++
/**
|
|
* @file llviewerparceloverlay.h
|
|
* @brief LLViewerParcelOverlay class header file
|
|
*
|
|
* $LicenseInfo:firstyear=2002&license=viewerlgpl$
|
|
* Second Life Viewer Source Code
|
|
* Copyright (C) 2010, Linden Research, Inc.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation;
|
|
* version 2.1 of the License only.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*
|
|
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
|
|
* $/LicenseInfo$
|
|
*/
|
|
|
|
#ifndef LL_LLVIEWERPARCELOVERLAY_H
|
|
#define LL_LLVIEWERPARCELOVERLAY_H
|
|
|
|
// The ownership data for land parcels.
|
|
// One of these structures per region.
|
|
|
|
#include "llbbox.h"
|
|
#include "lldarray.h"
|
|
#include "llframetimer.h"
|
|
#include "lluuid.h"
|
|
#include "llviewertexture.h"
|
|
#include "llgl.h"
|
|
|
|
class LLViewerRegion;
|
|
class LLVector3;
|
|
class LLColor4U;
|
|
class LLVector2;
|
|
|
|
class LLViewerParcelOverlay : public LLGLUpdate
|
|
{
|
|
public:
|
|
LLViewerParcelOverlay(LLViewerRegion* region, F32 region_width_meters);
|
|
~LLViewerParcelOverlay();
|
|
|
|
// ACCESS
|
|
LLViewerTexture* getTexture() const { return mTexture; }
|
|
|
|
BOOL isOwned(const LLVector3& pos) const;
|
|
BOOL isOwnedSelf(const LLVector3& pos) const;
|
|
BOOL isOwnedGroup(const LLVector3& pos) const;
|
|
BOOL isOwnedOther(const LLVector3& pos) const;
|
|
|
|
// "encroaches" means the prim hangs over the parcel, but its center
|
|
// might be in another parcel. for now, we simply test axis aligned
|
|
// bounding boxes which isn't perfect, but is close
|
|
bool encroachesOwned(const std::vector<LLBBox>& boxes) const;
|
|
bool encroachesOnUnowned(const std::vector<LLBBox>& boxes) const;
|
|
bool encroachesOnNearbyParcel(const std::vector<LLBBox>& boxes) const;
|
|
|
|
BOOL isSoundLocal(const LLVector3& pos) const;
|
|
|
|
BOOL isBuildCameraAllowed(const LLVector3& pos) const;
|
|
F32 getOwnedRatio() const;
|
|
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
|
const U8* getOwnership() const { return mOwnership; }
|
|
// [/SL:KB]
|
|
|
|
// Returns the number of vertices drawn
|
|
S32 renderPropertyLines();
|
|
|
|
U8 ownership( const LLVector3& pos) const;
|
|
|
|
// MANIPULATE
|
|
void uncompressLandOverlay(S32 chunk, U8 *compressed_overlay);
|
|
|
|
// Indicate property lines and overlay texture need to be rebuilt.
|
|
void setDirty();
|
|
|
|
void idleUpdate(bool update_now = false);
|
|
void updateGL();
|
|
|
|
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
|
typedef boost::signals2::signal<void (const LLViewerRegion*)> update_signal_t;
|
|
static boost::signals2::connection setUpdateCallback(const update_signal_t::slot_type & cb);
|
|
// [/SL:KB]
|
|
|
|
private:
|
|
// This is in parcel rows and columns, not grid rows and columns
|
|
// Stored in bottom three bits.
|
|
U8 ownership(S32 row, S32 col) const
|
|
{ return 0x7 & mOwnership[row * mParcelGridsPerEdge + col]; }
|
|
|
|
void addPropertyLine(LLDynamicArray<LLVector3, 256>& vertex_array,
|
|
LLDynamicArray<LLColor4U, 256>& color_array,
|
|
LLDynamicArray<LLVector2, 256>& coord_array,
|
|
const F32 start_x, const F32 start_y,
|
|
const U32 edge,
|
|
const LLColor4U& color);
|
|
|
|
void updateOverlayTexture();
|
|
void updatePropertyLines();
|
|
|
|
private:
|
|
// Back pointer to the region that owns this structure.
|
|
LLViewerRegion* mRegion;
|
|
|
|
S32 mParcelGridsPerEdge;
|
|
// <FS:CR> Aurora Sim
|
|
S32 mRegionSize;
|
|
// </FS:CR> Aurora Sim
|
|
|
|
LLPointer<LLViewerTexture> mTexture;
|
|
LLPointer<LLImageRaw> mImageRaw;
|
|
|
|
// Size: mParcelGridsPerEdge * mParcelGridsPerEdge
|
|
// Each value is 0-3, PARCEL_AVAIL to PARCEL_SELF in the two low bits
|
|
// and other flags in the upper bits.
|
|
U8 *mOwnership;
|
|
|
|
// Update propery lines and overlay texture
|
|
BOOL mDirty;
|
|
LLFrameTimer mTimeSinceLastUpdate;
|
|
S32 mOverlayTextureIdx;
|
|
|
|
S32 mVertexCount;
|
|
F32* mVertexArray;
|
|
U8* mColorArray;
|
|
|
|
// [SL:KB] - Patch: World-MinimapOverlay | Checked: 2012-06-20 (Catznip-3.3.0)
|
|
static update_signal_t* mUpdateSignal;
|
|
// [/SL:KB]
|
|
};
|
|
|
|
#endif
|