Changeset 5437 in orxonox.OLD for trunk

Timestamp:

Oct 26, 2005, 11:01:43 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Sphers Rendered around the Turret-Power-Up (this looks really bad)

Location:

trunk

Files:

• Makefile.in (modified) (1 diff)
• configure (modified) (1 diff)
• src/lib/graphics/importer/material.cc (modified) (1 diff)
• src/lib/graphics/importer/primitive_model.cc (modified) (2 diffs)
• src/world_entities/power_ups/turret_power_up.cc (modified) (4 diffs)
• src/world_entities/power_ups/turret_power_up.h (modified) (1 diff)

trunk/Makefile.in

@@ -39 +39 @@
         $(srcdir)/doc/documentation.am $(top_srcdir)/configure AUTHORS \
         COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp \
-        install-sh missing mkinstalldirs
+        install-sh ltmain.sh missing mkinstalldirs
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

trunk/configure

@@ -5429 +5429 @@
 echo "${ECHO_T}$ac_cv_lib_ALut_main" >&6
 if test $ac_cv_lib_ALut_main = yes; then
-  FOUND_ALUT=yes; LIBS="$LIBS -lALut"
+  FOUND_ALUT=yes; LIBS="-lALut $LIBS"
 fi
 

trunk/src/lib/graphics/importer/material.cc

@@ -91 +91 @@
     {
       glEnable(GL_BLEND);
+      glBlendFunc(GL_SRC_ALPHA, GL_ONE);
       glColor4f(*(this->diffuse), *(this->diffuse+1), *(this->diffuse+2), this->transparency);
-      glBlendFunc(GL_SRC_ALPHA, GL_ONE);
     }
   else

trunk/src/lib/graphics/importer/primitive_model.cc

@@ -84 +84 @@
         {
           float vj = j/df *PI;
+          this->addVertexNormal(cos(vi) * cos(vj),
+                                sin(vj),
+                                sin(vi) * cos(vj));
+
           this->addVertex(size * cos(vi) * cos(vj),
                           size * sin(vj),
                           size * sin(vi) * cos(vj));
+
           this->addVertexTexture(i / (df *2.0), (j-1.0)/(df)+.5);
         }
     }
   this->addVertex(0, -size, 0);
+  this->addVertexNormal(0, -1, 0);
   this->addVertexTexture(0,0);
   this->addVertex(0, size, 0);
+  this->addVertexNormal(0, 1, 0);
   this->addVertexTexture(0 ,1);
 
@@ -119 +126 @@
             {
               v1 = this->getVertexCount() - 2;
-              this->addFace(3, VERTEX_TEXCOORD, v1, v1, v3, v3, v4, v4);
+              this->addFace(3, VERTEX_TEXCOORD_NORMAL, v1, v1, v1, v3, v3, v3, v4, v4, v4);
             }
           else if (j == detail)
             {
               v3 = this->getVertexCount()-1;
-              this->addFace(3, VERTEX_TEXCOORD, v1, v1, v2, v2, v3, v3);
+              this->addFace(3, VERTEX_TEXCOORD_NORMAL, v1, v1, v1, v2, v2, v2, v3, v3, v3);
             }
           else
-            this->addFace(4, VERTEX_TEXCOORD, v1, v1, v2, v2, v3, v3, v4, v4);
+            this->addFace(4, VERTEX_TEXCOORD_NORMAL, v1, v1, v1, v2, v2, v2, v3, v3, v3, v4, v4, v4);
         }
     }

trunk/src/world_entities/power_ups/turret_power_up.cc

@@ -20 +20 @@
 #include "list.h"
 
+#include "primitive_model.h"
+
 using namespace std;
 
 CREATE_FACTORY(TurretPowerUp);
-
-GLUquadricObj* TurretPowerUp_sphereObj = NULL;
-Material*      TurretPowerUp_sphereMat = NULL;
-
 
 TurretPowerUp::TurretPowerUp ()
@@ -41 +39 @@
 
 
-TurretPowerUp::~TurretPowerUp () {
-
+TurretPowerUp::~TurretPowerUp ()
+{
+  delete this->sphereModel;
+  delete this->sphereMaterial;
 }
 
@@ -51 +51 @@
   this->loadModelWithScale("models/guns/turret1.obj", 2.0);
 
-  if (TurretPowerUp_sphereObj == NULL)
-    TurretPowerUp_sphereObj = gluNewQuadric();
-  if(TurretPowerUp_sphereMat == NULL)
-  {
-    TurretPowerUp_sphereMat = new Material("TurretPowerUp_Sphere");
-    TurretPowerUp_sphereMat->setTransparency(.1);
-  }
+  this->sphereModel = new PrimitiveModel(PRIM_SPHERE, 7, 5);
+  this->sphereMaterial = new Material;
+  this->sphereMaterial->setTransparency(.0001);
+  this->sphereMaterial->setDiffuse(.1, .1, .8);
+
   this->rotation = Vector(0,1,0);
-  this->cycle    = 0;
+  this->cycle    = (float)rand()/RAND_MAX*M_2_PI;
+  this->shiftDir(Quaternion((float)rand()/RAND_MAX*M_2_PI, this->rotation));
 }
 
@@ -112 +111 @@
   Vector tmpRot = this->getAbsDir().getSpacialAxis();
   glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
-  TurretPowerUp_sphereMat->select();
-//  gluSphere(TurretPowerUp_sphereObj, 3, 5, 5);
   this->model->draw();
+
+  this->sphereMaterial->select();
+  this->sphereModel->draw();
   glPopMatrix();
-
 }
 

trunk/src/world_entities/power_ups/turret_power_up.h

@@ -27 +27 @@
    Vector              rotation;
    float               cycle;
+
+   Model*              sphereModel;
+   Material*           sphereMaterial;
 };