Changeset 8898 in orxonox.OLD

Timestamp:

Jun 29, 2006, 1:03:37 AM (18 years ago)

Author:

patrick

Message:

material displayed now and better

Location:

branches/single_player_map/src/world_entities

Files:

• creatures/fps_player.cc (modified) (1 diff)
• weapons/fps_sniper_rifle.cc (modified) (3 diffs)
• weapons/fps_sniper_rifle.h (modified) (2 diffs)
• world_entity.cc (modified) (1 diff)

branches/single_player_map/src/world_entities/creatures/fps_player.cc

@@ -121 +121 @@
 
   this->getWeaponManager().setSlotCount(2);
-  this->getWeaponManager().setSlotPosition(0, Vector(1.5, -0.7, 0.5));
+  this->getWeaponManager().setSlotPosition(0, Vector(1.5, -0.7, 1.1));
   this->getWeaponManager().setSlotDirection(0, Quaternion(M_PI_2, Vector(0,1,0)));
   this->getWeaponManager().setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);

branches/single_player_map/src/world_entities/weapons/fps_sniper_rifle.cc

@@ -67 +67 @@
 {
   // model will be deleted from WorldEntity-destructor
+  if( this->material != NULL)
+    delete this->material;
 }
 
@@ -75 +77 @@
 
   this->loadModel("models/guns/fps_sniper_rifle.obj", 0.2);
+  this->material = new Material();
+  this->material->setIllum(3);
+  this->material->setAmbient(1.0, 1.0, 1.0);
+  this->material->setDiffuseMap("maps/rifle01tex.jpg");
 
   this->setStateDuration(WS_SHOOTING, .1);
@@ -150 +156 @@
 
 
+
+/**
+ *  this will draw the weapon
+ */
+void FPSSniperRifle::draw () const
+{
+  /* draw gun body */
+  glMatrixMode(GL_MODELVIEW);
+  glPushMatrix();
+  glTranslatef (this->getAbsCoor ().x,
+                this->getAbsCoor ().y,
+                this->getAbsCoor ().z);
+
+  Vector tmpRot = this->getAbsDir().getSpacialAxis();
+  glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
+
+  if( this->leftRight == W_RIGHT)
+    glScalef(1.0, 1.0, -1.0);
+
+  this->material->select();
+  static_cast<StaticModel*>(this->getModel())->draw();
+
+  glPopMatrix();
+
+}
+
+
+

branches/single_player_map/src/world_entities/weapons/fps_sniper_rifle.h

@@ -35 +35 @@
 
 
+class Material;
+
 class FPSSniperRifle : public Weapon
   {
@@ -50 +52 @@
     virtual void fire();
 
+    virtual void draw() const;
+
+
 
   private:
-    int leftRight;   // this will become an enum
+    int              leftRight;   //!< this will become an enum
+    Material*        material;    //!< material
 
   };

branches/single_player_map/src/world_entities/world_entity.cc

@@ -617 +617 @@
     }
 
-    if( this->aabbNode != NULL)
-      this->aabbNode->drawBV(0, DRAW_BV_POLYGON, Vector(1, 0.6, 0.2), true);
+//     if( this->aabbNode != NULL)
+//       this->aabbNode->drawBV(0, DRAW_BV_POLYGON, Vector(1, 0.6, 0.2), true);
 
     glPopMatrix();