Changeset 9869 in orxonox.OLD for trunk/src/lib/graphics/importer/interactive_model.h

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/lib/graphics/importer/interactive_model.h (modified) (2 diffs)

trunk/src/lib/graphics/importer/interactive_model.h

@@ -30 +30 @@
 class InteractiveModel : public Model
 {
+  ObjectListDeclaration(InteractiveModel);
   public:
     InteractiveModel();
@@ -38 +39 @@
     virtual void setAnimation(int animNum, int playbackMode = 0) = 0;
     virtual void setAnimation(int firstFrame, int lastFrame, int fps, int bStoppable, int animPlayback) {}
-    virtual int getAnimation() = 0;
+    virtual int getAnimation() const = 0;
 
     virtual bool isAnimationFinished() { return false; }