Changeset 1195

Timestamp:

08/10/06 17:08:57 (18 years ago)

Author:

szydlowski

Message:

visualization workin' fine (TM)
demo recording/playback partially implemented

Files:

• GTP/trunk/App/Demos/Vis/KdTreeDemo/OGRE/include/TestKdTree.h (modified) (4 diffs)
• GTP/trunk/App/Demos/Vis/KdTreeDemo/OGRE/include/TestKdTreeAppListener.h (modified) (3 diffs)
• GTP/trunk/App/Demos/Vis/KdTreeDemo/OGRE/src/TestKdTree.cpp (modified) (3 diffs)
• GTP/trunk/App/Demos/Vis/KdTreeDemo/OGRE/src/TestKdTreeAppListener.cpp (modified) (14 diffs)
• GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreKdRenderable.h (modified) (1 diff)
• GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreKdTree.h (modified) (11 diffs)
• GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/scripts/Plugin_VisibilitySceneManager.vcproj (modified) (2 diffs)
• GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTree.cpp (modified) (5 diffs)
• GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTreeHierarchyInterface.cpp (modified) (3 diffs)
• GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTreeSceneManager.cpp (modified) (5 diffs)
• GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreKdTreeSceneNode.cpp (modified) (1 diff)
• OGRE/trunk/resources/overlays/TestKdTree.overlay (modified) (2 diffs)

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

@@ -6 +6 @@
 #include <ivreader.h>
 #include "TestKdTreeAppListener.h"
+
+
+class KdTreeAppRenderTargetListener : public RenderTargetListener
+{
+public:
+        KdTreeAppRenderTargetListener(SceneManager *sceneMgr);
+
+protected:
+        void preViewportUpdate (const RenderTargetViewportEvent &evt);
+        void postRenderTargetUpdate (const RenderTargetEvent &evt);
+
+        SceneManager *mSceneMgr;
+
+        ShadowTechnique mSavedShadowTechnique;
+        ColourValue mSavedAmbientLight;
+};
 
 class KdTreeApp : public ExampleApplication
@@ -15 +31 @@
         ~KdTreeApp()
         {
+                delete mRenderTargerListener;
                 delete mFrameListener;
         }
@@ -24 +41 @@
         Camera *mFollowCam;
         KdTreeAppListener *mFrameListener;
+        KdTreeAppRenderTargetListener *mRenderTargerListener;
 
         String  mSceneFiles;
@@ -69 +87 @@
 };
 
-class KdTreeAppRenderTargetListener : public RenderTargetListener
-{
-public:
-        KdTreeAppRenderTargetListener(SceneManager *sceneMgr);
-
-protected:
-        void preViewportUpdate (const RenderTargetViewportEvent &evt);
-        void postRenderTargetUpdate (const RenderTargetEvent &evt);
-
-        SceneManager *mSceneMgr;
-
-        ShadowTechnique mSavedShadowTechnique;
-        ColourValue mSavedAmbientLight;
-};
-
 #endif

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

@@ -55 +55 @@
         bool mShowTree;
         bool mFreeMove;
+        bool mTopCamFollow;
 
         Real mDelayedQueriesIssued;
@@ -71 +72 @@
         OverlayElement *mRenderMethodInfo;
         OverlayElement *mMovementInfo;
+        OverlayElement *mTopCamInfo;
 
         OverlayElement *mFrustumCulledNodesInfo;
@@ -107 +109 @@
     void updateStats(void);
 
+        // stuff for walkthrough recording/playback
+        struct FrameInfo
+        {
+                FrameInfo(Vector3 pos, Quaternion or, Real time):
+                mPosition(pos), mOrientation(or), mElapsedTime(time)
+                { }
+
+                Vector3 mPosition;
+                Quaternion mOrientation;
+                Real    mElapsedTime;
+        };
+
+        typedef std::list<FrameInfo> FrameList;
+
+        enum AppState
+        {
+                AS_NORMAL,
+                AS_RECORD,
+                AS_PLAYBACK
+        };
+
+        FrameList mFrameList;
+
+        AppState mAppState;
+
+        void toggleRecord();
+        void togglePlayback();
+        void saveFrameInfo(Real elapsedTime);
+
 public:
+        void loadFrames(const String& filename);
+        void saveFrames(const String& filename);
 
         // visualization modes for scene nodes

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

@@ -246 +246 @@
                         light->setDirection(-1,-1,-1);
                 }
