Changeset 10107 in orxonox.OLD for branches/playability/src/world_entities/effects

Timestamp:

Dec 19, 2006, 10:03:19 PM (18 years ago)

Author:

marcscha

Message:

many additions, several fixes

File:

• branches/playability/src/world_entities/effects/trail.cc (modified) (15 diffs)

branches/playability/src/world_entities/effects/trail.cc

@@ -174 +174 @@
   //glMatrixMode(GL_MODELVIEW);
   //glLoadIdentity();
-
-  glEnable( GL_BLEND);
+  /*
+  glEnable(GL_BLEND);
   glBlendFunc(GL_SRC_ALPHA,GL_ONE);
-  glDisable( GL_ALPHA_TEST);
+  glDisable( GL_ALPHA_TEST);*/
 
   glTranslatef(-this->getAbsCoor().x,-this->getAbsCoor().y,-this->getAbsCoor().z);
@@ -183 +183 @@
   this->material->select();
 
-  float alphaStep = (trailAlphaMax - trailAlphaMin)/this->sections;
+  //float alphaStep = 1.0 / this->sections;
 
   glBegin(GL_TRIANGLE_STRIP);
@@ -190 +190 @@
   for( int i = 1; i < this->sections-1; i++)
   {
-    radone  = this->radius * (1.0-i*fact);
-    radzero  = this->radius * (1.0-(i+1)*fact);
+    radone  = this->radius * (1.0-i*fact + 0.2 * (float)rand()/(float)RAND_MAX);
+    radzero  = this->radius * (1.0-(i+1)*fact + 0.2 * (float)rand()/(float)RAND_MAX);
 
     now   =  this->nodeList[i];
@@ -204 +204 @@
     Q[3]  = now + Vector(0,-radone,0) ;
     
-    glTexCoord2f(0.0f, 0.0f); glColor4f(1,1,1, trailAlphaMax - i * alphaStep); glVertex3f(Q[0].x,Q[0].y,Q[0].z);
-        glTexCoord2f(1.0f, 0.0f); glColor4f(1,1,1, trailAlphaMax - i * alphaStep); glVertex3f(Q[3].x,Q[3].y,Q[3].z);
+    glTexCoord2f(0.0f, 0.0f); glVertex3f(Q[0].x,Q[0].y,Q[0].z);
+        glTexCoord2f(1.0f, 0.0f); glVertex3f(Q[3].x,Q[3].y,Q[3].z);
 
     if( i == this->sections - 1)
@@ -212 +212 @@
       Q[1]  = later + Vector(0,radzero,0) ;
       Q[2]  = later + Vector(0,-radzero,0) ;
-      glTexCoord2f(0.0f, 1.0f); glColor4f(1,1,1, trailAlphaMax - i * alphaStep); glVertex3f(Q[1].x,Q[1].y,Q[1].z);
-      glTexCoord2f(1.0f, 1.0f); glColor4f(1,1,1, trailAlphaMax - i * alphaStep); glVertex3f(Q[2].x,Q[2].y,Q[2].z);
+      glTexCoord2f(0.0f, 1.0f); glVertex3f(Q[1].x,Q[1].y,Q[1].z);
+      glTexCoord2f(1.0f, 1.0f); glVertex3f(Q[2].x,Q[2].y,Q[2].z);
     }
 
