Changeset 8195 in orxonox.OLD for branches/bsp_model/src/world_entities

Timestamp:

Jun 7, 2006, 3:14:46 PM (19 years ago)

Author:

bottac

Message:

merged back from old branch.

Location:

branches/bsp_model/src/world_entities

Files:

• bsp_entity.cc (modified) (1 diff)
• world_entity.cc (modified) (2 diffs)

branches/bsp_model/src/world_entities/bsp_entity.cc

@@ -96 +96 @@
 void BSPEntity::tick(float time)
 {
-
+  this->bspManager->tick(time);
 }
 

branches/bsp_model/src/world_entities/world_entity.cc

@@ -499 +499 @@
 
   Vector v = this->getAbsDirX();
-  v.x *= 10;
-  v.y *= 10;
-  v.z *= 10;
-  Vector u = this->getAbsDirY();
-
-  if(feet.x == (u.x+this->getAbsCoor().x) &&  feet.y == u.y +this->getAbsCoor().y && feet.z == this->getAbsCoor().z)
+  v.x *= 10.1;
+  v.y *= 10.1;
+  v.z *= 10.1;
+  Vector u = Vector(0.0,-20.0,0.0);
+
+         
+  if(!(this->getAbsCoor().x == ray_2.x && this->getAbsCoor().y == ray_2.y && this->getAbsCoor().z == ray_2.z) )
   {
 
   this->setAbsCoor(ray_2 - v);
-  }
-  else
+
+  }
+    else
   {
     if(ray_1.x == this->getAbsCoor().x + v.x && ray_1.y == this->getAbsCoor().y + v.y + 0.1 && ray_1.z ==this->getAbsCoor().z + v.z)
@@ -519 +521 @@
 
   }
+   
+    
 }