Changeset 161 for trunk/VUT/Ogre

Timestamp:

07/08/05 17:34:05 (19 years ago)

Author:

mattausch

Message:

added moving robots

Location:

trunk/VUT/Ogre

Files:

• include/OgreTerrainContentGenerator.h (modified) (4 diffs)
• resources/VisibilityDemo.overlay (modified) (1 diff)
• src/OgreTerrainContentGenerator.cpp (modified) (3 diffs)

trunk/VUT/Ogre/include/OgreTerrainContentGenerator.h

@@ -4 +4 @@
 #include "OgreSceneContentGenerator.h"
 //#include <Ogre.h>
+
+#define MAX_HEIGHT 5000 // maximal possible height for object position
 
 namespace Ogre {
@@ -23 +25 @@
 
 /** 
-        Class which randomly fills a terrain with objects.
+        Thsi class used to fill a terrain with content,
+        e.g., it randomly fills a terrain with objects of a specific type.
 */
 class __declspec(dllexport) TerrainContentGenerator: public SceneContentGenerator
@@ -31 +34 @@
         ~TerrainContentGenerator();
 
-        /** 
-                Generates objects and places it on the terrain.
+        /** Generates objects and places it on the terrain.
         */
         SceneNode *GenerateSceneObject(const Vector3 &position, 
                 const Vector3 &rotation, const String &objName);
-        /** 
-                Generates objects and optionally places it on the terrain.
+        /** Generates objects and optionally places it on the terrain.
                 @param clampToTerrain if true, scene object is clamped to the terrain
         */
@@ -43 +44 @@
                 const Vector3 &rotation, const String &objName, const bool clampToTerrain);
         
-        /** offset which is added to objects when put into the terrain */
+        /** The offset is added to objects when they are put into the terrain.
+        */
         void SetOffset(Real offset);
-        
-        RayQueryExecutor *GetRayQueryExecutor();
 
 protected:

trunk/VUT/Ogre/resources/VisibilityDemo.overlay

@@ -326 +326 @@
                         caption [F4] Start / End frame recording
                 }
+                element TextArea(Example/Visibility/Help/Animation): Example/Visibility/Templates/BasicText
+                {
+                        left 5
+                        width 180
+                        height 30
+                        caption [F9] Start / End animation
+                }
                 element TextArea(Example/Visibility/Help/Screenshots): Example/Visibility/Templates/BasicText
                 {

trunk/VUT/Ogre/src/OgreTerrainContentGenerator.cpp

@@ -1 +1 @@
 #include "OgreTerrainContentGenerator.h"
 
-#define MAX_HEIGHT 5000 // maximal possible height
 
 namespace Ogre {
@@ -69 +68 @@
 SceneNode *TerrainContentGenerator::GenerateSceneObject(const Vector3 &position, 
                                          const Vector3 &rotation, const String& objName, const bool clampToTerrain)
-{
+{       
+        if (clampToTerrain)
+                return GenerateSceneObject(position, rotation, objName);
         
-        if (clampToTerrain)
-        {
-                return GenerateSceneObject(position, rotation, objName);
-        }
-        else
-        {
-                return SceneContentGenerator::GenerateSceneObject(position, rotation, objName);
-        }
+        return SceneContentGenerator::GenerateSceneObject(position, rotation, objName);
 }
 //-----------------------------------------------------------------------
@@ -103 +97 @@
 }
 //-----------------------------------------------------------------------
-RayQueryExecutor *TerrainContentGenerator::GetRayQueryExecutor()
-{
-        return mRayQueryExecutor;
-}
-//-----------------------------------------------------------------------
 void TerrainContentGenerator::SetOffset(Real offset)
 {