Changeset 1165 for GTP/trunk

Timestamp:

07/27/06 17:08:21 (18 years ago)

Author:

szydlowski

Message:

Started implementing the hierarchy interface for the kdtree scene manager

Location:

GTP/trunk

Files:

• App/Demos/Vis/KdTreeDemo/OGRE/include/TestKdTreeAppListener.h (modified) (1 diff)
• App/Demos/Vis/KdTreeDemo/OGRE/src/TestKdTree.cpp (modified) (1 diff)
• Lib/Vis/OnlineCullingCHC/OGRE/include/OgreKdTree.h (modified) (2 diffs)
• Lib/Vis/OnlineCullingCHC/OGRE/include/OgreKdTreeHierarchyInterface.h (added)
• Lib/Vis/OnlineCullingCHC/OGRE/include/OgreKdTreeSceneManager.h (modified) (4 diffs)
• Lib/Vis/OnlineCullingCHC/OGRE/scripts/Plugin_VisibilitySceneManager.vcproj (modified) (2 diffs)
• Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTreeHierarchyInterface.cpp (added)
• Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTreeSceneManager.cpp (modified) (5 diffs)
• Lib/Vis/OnlineCullingCHC/OGRE/src/OgreVisibilitySceneManagerDll.cpp (modified) (1 diff)
• Lib/Vis/shared/scripts/GtpVisibility.sln (modified) (1 diff)
• Lib/Vis/shared/scripts/GtpVisibility.suo (modified) (previous)

GTP/trunk/App/Demos/Vis/KdTreeDemo/OGRE/include/TestKdTreeAppListener.h

@@ -666 +666 @@
         mCamera->moveRelative(mTranslateVector);
                 mTopCam->moveRelative(mCullTransVec);
+
+                Vector3 pos = mCamera->getPosition();
+                RaySceneQuery * rsquery = mSceneMgr->createRayQuery(Ray(pos, Vector3::NEGATIVE_UNIT_Y));
+                RaySceneQueryResult& rsresult = rsquery->execute();
+
+                RaySceneQueryResult::iterator it = rsresult.begin();
+                RaySceneQueryResult::iterator end = rsresult.end();
+
+                while (it != end && it->movable)
+                {
+                        if (it->movable->getName() != "PlayerCam")
+                        {
+                                mCamera->setPosition(pos.x, it->movable->getWorldBoundingBox().getCenter().y + 3, pos.z);
+                                break;
+                        }
+                        it++;
+                }
+                OGRE_DELETE(rsquery);
         }
 

GTP/trunk/App/Demos/Vis/KdTreeDemo/OGRE/src/TestKdTree.cpp

@@ -117 +117 @@
                 //mCamera->setPosition(Vector3(830, 300, -540));
                 //mCamera->setOrientation(Quaternion(-0.3486, 0.0122, 0.9365, 0.0329));
-                mCamera->setPosition(Vector3(688, 866, 944));
-                mCamera->setOrientation(Quaternion(-0.979419, 0.201128, 0.0165594, 0.00340038));
+                // total view
+                //mCamera->setPosition(Vector3(688, 866, 944));
+                //mCamera->setOrientation(Quaternion(-0.979419, 0.201128, 0.0165594, 0.00340038));
                 mTopCam->setPosition(Vector3(1232, 3990, -1477));
+                // walkthrough view
+                mCamera->setPosition(Vector3(1102.56, 181.845, -350.305));
+                mCamera->setOrientation(Quaternion(-0.977321, -0.117497, -0.174903, 0.0210273));
         }
         else

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreKdTree.h

@@ -19 +19 @@
 
 #include <stack>
+
+#include "OgreKdTreeHierarchyInterface.h"
 
 namespace Ogre
@@ -339 +341 @@
 
         public:
+                friend class Ogre::KdTreeHierarchyInterface;
+
                 typedef KdTree::Leaf * LeafPtr;
                 typedef std::set<LeafPtr> LeafSet;

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreKdTreeSceneManager.h

@@ -11 +11 @@
 #define _KdTreeSceneManager_H__
 
+#include <OgreKdTreeHierarchyInterface.h>
 #include <OgreSceneManager.h>
 #include "OgreKdTree.h"
+#include "VisibilityManager.h"
+
+#define KDTREE_MAX_DEPTH 20
 
 namespace Ogre
@@ -23 +27 @@
         {
         public:
-                KdTreeSceneManager(const String& name);
+                KdTreeSceneManager(const String& name, GtpVisibility::VisibilityManager *vm);
                 //KdTreeSceneManager(const String& name, int maxdepth);
                 ~KdTreeSceneManager(void);
@@ -54 +58 @@
                         SceneManager::clearScene();
                 }
+
         protected:
+                GtpVisibility::VisibilityManager *mVisibilityManager;
+
+                KdTreeHierarchyInterface *mHierarchyInterface;
 
                 int mMaxDepth;
@@ -76 +84 @@
         protected:
                 void initMetaData(void) const;