-                light->setDiffuseColour(ColourValue());
+                light->setDiffuseColour(ColourValue::White);
                 light->setSpecularColour(ColourValue(1, 1, 0.2));
 
@@ -276 +276 @@
         mFrameListener->showDebugOverlay( true );
         mRoot->addFrameListener(mFrameListener);
-        mWindow->addListener(new KdTreeAppRenderTargetListener(mSceneMgr));
+        mRenderTargerListener = new KdTreeAppRenderTargetListener(mSceneMgr);
+        mWindow->addListener(mRenderTargerListener);
 }
 
@@ -312 +313 @@
         mTopCam->setDirection(0,0,-1);
         mTopCam->pitch(Radian(-Math::HALF_PI));
-        mTopCam->setCullingFrustum(mCamera);
+        //mTopCam->setCullingFrustum(mCamera);
         mTopCam->setNearClipDistance(1);
 

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

@@ +1 @@
+#include <fstream>
+#include <cstdlib>
+
 #include "TestKdTreeAppListener.h"
 
@@ -92 +95 @@
         }
 
+        mTopCamFollow = true;
         mFreeMove = false;
         mShowTree = false;
@@ -97 +101 @@
         mVizCamTransVect = Vector3::ZERO;
         mSeqNum = 0;
+
+        mAppState = AS_NORMAL;
 
         mDelayedQueriesIssued = 0.0;
@@ -127 +133 @@
 
         showDebugOverlay(true);
+
+        loadFrames("demo-in.txt");
 }
 //-----------------------------------------------------------------------
@@ -139 +147 @@
                 PlatformManager::getSingleton().destroyInputReader( mInputDevice );
         }
+
+        // save demo
+        if (!mFrameList.empty())
+                saveFrames("demo-out.txt");
 }
 //-----------------------------------------------------------------------
@@ -183 +195 @@
         const int vert_space = 15;
         const String na = ": N/A";
-        String sMD, sKT, sKI, sHL, sBM, sRM, sFM;
+        String sMD, sKT, sKI, sHL, sBM, sRM, sFM, sTC;
 
         int top = border_height;
@@ -244 +256 @@
                 sFM = ": Ground";
 
+        sTC = na;
+        if (mTopCamFollow)
+                sTC = ": Follow";
+        else
+                sTC = ": Free";
+
         initOverlayElement(&mRenderMethodInfo, ext, "RenderMethod", top, sRM); top += vert_space;
         initOverlayElement(&mBuildMethodInfo, ext, "BuildMethod", top, sBM); top += vert_space;
@@ -251 +269 @@
         initOverlayElement(&mKIInfo, ext, "KI", top, sKI); top += vert_space;
         initOverlayElement(&mMovementInfo, ext, "Movement", top, sFM); top += vert_space;
+        initOverlayElement(&mTopCamInfo, ext, "TopCam", top, sTC); top += vert_space;
 
         OverlayElement *visPanel = OverlayManager::getSingleton().
@@ -313 +332 @@
 bool KdTreeAppListener::processUnbufferedKeyInput(const FrameEvent& evt)
 {
+        // demo recording stuff
+        if (mInputDevice->isKeyDown(KC_F5) && mTimeUntilNextToggle <= 0)
+        {
+                toggleRecord();
+                mTimeUntilNextToggle = 0.5;
+        }
+
+        if (mInputDevice->isKeyDown(KC_F9) && mTimeUntilNextToggle <= 0)
+        {
+                togglePlayback();
+                mTimeUntilNextToggle = 0.5;
+        }
+
+        const static int vizCamSpeedup = 12;
         // moving the cull camera
         if (mInputDevice->isKeyDown(KC_NUMPAD2))
         {
-                mVizCamTransVect.y = -mMoveScale;
+                mVizCamTransVect.y = -mMoveScale * vizCamSpeedup;
         }
         if (mInputDevice->isKeyDown(KC_NUMPAD8))
         {
-                mVizCamTransVect.y = mMoveScale;
+                mVizCamTransVect.y = mMoveScale * vizCamSpeedup;
         }
         if (mInputDevice->isKeyDown(KC_NUMPAD4))
         {
-                mVizCamTransVect.x = mMoveScale;
+                mVizCamTransVect.x = -mMoveScale * vizCamSpeedup;
         }
         if (mInputDevice->isKeyDown(KC_NUMPAD6))
         {
-                mVizCamTransVect.x = -mMoveScale;
+                mVizCamTransVect.x = mMoveScale * vizCamSpeedup;
         }
         if (mInputDevice->isKeyDown(KC_SUBTRACT))
         {
-                mVizCamTransVect.z = mMoveScale;
+                mVizCamTransVect.z = mMoveScale * vizCamSpeedup;
         }
         if (mInputDevice->isKeyDown(KC_ADD))
         {
-                mVizCamTransVect.z = -mMoveScale;
+                mVizCamTransVect.z = -mMoveScale * vizCamSpeedup;
         }
 
         // stuff for the overlay
-        static String sNA = ": N/A";
+        const static String sNA = ": N/A";
 
         static String bmOptions[] = { "Recursive", "PriorityQueue" };
@@ -504 +537 @@
         }
 
