Changeset 2491 for code/branches

Timestamp:

Dec 17, 2008, 12:10:23 AM (16 years ago)

Author:

rgrieder

Message:

• "gravity" xml parameter got missed in Scene
• fixed issue with rotationrate and rotationaxis in MobileEntity
• updated msvc files

Location:

code/branches/presentation

Files:

• src/orxonox/objects/Scene.cc (modified) (2 diffs)
• src/orxonox/objects/worldentities/MobileEntity.cc (modified) (1 diff)
• visual_studio/vc8/orxonox.vcproj (modified) (4 diffs)

code/branches/presentation/src/orxonox/objects/Scene.cc

@@ -117 +117 @@
         XMLPortParam(Scene, "shadow", setShadow, getShadow, xmlelement, mode).defaultValues(true);
 
+        XMLPortParam(Scene, "gravity", setGravity, getGravity, xmlelement, mode);
         XMLPortParam(Scene, "negativeWorldRange", setNegativeWorldRange, getNegativeWorldRange, xmlelement, mode);
         XMLPortParam(Scene, "positiveWorldRange", setPositiveWorldRange, getPositiveWorldRange, xmlelement, mode);
@@ -191 +192 @@
             this->collisionConfig_ = new btDefaultCollisionConfiguration();
             this->dispatcher_      = new btCollisionDispatcher(this->collisionConfig_);
-            this->solver_          = new btSequentialImpulseConstraintSolver;
+            this->solver_          = new btSequentialImpulseConstraintSolver();
 
             this->physicalWorld_   = new btDiscreteDynamicsWorld(this->dispatcher_, this->broadphase_, this->solver_, this->collisionConfig_);

code/branches/presentation/src/orxonox/objects/worldentities/MobileEntity.cc

@@ -64 +64 @@
 
         XMLPortParamTemplate(MobileEntity, "velocity",     setVelocity,     getVelocity,     xmlelement, mode, const Vector3&);
-        XMLPortParamTemplate(MobileEntity, "rotationaxis", setRotationAxis, getRotationAxis, xmlelement, mode, const Vector3&);
-        XMLPortParam(MobileEntity, "rotationrate", setRotationRate, getRotationRate, xmlelement, mode);
+
+        Vector3 rotationAxis(this->getRotationAxis());
+        Degree rotationRate = this->getRotationRate();
+        XMLPortParamVariable(MobileEntity, "rotationaxis", rotationAxis, xmlelement, mode);
+        XMLPortParamVariable(MobileEntity, "rotationrate", rotationRate, xmlelement, mode);
+        if (mode == XMLPort::LoadObject)
+        {
+            if (rotationAxis == Vector3::ZERO)
+                this->setAngularVelocity(Vector3::ZERO);
+            else
+                this->setAngularVelocity(rotationAxis.normalisedCopy() * rotationRate.valueRadians());
+        }
     }
 

code/branches/presentation/visual_studio/vc8/orxonox.vcproj

@@ -649 +649 @@
                                         >
                                         <File
+                                                RelativePath="..\..\src\orxonox\objects\collisionshapes\BoxCollisionShape.cc"
+                                                >
+                                        </File>
+                                        <File
                                                 RelativePath="..\..\src\orxonox\objects\collisionshapes\CollisionShape.cc"
                                                 >
@@ -654 +658 @@
                                         <File
                                                 RelativePath="..\..\src\orxonox\objects\collisionshapes\CompoundCollisionShape.cc"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\objects\collisionshapes\ConeCollisionShape.cc"
                                                 >
                                         </File>
@@ -1301 +1309 @@
                                         >
                                         <File
+                                                RelativePath="..\..\src\orxonox\objects\collisionshapes\BoxCollisionShape.h"
+                                                >
+                                        </File>
+                                        <File
                                                 RelativePath="..\..\src\orxonox\objects\collisionshapes\CollisionShape.h"
                                                 >
@@ -1306 +1318 @@
                                         <File
                                                 RelativePath="..\..\src\orxonox\objects\collisionshapes\CompoundCollisionShape.h"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\objects\collisionshapes\ConeCollisionShape.h"
                                                 >
                                         </File>