Changeset 10391 in orxonox.OLD

Timestamp:

Jan 26, 2007, 7:12:37 PM (18 years ago)

Author:

patrick

Message:

more on camera loading and many planet properties

Location:

trunk/src/world_entities

Files:

• camera.cc (modified) (4 diffs)
• planet.cc (modified) (5 diffs)
• planet.h (modified) (2 diffs)
• world_entity.cc (modified) (9 diffs)
• world_entity.h (modified) (1 diff)

trunk/src/world_entities/camera.cc

@@ -41 +41 @@
 {
   this->registerObject(this, Camera::_objectList);
+
   this->init();
 }
 
-/*
+
 Camera::Camera(const TiXmlElement* root)
 {
   this->registerObject(this, Camera::_objectList);
+
+  if( root != NULL)
+    this->loadParams(root);
+
   this->init();
-  this->loadParams(root);
-}
-*/
+
+}
+
 
 /**
@@ -87 +92 @@
   this->viewLeftDistance = 10;
 
-  //this->loadParams(doc.RootElement());
-
   this->setViewMode(Camera::ViewNormal);
 
   this->setParentMode(PNODE_ALL);
   this->eventHandling = true;
-  
+
   //add to track
   if(this->entityTrack)
@@ -213 +216 @@
   if (fabsf(tmpFovy) > 0.01)
     this->fovy += tmpFovy * fabsf(dt);
-    
+
   if(this->entityTrack)
     this->entityTrack->tick(dt);
@@ -302 +305 @@
 {
   // Do the PNode loading stuff
-  PNode::loadParams(root);
+  WorldEntity::loadParams(root);
 
   LoadParam(root, "viewTopFovy", this, Camera, setViewTopFovy);

trunk/src/world_entities/planet.cc

@@ -45 +45 @@
   this->toList(OM_GROUP_01);
 
+  this->rotSpeedPlanet = 0.0;
+  this->rotSpeedCloud = 0.0;
+
   //this->materialPlanet->setIllum(20);
   //this->materialPlanet->setAmbient(0.1, 0.1, 0.1);
@@ -54 +57 @@
   this->setModel(model);
 
-
-
+  this->cloudModel = new PrimitiveModel(PRIM_SPHERE, this->size + 10, 50);
 }
 
@@ -77 +79 @@
   LoadParam(root, "cloud-texture", this, Planet, setCloudTexture)
       .describe("Sets the cloud texture of the planet");
+
+  LoadParam(root, "cloud-rotation", this, Planet, setCloudRotation)
+      .describe("Sets the cloud rotation speed");
 
   LoadParam(root, "size", this, Planet, setSize)
@@ -103 +108 @@
 
 
+void Planet::setCloudRotation(float rotationSpeed)
+{
+  this->rotSpeedCloud = rotationSpeed;
+}
+
 /**
  * @param size The new size of the Planet
@@ -114 +124 @@
 
 
+void Planet::tick( float dt)
+{
+  if( dt != 0.)
+    this->shiftDir( Quaternion( this->rotSpeedPlanet * dt, Vector(1,0,0)));
+}
 
+
+/**
+ * draws the planet
+ */
 void Planet::draw() const
 {
+  // draw the clouds
   this->materialPlanet.select();
+  WorldEntity::draw();
 
-  WorldEntity::draw();
+  this->materialCloud.select();
+  WorldEntity::draw(this->cloudModel);
+
 }
 

trunk/src/world_entities/planet.h

@@ -29 +29 @@
   void setTexture(const std::string& textureName);
   void setCloudTexture(const std::string& textureName);
+  void setCloudRotation(float rotationSpeed);
 
 
 
+  virtual void tick( float dt);
   virtual void draw() const;
 
@@ -42 +44 @@
   Model*          cloudModel;      //!< the model for the cloud
 
-
+  float           rotSpeedCloud;   //! cloud rotation speed
+  float           rotSpeedPlanet;  //! planet rotation speed
   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)

trunk/src/world_entities/world_entity.cc

@@ -68 +68 @@
  */
 WorldEntity::WorldEntity()
-  : Synchronizeable(), _collisionFilter(this)
+    : Synchronizeable(), _collisionFilter(this)
 {
   this->registerObject(this, WorldEntity::_objectList);
@@ -171 +171 @@
   // Track
   LoadParamXML(root, "Track", this, WorldEntity, addTrack)
-   .describe("creates and adds a track to this WorldEntity");
+  .describe("creates and adds a track to this WorldEntity");
 }
 
@@ -191 +191 @@
   }
   LOAD_PARAM_END_CYCLE(element);*/
-  
+
 
 }
@@ -252 +252 @@
         this->setModel(model, modelNumber);
 
-        if( modelNumber == 0)
+        if( modelNumber == 0)
         {
-          this->buildObbTree(obbTreeDepth);
+          this->buildObbTree(obbTreeDepth);
         }
       }
@@ -275 +275 @@
     {
       PRINTF(4)("fetching MD3 file: %s\n", fileName.c_str());
-//      Model* m = new md3::MD3Model(fileName, this->scaling);
-//      this->setModel(m, 0);
+      //      Model* m = new md3::MD3Model(fileName, this->scaling);
+      //      this->setModel(m, 0);
 
       //       if( m != NULL)
@@ -448 +448 @@
 void WorldEntity::unmount(int slot)
 {
-    if( this->mountPoints[slot] == NULL)
+  if( this->mountPoints[slot] == NULL)
   {
     PRINTF(0)("you tried to remove an entity from a mount point that doesn't exist (slot %i)\n", slot);
@@ -649 +649 @@
 */
 void WorldEntity::tick(float time)
-{
-}
+{}
 
 
@@ -689 +688 @@
       this->models[0]->draw();
     }
-    
+
     //if (this->entityTrack)
-       //this->entityTrack->drawGraph(0.02);
+    //this->entityTrack->drawGraph(0.02);
 
     //     if( this->aabbNode != NULL)
@@ -699 +698 @@
   }
 }
+
+
+/**
+ *  the entity is drawn onto the screen with this function
+ *
+ * This is a central function of an entity: call it to let the entity painted to the screen.
+ * Just override this function with whatever you want to be drawn.
+*/
+void WorldEntity::draw(const Model* model) const
+{
+  glMatrixMode(GL_MODELVIEW);
+  glPushMatrix();
+
+  /* translate */
+  glTranslatef (this->getAbsCoor ().x,
+                this->getAbsCoor ().y,
+                this->getAbsCoor ().z);
+  Vector tmpRot = this->getAbsDir().getSpacialAxis();
+  glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
+
+
+  // This Draws the LOD's
+  if( model != NULL)
+    model->draw();
+
+  glPopMatrix();
+}
+
 
 /**

trunk/src/world_entities/world_entity.h

@@ -75 +75 @@
   virtual void tick (float time);
   virtual void draw () const;
+  void draw(const Model* model) const;
   void debugDrawMountPoints() const;