Changeset 154 for trunk/VUT/work/ogre_changes/Plugins

Timestamp:

07/04/05 17:57:51 (19 years ago)

Author:

mattausch

Message:

added item buffer queries.

Location:

trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager

Files:

• include/OgreOctree.h (modified) (2 diffs)
• include/OgreTerrainRenderable.h (modified) (3 diffs)
• src/OgreOctree.cpp (modified) (2 diffs)
• src/OgreOctreeSceneManager.cpp (modified) (3 diffs)
• src/OgreTerrainRenderable.cpp (modified) (7 diffs)

trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/include/OgreOctree.h

@@ -192 +192 @@
         void _updateBounds();
 
+        /** Sets scene node id 
+        @param the id
+        */
+        void setId(int id);
+        
+        /** see set */
+        int getId(void);
+
 protected:
         
@@ -201 +209 @@
         bool mVisible;
         int mDepth;
+        int mId;
 
 #endif // GTP_VISIBILITY_MODIFIED_OGRE

trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/include/OgreTerrainRenderable.h

@@ -47 +47 @@
 
 #define MORPH_CUSTOM_PARAM_ID 77
+
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
+#define MAX_RENDERLEVEL_INDEX 15
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
 
 namespace Ogre
@@ -293 +297 @@
         /// Get the static list of indexes cached (internal use only)
         static TerrainBufferCache& _getIndexCache(void) {return msIndexCache;}
-                // index of renderlevel of current pass
-                static int getCurrentRenderLevelIndex() {return msCurrentRenderLevelIndex;}
-                static void setCurrentRenderLevelIndex(int index) {msCurrentRenderLevelIndex = index;}
+
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
+                // index of renderlevel used for current pass
+                static int getCurrentRenderLevelIndex();
+                // returns index of renderlevel
+                static void setCurrentRenderLevelIndex(int index);
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
+
     protected:
                 // index of renderlevel of current pass
@@ -355 +364 @@
         VertexData* mTerrain;
 
-        /// The current LOD level: for multiple passes, up to 10 renderlevels can be saved
-        int mRenderLevel[10];
+        /// The current LOD level
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
+        int mRenderLevel[MAX_RENDERLEVEL_INDEX];
+#else
+                int mRenderLevel;
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
+
         /// The previous 'next' LOD level down, for frame coherency
         int mLastNextLevel; 

trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/src/OgreOctree.cpp

@@ -88 +88 @@
       mHalfSize( 0, 0, 0 )
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
-        , mLastVisited(0), mVisible(false), mLastRendered(-1)
+        , mLastVisited(0), mVisible(false), mLastRendered(-1), mId(-1)
 #endif //GTP_VISIBILITY_MODIFIED_OGRE
 {
@@ -271 +271 @@
         }
  }
+//-----------------------------------------------------------------------
+void Octree::setId(int id)
+{
+        mId = id;
+}
+//-----------------------------------------------------------------------
+int Octree::getId()
+{
+        return mId;
+}
 #endif //GTP_VISIBILITY_MODIFIED_OGRE
 }

trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/src/OgreOctreeSceneManager.cpp

@@ -318 +318 @@
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
         mNumOctreeNodes = 1;
+        mOctree->setId(mNumOctreeNodes);
 #endif // GTP_VISIBILITY_MODIFIED_OGRE
     mMaxDepth = depth;
@@ -468 +469 @@
             octant -> mChildren[ x ][ y ][ z ] = new Octree( octant );
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
-        mNumOctreeNodes ++;
+        mOctree->setId(++ mNumOctreeNodes);
 #endif // GTP_VISIBILITY_MODIFIED_OGRE
 
@@ -1032 +1033 @@
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
         mNumOctreeNodes = 1;
+        mOctree->setId(mNumOctreeNodes);
 #endif // GTP_VISIBILITY_MODIFIED_OGRE
     mOctree->mBox = box;

trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/src/OgreTerrainRenderable.cpp

@@ -58 +58 @@
     bool TerrainRenderable::mLevelInit = false;
     const TerrainOptions* TerrainRenderable::msOptions = 0;
+
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
         int TerrainRenderable::msCurrentRenderLevelIndex = 0;
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
     //-----------------------------------------------------------------------
     //-----------------------------------------------------------------------
@@ -177 +180 @@
         mInit = true;
 
-//#ifdef GTP_VISIBILITY_MODIFIED_OGRE
-                // for up to 10 passes
-                for (int i = 0; i < 10; ++i)
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
+                for (int i = 0; i < MAX_RENDERLEVEL_INDEX; ++i)
                 {
                         mRenderLevel[i] = 1;
                 }
+#else
+                mRenderLevel = 1;
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
 
         mMinLevelDistSqr = new Real[ msOptions->maxGeoMipMapLevel ];
@@ -330 +335 @@
         if ( mForcedRenderLevel >= 0 )
         {
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
             mRenderLevel[msCurrentRenderLevelIndex] = mForcedRenderLevel;
+#else
+                        mRenderLevel = mForcedRenderLevel;
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
             return ;
         }
@@ -339 +348 @@
         Real L = diff.squaredLength();
 
-                mRenderLevel[msCurrentRenderLevelIndex] = -1;
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
+            mRenderLevel[msCurrentRenderLevelIndex] = -1;;
+#else
+                        mRenderLevel = -1;
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
 
         for ( int i = 0; i < msOptions->maxGeoMipMapLevel; i++ )
@@ -345 +358 @@
             if ( mMinLevelDistSqr[ i ] > L )
             {
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
                 mRenderLevel[msCurrentRenderLevelIndex] = i - 1;
+#else
+                        mRenderLevel = i - 1;
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
                 break;
             }
         }
 
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
         if ( getRenderLevel() < 0 )
             mRenderLevel[msCurrentRenderLevelIndex] = msOptions->maxGeoMipMapLevel - 1;
+#else
+                if ( mRenderLevel < 0 )
+            mRenderLevel = msOptions->maxGeoMipMapLevel - 1;
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
 
         if (msOptions->lodMorph)
         {
             // Get the next LOD level down
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
             int nextLevel = mNextLevelDown[getRenderLevel()];
+#else
+                        int nextLevel = mNextLevelDown;
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
+            
             if (nextLevel == 0)
             {
@@ -668 +695 @@
     void TerrainRenderable::_adjustRenderLevel( int i )
     {
-
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
         mRenderLevel[msCurrentRenderLevelIndex] = i;
+#else
+                mRenderLevel = i;
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
     }
     //-----------------------------------------------------------------------
@@ -1469 +1499 @@
 
     }
-
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
+        //-----------------------------------------------------------------------
+        int TerrainRenderable::getCurrentRenderLevelIndex() 
+        {
+                return msCurrentRenderLevelIndex;
+        }
+        //-----------------------------------------------------------------------
+        void TerrainRenderable::setCurrentRenderLevelIndex(int index)
+        {
+                if (index > MAX_RENDERLEVEL_INDEX)
+                        index = 0;
+
+                msCurrentRenderLevelIndex = index;
+        }
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
 
 } //namespace