-        if (mInputDevice->isKeyDown(KC_Q) && mTimeUntilNextToggle <= 0)
+        if (mInputDevice->isKeyDown(KC_U) && mTimeUntilNextToggle <= 0)
         {
                 mFreeMove = !mFreeMove;
-                String move = "N/A";
+                String move = ": N/A";
                 if (mFreeMove)
                         move = ": Free";
@@ -518 +551 @@
         }
 
+        if (mInputDevice->isKeyDown(KC_I) && mTimeUntilNextToggle <= 0)
+        {
+                mTopCamFollow = !mTopCamFollow;
+                String move = ": N/A";
+                if (mTopCamFollow)
+                        move = ": Follow";
+                else
+                        move = ": Free";
+
+                mTopCamInfo->setCaption(move);
+
+                mTimeUntilNextToggle = 0.5;
+        }
 
         if (mInputDevice->isKeyDown(KC_BACK) && mTimeUntilNextToggle <= 0)
@@ -801 +847 @@
         mCamNode->translate(mCamNode->getLocalAxes(), mTranslateVector);
         mTopCam->moveRelative(mVizCamTransVect);
+        if (mTopCamFollow)
+        {
+                Vector3 toppos = mTopCam->getPosition();
+                Vector3 campos = mCamNode->getPosition();
+                mTopCam->setPosition(Vector3::ZERO);
+                mTopCam->setOrientation(Quaternion::IDENTITY);
+                mTopCam->setPosition(campos.x, toppos.y, campos.z);
+                mTopCam->pitch(Radian(-Math::HALF_PI));
+        }
 
         if (!mFreeMove)
@@ -894 +949 @@
 
         }
+
+
+        //saveFrameInfo(evt.timeSinceLastFrame);
+        if (mAppState == AS_RECORD)
+        {
+                mFrameList.push_back(FrameInfo(mCamNode->getPosition(), mCamNode->getOrientation(), evt.timeSinceLastFrame));
+        }
+
 
         //Camera        *followCam = mSceneMgr->getCamera("FollowCam");
@@ -953 +1016 @@
         }
 }
+
+/************************************************************************/
+/* functions for recording & playback of demos                          */
+/************************************************************************/
+
+//-----------------------------------------------------------------------------
+void KdTreeAppListener::toggleRecord()
+{
+        // TODO: overlay
+        if (mAppState == AS_NORMAL)
+        {
+                mAppState = AS_RECORD;
+        }
+        else if (mAppState == AS_RECORD)
+        {
+                mAppState = AS_NORMAL;
+        }
+}
+
+//-----------------------------------------------------------------------------
+void KdTreeAppListener::togglePlayback()
+{
+        // TODO: overlay
+        if (mAppState == AS_NORMAL)
+        {
+                mAppState = AS_PLAYBACK;
+        }
+        else if (mAppState == AS_PLAYBACK)
+        {
+                mAppState = AS_NORMAL;
+        }
+}
+
+//-----------------------------------------------------------------------------
+void KdTreeAppListener::saveFrameInfo(Real elapsedTime)
+{
+        mFrameList.push_back(FrameInfo(mCamNode->getPosition(), mCamNode->getOrientation(), elapsedTime));
+}
+
+//-----------------------------------------------------------------------------
+void KdTreeAppListener::saveFrames(const String& filename)
+{
+        // open file
+        std::ofstream dest(filename.c_str());
+        if (!dest)
+        {
+                LogManager::getSingleton().logMessage("Failed to open file for saving demo: " + filename);
+                return;
+        }
+
+        FrameList::iterator it = mFrameList.begin();
+        FrameList::iterator end = mFrameList.end();
+
+        // dump values
+        while (it != end)
+        {
+                dest << 
+                        StringConverter::toString(it->mPosition) << " " << 
+                        StringConverter::toString(it->mOrientation) << " " << 
+                        StringConverter::toString(it->mElapsedTime) << "\n";
+                ++ it;
+        }
+
+        dest.close();
+}
+
+//-----------------------------------------------------------------------------
+void KdTreeAppListener::loadFrames(const String& filename)
+{
+        // open file
+        std::ifstream src(filename.c_str());
+        if (!src)
+        {
+                LogManager::getSingleton().logMessage("Failed to open file for reading demo: " + filename);
+                return;
+        }
+
+        // clear the list
+        mFrameList.clear();
+
+        Vector3 pos;
+        Quaternion or;
+        Real time;
+
+        while (!src.eof())
+        {
+                src >> pos.x;   
+                src >> pos.y;   
+                src >> pos.z;
+
+                src >> or.w;
+                src >> or.x;
+                src >> or.y;
+                src >> or.z;
+
+                src >> time;
+
+                mFrameList.push_back(FrameInfo(pos, or, time));
+        }
+
+        // HACK pop last frame, was doubled while reading
+        mFrameList.pop_back();
+
+        src.close();
+}

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

