Changeset 79

Timestamp:

05/03/05 16:59:18 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/work/TestCulling

Files:

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

trunk/VUT/work/TestCulling/TestCulling.vcproj

@@ -122 +122 @@
                         UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
                         <File
+                                RelativePath="..\TestCullingTerrain\SceneContentGenerator.cpp">
+                        </File>
+                        <File
                                 RelativePath=".\TestCullingApplication.cpp">
                         </File>
@@ -129 +132 @@
                         Filter="h;hpp;hxx;hm;inl;inc;xsd"
                         UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+                        <File
+                                RelativePath="..\TestCullingTerrain\SceneContentGenerator.h">
+                        </File>
                         <File
                                 RelativePath=".\TestCullingApplication.h">

trunk/VUT/work/TestCulling/TestCullingApplication.cpp

@@ -12 +12 @@
 #include <../CEGUIRenderer/include/OgreCEGUITexture.h>
 #include <OgreMemoryMacros.h>
-
-#include "Ogre.h"
+#include <Ogre.h>
 #include "TestCullingApplication.h"
+#include "SceneContentGenerator.h"
 
 #define WIN32_LEAN_AND_MEAN
@@ -48 +48 @@
         //l->setPosition(20,80,50);
 
-        mMinTranslation = Vector3(-70.0f, -70.0f, 0.0f);
-        mMaxTranslation = Vector3(70.0f, 70.0f, 600.0f);
-
-        mMinAngle = Vector3(0, 0, 0);
-        mMaxAngle = Vector3(360, 360, 360);
-
-        generateScene(330);
+        SceneContentGenerator contentGenerator();
+        contentGenerator.GenerateScene(330);
 
         // Create a skybox
@@ -90 +85 @@
     mSceneMgr = mRoot->getSceneManager(ST_GENERIC);
 }
-//-----------------------------------------------------------------------
-void TestCullingApplication::generateSceneObject(const Vector3 &translationRatio, 
-                                                                                                 const Vector3 &rotationRatio, 
-                                                                                                 const int idx, 
-                                                                                                 const String& entName)
-{
-        Vector3 rotation = mMinAngle + rotationRatio * (mMaxAngle - mMinAngle);
-        Vector3 translation = mMinTranslation + 
-                translationRatio * (mMaxTranslation - mMinTranslation);
-
-        char name[16];
-    sprintf( name, "object%d", idx );
-
-    Entity *ent = mSceneMgr->createEntity(name, entName);
-        SceneNode *node = mSceneMgr->getRootSceneNode()->
-                createChildSceneNode(String(name) + "Node", translation);
-        node->attachObject(ent);
-        node->scale(0.1,0.1,0.1);
-
-        node->yaw(Degree(rotation.x));
-    node->pitch(Degree(rotation.y));
-        node->roll(Degree(rotation.z));
-}
-//-----------------------------------------------------------------------
-void TestCullingApplication::generateScene( int numObjects )
-{
-        srand (time (0));
-        
-        Vector3 rotationRatio;
-        Vector3 translationRatio;
-
-        for(int i=0; i < numObjects; i++)
-        {
-                rotationRatio.x = rand() / (float) RAND_MAX;
-                rotationRatio.y = rand() / (float) RAND_MAX;
-                rotationRatio.z = rand() / (float) RAND_MAX;
-
-                translationRatio.x = rand() / (float) RAND_MAX;
-                translationRatio.y = rand() / (float) RAND_MAX;
-                translationRatio.z = rand() / (float) RAND_MAX;
-
-                generateSceneObject(translationRatio, rotationRatio, i, "sphere.mesh");
-        }
-}
+
+
 /***********************************************/
 /* MouseQueryListener implementation           */

trunk/VUT/work/TestCulling/TestCullingApplication.h

@@ -93 +93 @@
         @param number of objects to generate
         */
-        void generateScene(int numObjects);
+        void GenerateScene(int numObjects);
 
         /** generates a new scene object