@@ -222 +222 @@
   for( int i = this->sections-1; i > 0; i--)
   {
-    radone  = this->radius * (1.0-i*fact);
-    radzero  = this->radius * (1.0-(i-1)*fact);
+    radone  = this->radius * (1.0-i*fact + 0.2 * (float)rand()/(float)RAND_MAX);
+    radzero  = this->radius * (1.0-(i-1)*fact + 0.2 * (float)rand()/(float)RAND_MAX);
 
     now   =  this->nodeList[i];
@@ -236 +236 @@
     Q[3]  = now + Vector(0,-radone,0) ;
 
-        glTexCoord2f(1.0f, 0.0f); glColor4f(1,1,1, trailAlphaMax - i * alphaStep); glVertex3f(Q[3].x,Q[3].y,Q[3].z+0.01f);
-        glTexCoord2f(0.0f, 0.0f); glColor4f(1,1,1, trailAlphaMax - i * alphaStep); glVertex3f(Q[0].x,Q[0].y,Q[0].z+0.01f);
+        glTexCoord2f(1.0f, 0.0f); glVertex3f(Q[3].x,Q[3].y,Q[3].z+0.01f);
+        glTexCoord2f(0.0f, 0.0f); glVertex3f(Q[0].x,Q[0].y,Q[0].z+0.01f);
 
     if( i == 1)
@@ -243 +243 @@
         Q[1]  = later + Vector(0,radzero,0) ;
         Q[2]  = later + Vector(0,-radzero,0) ;
-                glTexCoord2f(1.0f, 1.0f); glColor4f(1,1,1, trailAlphaMax - i * alphaStep); glVertex3f(Q[2].x,Q[2].y,Q[2].z+0.01f);
-                glTexCoord2f(0.0f, 1.0f); glColor4f(1,1,1, trailAlphaMax - i * alphaStep); glVertex3f(Q[1].x,Q[1].y,Q[1].z+0.01f);
+
+                glTexCoord2f(1.0f, 1.0f); glVertex3f(Q[2].x,Q[2].y,Q[2].z+0.01f);
+                glTexCoord2f(0.0f, 1.0f); glVertex3f(Q[1].x,Q[1].y,Q[1].z+0.01f);
         }
 
@@ -254 +255 @@
   for( int i = 1; i < this->sections-1; i++)
   {
-    radone  = this->radius * (1.0-i*fact);
-    radzero  = this->radius * (1.0-(i+1)*fact);
+    radone  = this->radius * (1.0-i*fact + 0.2 * (float)rand()/(float)RAND_MAX);
+    radzero  = this->radius * (1.0-(i+1)*fact + 0.2 * (float)rand()/(float)RAND_MAX);
 
     now   =  this->nodeList[i];
@@ -268 +269 @@
     Q[3]  = now + targ.cross(Vector(0,-radone,0)) ;
     
-        glTexCoord2f(0.0f, 0.0f); glColor4f(1,1,1, trailAlphaMax - i * alphaStep); glVertex3f(Q[0].x,Q[0].y,Q[0].z);
-        glTexCoord2f(1.0f, 0.0f); glColor4f(1,1,1, trailAlphaMax - i * alphaStep); glVertex3f(Q[3].x,Q[3].y,Q[3].z);
+        glTexCoord2f(0.0f, 0.0f); glVertex3f(Q[0].x,Q[0].y,Q[0].z);
+        glTexCoord2f(1.0f, 0.0f); glVertex3f(Q[3].x,Q[3].y,Q[3].z);
 
     if( i == this->sections-1)
@@ -275 +276 @@
       Q[1]  = later + targ.cross(Vector(0,radzero,0)) ;
       Q[2]  = later + targ.cross(Vector(0,-radzero,0)) ;
-      glTexCoord2f(0.0f, 1.0f); glColor4f(1,1,1, trailAlphaMax - i * alphaStep); glVertex3f(Q[1].x,Q[1].y,Q[1].z);
-      glTexCoord2f(1.0f, 1.0f); glColor4f(1,1,1, trailAlphaMax - i * alphaStep); glVertex3f(Q[2].x,Q[2].y,Q[2].z);
+      glTexCoord2f(0.0f, 1.0f); glVertex3f(Q[1].x,Q[1].y,Q[1].z);
+      glTexCoord2f(1.0f, 1.0f); glVertex3f(Q[2].x,Q[2].y,Q[2].z);
     }
 
