Changeset 187 for trunk/VUT/work

Timestamp:

07/31/05 11:16:09 (19 years ago)

Author:

mattausch

Message:

added animationbug fix (deleting while animation)fixed visibilityQueriesadditive shadow volumes fixed for octree
hack to fully empty queue after traversal
added demo for vienna model

Location:

trunk/VUT/work

Files:

• IVReader/include/ivmeshdata.h (modified) (2 diffs)
• IVReader/include/ivreader.h (modified) (2 diffs)
• IVReader/src/ivmanualmeshloader.cpp (modified) (1 diff)
• IVReader/src/ivmeshdata.cpp (modified) (1 diff)
• IVReader/src/ivnode.cpp (modified) (1 diff)
• IVReader/src/ivreader.cpp (modified) (4 diffs)
• TestCullingTerrain/TerrainFrameListener.cpp (modified) (4 diffs)
• TestCullingTerrain/TerrainFrameListener.h (modified) (1 diff)
• TestCullingTerrain/TestCullingTerrain.vcproj (modified) (2 diffs)
• TestCullingTerrain/TestCullingTerrainApplication.cpp (modified) (1 diff)
• iv/Demo_IV.dsp (added)
• iv/Demo_IV.vcproj (added)
• iv/IVFrameListener.cpp (added)
• iv/IVFrameListener.h (added)
• iv/TestCullingIVApplication.cpp (added)
• iv/TestCullingIVApplication.h (added)
• iv/scripts (deleted)
• iv/src (deleted)
• ogre_changes/Plugins/OctreeSceneManager/include/OgreOctreeNode.h (added)
• ogre_changes/Plugins/OctreeSceneManager/src/OgreOctreeNode.cpp (modified) (3 diffs)

trunk/VUT/work/IVReader/include/ivmeshdata.h

@@ -5 +5 @@
 #include <Ogre.h>
 
-enum IVRenderOperationType
+enum mIVReaderenderOperationType
 {
         IV_ROT_INVALID = -1,
@@ -25 +25 @@
                 Ogre::Real *vertices, *normals, *texCoords, *indices, *normalIndices, *texCoordIndices;
                 int vcnt, ncnt, tcnt, icnt, nicnt, ticnt;
-                IVRenderOperationType roType;
+                mIVReaderenderOperationType roType;
                 Ogre::AxisAlignedBox *boundingBox;
 

trunk/VUT/work/IVReader/include/ivreader.h

@@ -1 @@
-#ifndef __IVReader_H__
-#define __IVReader_H__
+#ifndef __mIVReader_H__
+#define __mIVReader_H__
 
 
@@ -120 +120 @@
                 Ogre::Entity *createEntity(Ogre::SceneManager* sceneMgr, std::string name, IVMeshData *mData, Ogre::Vector3 *translation = NULL);
 
-                void buildTree(Ogre::SceneManager *sceneMgr, Ogre::SceneNode *sceneNodeRoot, IVNode *ivRoot, IVMeshData *mData = NULL, Ogre::Material *material = NULL);
+                void buildTree(Ogre::SceneManager *sceneMgr, Ogre::SceneNode *sceneNodeRoot, IVNode *mIVReaderoot, IVMeshData *mData = NULL, Ogre::Material *material = NULL);
 
                 IVDefListNode *defList;

trunk/VUT/work/IVReader/src/ivmanualmeshloader.cpp

@@ -1 +1 @@
 #include "ivmanualmeshloader.h"
-#include "IVReader.h"
+#include "ivreader.h"
 
 IVManualMeshLoader::IVManualMeshLoader()

trunk/VUT/work/IVReader/src/ivmeshdata.cpp

@@ -1 +1 @@
 #include "ivmeshdata.h"
-#include "IVReader.h"
+#include "ivreader.h"
 
 

trunk/VUT/work/IVReader/src/ivnode.cpp

@@ -1 +1 @@
 #include "ivnode.h"
-#include "IVReader.h"
+#include "ivreader.h"
 
 IVField::IVField()

trunk/VUT/work/IVReader/src/ivreader.cpp

@@ -1 @@
-#include "ivreader.h"
+#include "IVReader.h"
 #include <string>
 #include <stdlib.h>
@@ -571 +571 @@
 }
 
