Changeset 1852

Timestamp:

Sep 28, 2008, 5:15:55 PM (16 years ago)

Author:

rgrieder

Message:

TutorialShip compiles now. Still a stub.

Location:

code/branches/orxonox_tutorial/src/orxonox/objects

Files:

• TutorialShip.cc (modified) (4 diffs)
• TutorialShip.h (modified) (4 diffs)

code/branches/orxonox_tutorial/src/orxonox/objects/TutorialShip.cc

@@ -54 +54 @@
     }
 
+    bool TutorialShip::create()
+    {
+        return true;
+    }
+
     TutorialShip::~TutorialShip()
     {
     }
-
     
-    void SpaceShip::setConfigValues()
+    void TutorialShip::setConfigValues()
     {
         //SetConfigValue(bInvertYAxis_, false).description("Set this to true for joystick-like mouse behaviour (mouse up = ship down).");
@@ -66 +70 @@
     }
 
+    void TutorialShip::registerAllVariables()
+    {
+    }
     
     /**
@@ -73 +80 @@
         @return The XML-element
     */
-    void SpaceShip::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    void TutorialShip::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
         SUPER(TutorialShip, XMLPort, xmlelement, mode);
@@ -81 +88 @@
 
     
-    void SpaceShip::tick(float dt)
+    void TutorialShip::tick(float dt)
     {
         SUPER(TutorialShip, tick, dt);
     }
 
+    void TutorialShip::fire()
+    {
+    }
 }

code/branches/orxonox_tutorial/src/orxonox/objects/TutorialShip.h

@@ -29 +29 @@
 #ifndef _TutorialShip_H__
 #define _TutorialShip_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include <OgrePrerequisites.h>
 #include <string>
-#include "OrxonoxPrereqs.h"
-#include <OgrePrerequisites.h>
-
 #include "util/Math.h"
 #include "Camera.h"
@@ -38 +39 @@
 #include "RadarViewable.h"
 #include "tools/BillboardSet.h"
+#include "SpaceShip.h"
 
 namespace orxonox
@@ -47 +49 @@
             ~TutorialShip();
 
-        private:
             bool create();
             void registerAllVariables();
@@ -56 +57 @@
             // Methods for console commands
             static void fire();
+
+        private:
     };
 }