1 files changed, 56 insertions, 6 deletions

diff --git a/linden/indra/newview/llspatialpartition.h b/linden/indra/newview/llspatialpartition.h
index be0163b..deb8b0e 100644
--- a/linden/indra/newview/llspatialpartition.h
+++ b/linden/indra/newview/llspatialpartition.h
@@ -52,6 +52,8 @@
 class LLSpatialPartition;
 class LLSpatialBridge;
 class LLSpatialGroup;
+class LLTextureAtlas;
+class LLTextureAtlasSlot;
 
 S32 AABBSphereIntersect(const LLVector3& min, const LLVector3& max, const LLVector3 &origin, const F32 &rad);
 S32 AABBSphereIntersectR2(const LLVector3& min, const LLVector3& max, const LLVector3 &origin, const F32 &radius_squared);
@@ -66,12 +68,13 @@ protected:
         
 public:
         LLDrawInfo(U16 start, U16 end, U32 count, U32 offset, 
-                                LLViewerImage* image, LLVertexBuffer* buffer, 
+                                LLImageGL* gl_image, LLViewerImage* image, LLVertexBuffer* buffer, 
                                 BOOL fullbright = FALSE, U8 bump = 0, BOOL particle = FALSE, F32 part_size = 0);
         
 
         LLPointer<LLVertexBuffer> mVertexBuffer;
-        LLPointer<LLViewerImage> mTexture;
+        LLPointer<LLImageGL>     mTexture;
+        LLPointer<LLViewerImage> mViewerTexture;
         LLColor4U mGlowColor;
         S32 mDebugColor;
         const LLMatrix4* mTextureMatrix;
@@ -159,11 +162,13 @@ public:
 
         typedef std::vector<LLPointer<LLSpatialGroup> > sg_vector_t;
         typedef std::set<LLPointer<LLSpatialGroup> > sg_set_t;
+        typedef std::list<LLPointer<LLSpatialGroup> > sg_list_t;
         typedef std::vector<LLPointer<LLSpatialBridge> > bridge_list_t;
         typedef std::vector<LLPointer<LLDrawInfo> > drawmap_elem_t; 
         typedef std::map<U32, drawmap_elem_t > draw_map_t;      
         typedef std::vector<LLPointer<LLVertexBuffer> > buffer_list_t;
-        typedef std::map<LLPointer<LLViewerImage>, buffer_list_t> buffer_texture_map_t;
+        typedef std::map<LLPointer<LLImageGL>, buffer_list_t> buffer_texture_map_t; // KL render-pipeline
+//      typedef std::map<LLPointer<LLViewerImage>, buffer_list_t> buffer_texture_map_t; // KL standard
         typedef std::map<U32, buffer_texture_map_t> buffer_map_t;
 
         typedef LLOctreeListener<LLDrawable>    BaseType;
@@ -183,6 +188,14 @@ public:
                 }
         };
 
+        struct CompareUpdateUrgency
+        {
+                bool operator()(const LLPointer<LLSpatialGroup> lhs, const LLPointer<LLSpatialGroup> rhs)
+                {
+                        return lhs->getUpdateUrgency() > rhs->getUpdateUrgency();
+                }
+        };
+
         struct CompareDepthGreater
         {
                 bool operator()(const LLSpatialGroup* const& lhs, const LLSpatialGroup* const& rhs)
@@ -209,6 +222,10 @@ public:
                 IMAGE_DIRTY                             = 0x00004000,
                 OCCLUSION_DIRTY                 = 0x00008000,
                 MESH_DIRTY                              = 0x00010000,
+                NEW_DRAWINFO                    = 0x00020000,
+                IN_BUILD_Q1                             = 0x00040000,
+                IN_BUILD_Q2                             = 0x00080000,
+        
         } eSpatialState;
 
         typedef enum
@@ -252,6 +269,7 @@ public:
         
         void updateDistance(LLCamera& camera);
         BOOL needsUpdate();