-void IVReader::buildTree(Ogre::SceneManager* sceneMgr,  Ogre::SceneNode *sceneNodeRoot, IVNode *ivRoot, IVMeshData *mData, Ogre::Material *material)
+void IVReader::buildTree(Ogre::SceneManager* sceneMgr,  Ogre::SceneNode *sceneNodeRoot, IVNode *IVReaderoot, IVMeshData *mData, Ogre::Material *material)
 {
         using namespace Ogre;
@@ -586 +586 @@
         IVType t; int i;
         
-        IVNode *help = ivRoot->getNextChildNode(true);
+        IVNode *help = IVReaderoot->getNextChildNode(true);
         while (help != NULL)
         {       
@@ -766 +766 @@
                 }
 
-                help = ivRoot->getNextChildNode();
+                help = IVReaderoot->getNextChildNode();
         }
         if (meshDataCreated) if (mData != NULL) delete mData;

trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.cpp

@@ -169 +169 @@
 
         // set scene manager options
-        mSceneMgr->setOption("TestGeometryForVisibleLeaves", &mTestGeometryForVisibleLeaves);
-
-        // apply delayed rendering (i.e., transparents after hierarchical culling pass)
-        // only if optimization is not used 
-        bool delayRenderTransparents = !mTestGeometryForVisibleLeaves;
-
-        mSceneMgr->setOption("DelayRenderTransparents", &delayRenderTransparents);
+        setTestGeometryForVisibleLeaves(mTestGeometryForVisibleLeaves);
+
         mSceneMgr->setOption("UseDepthPass", &mUseDepthPass);
         
@@ -190 +185 @@
 TerrainFrameListener::~TerrainFrameListener()
 {
-        delete mRayQueryExecutor;
-        delete mEventProcessor;
-
-        if (mQueryManager)
-        {
-                delete mQueryManager;
-                mQueryManager = NULL;
-        }
+        OGRE_DELETE(mRayQueryExecutor);
+        OGRE_DELETE(mEventProcessor);
+        OGRE_DELETE(mQueryManager);
 }
 //-----------------------------------------------------------------------
@@ -858 +848 @@
 }
 //-----------------------------------------------------------------------
