diff options
author | Jacek Antonelli | 2008-08-15 23:44:54 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:54 -0500 |
commit | b2afb8800bb033a04bb3ecdf0363068d56648ef1 (patch) | |
tree | 3568129b5bbddb47cd39d622b4137a8fbff4abaf /linden/indra/newview/llviewerregion.h | |
parent | Second Life viewer sources 1.14.0.1 (diff) | |
download | meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.zip meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.gz meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.bz2 meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.xz |
Second Life viewer sources 1.15.0.2
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llviewerregion.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewerregion.h b/linden/indra/newview/llviewerregion.h index 69a8f19..5b7ce17 100644 --- a/linden/indra/newview/llviewerregion.h +++ b/linden/indra/newview/llviewerregion.h | |||
@@ -4,6 +4,7 @@ | |||
4 | * | 4 | * |
5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
6 | * | 6 | * |
7 | * Second Life Viewer Source Code | ||
7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
@@ -227,9 +228,19 @@ public: | |||
227 | void unpackRegionHandshake(); | 228 | void unpackRegionHandshake(); |
228 | 229 | ||
229 | void calculateCenterGlobal(); | 230 | void calculateCenterGlobal(); |
231 | void calculateCameraDistance(); | ||
230 | 232 | ||
231 | friend std::ostream& operator<<(std::ostream &s, const LLViewerRegion ®ion); | 233 | friend std::ostream& operator<<(std::ostream &s, const LLViewerRegion ®ion); |
232 | 234 | ||
235 | public: | ||
236 | struct CompareDistance | ||
237 | { | ||
238 | bool operator()(const LLViewerRegion* const& lhs, const LLViewerRegion* const& rhs) | ||
239 | { | ||
240 | return lhs->mCameraDistanceSquared < rhs->mCameraDistanceSquared; | ||
241 | } | ||
242 | }; | ||
243 | |||
233 | protected: | 244 | protected: |
234 | void disconnectAllNeighbors(); | 245 | void disconnectAllNeighbors(); |
235 | void initStats(); | 246 | void initStats(); |
@@ -284,13 +295,15 @@ protected: | |||
284 | U32 mPingDelay; | 295 | U32 mPingDelay; |
285 | F32 mDeltaTime; // Time since last measurement of lastPackets, Bits, etc | 296 | F32 mDeltaTime; // Time since last measurement of lastPackets, Bits, etc |
286 | 297 | ||
298 | // Misc | ||
287 | LLVLComposition *mCompositionp; // Composition layer for the surface | 299 | LLVLComposition *mCompositionp; // Composition layer for the surface |
288 | 300 | ||
289 | U32 mRegionFlags; // includes damage flags | 301 | U32 mRegionFlags; // includes damage flags |
290 | U8 mSimAccess; | 302 | U8 mSimAccess; |
291 | F32 mBillableFactor; | 303 | F32 mBillableFactor; |
292 | U32 mMaxTasks; // max prim count | 304 | U32 mMaxTasks; // max prim count |
293 | 305 | F32 mCameraDistanceSquared; // updated once per frame | |
306 | |||
294 | // Maps local ids to cache entries. | 307 | // Maps local ids to cache entries. |
295 | // Regions can have order 10,000 objects, so assume | 308 | // Regions can have order 10,000 objects, so assume |
296 | // a structure of size 2^14 = 16,000 | 309 | // a structure of size 2^14 = 16,000 |