@@ -12 +12 @@
 
 #include "OgreKdTree.h"
-#include "HierarchyInterface.h"
 
 namespace Ogre

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

@@ -27 +27 @@
 #include <stack>
 
+#include "HierarchyInterface.h"
 
 
@@ -210 +211 @@
 
                         // Gets this node's parent (NULL if this is the root).
-                        Node *getParent(void) const { return mParent; };
-                        // Gets the nodes left & right child nodes, or NULL if not present
-                        // or node is leaf
-                        virtual Node *getLeftChild(void) const = 0;
-                        virtual Node *getRightChild(void) const = 0;
-                        
-                        // returns the level the node is on
-                        int getLevel(void) const { return mLevel; };
-
+                        KdTree::Node *getParent(void) const { return mParent; };
+
+                        // Gets the nodes left & right child nodes, or NULL if not present or node is leaf
+                        virtual KdTree::Node *getLeftChild(void) const = 0;
+                        virtual KdTree::Node *getRightChild(void) const = 0;
+
+                        // add contained objects to render queue
                         virtual void queueVisibleObjects(unsigned long currentFrame, 
                                 Camera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes) = 0;
+
+                        // add contained geometry (Entities) to list
+                        virtual void getGeometryList(GtpVisibility::GeometryVector *geometryList) = 0;
                         
+                        // create (when necessary), setup and return wire bounding box representing the node
                         WireBoundingBox * getWireBoundingBox()
                         {
@@ -238 +241 @@
                                 
                                 return mWBB;
-
                         }
+
+                        // returns the level the node is on
+                        int getLevel(void) const { return mLevel; };
 
                         // functions for the CHC hierarchy interface
@@ -270 +275 @@
                         */
                         virtual void _updateBounds(bool recurse = true) = 0;
-
+                        
+                        /** bounding box of the node**/
                         AxisAlignedBox mAABB;
 
-                        // for the CHC hierarchy interface
-                        /** the real extent of the node. */
+                        /** mounding box of all objects inside the node */
                         AxisAlignedBox mWorldAABB;
                 protected:
@@ -283 +288 @@
                         WireBoundingBox * mWBB;
                         
+                        // for the CHC hierarchy interface
                         unsigned int mLastRendered;
                         unsigned int mLastVisited;
@@ -317 +323 @@
 
                         // a branch should have at least one child
-                        virtual Node * getLeftChild() const { return mLeft; };
-                        virtual Node * getRightChild() const { return mRight; };
+                        virtual KdTree::Node * getLeftChild() const { return mLeft; };
+                        virtual KdTree::Node * getRightChild() const { return mRight; };
 
                         virtual void queueVisibleObjects(unsigned long currentFrame, 
@@ -327 +333 @@
                                                 queue->addRenderable(getWireBoundingBox());
                         }
+
+                        // a branch has no geometry, do nothing
+                        virtual void getGeometryList(GtpVisibility::GeometryVector *geometryList) { }
 
                         // branches do not posses geometry => just merge child aabbs
@@ -369 +378 @@
 
                         // a leaf never has children 