@@ -285 +286 @@
   for( int i = this->sections-1; i > 0; i--)
   {
-    radone  = this->radius * (1.0-i*fact);
-    radzero  = this->radius * (1.0-(i-1)*fact);
+    radone  = this->radius * (1.0-i*fact + 0.2 * (float)rand()/(float)RAND_MAX);
+    radzero  = this->radius * (1.0-(i-1)*fact + 0.2 * (float)rand()/(float)RAND_MAX);
 
     now   =  this->nodeList[i];
@@ -299 +300 @@
     Q[3]  = now + targ.cross(Vector(0,-radone,0)) ;
 
-        glTexCoord2f(0.0f, 0.0f); glColor4f(1,1,1, trailAlphaMax - i * alphaStep); glVertex3f(Q[0].x+0.01f,Q[0].y,Q[0].z);
-        glTexCoord2f(1.0f, 0.0f); glColor4f(1,1,1, trailAlphaMax - i * alphaStep); glVertex3f(Q[3].x+0.01f,Q[3].y,Q[3].z);
+        glTexCoord2f(0.0f, 0.0f); glVertex3f(Q[0].x+0.01f,Q[0].y,Q[0].z);
+        glTexCoord2f(1.0f, 0.0f); glVertex3f(Q[3].x+0.01f,Q[3].y,Q[3].z);
 
     if( i == 1)
@@ -306 +307 @@
         Q[1]  = later + targ.cross(Vector(0,radzero,0)) ;
         Q[2]  = later + targ.cross(Vector(0,-radzero,0)) ;
-                glTexCoord2f(0.0f, 1.0f); glColor4f(1,1,1, trailAlphaMax - i * alphaStep); glVertex3f(Q[1].x+0.01f,Q[1].y,Q[1].z);
-                glTexCoord2f(1.0f, 1.0f); glColor4f(1,1,1, trailAlphaMax - i * alphaStep); glVertex3f(Q[2].x+0.01f,Q[2].y,Q[2].z);
+
+                glTexCoord2f(0.0f, 1.0f); glVertex3f(Q[1].x+0.01f,Q[1].y,Q[1].z);
+                glTexCoord2f(1.0f, 1.0f); glVertex3f(Q[2].x+0.01f,Q[2].y,Q[2].z);
         }
 
@@ -316 +318 @@
   glPopMatrix();
   glPopAttrib();
-/*
-  //glTranslatef(this->getAbsCoor().x, this->getAbsCoor().y, this->getAbsCoor().z);
-  //glTranslatef(0,0,0);
-
-  const PNode* camera = State::getCameraNode();  //!< @todo MUST be different
-  Vector cameraPos = camera->getAbsCoor();
-  Vector cameraTargetPos = State::getCameraTargetNode()->getAbsCoor();
-  Vector view = cameraTargetPos - cameraPos;
-  Vector up = Vector(0, 1, 0);
-  up = camera->getAbsDir().apply(up);
-  Vector h = up.cross(view);
-  Vector v = h.cross(view);
-  h.normalize();
-  v.normalize();
-
-  v *= sizeX;
-  h *= sizeY;
-
-//v += this->getAbsCoor();
-    //PRINTF(0)("sizeX: %f sizeY: %f\n", sizeX, sizeY);
-  glBegin(GL_QUADS);
-  glTexCoord2f(0.0f, 0.0f);
-  glVertex3f(this->getAbsCoor().x - h.x - v.x,
-             this->getAbsCoor().y - h.y - v.y,
-             this->getAbsCoor().z - h.z - v.z);
-  glTexCoord2f(1.0f, 0.0f);
-  glVertex3f( this->getAbsCoor().x + h.x - v.x,
-              this->getAbsCoor().y + h.y - v.y,
-              this->getAbsCoor().z + h.z - v.z);
-  glTexCoord2f(1.0f, 1.0f);
-  glVertex3f(this->getAbsCoor().x + h.x + v.x,
-             this->getAbsCoor().y + h.y + v.y,
-             this->getAbsCoor().z + h.z + v.z);
-  glTexCoord2f(0.0f, 1.0f);
-  glVertex3f(this->getAbsCoor().x - h.x + v.x,
-             this->getAbsCoor().y - h.y + v.y,
-             this->getAbsCoor().z - h.z + v.z);
-  glEnd();
-
-
-  glPopMatrix();
-
-  glPopAttrib();*/
-}
+}