Changeset 6417 for code/trunk/src/orxonox/Test.h

Timestamp:

Dec 25, 2009, 10:23:58 PM (15 years ago)

Author:

rgrieder

Message:

Merged presentation2 branch back to trunk.
Major new features:

• Actual GUI with settings, etc.
• Improved space ship steering (human interaction)
• Rocket fire and more particle effects
• Advanced sound framework

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/Test.h (modified) (2 diffs)

code/trunk/src/orxonox/Test.h

@@ -76 +76 @@
       void checkS4();
 
+      void printPointer();
+
       static void printV1(){ instance_->checkU1(); }
       static void printV2(){ instance_->checkU2(); }
@@ -94 +96 @@
       TYPE s4;
 
+      Test* pointer_;
+
       static Test* instance_;
   };