-                        virtual Node * getLeftChild() const { return 0; };
-                        virtual Node * getRightChild() const { return 0; };
+                        virtual KdTree::Node * getLeftChild() const { return 0; };
+                        virtual KdTree::Node * getRightChild() const { return 0; };
 
                         virtual void queueVisibleObjects(unsigned long currentFrame, 
                                 Camera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes);
 
+                        virtual void getGeometryList(GtpVisibility::GeometryVector *geometryList);
+
                         // update the world aabb based on the contained geometry
                         virtual void _updateBounds(bool recurse = true);
@@ -394 +405 @@
                 struct SplitCandidate
                 {
-                        SplitCandidate(PlaneEventList * e, int n, AxisAlignedBox& a, KdTree::Branch * p, Real c, Real d, SplitInfo * b, PlaneEvent::Side s):
-                                events(e), nObjects(n), aabb(a), parent(p), cost(c), decrease(d), best(b), side(s) { };
+                        SplitCandidate(PlaneEventList * e, int n, AxisAlignedBox& a,
+                                KdTree::Branch * p, Real c, Real d, SplitInfo * b, PlaneEvent::Side s):
+                        events(e), nObjects(n), aabb(a), parent(p), cost(c), decrease(d), best(b), side(s)
+                        { };
 
                         bool operator < (const SplitCandidate& rhs) const
@@ -504 +517 @@
 
                 // test visibility of objects and add to render queue
-                void queueVisibleObjects(Camera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes = false);
+                void queueVisibleObjects(Camera* cam, RenderQueue* queue, bool onlyShadowCasters, 
+                        bool showBoxes, KdTree::NodeList& visibleNodes);
+
+                // find visible nodes & place in list
+                //void findVisibleNodes(NodeList& visibleNodes, Camera * cam);
 
                 // self-explanatory ...
@@ -536 +553 @@
 
                 // recursive rendering function
-                void recQueueVisibleObjects(KdTree::Node * node, unsigned long currentFrame, 
-                        Camera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes);
+                void recQueueVisibleObjects(KdTree::Node * node, unsigned long currentFrame, Camera* cam,
+                        RenderQueue* queue, bool onlyShadowCasters, bool showBoxes, KdTree::NodeList& visibleNodes);
+
+                // recursively find visible nodes
+                //void recFindVisibleNodes(KdTree::Node * node, NodeList& visibleNodes, Camera * cam);
 
                 // the root node of the kdtree

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

@@ -21 +21 @@
                                 Optimization="0"
                                 AdditionalIncludeDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Dependencies\include";..\include;..\..\..\OnlineCullingCHC\include;..\..\..\Preprocessing\src"
-                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PLUGIN_OCCLUSIONCULLINGSCENEMANAGER_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE;KDTREE_DEBUG"
+                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PLUGIN_OCCLUSIONCULLINGSCENEMANAGER_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE"
                                 MinimalRebuild="TRUE"
                                 BasicRuntimeChecks="3"
@@ -89 +89 @@
                                 OptimizeForProcessor="2"
                                 AdditionalIncludeDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Dependencies\include";..\include;..\..\..\OnlineCullingCHC\include;..\..\..\Preprocessing\src"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GTP_VISIBILITY_MODIFIED_OGRE;KDTREE_DEBUG"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GTP_VISIBILITY_MODIFIED_OGRE"
                                 StringPooling="TRUE"
                                 RuntimeLibrary="2"

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

@@ -307 +307 @@
         mMaxDepth(maxdepth), 
         mBuildMethod(bm), 
-        mHiLiteLevel(HILITE_OFF),
+        mHiLiteLevel(0),
         mShowAllBoxes(false),
         mShowNodes(true),
@@ -335 +335 @@
         void KdTree::init()
         {
-                // init visualization materials
-                MaterialPtr mphi = MaterialManager::getSingleton().getByName("KdTree/BoxHiLite");
-                if (mphi.isNull())
+                MaterialPtr mat;
+                TextureUnitState *tex;
+
+                // init visualization materials (unlit solid green/yellow)
+                mat = MaterialManager::getSingleton().getByName("KdTree/BoxHiLite");
+                if (mat.isNull())
                 {
                         ColourValue green(0, 1, 0);
-                        mphi = MaterialManager::getSingleton().create("KdTree/BoxHiLite", "General");
-                        mphi->setAmbient(green);
-                        mphi->setDiffuse(green);
-                        mphi->setLightingEnabled(true);
-                        mphi->getTechnique(0)->getPass(0)->removeAllTextureUnitStates();
-                }
-
-                MaterialPtr mpviz = MaterialManager::getSingleton().getByName("KdTree/BoxViz");
-                if (mpviz.isNull())
+                        mat = MaterialManager::getSingleton().create("KdTree/BoxHiLite", "General");
+                        //mat->setAmbient(green);
+                        //mat->setDiffuse(green);
+                        mat->setLightingEnabled(false);
+                        tex = mat->getTechnique(0)->getPass(0)->createTextureUnitState();
+                        tex->setColourOperationEx(LBX_SOURCE2, LBS_CURRENT, LBS_MANUAL, green, green);
+                }
+
+                mat = MaterialManager::getSingleton().getByName("KdTree/BoxViz");
+                if (mat.isNull())
                 {
                         ColourValue yellow(1, 1, 0);
-                        mpviz = MaterialManager::getSingleton().create("KdTree/BoxViz", "General");
-                        mpviz->setAmbient(yellow);
-                        mpviz->setDiffuse(yellow);
-                        mpviz->setLightingEnabled(true);
-                        mpviz->getTechnique(0)->getPass(0)->removeAllTextureUnitStates();
+                        mat = MaterialManager::getSingleton().create("KdTree/BoxViz", "General");
+                        //mat->setAmbient(yellow);
+                        //mat->setDiffuse(yellow);
+                        mat->setLightingEnabled(false);
+                        tex = mat->getTechnique(0)->getPass(0)->createTextureUnitState();
+                        tex->setColourOperationEx(LBX_SOURCE2, LBS_CURRENT, LBS_MANUAL, yellow, yellow);
                 }
 
@@ -1180 +1185 @@
 
         //-------------------------------------------------------------------------
-        void KdTree::queueVisibleObjects(Camera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes)
+        void KdTree::queueVisibleObjects(Camera* cam, RenderQueue* queue, bool onlyShadowCasters, 
+                bool showBoxes, KdTree::NodeList& visibleNodes)
         {
                 if (mKdRoot)
                         recQueueVisibleObjects(mKdRoot, Root::getSingleton().getCurrentFrameNumber(),
-                                cam, queue, onlyShadowCasters, showBoxes);
+                                cam, queue, onlyShadowCasters, showBoxes, visibleNodes);
         }
 
         //-------------------------------------------------------------------------
         void KdTree::recQueueVisibleObjects(KdTree::Node * node, unsigned long currentFrame, 
-                Camera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes)
+                Camera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes, KdTree::NodeList& visibleNodes)
         {
                 // test visibility
                 if (cam->isVisible(node->mAABB))
                 {
-#if 0
+                        visibleNodes.push_back(node);
+
                         node->queueVisibleObjects(currentFrame, cam, queue, onlyShadowCasters, showBoxes);
 
                         if (node->getLeftChild())
-                                recQueueVisibleObjects(node->getLeftChild(), currentFrame, cam, queue, onlyShadowCasters, showBoxes);
+                                recQueueVisibleObjects(node->getLeftChild(), currentFrame, 
+                                cam, queue, onlyShadowCasters, showBoxes, visibleNodes);
                         if (node->getRightChild())
-                                recQueueVisibleObjects(node->getRightChild(), currentFrame, cam, queue, onlyShadowCasters, showBoxes);
-#else
-#ifdef KDTREE_DEBUG
-                        WireBoundingBox * wbb = 0;
-                        if (showBoxes)
-                                wbb = node->getWireBoundingBox();
-#endif
-
-                        if (node->isLeaf())
-                        {
-                                KdTree::Leaf * leaf = KDLEAFPTR_CAST(node);
-                                KdRenderableList::iterator it  = leaf->mKdRenderables.begin();
-                                KdRenderableList::iterator end = leaf->mKdRenderables.end();
-                                while (it != end)
-                                {                       
-                                        if (!(*it)->isQueued(currentFrame, cam))
-                                        {
-                                                (*it)->queueObjects(cam, queue, onlyShadowCasters);
-                                        }
-                                        it++;
-                                }
-#ifdef KDTREE_DEBUG
-                                if (wbb)
-                                        queue->addRenderable(wbb);
-#else
-                                if (showBoxes)
-                                        queue->addRenderable(leaf->getWireBoundingBox());
-#endif
-                        }
-                        else
-                        {
-                                KdTree::Branch * branch = KDBRANCHPTR_CAST(node);
-#ifdef KDTREE_DEBUG
-                                if (wbb)
-                                        queue->addRenderable(wbb);
-#else
-                                if (showBoxes)
-                                        queue->addRenderable(branch->getWireBoundingBox());
-#endif
-
-                                if (branch->mLeft)
-                                        recQueueVisibleObjects(branch->mLeft, currentFrame, cam, queue, onlyShadowCasters, showBoxes);
-                                if (branch->mRight)
-                                        recQueueVisibleObjects(branch->mRight, currentFrame, cam, queue, onlyShadowCasters, showBoxes);
-                        }
-#endif
-                }
-        }
+                                recQueueVisibleObjects(node->getRightChild(), currentFrame, 
+                                cam, queue, onlyShadowCasters, showBoxes, visibleNodes);
+                }
+        }
+
+        ////-------------------------------------------------------------------------
+        //void KdTree::findVisibleNodes(NodeList& visibleNodes, Camera * cam)
+        //{
+        //      if (mKdRoot)
+        //              recFindVisibleNodes(mKdRoot, visibleNodes, cam);
+        //}
+
+        ////-------------------------------------------------------------------------
+        //void KdTree::recFindVisibleNodes(KdTree::Node * node, NodeList& visibleNodes, Camera * cam)
+        //{
+        //      // test visibility
+        //      if (cam->isVisible(node->mAABB))
+        //      {
+        //              visibleNodes.push_back(node);
+
+        //              if (node->getLeftChild())
+        //                      recFindVisibleNodes(node->getLeftChild(), visibleNodes, cam);
+        //              if (node->getRightChild())
+        //                      recFindVisibleNodes(node->getRightChild(), visibleNodes, cam);
+        //      }
+        //}
 
         /************************************************************************/
