Changeset 8317 in orxonox.OLD

Timestamp:

Jun 11, 2006, 2:15:24 PM (18 years ago)

Author:

bottac

Message:

collision detection: partial fix.

Location:

branches/bsp_model/src/lib/graphics/importer

Files:

• bsp_file.cc (modified) (2 diffs)
• bsp_manager.cc (modified) (6 diffs)
• bsp_manager.h (modified) (1 diff)

branches/bsp_model/src/lib/graphics/importer/bsp_file.cc

@@ -214 +214 @@
     bspFile.read(this->visData, size);
 
-    PRINTF(4)("BSP FILE: VisDataSize: %i Bytes. \n", size);
-    PRINTF(4)("BSP FILE: NumVisData: %i. \n", size /1 - 8);
-    PRINTF(4)("BSP FILE: Remainder: %i. \n", size % 1);
-    PRINTF(4)("BSP FILE: VisDataOffset: %i. \n", offset);
+    PRINTF(0)("BSP FILE: VisDataSize: %i Bytes. \n", size);
+    PRINTF(0)("BSP FILE: NumVisData: %i. \n", size /1 - 8);
+    PRINTF(0)("BSP FILE: Remainder: %i. \n", size % 1);
+    PRINTF(0)("BSP FILE: VisDataOffset: %i. \n", offset);
 
     // Get the Textures
@@ -391 +391 @@
 {
   ::std::string absFileName;
-   char* baseName = "/worlds/bsp";
+  char* baseName = "/worlds/bsp/";
 
   char fileName [500];

branches/bsp_model/src/lib/graphics/importer/bsp_manager.cc

@@ -103 +103 @@
 const void BspManager::tick(float time)
 {
-  //if(!this->bspFile->MovieMaterials.empty())
-  //this->bspFile->MovieMaterials.front()->tick(time );
-
+ 
+  if(!this->bspFile->MovieMaterials.empty())
+  {
+      ::std::vector<MoviePlayer *>::iterator it = this->bspFile->MovieMaterials.begin() ;
+      while(it != this->bspFile->MovieMaterials.end())
+      {
+         (*it)->tick(time); 
+        it++;
+      }
+ //this->bspFile->MovieMaterials.front()->tick(time );
+  
+  
+  }
+  
 }
 const void BspManager::draw()
@@ -302 +313 @@
     return;
   }
-  if(curFace.type != 1) return;
+ // if(curFace.type != 1) return;
   if((char*)(this->bspFile->textures)[curFace.texture*72]== 0) return;
 
   if(this->lastTex != curFace.texture) {
     if(this->bspFile->Materials[curFace.texture].animated) {
-      glBlendFunc(GL_ZERO,GL_ONE);
-      //glEnable(GL_BLEND);
+     // glBlendFunc(GL_ZERO,GL_ONE);
+   
+    
+      
       if(this->bspFile->Materials[curFace.texture].aviMat->getStatus() == 2) this->bspFile->Materials[curFace.texture].aviMat->start(0);
       //this->bspFile->Materials[curFace.texture].aviMat->tick(0.005);
@@ -314 +327 @@
       glActiveTextureARB(GL_TEXTURE0_ARB);
       glBindTexture(GL_TEXTURE_2D, n );
-     // glDisable(GL_BLEND);
+      this->lastTex = curFace.texture;
+      
     } else {
       this->bspFile->Materials[curFace.texture].mat->select();
@@ -322 +336 @@
 
   if(curFace.lm_index < 0) {
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     glActiveTextureARB(GL_TEXTURE1_ARB);
     glBindTexture(GL_TEXTURE_2D, this->bspFile->whiteLightMap );
@@ -922 +937 @@
 
     this->checkCollisionRayN(this->root,0.0f,1.0f, &position, &dest );
-    if(this->outputFraction == 1.0f) out = dest;
+    if(this->outputFraction == 1.0f)
+    {
+      if(this->outputAllSolid) collision = true;
+      else collision = false;
+      out = dest;
+      
+    }
     else {
+      
       collision = true;
       out.x = position.x + (dest.x -position.x) * this->outputFraction;
@@ -944 +966 @@
     // Return the normal here: Normal's stored in this->collPlane;
 
-    if(collision) {
+    if(collision ) {
       PRINTF(0)("We got a collision!! Are you sure: outputFraction = %f\n", this->outputFraction);
       worldEntity->registerCollision(this->parent, worldEntity, Vector(this->collPlane->x, this->collPlane->y, this->collPlane->z), out);

branches/bsp_model/src/lib/graphics/importer/bsp_manager.h

@@ -109 +109 @@
   Vector out1; //!< For debugging only
   Vector out2; //!< For debugging only
+                        
+  int tgl;
 };