Changeset 110 for trunk

Timestamp:

05/24/05 07:21:00 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT

Files:

• Ogre/include/OgreTerrainContentGenerator.h (modified) (2 diffs)
• Ogre/src/OgreSceneContentGenerator.cpp (modified) (1 diff)
• Ogre/src/OgreTerrainContentGenerator.cpp (modified) (3 diffs)
• work/TestCullingTerrain/TestCullingTerrainApplication.cpp (modified) (2 diffs)

trunk/VUT/Ogre/include/OgreTerrainContentGenerator.h

@@ -37 +37 @@
                 const Vector3 &rotation, const String &objName);
         
-        /** maximum height where objects can be put into the terrain */
-        //void SetMaxHeight(Real maxHeight);
+        /** offset which is added to objects when put into the terrain */
+        void SetOffset(Real offset);
         
         RayQueryExecutor *GetRayQueryExecutor();
@@ -44 +44 @@
 protected:
         RayQueryExecutor *mRayQueryExecutor;
-        //Real mMaxHeight;
+        Real mOffset;
 };
 

trunk/VUT/Ogre/src/OgreSceneContentGenerator.cpp

@@ -86 +86 @@
 {
         Matrix3 mat;
-        mat.FromEulerAnglesXYZ(Degree(rotation.x),//.valueRadians(), 
+        mat.FromEulerAnglesYXZ(Degree(rotation.x),//.valueRadians(), 
                                                    Degree(rotation.y),//.valueRadians(), 
                                                    Degree(rotation.z));//.valueRadians());

trunk/VUT/Ogre/src/OgreTerrainContentGenerator.cpp

@@ -51 +51 @@
 //-----------------------------------------------------------------------
 TerrainContentGenerator::TerrainContentGenerator(SceneManager *sm):
-SceneContentGenerator(sm)//, mMaxHeight(50)
+SceneContentGenerator(sm), mOffset(0)
 {
         mMinPos = Vector3(0.0f, MAX_HEIGHT, 0.0f);
@@ -76 +76 @@
         if (mRayQueryExecutor->executeRayQuery(&queryResult, position, Vector3::NEGATIVE_UNIT_Y))
         {
+                queryResult.y += mOffset;
                 // reject if height is too high
                 if (queryResult.y < mMaxPos.y)
@@ -91 +92 @@
 }
 //-----------------------------------------------------------------------
-/*void TerrainContentGenerator::SetMaxHeight(Real maxHeight)
+void TerrainContentGenerator::SetOffset(Real offset)
 {
-        mMaxHeight = maxHeight;
-}*/
+        mOffset = offset;
+}
 
 } // namespace Ogre

trunk/VUT/work/TestCullingTerrain/TestCullingTerrainApplication.cpp

@@ -93 +93 @@
 {
         // Set ambient light
-        mSceneMgr->setAmbientLight(ColourValue(0.5, 0.5, 0.5));
-        
-        // Create a light
-        Light* l = mSceneMgr->createLight("MainLight");
-        // Accept default settings: point light, white diffuse, just set position
-        // NB I could attach the light to a SceneNode if I wanted it to move automatically with
-        // other objects, but I don't
-        l->setPosition(20,80,50);
+        //mSceneMgr->setAmbientLight(ColourValue(0.5, 0.5, 0.5));
+        mSceneMgr->setAmbientLight(ColourValue(0.0, 0.0, 0.0));
+
+        //-- create light
+        mSunLight = mSceneMgr->createLight("MainLight");
+        mSunLight->setType(Light::LT_POINT);
+    mSunLight->setPosition(-707, 4000, -500);
+        //mSunLight->setSpotlightRange(Degree(30), Degree(50));
+
+    Vector3 dir;
+        dir = -mSunLight->getPosition();
+        dir.normalise();
+        mSunLight->setDirection(dir);
+        mSunLight->setDiffuseColour(0.8, 0.8, 0.8);
+        mSunLight->setSpecularColour(0.9, 0.9, 1);
+
+        //mSunLight->setCastShadows(true);
 
         // --Fog
@@ -128 +137 @@
 
         mTerrainContentGenerator = new TerrainContentGenerator(mSceneMgr);
-
+        
         // if no objects file generate yourself
-        //if (!mTerrainContentGenerator->LoadObjects("objects.out"))
-        //{
-                // the objects are generated on the whole terrain
+        if (!mTerrainContentGenerator->LoadObjects("objects.out"))
+        {
                 // height is restricted to 50, so no objects appear on peaks 
                 // => there is much occlusion
                 mTerrainContentGenerator->SetMaxPos(Vector3(3000.0f, 50.0f, 3000.0f));
-                mTerrainContentGenerator->GenerateScene(1500, "robot");
+                mTerrainContentGenerator->SetOffset(50);
+
+                // the objects are generated on the whole terrain
+                mTerrainContentGenerator->GenerateScene(1500, "athene");
                 //      mTerrainContentGenerator->GenerateScene(500, "ninja");
-        //}
+        }
 
         // no limitations needed anymore: the user can set 
         // objects also on peaks of terrain
         mTerrainContentGenerator->SetMaxPos(Vector3(3000.0f, 5000.0f, 3000.0f));
-
-        //-- create light
-        mSunLight = mSceneMgr->createLight("SunLight");
-        mSunLight->setType(Light::LT_SPOTLIGHT);
-    mSunLight->setPosition(1000,1250,500);
-        mSunLight->setSpotlightRange(Degree(30), Degree(50));
-
-    Vector3 dir;
-    dir = -mSunLight->getPosition();
-        dir.normalise();
-        mSunLight->setDirection(dir);
-        mSunLight->setDiffuseColour(0.35, 0.35, 0.38);
-        mSunLight->setSpecularColour(0.9, 0.9, 1);
-
-         mSunLight->setCastShadows(true);
 }
 //-----------------------------------------------------------------------