Changeset 10653 in orxonox.OLD for trunk/src

Timestamp:

May 10, 2007, 5:42:26 PM (18 years ago)

Author:

snellen

Message:

planet rotation now xml-loadable

Location:

trunk/src/world_entities/environments

Files:

• planet.cc (modified) (3 diffs)
• planet.h (modified) (2 diffs)

trunk/src/world_entities/environments/planet.cc

@@ -47 +47 @@
 
   this->rotSpeedPlanet = 0.0;
+  this->rotVecPlanet = Vector(0,1,0);
   this->rotSpeedCloud = 0.0;
   this->bClouds = false;
@@ -85 +86 @@
   LoadParam(root, "cloud-rotation", this, Planet, setCloudRotation)
       .describe("Sets the cloud rotation speed");
+  
+  LoadParam(root, "planet-rotation-speed", this, Planet, setPlanetRotationSpeed)
+      .describe("Sets the planet rotation speed");
+  
+  LoadParam(root, "planet-rotation-axis", this, Planet, setPlanetRotationAxis)
+      .describe("Sets the planet rotation axis");
 }
 
@@ -132 +139 @@
 {
   if( dt != 0.)
-    this->shiftDir( Quaternion( this->rotSpeedPlanet * dt, Vector(1,0,0)));
+    this->shiftDir( Quaternion( this->rotSpeedPlanet * dt, this->rotVecPlanet));
 }
 

trunk/src/world_entities/environments/planet.h

@@ -31 +31 @@
   void setCloudTexture(const std::string& textureName);
   void setCloudRotation(float rotationSpeed);
+  void setPlanetRotationSpeed(float rotationSpeed){ this->rotSpeedPlanet = rotationSpeed;}
+  void setPlanetRotationAxis(float x, float y, float z){ this->rotVecPlanet = Vector(x,y,z);}
 
 
@@ -48 +50 @@
   float           rotSpeedCloud;   //! cloud rotation speed
   float           rotSpeedPlanet;  //! planet rotation speed
+  Vector          rotVecPlanet;    //! planet rotation vector
   float           size;            //!< Size of the Planet. This should match the frustum maximum range.
   float           textureSize;     //!< this is the length of a texture (assumes a square texture)