Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6489 in orxonox.OLD for branches/avi_play_merge/src


Ignore:
Timestamp:
Jan 11, 2006, 4:48:53 PM (19 years ago)
Author:
stefalie
Message:

avi_play_merge: fastfactory works

Location:
branches/avi_play_merge/src/world_entities
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/avi_play_merge/src/world_entities/movie_entity.cc

    r6488 r6489  
    2121using namespace std;
    2222
    23 //CREATE_FAST_FACTORY_STATIC(MovieEntity, CL_MOVIE_ENTITY);
     23CREATE_FAST_FACTORY_STATIC(MovieEntity, CL_MOVIE_ENTITY);
    2424
    2525/**
  • branches/avi_play_merge/src/world_entities/movie_entity.h

    r6488 r6489  
    1515class Model;
    1616class Material;
     17class FastFactory;
    1718
    1819
     
    2122{
    2223  private:
    23     MediaContainer* media_container;
    24     Model* model;
    25     Material* material;
     24    MediaContainer*                   media_container;
     25    Model*                            model;
     26    Material*                         material;
     27
     28    static FastFactory*               fastFactory;
    2629
    2730    int counter;
     
    3033
    3134  public:
    32     MovieEntity (const TiXmlElement* root);
     35    MovieEntity (const TiXmlElement* root = NULL);
    3336    ~MovieEntity ();
    3437
Note: See TracChangeset for help on using the changeset viewer.