diff options
author | Jacek Antonelli | 2008-08-15 23:45:55 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:55 -0500 |
commit | 9063e60aefe54f7c45aaa8cb24e8998b2c7343ab (patch) | |
tree | 1c8235465701c910a5d76448ddc8eb1f14457ebc /linden/indra/newview/llspatialpartition.h | |
parent | Second Life viewer sources 1.20.9 (diff) | |
download | meta-impy-9063e60aefe54f7c45aaa8cb24e8998b2c7343ab.zip meta-impy-9063e60aefe54f7c45aaa8cb24e8998b2c7343ab.tar.gz meta-impy-9063e60aefe54f7c45aaa8cb24e8998b2c7343ab.tar.bz2 meta-impy-9063e60aefe54f7c45aaa8cb24e8998b2c7343ab.tar.xz |
Second Life viewer sources 1.20.10
Diffstat (limited to 'linden/indra/newview/llspatialpartition.h')
-rw-r--r-- | linden/indra/newview/llspatialpartition.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/linden/indra/newview/llspatialpartition.h b/linden/indra/newview/llspatialpartition.h index bbd4add..b4b1101 100644 --- a/linden/indra/newview/llspatialpartition.h +++ b/linden/indra/newview/llspatialpartition.h | |||
@@ -66,7 +66,6 @@ public: | |||
66 | 66 | ||
67 | LLPointer<LLVertexBuffer> mVertexBuffer; | 67 | LLPointer<LLVertexBuffer> mVertexBuffer; |
68 | LLPointer<LLViewerImage> mTexture; | 68 | LLPointer<LLViewerImage> mTexture; |
69 | LLPointer<LLCubeMap> mReflectionMap; | ||
70 | LLColor4U mGlowColor; | 69 | LLColor4U mGlowColor; |
71 | S32 mDebugColor; | 70 | S32 mDebugColor; |
72 | const LLMatrix4* mTextureMatrix; | 71 | const LLMatrix4* mTextureMatrix; |
@@ -262,7 +261,6 @@ public: | |||
262 | LLPointer<LLVertexBuffer> mVertexBuffer; | 261 | LLPointer<LLVertexBuffer> mVertexBuffer; |
263 | F32* mOcclusionVerts; | 262 | F32* mOcclusionVerts; |
264 | GLuint mOcclusionQuery; | 263 | GLuint mOcclusionQuery; |
265 | LLPointer<LLCubeMap> mReflectionMap; | ||
266 | 264 | ||
267 | U32 mBufferUsage; | 265 | U32 mBufferUsage; |
268 | draw_map_t mDrawMap; | 266 | draw_map_t mDrawMap; |
@@ -314,8 +312,6 @@ public: | |||
314 | virtual void rebuildGeom(LLSpatialGroup* group); | 312 | virtual void rebuildGeom(LLSpatialGroup* group); |
315 | 313 | ||
316 | S32 cull(LLCamera &camera, std::vector<LLDrawable *>* results = NULL, BOOL for_select = FALSE); // Cull on arbitrary frustum | 314 | S32 cull(LLCamera &camera, std::vector<LLDrawable *>* results = NULL, BOOL for_select = FALSE); // Cull on arbitrary frustum |
317 | void markReimage(LLSpatialGroup* group); | ||
318 | void processImagery(LLCamera* camera); | ||
319 | 315 | ||
320 | BOOL isVisible(const LLVector3& v); | 316 | BOOL isVisible(const LLVector3& v); |
321 | 317 | ||
@@ -326,23 +322,12 @@ public: | |||
326 | void restoreGL(); | 322 | void restoreGL(); |
327 | void resetVertexBuffers(); | 323 | void resetVertexBuffers(); |
328 | 324 | ||
329 | protected: | ||
330 | |||
331 | typedef std::set<LLPointer<LLSpatialGroup> > spatial_group_set_t; | ||
332 | spatial_group_set_t mSpatialGroups; | ||
333 | |||
334 | typedef std::queue<LLPointer<LLSpatialGroup> > spatial_group_queue_t; | ||
335 | |||
336 | //things that need an image update | ||
337 | spatial_group_queue_t mImageQueue; | ||
338 | |||
339 | public: | 325 | public: |
340 | LLSpatialGroup::OctreeNode* mOctree; | 326 | LLSpatialGroup::OctreeNode* mOctree; |
341 | BOOL mOcclusionEnabled; // if TRUE, occlusion culling is performed | 327 | BOOL mOcclusionEnabled; // if TRUE, occlusion culling is performed |
342 | BOOL mInfiniteFarClip; // if TRUE, frustum culling ignores far clip plane | 328 | BOOL mInfiniteFarClip; // if TRUE, frustum culling ignores far clip plane |
343 | U32 mBufferUsage; | 329 | U32 mBufferUsage; |
344 | BOOL mRenderByGroup; | 330 | BOOL mRenderByGroup; |
345 | BOOL mImageEnabled; | ||
346 | U32 mLODSeed; | 331 | U32 mLODSeed; |
347 | U32 mLODPeriod; //number of frames between LOD updates for a given spatial group (staggered by mLODSeed) | 332 | U32 mLODPeriod; //number of frames between LOD updates for a given spatial group (staggered by mLODSeed) |
348 | U32 mVertexDataMask; | 333 | U32 mVertexDataMask; |