Changeset 160 for trunk/VUT/Ogre/include

Timestamp:

07/08/05 01:53:01 (20 years ago)

Author:

mattausch

Message:

added animation

Location:

trunk/VUT/Ogre/include

Files:

• OgrePlatformOcclusionQuery.h (modified) (1 diff)
• OgreSceneContentGenerator.h (modified) (5 diffs)

trunk/VUT/Ogre/include/OgrePlatformOcclusionQuery.h

@@ -21 +21 @@
 
         virtual bool GetQueryResult(unsigned int &queryResult,
-                const bool waitForResult) const;
+        const bool waitForResult) const;
         virtual void BeginQuery();
         virtual void EndQuery();

trunk/VUT/Ogre/include/OgreSceneContentGenerator.h

@@ -7 +7 @@
 
 namespace Ogre {
+
+typedef std::vector<SceneNode *> SceneNodeList;
+typedef std::vector<Entity *> EntityList;
 
 /** Class which fills a scene with content in a random fashion.
@@ -20 +23 @@
         */
         void GenerateScene(int numObjects, const String &objName);
+
         /** Generates a new object in the scene using ray scene queries 
                 and inserts it into thr scene hierarchy.
@@ -31 +35 @@
                 const Vector3 &rotation, const String &objName);
 
+        /** Minimum angle for the random orientation.
+        */
         void SetMinAngle(Vector3 minAngle);
+        
+        /** Maximum angle for the random orientation.
+        */
         void SetMaxAngle(Vector3 maxAngle);
+        
+        /** Minimum possible random position.
+        */
         void SetMinPos(Vector3 minPos);
+        /** Maximum possible random position.
+        */
         void SetMaxPos(Vector3 maxPos);
+        /** Scale factor applied to each generated object.
+        */
         void SetScale(Vector3 scale);
         
-        /** The number of created objects */
+        /** The number of created objects.
+        */
         int GetObjectCount();
 
-        /** Writes scene nodes to file */
+        /** Writes scene nodes to file.
+        */
         bool WriteObjects(const std::string &filename);
 
-        /** Loads scene nodes from file */
+        /** Loads scene nodes from file.
+        */
         bool LoadObjects(const std::string &filename);
+
         /** Generates a scene object with the specified parameters
                 @param position the position of the scene object
@@ -53 +73 @@
         SceneNode *GenerateSceneObject(const Vector3 &position, 
                 const Quaternion &orientation, const String &objName);
+
+        /** Gets pointer to list of generated scene nodes.
+        */
+        SceneNodeList *GetGeneratedSceneNodes();
+        
+        /** Gets pointer to list of entities.
+        */
+        EntityList *GetGeneratedEntities();
+
+        /** Removes generated object from scene graph.
+        */
+        void RemoveGeneratedObjects();
 
 protected:
@@ -64 +96 @@
         SceneManager *mSceneMgr;
         
-        std::vector<SceneNode *> mSceneObjects;
+        SceneNodeList mSceneNodes;
+        EntityList mEntities;
 };