Changeset 82 for trunk/VUT/work

Timestamp:

05/03/05 17:30:53 (20 years ago)

Author:

mattausch

Message:

worked on the demos

Location:

trunk/VUT/work

Files:

• TestCulling/SceneContentGenerator.cpp (modified) (1 diff)
• TestCulling/SceneContentGenerator.h (modified) (3 diffs)
• TestCulling/TestCulling.vcproj (modified) (2 diffs)
• TestCulling/TestCullingApplication.cpp (modified) (1 diff)
• TestCullingTerrain/TerrainContentGenerator.cpp (modified) (3 diffs)
• TestCullingTerrain/TestCullingTerrain.vcproj (modified) (3 diffs)
• TestCullingTerrain/TestCullingTerrainApplication.cpp (modified) (5 diffs)
• TestCullingTerrain/TestCullingTerrainApplication.h (modified) (2 diffs)

trunk/VUT/work/TestCulling/SceneContentGenerator.cpp

@@ -73 +73 @@
         currentObject->roll(Degree(rotation.z));
 
-        return currentObject;
-        
         /*
         char msg[100];
-        sprintf(msg, "pos: %3.3f %3.3f %3.3f, newpos: %3.3f %3.3f %3.3f\n", 
-                position.x, position.y, position.z, queryResult.x, queryResult.y, queryResult.z);
-
+        sprintf(msg, "pos: %3.3f %3.3f %3.3f\n", position.x, position.y, position.z);
         OutputDebugString(msg);
         */
+
+        return currentObject;
 }
 //-----------------------------------------------------------------------

trunk/VUT/work/TestCulling/SceneContentGenerator.h

@@ -14 +14 @@
 public:
         SceneContentGenerator(SceneManager *sm);
-        
+        virtual ~SceneContentGenerator() {};
         /** Generates scene object in a random fashion.
                 @param number of objects to generate
@@ -21 +21 @@
         void GenerateScene(int numObjects, const String &objName);
         /** Generates a new object in the scene using ray scene queries 
-                and inserts it into scene hierarchy.
+                and inserts it into thr scene hierarchy.
                 @param position position where the object is created
                 @param rotation rotation angle applied locally to object
@@ -27 +27 @@
                 @returns scene object if it was successfully created, NULL otherwise
         */
-        SceneNode *GenerateSceneObject(const Vector3 &position, 
+        virtual SceneNode *GenerateSceneObject(const Vector3 &position, 
                 const Vector3 &rotation, const String &objName);
 

trunk/VUT/work/TestCulling/TestCulling.vcproj

@@ -122 +122 @@
                         UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
                         <File
-                                RelativePath="..\TestCullingTerrain\SceneContentGenerator.cpp">
+                                RelativePath=".\SceneContentGenerator.cpp">
                         </File>
                         <File
@@ -133 +133 @@
                         UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
                         <File
-                                RelativePath="..\TestCullingTerrain\SceneContentGenerator.h">
+                                RelativePath=".\SceneContentGenerator.h">
                         </File>
                         <File

trunk/VUT/work/TestCulling/TestCullingApplication.cpp

@@ -48 +48 @@
         //l->setPosition(20,80,50);
 
-        SceneContentGenerator contentGenerator();
-        contentGenerator.GenerateScene(330);
+        SceneContentGenerator contentGenerator(mSceneMgr);
+        contentGenerator.GenerateScene(330, "robot.mesh");
 
         // Create a skybox

trunk/VUT/work/TestCullingTerrain/TerrainContentGenerator.cpp

@@ -19 +19 @@
 }
 //-----------------------------------------------------------------------
