Changeset 5437 in orxonox.OLD for trunk/src/world_entities

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/src/world_entities/power_ups

Files:

• turret_power_up.cc (modified) (4 diffs)
• turret_power_up.h (modified) (1 diff)

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;
 };