Changeset 173 for trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp

Timestamp:

07/13/05 18:28:40 (19 years ago)

Author:

mattausch

Message:

did some code cleanup

File:

• trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp (modified) (5 diffs)

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp

@@ -11 +11 @@
 //#include "OgreRefAppWorld.h"
 #include "TestCullingTerrainApplication.h"
-
+#include "TerrainFrameListener.h"
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
-String currentObjectCaptions[] =
-{
-        "robot",
-        "athene",
-        "ninja"
-        //"ogrehead"
-};
-
-const float walk_duration = 10.0f;
-const float wait_duration = 2.0f;
-const float rotate_factor = 0.7f;
-const float move_factor = 0.03;
-
-/***************************************/
-/*      EntityState implementation     */
-/***************************************/
+
+/**********************************************/
+/*             EntityState implementation     */
+/**********************************************/
+
+
 Vector3 EntityState::msMinPos = Vector3::ZERO;
 Vector3 EntityState::msMaxPos = Vector3::ZERO;
@@ -250 +240 @@
         mSunLight->setCastShadows(true);
 
-        // set light angle not too sharp, otherwise shadows textures will be broken
+        // set light angle not too small over the surface, otherwise shadows textures will be broken
         Vector3 dir(0.5, 1, 0.5);
         dir.normalise();
@@ -288 +278 @@
         mSceneMgr->getRootSceneNode()->createChildSceneNode()->attachObject(pPlaneEnt); */
 
-        mSceneMgr->setShadowTextureSettings(1024, 2);
+        // Use 512x512 texture in GL since we can't go higher than the window res
+        mSceneMgr->setShadowTextureSettings(512, 2);
+
         mSceneMgr->setShadowColour(ColourValue(0.5, 0.5, 0.5));
    
@@ -326 +318 @@
 void  TestCullingTerrainApplication::generateScene(int num, int objectType)
 {
-        mTerrainContentGenerator->GenerateScene(num, currentObjectCaptions[objectType]);
+        Vector3 scale(TerrainFrameListener::msObjectScales[objectType], 
+                                  TerrainFrameListener::msObjectScales[objectType],
+                                  TerrainFrameListener::msObjectScales[objectType]);
+
+        mTerrainContentGenerator->SetScale(scale);
+        mTerrainContentGenerator->SetOffset(TerrainFrameListener::msObjectTerrainOffsets[objectType]);
+        mTerrainContentGenerator->GenerateScene(num, TerrainFrameListener::msObjectCaptions[objectType]);
 
         if (objectType != 0) // from our objects, only robot has animation phases
@@ -384 +382 @@
 }
 //-----------------------------------------------------------------------
-String TestCullingTerrainApplication::getCurrentObjectCaption(int id)
-{
-        return currentObjectCaptions[id];
-}
-//-----------------------------------------------------------------------
 void TestCullingTerrainApplication::chooseSceneManager()
 {