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

Timestamp:

08/03/05 14:12:41 (19 years ago)

Author:

mattausch

Message:

changed to ogre 103
added readme

Location:

trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager

Files:

• include/OgreOctree.h (modified) (2 diffs)
• include/OgreOctreeCamera.h (modified) (1 diff)
• include/OgreOctreeNode.h (modified) (2 diffs)
• include/OgreOctreeSceneManager.h (modified) (2 diffs)
• include/OgreTerrainRenderable.h (modified) (1 diff)
• src/OgreOctree.cpp (modified) (2 diffs)
• src/OgreOctreeNode.cpp (modified) (2 diffs)
• src/OgreTerrainRenderable.cpp (modified) (10 diffs)

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

@@ -36 +36 @@
 #define OCTREE_H
 
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
 #include "OgreTerrainPrerequisites.h"
+#endif
 #include <OgreAxisAlignedBox.h>
 #include <OgreWireBoundingBox.h>
@@ -58 +60 @@
 */
 
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
 class _OgreTerrainExport Octree
+#else
+class Octree
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
 {
 public:

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

@@ -59 +59 @@
 than the default.
 */
+
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
 class _OgreTerrainExport OctreeCamera : public Camera

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

@@ -47 +47 @@
 *
 */
-
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
 class _OgreTerrainExport OctreeNode : public SceneNode
+#else
+class OctreeNode : public SceneNode
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
 {
 public:
@@ -104 +107 @@
     };
 
+
+
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
         /// scale for node visualization

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

@@ -35 +35 @@
 #define OCTREESCENEMANAGER_H
 
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
 #include "OgreTerrainPrerequisites.h"
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
 #include "OgreSceneManager.h"
 #include "OgreRenderOperation.h"
@@ -71 +73 @@
 */
 
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
 class _OgreTerrainExport OctreeSceneManager : public SceneManager
+#else
+class OctreeSceneManager : public SceneManager
+#endif GTP_VISIBILITY_MODIFIED_OGRE
 {
     friend class OctreeIntersectionSceneQuery;

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

@@ -231 +231 @@
         inline int getRenderLevel() const
         {
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
             return mRenderLevel[msCurrentRenderLevelIndex];
+#else
+            return mRenderLevel;
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
         };
 

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

@@ -36 +36 @@
 #include <OgreOctree.h>
 #include <OgreOctreeNode.h>
-#include <OgreLogManager.h>
 
 namespace Ogre
@@ -174 +173 @@
     if(mWireBoundingBox == 0)
         mWireBoundingBox = new WireBoundingBox();
-
-        //mWireBoundingBox->setupBoundingBox(mBox);
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
         mWireBoundingBox->setupBoundingBox(mWorldAABB);
+#else
+        mWireBoundingBox->setupBoundingBox(mBox);
+#endif  
 
     return mWireBoundingBox;

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

@@ -38 +38 @@
 #include <OgreOctreeNode.h>
 #include <OgreOctreeSceneManager.h>
-#include <OgreLogManager.h>
 #include <OgreMeshManager.h>
 #include <OgreSubMesh.h>
@@ -157 +156 @@
         MovableObject * mo = mit->second;
 
-                //LogManager::getSingleton().logMessage("notify");
         mo->_notifyCurrentCamera(cam);
         if ( mo->isVisible() &&
             (!onlyShadowCasters || mo->getCastShadows()))
         {
-                        //LogManager::getSingleton().logMessage("update queue");
             mo -> _updateRenderQueue( queue );
         }

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

@@ -67 +67 @@
     //-----------------------------------------------------------------------
     TerrainRenderable::TerrainRenderable(const String& name)
-        : mTerrain(0), mName(name),  mDeltaBuffers(0), mPositionBuffer(0)
+        : Renderable(), mTerrain(0), mName(name),  mDeltaBuffers(0), mPositionBuffer(0)
     {
         mForcedRenderLevel = -1;
@@ -220 +220 @@
                 *pSysPos++ = *pPos++ = ( float ) j * msOptions->scale.z; //z
 
-                *pTex0++ = ( float ) i / ( float ) msOptions->pageSize;
-                *pTex0++ = ( float ) ( float ) j / ( float ) msOptions->pageSize;
-
-                *pTex1++ = ( ( float ) i / ( float ) msOptions->tileSize ) * msOptions->detailTile;
-                *pTex1++ = ( ( float ) ( float ) j / ( float ) msOptions->tileSize ) * msOptions->detailTile;
+                *pTex0++ = ( float ) i / ( float ) ( msOptions->pageSize - 1 );
+                *pTex0++ = ( float ) j / ( float ) ( msOptions->pageSize - 1 );
+
+                *pTex1++ = ( ( float ) i / ( float ) ( msOptions->tileSize - 1 ) ) * msOptions->detailTile;
+                *pTex1++ = ( ( float ) j / ( float ) ( msOptions->tileSize - 1 ) ) * msOptions->detailTile;
 
                 if ( height < min )
@@ -261 +261 @@
 
         _calculateMinLevelDist2( C );
-        if (msOptions->lit)
-            _calculateNormals();
 
     }
@@ -301 +299 @@
     void TerrainRenderable::_calculateNormals()
     {
+
         Vector3 norm;
 
@@ -342 +341 @@
             return ;
         }
+
 
                 Vector3 cpos = cam -> getDerivedPosition();
@@ -381 +381 @@
             int nextLevel = mNextLevelDown[getRenderLevel()];
 #else
-                        int nextLevel = mNextLevelDown;
+                        int nextLevel = mNextLevelDown[mRenderLevel];
 #endif // GTP_VISIBILITY_MODIFIED_OGRE
             
@@ -393 +393 @@
                 // Set the morph such that the morph happens in the last 0.25 of
                 // the distance range
-                Real range = mMinLevelDistSqr[nextLevel] - mMinLevelDistSqr[getRenderLevel()];
+ #ifdef GTP_VISIBILITY_MODIFIED_OGRE
+Real range = mMinLevelDistSqr[nextLevel] - mMinLevelDistSqr[getRenderLevel()];
+#else
+                Real range = mMinLevelDistSqr[nextLevel] - mMinLevelDistSqr[mRenderLevel];
+#endif // GTP_VISIBILITY_MODIFIED_OGRE               
                 if (range)
                 {
-                    Real percent = (L - mMinLevelDistSqr[getRenderLevel()]) / range;
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
+Real percent = (L - mMinLevelDistSqr[getRenderLevel()]) / range;
+#else
+                    Real percent = (L - mMinLevelDistSqr[mRenderLevel]) / range;
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
                     // scale result so that msLODMorphStart == 0, 1 == 1, clamp to 0 below that
                     Real rescale = 1.0f / (1.0f - msOptions->lodMorphStart);
@@ -430 +438 @@
 
         }
+
     }
     //-----------------------------------------------------------------------
@@ -668 +677 @@
             return ;
 
+
             if ( mLevelIndex.size() == 0 )
         {
             for ( int i = 0; i < 16; i++ )
             {
+
                                 mLevelIndex.push_back( new IndexMap() );
+
             }
 
@@ -695 +707 @@
     void TerrainRenderable::_adjustRenderLevel( int i )
     {
+
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
         mRenderLevel[msCurrentRenderLevelIndex] = i;