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

Timestamp:

Dec 28, 2008, 7:15:55 PM (15 years ago)

Author:

rgrieder

Message:

• Renamed TransformSpace::Space to TransformSpace::Enum
• Small changes and adjustments WorldEntity (Revealed while commenting…)

File:

• code/branches/presentation/src/orxonox/objects/worldentities/WorldEntity.h (modified) (9 diffs)

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

@@ -40 +40 @@
 #include "LinearMath/btMotionState.h"
 
+#include "util/Math.h"
+#include "core/BaseObject.h"
 #include "network/synchronisable/Synchronisable.h"
-#include "core/BaseObject.h"
-#include "util/Math.h"
+#include "objects/collisionshapes/CompoundCollisionShape.h"
 
 namespace orxonox
@@ -48 +49 @@
     class _OrxonoxExport WorldEntity : public BaseObject, public Synchronisable, public btMotionState
     {
+        friend class Scene;
+
         public:
             WorldEntity(BaseObject* creator);
@@ -71 +74 @@
             const Vector3& getWorldPosition() const;
 
-            void translate(const Vector3& distance, TransformSpace::Space relativeTo = TransformSpace::Parent);
-            inline void translate(float x, float y, float z, TransformSpace::Space relativeTo = TransformSpace::Parent)
+            void translate(const Vector3& distance, TransformSpace::Enum relativeTo = TransformSpace::Parent);
+            inline void translate(float x, float y, float z, TransformSpace::Enum relativeTo = TransformSpace::Parent)
                 { this->translate(Vector3(x, y, z), relativeTo); }
 
@@ -88 +91 @@
             const Quaternion& getWorldOrientation() const;
 
-            void rotate(const Quaternion& rotation, TransformSpace::Space relativeTo = TransformSpace::Local);
-            inline void rotate(const Vector3& axis, const Degree& angle, TransformSpace::Space relativeTo = TransformSpace::Local)
+            void rotate(const Quaternion& rotation, TransformSpace::Enum relativeTo = TransformSpace::Local);
+            inline void rotate(const Vector3& axis, const Degree& angle, TransformSpace::Enum relativeTo = TransformSpace::Local)
                 { this->rotate(Quaternion(angle, axis), relativeTo); }
 
-            inline void yaw(const Degree& angle, TransformSpace::Space relativeTo = TransformSpace::Local)
+            inline void yaw(const Degree& angle, TransformSpace::Enum relativeTo = TransformSpace::Local)
                 { this->rotate(Quaternion(angle, Vector3::UNIT_Y), relativeTo); }
-            inline void pitch(const Degree& angle, TransformSpace::Space relativeTo = TransformSpace::Local)
+            inline void pitch(const Degree& angle, TransformSpace::Enum relativeTo = TransformSpace::Local)
                 { this->rotate(Quaternion(angle, Vector3::UNIT_X), relativeTo); }
-            inline void roll(const Degree& angle, TransformSpace::Space relativeTo = TransformSpace::Local)
+            inline void roll(const Degree& angle, TransformSpace::Enum relativeTo = TransformSpace::Local)
                 { this->rotate(Quaternion(angle, Vector3::UNIT_Z), relativeTo); }
 
-            void lookAt(const Vector3& target, TransformSpace::Space relativeTo = TransformSpace::Parent, const Vector3& localDirectionVector = Vector3::NEGATIVE_UNIT_Z);
-            void setDirection(const Vector3& direction, TransformSpace::Space relativeTo = TransformSpace::Local, const Vector3& localDirectionVector = Vector3::NEGATIVE_UNIT_Z);
-            inline void setDirection(float x, float y, float z, TransformSpace::Space relativeTo = TransformSpace::Local, const Vector3& localDirectionVector = Vector3::NEGATIVE_UNIT_Z)
+            void lookAt(const Vector3& target, TransformSpace::Enum relativeTo = TransformSpace::Parent, const Vector3& localDirectionVector = Vector3::NEGATIVE_UNIT_Z);
+            void setDirection(const Vector3& direction, TransformSpace::Enum relativeTo = TransformSpace::Local, const Vector3& localDirectionVector = Vector3::NEGATIVE_UNIT_Z);
+            inline void setDirection(float x, float y, float z, TransformSpace::Enum relativeTo = TransformSpace::Local, const Vector3& localDirectionVector = Vector3::NEGATIVE_UNIT_Z)
                 { this->setDirection(Vector3(x, y, z), relativeTo, localDirectionVector); }
 
@@ -127 +130 @@
             void attach(WorldEntity* object);
             void detach(WorldEntity* object);
-            WorldEntity* getAttachedObject(unsigned int index) const;
+            WorldEntity* getAttachedObject(unsigned int index);
             inline const std::set<WorldEntity*>& getAttachedObjects() const
                 { return this->children_; }
@@ -216 +219 @@
 
             inline void setRestitution(float restitution)
-                { this->restitution_ = restitution; resetPhysicsProps(); }
+                { this->restitution_ = restitution; internalSetPhysicsProps(); }
             inline float getRestitution() const
                 { return this->restitution_; }
 
             inline void setAngularFactor(float angularFactor)
-                { this->angularFactor_ = angularFactor; resetPhysicsProps(); }
+                { this->angularFactor_ = angularFactor; internalSetPhysicsProps(); }
             inline float getAngularFactor() const
                 { return this->angularFactor_; }
 
             inline void setLinearDamping(float linearDamping)
-                { this->linearDamping_ = linearDamping; resetPhysicsProps(); }
+                { this->linearDamping_ = linearDamping; internalSetPhysicsProps(); }
             inline float getLinearDamping() const
                 { return this->linearDamping_; }
 
             inline void setAngularDamping(float angularDamping)
-                { this->angularDamping_ = angularDamping; resetPhysicsProps(); }
+                { this->angularDamping_ = angularDamping; internalSetPhysicsProps(); }
             inline float getAngularDamping() const
                 { return this->angularDamping_; }
 
             inline void setFriction(float friction)
-                { this->friction_ = friction; resetPhysicsProps(); }
+                { this->friction_ = friction; internalSetPhysicsProps(); }
             inline float getFriction() const
                 { return this->friction_; }
@@ -242 +245 @@
             void attachCollisionShape(CollisionShape* shape);
             void detachCollisionShape(CollisionShape* shape);
-            CollisionShape* getAttachedCollisionShape(unsigned int index) const;
-
-            inline CompoundCollisionShape* getCollisionShape() const
-                { return this->collisionShape_; }
-            inline btRigidBody* getPhysicalBody() const
-                { return this->physicalBody_; }
+            CollisionShape* getAttachedCollisionShape(unsigned int index);
 
             void notifyCollisionShapeChanged();
@@ -265 +263 @@
             virtual bool isCollisionTypeLegal(CollisionType type) const = 0;
 
-            btRigidBody*  physicalBody_;
+            btRigidBody* physicalBody_;
 
         private:
             void updateCollisionType();
             void recalculateMassProps();
-            void resetPhysicsProps();
+            void internalSetPhysicsProps();
 
             bool notifyBeingAttached(WorldEntity* newParent);
@@ -297 +295 @@
             bool                         bPhysicsActiveSynchronised_;
             bool                         bPhysicsActiveBeforeAttaching_;
-            CompoundCollisionShape*      collisionShape_;
+            CompoundCollisionShape       collisionShape_;
             btScalar                     mass_;
             btVector3                    localInertia_;