Changeset 6815 in orxonox.OLD for trunk/src/lib/graphics/effects/graphics_effect.h

Timestamp:

Jan 28, 2006, 5:11:51 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/network back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r6774:HEAD

no conflicts…
thats what i call orthogonal work

File:

• trunk/src/lib/graphics/effects/graphics_effect.h (modified) (1 diff)

trunk/src/lib/graphics/effects/graphics_effect.h

@@ -25 +25 @@
     virtual bool deactivate() = 0;
 
-    inline bool isActivated() { return this->bActivated; }
+    virtual void draw() const;
+    virtual void tick(float dt);
+
+    inline bool isActivated() const { return this->bActivated; }