Changeset 533

Timestamp:

Dec 15, 2007, 7:32:23 PM (16 years ago)

Author:

rgrieder

Message:

• some minor changes in order to make the project compile with VC08 (doesn't yet)

Location:

code/branches/FICN/src

Files:

• network/dummyserver3.cc (modified) (1 diff)
• orxonox/InputManager.h (modified) (1 diff)
• orxonox/objects/WorldEntity.h (modified) (3 diffs)

code/branches/FICN/src/network/dummyserver3.cc

@@ -3 +3 @@
 //#include "PacketTypes.h"
 #include "Server.h"
+
+#ifdef WIN32
+#include <windows.h>
+#define usleep(x) Sleep((x)/1000)
+#else
+#include <unistd.h>
+#endif
 
 namespace network{

code/branches/FICN/src/orxonox/InputManager.h

@@ -2 +2 @@
 #define InputManager_H
 
+#ifdef WIN32
+#include <OIS/OISMouse.h>
+#include <OIS/OISKeyboard.h>
+#include <OIS/OISJoyStick.h>
+#include <OIS/OISInputManager.h>
+#else
 #include <OISMouse.h>
 #include <OISKeyboard.h>
 #include <OISJoyStick.h>
 #include <OISInputManager.h>
+#endif
 
 #include <OgreRenderWindow.h>

code/branches/FICN/src/orxonox/objects/WorldEntity.h

@@ -18 +18 @@
             void tick(float dt);
 
+        private:
+            Ogre::SceneNode* node_;
+            static unsigned int worldEntityCounter_s;
+
+            bool bStatic_;
+            Vector3 velocity_;
+            Vector3 acceleration_;
+            Vector3 rotationAxis_;
+            Radian rotationRate_;
+            Radian momentum_;
+
+        public:
             inline Ogre::SceneNode* getNode()
                 { return this->node_; }
@@ -50 +62 @@
             inline void setDirection(const Vector3 &vec, Ogre::Node::TransformSpace relativeTo=Ogre::Node::TS_LOCAL, const Vector3 &localDirectionVector=Vector3::NEGATIVE_UNIT_Z)
                 { this->node_->setDirection(vec, relativeTo, localDirectionVector); }
+            inline void setOrientation(const Ogre::Quaternion quat)
+                { this->node_->setOrientation(quat); }
             inline void lookAt(const Vector3 &targetPoint, Ogre::Node::TransformSpace relativeTo, const Vector3 &localDirectionVector=Vector3::NEGATIVE_UNIT_Z)
                 { this->node_->lookAt(targetPoint, relativeTo, localDirectionVector); }
@@ -96 +110 @@
 
 
+            inline const Ogre::Quaternion& getOrientation()
+                { return this->node_->getOrientation(); }
+
+
             static Ogre::SceneManager* sceneManager_s;
             static int num_s;
 
-        private:
-            Ogre::SceneNode* node_;
-            static unsigned int worldEntityCounter_s;
-
-            bool bStatic_;
-            Vector3 velocity_;
-            Vector3 acceleration_;
-            Vector3 rotationAxis_;
-            Radian rotationRate_;
-            Radian momentum_;
     };
 }