+                GtpVisibility::VisibilityManager *visManager;
         public:
-                KdTreeSceneManagerFactory(void) {};
+                KdTreeSceneManagerFactory(GtpVisibility::VisibilityManager * vm)
+                {
+                        visManager = vm;
+                };
                 ~KdTreeSceneManagerFactory(void) {};
                 /// Factory type name

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/scripts/Plugin_VisibilitySceneManager.vcproj

@@ -273 +273 @@
                                 </File>
                                 <File
+                                        RelativePath="..\include\OgreKdTreeHierarchyInterface.h">
+                                </File>
+                                <File
                                         RelativePath="..\include\OgreKdTreeSceneManager.h">
                                 </File>
@@ -284 +287 @@
                                 <File
                                         RelativePath="..\src\OgreKdTree.cpp">
+                                </File>
+                                <File
+                                        RelativePath="..\src\OgreKdTreeHierarchyInterface.cpp">
                                 </File>
                                 <File

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTreeSceneManager.cpp

@@ -18 +18 @@
 namespace Ogre
 {
-        KdTreeSceneManager::KdTreeSceneManager(const String& name):
-                SceneManager(name)
-        {
-                int maxdepth = 20;
-                mKdTree = 0;
-                init(maxdepth);
-        }
-
-        KdTreeSceneManager::~KdTreeSceneManager(void)
-        {
-                delete mKdTree;
-        }
-
-        const String& KdTreeSceneManager::getTypeName(void) const
-        {
-                return KdTreeSceneManagerFactory::FACTORY_TYPE_NAME;
-        }
-
-        void KdTreeSceneManager::init(int maxdepth)
+        KdTreeSceneManager::KdTreeSceneManager(const String& name, GtpVisibility::VisibilityManager *vm):
+                SceneManager(name), mKdTree(0), mVisibilityManager(vm)
         {
                 // Replace root node with my node
@@ -44 +27 @@
                 mSceneRoot->_notifyRootNode();
 
-                mMaxDepth = maxdepth;
+                mMaxDepth = KDTREE_MAX_DEPTH;
                 mShowBoxes = false;
 
@@ -50 +33 @@
                 OGRE_DELETE(mKdTree);
 
-                mBuildMethod = KdTree::KDBM_RECURSIVE;
-                //mBuildMethod = KdTree::KDBM_PRIORITYQUEUE;
+                //mBuildMethod = KdTree::KDBM_RECURSIVE;
+                mBuildMethod = KdTree::KDBM_PRIORITYQUEUE;
 #ifdef KDTREE_DEBUG
                 mHighlighLevel = 0;
                 mShowAllBoxes = false;
 #endif
+
+                mHierarchyInterface = new KdTreeHierarchyInterface(this, mDestRenderSystem);
+        }
+
+        KdTreeSceneManager::~KdTreeSceneManager(void)
+        {
+                delete mKdTree;
+        }
+
+        const String& KdTreeSceneManager::getTypeName(void) const
+        {
+                return KdTreeSceneManagerFactory::FACTORY_TYPE_NAME;
         }
 
@@ -310 +305 @@
                 mMetaData.typeName = FACTORY_TYPE_NAME;
                 mMetaData.description = "Scene manager that organises the scene based on a kd-tree";
-                mMetaData.sceneTypeMask = ST_GENERIC; // support generic scenes (so far)
+                mMetaData.sceneTypeMask = 0xFFFF; // support all types of scenes (hopefully)
                 mMetaData.worldGeometrySupported = false;
         }
@@ -317 +312 @@
                 const String& instanceName)
         {
-                return new KdTreeSceneManager(instanceName);
+                return new KdTreeSceneManager(instanceName, visManager);
         }
         //-----------------------------------------------------------------------

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreVisibilitySceneManagerDll.cpp

@@ -54 +54 @@
         //visibilityTerrainPlugin = new VisibilityTerrainSceneManagerFactory(visManager);
         occlusionCullingPlugin = new OcclusionCullingSceneManagerFactory(visManager);
-        kdTreeFactory = new KdTreeSceneManagerFactory();
+        kdTreeFactory = new KdTreeSceneManagerFactory(visManager);
         // Construct listener manager singleton
         new TerrainPageSourceListenerManager();

GTP/trunk/Lib/Vis/shared/scripts/GtpVisibility.sln

@@ -40 +40 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestKdTree", "..\..\..\..\App\Demos\Vis\KdTreeDemo\OGRE\scripts\TestKdTree.vcproj", "{17F2C6F9-6101-430E-ABF4-71383868EF24}"
         ProjectSection(ProjectDependencies) = postProject
+                {80DECC17-BDDD-4412-8CF8-F7C1C17A7436} = {80DECC17-BDDD-4412-8CF8-F7C1C17A7436}
+                {7319E499-473D-4CE5-9983-725D6E68A55D} = {7319E499-473D-4CE5-9983-725D6E68A55D}
         EndProjectSection
 EndProject