@@ -1356 +1342 @@
         }
 
+        //-------------------------------------------------------------------------
         void KdTree::Leaf::queueVisibleObjects(unsigned long currentFrame, 
                 Camera* cam, RenderQueue* queue, bool onlyShadowCasters, bool showBoxes)
@@ -1376 +1363 @@
 
         //-------------------------------------------------------------------------
+        void KdTree::Leaf::getGeometryList(GtpVisibility::GeometryVector *geometryList)
+        {
+                KdRenderableList::iterator it = mKdRenderables.begin();
+                KdRenderableList::iterator end = mKdRenderables.end();
+                while (it != end)
+                {
+                        (*it)->getGeometryList(geometryList);
+                        it++;
+                }
+        }
+
+        //-------------------------------------------------------------------------
         // update the world aabb based on the contained geometry
         void KdTree::Leaf::_updateBounds(bool recurse)

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

@@ -42 +42 @@
         else
         {
-                KdTree::Branch * kdbranch = KDBRANCHPTR_CAST(node);
-                if (kdbranch->mLeft)
-                        mDistanceQueue->push(kdbranch->mLeft);
-                if (kdbranch->mRight)
-                        mDistanceQueue->push(kdbranch->mRight);
+                //KdTree::Branch * kdbranch = KDBRANCHPTR_CAST(node);
+                //if (kdbranch->mLeft)
+                //      mDistanceQueue->push(kdbranch->mLeft);
+                //if (kdbranch->mRight)
+                //      mDistanceQueue->push(kdbranch->mRight);
+                if (kdnode->getLeftChild())
+                        mDistanceQueue->push(kdnode->getLeftChild());
+                if (kdnode->getRightChild())
+                        mDistanceQueue->push(kdnode->getRightChild());
         }
 }
