Changeset 8233 in orxonox.OLD

Timestamp:

Jun 8, 2006, 1:26:50 PM (18 years ago)

Author:

bottac

Message:

Colision test

Location:

branches/bsp_model/src/lib/graphics/importer

Files:

• bsp_file.cc (modified) (2 diffs)
• bsp_manager.cc (modified) (7 diffs)

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

@@ -603 +603 @@
   MoviePlayer * testMC = new MoviePlayer(mat);
   testMC->start(0);
+  
+  this->MovieMaterials.push_back(testMC);
 
   //Material* tmp = new Material();
@@ -632 +634 @@
   sc *= 1/255.0;
 
-  scale = 1.8; // Adjust brightness here
+  scale = 1.0f; // Adjust brightness here
 
   if(sc > 1.0f && (temp = (1.0f/sc)) < scale) scale=temp;

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 );
 
 }
@@ -305 +307 @@
   if(this->lastTex != curFace.texture) {
     if(this->bspFile->Materials[curFace.texture].animated) {
-      glBlendFunc(GL_ONE,GL_ONE_MINUS_SRC_COLOR);
-      glEnable(GL_BLEND);
+      glBlendFunc(GL_ZERO,GL_ONE);
+      //glEnable(GL_BLEND);
       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);
+      //this->bspFile->Materials[curFace.texture].aviMat->tick(0.005);
       int n =  this->bspFile->Materials[curFace.texture].aviMat->getTexture();
       glActiveTextureARB(GL_TEXTURE0_ARB);
       glBindTexture(GL_TEXTURE_2D, n );
-      glDisable(GL_BLEND);
+     // glDisable(GL_BLEND);
     } else {
       this->bspFile->Materials[curFace.texture].mat->select();
@@ -324 +326 @@
     glEnable(GL_TEXTURE_2D);
   } else {
+   // glEnable(GL_BLEND);
+    //glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     glActiveTextureARB(GL_TEXTURE1_ARB);
     glBindTexture(GL_TEXTURE_2D, this->bspFile->glLightMapTextures[curFace.lm_index]);
     glEnable(GL_TEXTURE_2D);
+  //  glDisable(GL_BLEND);
   }
 
@@ -887 +893 @@
     Vector dest1 = position1 + forwardDir;
     Vector dest2 = position2 + forwardDir;
-    dest = position - Vector(0.0, 20.0,0.0);
+    dest = position - Vector(0.0, 40.0,0.0);
     Vector out1;
     Vector out2;
-
+    /*
     this->checkCollisionRayN(this->root,0.0f,1.0f, &position1, &dest1 );
     if(this->outputFraction == 1.0f)  out1 = dest;
@@ -911 +917 @@
     }
 
+    */
+    
+    float height = 10;
+        
+        
     this->checkCollisionRayN(this->root,0.0f,1.0f, &position, &dest );
     if(this->outputFraction == 1.0f) out = dest;
@@ -919 +930 @@
       out.z = position.z + (dest.z -position.z) * this->outputFraction;
 
-      Vector out3 = out + Vector(3*this->collPlane->x,3*this->collPlane->y,3*this->collPlane->z);
+      Vector out3 = out + Vector(height*this->collPlane->x,height*this->collPlane->y,height*this->collPlane->z);
       this->out = out;
-      this->out1 = out1;
-      this->out2 = out2;
+      //this->out1 = out1;
+      //this->out2 = out2;
       //this->drawDebugCube(&out1);
       //this->drawDebugCube(&out2);
@@ -929 +940 @@
 
     }
+    
+    
 
     // Return the normal here: Normal's stored in this->collPlane;