+        F32 getUpdateUrgency() const;
         BOOL changeLOD();
         void rebuildGeom();
         void rebuildMesh();
@@ -261,6 +279,8 @@ public:
         element_list& getData() { return mOctreeNode->getData(); }
         U32 getElementCount() const { return mOctreeNode->getElementCount(); }
 
+        void drawObjectBox(LLColor4 col);
+
          //LISTENER FUNCTIONS
         virtual void handleInsertion(const TreeNode* node, LLDrawable* face);
         virtual void handleRemoval(const TreeNode* node, LLDrawable* face);
@@ -269,6 +289,36 @@ public:
         virtual void handleChildAddition(const OctreeNode* parent, OctreeNode* child);
         virtual void handleChildRemoval(const OctreeNode* parent, const OctreeNode* child);
 
+//-------------------
+//for atlas use
+//-------------------
+        //atlas 
+        void setCurUpdatingTime(U32 t) {mCurUpdatingTime = t ;}
+        U32  getCurUpdatingTime() const { return mCurUpdatingTime ;}
+        
+        void setCurUpdatingSlot(LLTextureAtlasSlot* slotp) ;
+        LLTextureAtlasSlot* getCurUpdatingSlot(LLViewerImage* imagep, S8 recursive_level = 3) ;
+
+        void setCurUpdatingTexture(LLViewerImage* tex){ mCurUpdatingTexture = tex ;}
+        LLViewerImage* getCurUpdatingTexture() const { return mCurUpdatingTexture ;}
+        
+        BOOL hasAtlas(LLTextureAtlas* atlasp) ;
+        LLTextureAtlas* getAtlas(S8 ncomponents, S8 to_be_reserved, S8 recursive_level = 3) ;
+        void addAtlas(LLTextureAtlas* atlasp, S8 recursive_level = 3) ;
+        void removeAtlas(LLTextureAtlas* atlasp, BOOL remove_group = TRUE, S8 recursive_level = 3) ;
+        void clearAtlasList() ;
+private:
+        U32                     mCurUpdatingTime ;
+        //do not make the below two to use LLPointer
+        //because mCurUpdatingTime invalidates them automatically.
+        LLTextureAtlasSlot* mCurUpdatingSlotp ;
+        LLViewerImage*          mCurUpdatingTexture ;
+
+        std::vector< std::list<LLTextureAtlas*> > mAtlasList ; 
+//-------------------
+//end for atlas use
+//-------------------
+
 protected:
         virtual ~LLSpatialGroup();
 
@@ -327,7 +377,7 @@ class LLSpatialPartition: public LLGeometryManager
 public:
         static BOOL sFreezeState; //if true, no spatialgroup state updates will be made
 
-        LLSpatialPartition(U32 data_mask, U32 mBufferUsage = GL_STATIC_DRAW_ARB);
+        LLSpatialPartition(U32 data_mask,  BOOL render_by_group, U32 mBufferUsage);
         virtual ~LLSpatialPartition();
 
         LLSpatialGroup *put(LLDrawable *drawablep, BOOL was_visible = FALSE);
@@ -373,7 +423,7 @@ public:
         BOOL mOcclusionEnabled; // if TRUE, occlusion culling is performed
         BOOL mInfiniteFarClip; // if TRUE, frustum culling ignores far clip plane
         U32 mBufferUsage;
-        BOOL mRenderByGroup;
+        const BOOL mRenderByGroup;
         U32 mLODSeed;
         U32 mLODPeriod; //number of frames between LOD updates for a given spatial group (staggered by mLODSeed)
         U32 mVertexDataMask;
@@ -392,7 +442,7 @@ protected:
 public:
         typedef std::vector<LLPointer<LLSpatialBridge> > bridge_vector_t;
         
-        LLSpatialBridge(LLDrawable* root, U32 data_mask);
+        LLSpatialBridge(LLDrawable* root, BOOL render_by_group, U32 data_mask);
         
         virtual BOOL isSpatialBridge() const            { return TRUE; }