@@ -133 +137 @@
         }
 
-        // TODO: maybe boxlist?
         dynamic_cast<KdTreeSceneManager *>(mSceneManager)->getRenderQueue()->addRenderable(box);
 }
@@ -141 +144 @@
                                                                                                    bool includeChildren) 
 {
-        KdTree::Node * kdnode = KDNODEPTR_CAST(node);
-        if (kdnode->isLeaf())
-        {
-                KdTree::Leaf * kdleaf = KDLEAFPTR_CAST(node);
-                KdRenderableList::iterator it = kdleaf->mKdRenderables.begin();
-                KdRenderableList::iterator end = kdleaf->mKdRenderables.end();
-                while (it != end)
-                {
-                        (*it)->getGeometryList(geometryList);
-                        it++;
-                }
-        }
+        KDNODEPTR_CAST(node)->getGeometryList(geometryList);
 }
 

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

@@ -539 +539 @@
         {
                 getRenderQueue()->clear();
-                if (mKdTree)
-                        mKdTree->queueVisibleObjects(cam, getRenderQueue(), onlyShadowCasters, mShowBoxes);
+                if (mShowVisualization)
+                {
+                        PrepareVisualization(cam);
+                }
+                else
+                {
+                        mVisibleNodes.clear();
+                        if (mKdTree)
+                                mKdTree->queueVisibleObjects(cam, getRenderQueue(), onlyShadowCasters, mShowBoxes, mVisibleNodes);
+                }
         }
         else