-void TerrainFrameListener::toggleTestGeometryForVisibleLeaves()
-{
-        mTestGeometryForVisibleLeaves = !mTestGeometryForVisibleLeaves;
+void TerrainFrameListener::setTestGeometryForVisibleLeaves(bool testGeometryForVisibleLeaves)
+{
         mSceneMgr->setOption("TestGeometryForVisibleLeaves", &mTestGeometryForVisibleLeaves);
         
@@ -1005 +994 @@
                 break;
         case KC_G:
-                toggleTestGeometryForVisibleLeaves();
+                mTestGeometryForVisibleLeaves = !mTestGeometryForVisibleLeaves;
+                setTestGeometryForVisibleLeaves(mTestGeometryForVisibleLeaves);
                 break;
         case KC_T:

trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.h

@@ -119 +119 @@
     void changeThreshold(int incr);
         void changeAssumedVisibility(int incr);
-        void toggleTestGeometryForVisibleLeaves();
+        void setTestGeometryForVisibleLeaves(bool testGeometryForVisibleLeaves);
         void toggleShowOctree();
         void toggleUseDepthPass();

trunk/VUT/work/TestCullingTerrain/TestCullingTerrain.vcproj

@@ -73 +73 @@
                         <Tool
                                 Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="&quot;$(OGRE_PATH)\Dependencies\include&quot;;&quot;$(OGRE_PATH)\OgreMain\include&quot;;&quot;$(OGRE_PATH)\Samples\Common\include&quot;;&quot;$(OGRE_PATH)\Dependencies\include\CEGUI&quot;;&quot;$(OGRE_PATH)\ReferenceApplication\ReferenceAppLayer\include&quot;;&quot;$(OGRE_PATH)\PlugIns\OctreeSceneManager\include&quot;;&quot;$(OGRE_ADDONS_PATH)\dotsceneoctree\PlugIns\DotSceneManager\include&quot;;&quot;$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include&quot;;..\..\Ogre\include;..\..\GtpVisibility\include;..\include;..\TestCulling"
+                                AdditionalIncludeDirectories="&quot;$(OGRE_PATH)\Dependencies\include&quot;;&quot;$(OGRE_PATH)\OgreMain\include&quot;;&quot;$(OGRE_PATH)\Samples\Common\include&quot;;&quot;$(OGRE_PATH)\Dependencies\include\CEGUI&quot;;&quot;$(OGRE_PATH)\PlugIns\OctreeSceneManager\include&quot;;&quot;$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include&quot;;..\..\Ogre\include;..\..\GtpVisibility\include;..\include"
                                 PreprocessorDefinitions="_WINDOWS;_STLP_USE_DYNAMIC_LIB;OGRE_LIBRARY_IMPORTS;_RELEASE;WIN32;_STLP_RELEASE;GTP_VISIBILITY_MODIFIED_OGRE"
                                 RuntimeLibrary="2"
@@ -88 +88 @@
                                 OutputFile="$(OGRE_PATH)/Samples/Common/bin/Release/TestCullingTerrain.exe"
                                 LinkIncremental="1"
-                                AdditionalLibraryDirectories="&quot;$(OGRE_PATH)\Dependencies\Lib\$(ConfigurationName)&quot;;&quot;$(OGRE_ADDONS_PATH)\dotsceneoctree\PlugIns\DotSceneManager\bin\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\OgreMain\Lib\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib&quot;;&quot;$(GAMETOOLS_PATH)\trunk\VUT\Ogre\lib\$(ConfigurationName)&quot;"
+                                AdditionalLibraryDirectories="&quot;$(OGRE_PATH)\Dependencies\Lib\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\OgreMain\Lib\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)&quot;;&quot;$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib&quot;;&quot;$(GAMETOOLS_PATH)\trunk\VUT\Ogre\lib\$(ConfigurationName)&quot;"
                                 GenerateDebugInformation="TRUE"
                                 SubSystem="2"

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp

@@ -227 +227 @@
 void TestCullingTerrainApplication::createScene()
 {
+        Real scale = 3;
+        mSceneMgr->setOption("NodeVizScale", &scale);
+
         // Set ambient light
         mAmbientLight = ColourValue(0.5 , 0.5, 0.5);

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

@@ -46 +46 @@
 unsigned long green = 0xFFFFFFFF;
 
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
+Real OctreeNode::msVizScale = 1;
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
+
 unsigned short OctreeNode::mIndexes[ 24 ] = {0, 1, 1, 2, 2, 3, 3, 0,       //back
         0, 6, 6, 5, 5, 1,             //left
@@ -187 +191 @@
         }
 
+        //LogManager::getSingleton().logMessage("hagaaggaagag");
         AxisAlignedBox box = mLocalAABB;
+        
         // HACK: scale should not be done here
-        box.scale(Vector3(3, 3, 3));
+        box.scale(Vector3(msVizScale, msVizScale, msVizScale));
+
         mWireBoundingBox->setupBoundingBox(box);
         mWireBoundingBox->getRenderOperation(rend);
@@ -224 +231 @@
 
 }
-}
+
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
+void OctreeNode::setVizScale(Real scale)
+{
+        msVizScale = scale;
+}
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
+}