Changeset 82 for trunk/VUT/work/TestCulling

Timestamp:

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

Author:

mattausch

Message:

worked on the demos

Location:

trunk/VUT/work/TestCulling

Files:

• SceneContentGenerator.cpp (modified) (1 diff)
• SceneContentGenerator.h (modified) (3 diffs)
• TestCulling.vcproj (modified) (2 diffs)
• TestCullingApplication.cpp (modified) (1 diff)

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