Changeset 9989 in orxonox.OLD for branches

Timestamp:

Dec 3, 2006, 5:07:55 PM (18 years ago)

Author:

nicolasc

Message:

loads of tests, not really working

Location:

branches/playability/src/world_entities

Files:

• projectiles/hbolt.cc (modified) (7 diffs)
• projectiles/hbolt.h (modified) (2 diffs)
• test_entity2.cc (modified) (4 diffs)
• test_entity2.h (modified) (1 diff)

branches/playability/src/world_entities/projectiles/hbolt.cc

@@ -39 +39 @@
   this->registerObject(this, HBolt::_objectList);
 
-  this->loadModel("models/projectiles/hbolt.obj");   //!< Model not yet in repo
+  this->loadModel("models/projectiles/hbolt.obj");
 
   this->setMinEnergy(10);
   this->setHealthMax(0);
   this->lifeSpan = 5.0;
+
+  this->angle = 0;
+  this->rotationSpeed = 90;
 
   this->emitter = new DotEmitter(100, 5, M_2_PI);
@@ -112 +115 @@
 }
 
+
+void HBolt::updateAngle ()
+{
+  this->angle = this->angle + this->rotationSpeed;
+}
+
+
 /**
  *  signal tick, time dependent things will be handled here
@@ -125 +135 @@
     this->deactivate();
 
+  //this->updateAngle();
 
 }
@@ -141 +152 @@
 
 
-void HBolt::draw () const
+void HBolt::draw () //const
 {
+
+  glBegin(GL_TRIANGLES);
+  this->getModel();
+  glEnd();
+
   glPushAttrib(GL_ENABLE_BIT);
   glDisable(GL_LIGHTING);
@@ -149 +165 @@
   //glRotatef(30, 0.0f, 1.0f, 0.0f);
 
-  WorldEntity::draw();
-/*  glMatrixMode(GL_MODELVIEW);
+  //WorldEntity::draw();
+  glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
 
-  float matrix[4][4];
+/*  float matrix[4][4];
   glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
   this->getAbsDir().matrix (matrix);
@@ -161 +177 @@
   glPopMatrix();*/
 
-/*
+  this->updateAngle();
 
   float matrix[4][4];
@@ -167 +183 @@
   this->getAbsDir().matrix (matrix);
   glMultMatrixf((float*)matrix);
-  glRotatef(30, 0.0, 1.0, 0.0);
-  //glMultMatrixf((float*)matrix);
-  this->getModel()->draw();*/
-  //glPopMatrix();
+  glScalef(4.0, 4.0, 4.0);
+  glRotatef(this->getAngle(), 0.0, 1.0, 0.0);
+  this->getModel()->draw();
+  glPopMatrix();
   glPopAttrib();
 }

branches/playability/src/world_entities/projectiles/hbolt.h

@@ -31 +31 @@
 
     virtual void tick (float dt);
-    virtual void draw () const;
+    virtual void draw (); //const;
 
+    virtual void updateAngle();
+    inline float getAngle() { return this->angle; };
 
   private:
@@ -41 +43 @@
     ParticleEmitter*                  emitter;
 
+    float                             angle;
+    float                             rotationSpeed;
 
     WorldEntity* hitEntity; // FIXME TEMPORARY

branches/playability/src/world_entities/test_entity2.cc

@@ -84 +84 @@
   this->material->setAmbient(1.0, 0.0, 1.0);
 
+  this->angle = 0;
+  this->rotationSpeed = 10;
+
   //this->material->setDiffuseMap("maps/torp2.png");
 }
@@ -95 +98 @@
 {
   WorldEntity::loadParams(root);
+}
+
+
+void TestEntity2::updateAngle()
+{
+  this->angle = this->angle + this->rotationSpeed;
 }
 
@@ -231 +240 @@
   glEnd();
 
+  //this->angle += this->rotationSpeed;
+  glRotatef(this->angle, 0.0, 1.0, 0.0);
+
   glPopMatrix();
   glPopAttrib();
@@ -245 +257 @@
   this->setParent(pl);
 
-}
-
-
-
-
-
-
+  this->updateAngle();
+}
+
+
+
+
+
+

branches/playability/src/world_entities/test_entity2.h

@@ -24 +24 @@
 
   private:
+    virtual void updateAngle();
+
     Material*       material;
+    float           angle;
+    float           rotationSpeed;
 };