Changeset 6489 in orxonox.OLD

Timestamp:

Jan 11, 2006, 4:48:53 PM (18 years ago)

Author:

stefalie

Message:

avi_play_merge: fastfactory works

Location:

branches/avi_play_merge/src/world_entities

Files:

• movie_entity.cc (modified) (1 diff)
• movie_entity.h (modified) (3 diffs)

branches/avi_play_merge/src/world_entities/movie_entity.cc

@@ -21 +21 @@
 using namespace std;
 
-//CREATE_FAST_FACTORY_STATIC(MovieEntity, CL_MOVIE_ENTITY);
+CREATE_FAST_FACTORY_STATIC(MovieEntity, CL_MOVIE_ENTITY);
 
 /**

branches/avi_play_merge/src/world_entities/movie_entity.h

@@ -15 +15 @@
 class Model;
 class Material;
+class FastFactory;
 
 
@@ -21 +22 @@
 {
   private:
-    MediaContainer* media_container;
-    Model* model;
-    Material* material;
+    MediaContainer*                   media_container;
+    Model*                            model;
+    Material*                         material;
+
+    static FastFactory*               fastFactory;
 
     int counter;
@@ -30 +33 @@
 
   public:
-    MovieEntity (const TiXmlElement* root);
+    MovieEntity (const TiXmlElement* root = NULL);
     ~MovieEntity ();