diff options
| author | Chris Baker <baker@lindenlab.com> | 2014-06-16 21:15:41 +0000 |
|---|---|---|
| committer | Chris Baker <baker@lindenlab.com> | 2014-06-16 21:15:41 +0000 |
| commit | ee14005a2aea89b2988fa0a5060f38b669e45389 (patch) | |
| tree | 3b9930089be344a9c25172f3ca4be0fbf412ba17 /indra/newview/llspatialpartition.h | |
| parent | a92dbb592b338f48f7b75b68a9da511dc95279f9 (diff) | |
| parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) | |
viewer-release merge
Diffstat (limited to 'indra/newview/llspatialpartition.h')
| -rwxr-xr-x | indra/newview/llspatialpartition.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h index a7b99a0f6b..08a4d00d0f 100755 --- a/indra/newview/llspatialpartition.h +++ b/indra/newview/llspatialpartition.h @@ -640,12 +640,26 @@ class LLVolumeGeometryManager: public LLGeometryManager DISTANCE_SORT } eSortType; - virtual ~LLVolumeGeometryManager() { } + LLVolumeGeometryManager(); + virtual ~LLVolumeGeometryManager(); virtual void rebuildGeom(LLSpatialGroup* group); virtual void rebuildMesh(LLSpatialGroup* group); virtual void getGeometry(LLSpatialGroup* group); void genDrawInfo(LLSpatialGroup* group, U32 mask, LLFace** faces, U32 face_count, BOOL distance_sort = FALSE, BOOL batch_textures = FALSE, BOOL no_materials = FALSE); void registerFace(LLSpatialGroup* group, LLFace* facep, U32 type); + +private: + void allocateFaces(U32 pMaxFaceCount); + void freeFaces(); + + static int32_t sInstanceCount; + static LLFace** sFullbrightFaces; + static LLFace** sBumpFaces; + static LLFace** sSimpleFaces; + static LLFace** sNormFaces; + static LLFace** sSpecFaces; + static LLFace** sNormSpecFaces; + static LLFace** sAlphaFaces; }; //spatial partition that uses volume geometry manager (implemented in LLVOVolume.cpp) |