@@ -561 +569 @@
                                 getRenderQueue()->clear();
                                 if (mKdTree)
-                                        mKdTree->queueVisibleObjects(cam, getRenderQueue(), onlyShadowCasters, mShowBoxes);
+                                        mKdTree->queueVisibleObjects(cam, getRenderQueue(), onlyShadowCasters, mShowBoxes, mVisibleNodes);
                         }
 
@@ -571 +579 @@
                         //updatePvs(cam);
                 }
-        }
-
-        mVisibleNodes.clear();  
+                mVisibleNodes.clear();  
+        }
 }
 
@@ -726 +733 @@
         mVisibleNodes.push_back(node);
 
-        //KdRenderableList::const_iterator it = nodelist.begin();
-        //KdRenderableList::const_iterator end = nodelist.end();
-        //while (it != end)
-        //{
-        //      if (!(*it)->isQueued(mHierarchyInterface->GetFrameId(), cam))
-        //      {
-        //              mVisibleNodes.push_back(*it);
-        //              (*it)->queueObjects(cam, getRenderQueue(), onlyShadowCasters);
-        //      }
-        //      it++;
-        //}
-
         _renderQueueGroupObjects(currentGroup, QueuedRenderableCollection::OM_PASS_GROUP);
 }
@@ -937 +932 @@
         if (mRenderNodesForViz || mRenderNodesContentForViz)
         {
-                // HACK: change node material so it is better suited for visualization
-                //MaterialPtr nodeMat = MaterialManager::getSingleton().getByName("Core/NodeMaterial");
+                RenderQueue * queue = getRenderQueue();
+                unsigned long frameid = 0;
+
+                if (mRenderMethod == KdTree::KDRM_INTERNAL)
+                        frameid = Root::getSingleton().getCurrentFrameNumber();
+                else
+                        frameid = mHierarchyInterface->GetFrameId();
 
                 for (KdTree::NodeList::iterator it = mVisibleNodes.begin(); it != mVisibleNodes.end(); ++it)
                 {
-                        if (mRenderNodesForViz)
+                        if (mRenderNodesForViz && (*it)->isLeaf())
                         {
                                 WireBoundingBox * wirebox = (*it)->getWireBoundingBox();
-                                if (wirebox)
-                                        getRenderQueue()->addRenderable(wirebox);
+                                wirebox->setMaterial("KdTree/BoxViz");
+                                getRenderQueue()->addRenderable(wirebox);
                         }
                         // add renderables itself
                         if (mRenderNodesContentForViz) 
                         {
-                                (*it)->queueVisibleObjects(mHierarchyInterface->GetFrameId(), 
-                                        cam, getRenderQueue(), false, true);
+                                (*it)->queueVisibleObjects(frameid, cam, queue, false, false);
                         }
                 }

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

@@ -142 +142 @@
                         {
                                 Entity *ent = static_cast<Entity *>(movable);
-                                //std::stringstream d; d << "ent " << ent->getName(); 
-                                //LogManager::getSingleton().logMessage(d.str());
                                 geometryList->push_back(ent);
                         }

OGRE/trunk/resources/overlays/TestKdTree.overlay

@@ -126 +126 @@
                         width 120
                         height 30
-                        caption [Q] Movement
+                        caption [U] Movement
                 }
                 element TextArea(KdTree/MovementInfo): KdTree/Templates/BasicText
@@ -135 +135 @@
                         caption :
                 }
+                element TextArea(KdTree/TopCam): KdTree/Templates/BasicText
+                {
+                        left 5
+                        width 120
+                        height 30
+                        caption [I] Viz Cam
+                }
+                element TextArea(KdTree/TopCamInfo): KdTree/Templates/BasicText
+                {
+                        left 160
+                        width 180
+                        height 30
+                        caption :
+                }               
         }