Changeset 2485 for code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.h

Timestamp:

Dec 16, 2008, 6:01:13 PM (17 years ago)

Author:

landauf

Message:

Merged objecthierarchy2 into presentation branch

Couln't merge 2 lines in Gamestate.cc and a whole block of code in GSDedicated.cc (it seems like oli implemented in both branches something like a network-tick-limiter but with different approaches)

Not yet tested in network mode and with bots
The SpaceShips movement is also not yet fully adopted to the new physics (see Engine class)

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• src/orxonox/objects/worldentities/WorldEntity.h (modified) (5 diffs)

code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.h

@@ -74 +74 @@
             inline void translate(float x, float y, float z, TransformSpace::Space relativeTo = TransformSpace::Parent)
                 { this->translate(Vector3(x, y, z), relativeTo); }
+
+            virtual inline const Vector3& getVelocity() const
+                { return Vector3::ZERO; }
 
             virtual void setOrientation(const Quaternion& orientation) = 0;
@@ -105 +108 @@
                 { this->setScale3D(Vector3(x, y, z)); }
             const Vector3& getScale3D(void) const;
-
-            void setScale(float scale)
+            const Vector3& getWorldScale3D() const;
+
+            inline void setScale(float scale)
                 { this->setScale3D(scale, scale, scale); }
             inline float getScale() const
                 { Vector3 scale = this->getScale3D(); return (scale.x == scale.y && scale.x == scale.z) ? scale.x : 1; }
+            float getWorldScale() const;
 
             inline void scale3D(const Vector3& scale)
@@ -118 +123 @@
                 { this->scale3D(scale, scale, scale); }
 
+            virtual void changedScale() {}
+
             void attach(WorldEntity* object);
             void detach(WorldEntity* object);
@@ -134 +141 @@
             inline WorldEntity* getParent() const
                 { return this->parent_; }
+
+            void attachNode(Ogre::SceneNode* node);
+            void detachNode(Ogre::SceneNode* node);
+            void attachToNode(Ogre::SceneNode* node);
+            void detachFromNode(Ogre::SceneNode* node);
 
             void notifyChildPropsChanged();
@@ -302 +314 @@
         { return this->node_->getScale(); }
 #endif
+
+    SUPER_FUNCTION(5, WorldEntity, changedScale, false);
 }