Changeset 6307 in orxonox.OLD

Timestamp:

Dec 27, 2005, 12:20:32 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: PNode fix: PNODE_MOVEMENT didn't work, because the mask was bork

Location:

trunk/src

Files:

• lib/coord/p_node.cc (modified) (3 diffs)
• lib/graphics/render2D/element_2d.cc (modified) (1 diff)
• story_entities/world.cc (modified) (1 diff)
• world_entities/skybox.cc (modified) (2 diffs)
• world_entities/skybox.h (modified) (1 diff)

trunk/src/lib/coord/p_node.cc

@@ -628 +628 @@
 void PNode::setParentMode(PARENT_MODE parentMode)
 {
-  this->parentMode &= (0xfff0 | parentMode);
+  this->parentMode = ((this->parentMode & 0xfff0) | parentMode);
 }
 
@@ -745 +745 @@
 
 
-        if( this->parentMode & PNODE_LOCAL_ROTATE && this->bRelDirChanged)
+        if(this->bRelDirChanged && this->parentMode & PNODE_LOCAL_ROTATE )
         {
           /* update the current absDirection - remember * means rotation around sth.*/
@@ -752 +752 @@
         }
 
-        if(likely(this->parentMode & PNODE_MOVEMENT && this->bRelCoorChanged))
+        if(likely(this->bRelCoorChanged && this->parentMode & PNODE_MOVEMENT))
         {
         /* update the current absCoordinate */
-        this->prevRelCoordinate = this->relCoordinate;
-        this->absCoordinate = this->parent->getAbsCoor() + this->relCoordinate;
+          this->prevRelCoordinate = this->relCoordinate;
+          this->absCoordinate = this->parent->getAbsCoor() + this->relCoordinate;
         }
         else if( this->parentMode & PNODE_ROTATE_MOVEMENT && this->bRelCoorChanged)
         {
           /* update the current absCoordinate */
-        this->prevRelCoordinate = this->relCoordinate;
-        this->absCoordinate = this->parent->getAbsCoor() + parent->getAbsDir().apply(this->relCoordinate);
+          this->prevRelCoordinate = this->relCoordinate;
+          this->absCoordinate = this->parent->getAbsCoor() + parent->getAbsDir().apply(this->relCoordinate);
         }
         /////////////////////////////////////////////////

trunk/src/lib/graphics/render2D/element_2d.cc

@@ -704 +704 @@
 void Element2D::setParentMode2D(E2D_PARENT_MODE parentMode)
 {
-  this->parentMode &= (0xfff0 | parentMode);
+  this->parentMode = ((this->parentMode & 0xfff0) | parentMode);
 }
 

trunk/src/story_entities/world.cc

@@ -349 +349 @@
   if (this->sky != NULL)
   {
-    this->sky->setParent(this->localCamera);
-    this->sky->setParentMode(PNODE_MOVEMENT);
+    this->localCamera->addChild(sky);
   }
   SoundEngine::getInstance()->setListener(this->localCamera);

trunk/src/world_entities/skybox.cc

@@ -68 +68 @@
   this->size = 100.0;
 
-  this->material = new Material*[6];
   for (int i = 0; i < 6; i++)
     {
@@ -95 +94 @@
   for (int i = 0; i < 6; i++)
     delete this->material[i];
-  delete[] this->material;
- }
+}
 
 /**

trunk/src/world_entities/skybox.h

@@ -44 +44 @@
   void rebuild();
 
-  Material**      material;        //!< Materials for the SkyBox. sorted by number (0-5) top, bottom, left, right, front, back
+  Material*       material[6];     //!< Materials for the SkyBox. sorted by number (0-5) top, bottom, left, right, front, back
   float           size;            //!< Size of the SkyBox. This should match the frustum maximum range.