-bool RayQueryExecutor::executeRayQuery(Vector3 *result, const Vector3 &pos, const Vector3 &dir)
+bool RayQueryExecutor::executeRayQuery(Vector3 *result, const Vector3 &pos, 
+                                                                           const Vector3 &dir)
 {
         return executeRayQuery(result, Ray(pos, dir));
@@ -52 +53 @@
 {
         mMinPos = Vector3(0.0f, 5000.0f, 0.0f);
-        mMaxPos =Vector3(1000.0f, 5000.0f, 1000.0f);
+        mMaxPos = Vector3(1000.0f, 5000.0f, 1000.0f);
 
         mMinAngle = Vector3(0.0f, 0.0f, 0.0f);
@@ -72 +73 @@
         if (mRayQueryExecutor->executeRayQuery(&queryResult, position, Vector3::NEGATIVE_UNIT_Y))
         {
-                // reject if height too big
+                // reject if height is too high
                 if(queryResult.y < mMaxHeight)
                 {

trunk/VUT/work/TestCullingTerrain/TestCullingTerrain.vcproj

@@ -21 +21 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories=""$(OGRE_PATH)\Dependencies\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_ADDONS_PATH)\dotsceneoctree\PlugIns\DotSceneManager\include";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";../../GtpVisibility/include;../include"
+                                AdditionalIncludeDirectories=""$(OGRE_PATH)\Dependencies\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_ADDONS_PATH)\dotsceneoctree\PlugIns\DotSceneManager\include";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";..\..\GtpVisibility\include;..\include;..\TestCulling"
                                 PreprocessorDefinitions="_WINDOWS;_STLP_USE_DYNAMIC_LIB;OGRE_LIBRARY_IMPORTS;_DEBUG;WIN32;_STLP_DEBUG;PLUGIN_TERRAIN_IMPORTS;GTP_VISIBILITY_MODIFIED_OGRE"
                                 MinimalRebuild="TRUE"
@@ -122 +122 @@
                         UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
                         <File
-                                RelativePath=".\SceneContentGenerator.cpp">
+                                RelativePath="..\TestCulling\SceneContentGenerator.cpp">
                         </File>
                         <File
@@ -136 +136 @@
                         UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
                         <File
-                                RelativePath=".\SceneContentGenerator.h">
+                                RelativePath="..\TestCulling\SceneContentGenerator.h">
                         </File>
                         <File

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp

@@ -25 +25 @@
 TestCullingTerrainApplication::~TestCullingTerrainApplication()
 {
-        delete mSceneContentGenerator;
+        delete mTerrainContentGenerator;
 }
 //-----------------------------------------------------------------------
@@ -95 +95 @@
         mSceneMgr->_renderScene(mCamera, mWindow->getViewport(0), true);
 
-        mSceneContentGenerator = new TerrainContentGenerator(mSceneMgr);
-        mSceneContentGenerator->GenerateScene(300, "robot.mesh");
+        mTerrainContentGenerator = new TerrainContentGenerator(mSceneMgr);
+        mTerrainContentGenerator->GenerateScene(300, "robot.mesh");
         // no limitations now: the user can set objects also on peaks
-        mSceneContentGenerator->SetMaxHeight(5000); 
+        mTerrainContentGenerator->SetMaxHeight(5000); 
 }
 //-----------------------------------------------------------------------
@@ -119 +119 @@
 {
         mFrameListener= new MouseQueryListener(mWindow, mCamera, mSceneMgr, 
-                mGUIRenderer, mSceneContentGenerator);
+                mGUIRenderer, mTerrainContentGenerator);
         mFrameListener->showDebugOverlay(true);
         mRoot->addFrameListener(mFrameListener);
@@ -144 +144 @@
         mRMouseDown = false;
         mSceneMgr = sceneManager;
-        mSceneContentGenerator = sceneGenerator;
+        mTerrainContentGenerator = sceneGenerator;
 
     // Reduce move speed
@@ -207 +207 @@
                  
                  // Get results, create a node/entity on the position
-                 mCurrentObject = mSceneContentGenerator->GenerateSceneObject(
+                 mCurrentObject = mTerrainContentGenerator->GenerateSceneObject(
                          mouseRay.getOrigin(), mouseRay.getDirection(), "robot.mesh");
                 

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.h

@@ -86 +86 @@
 
         RayQueryExecutor *mRayQueryExecutor;
-        TerrainContentGenerator *mSceneContentGenerator;
+        TerrainContentGenerator *mTerrainContentGenerator;
 };
 
@@ -111 +111 @@
         Vector3 mMaxAngle;
 
-        TerrainContentGenerator *mSceneContentGenerator;
+        TerrainContentGenerator *mTerrainContentGenerator;
 
 private: