Changeset 9003 in orxonox.OLD for trunk/src/world_entities/weapons

Timestamp:

Jul 2, 2006, 1:36:13 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the single_player_map branche back
merged with command:
svn merge -r8896:HEAD ​https://svn.orxonox.net/orxonox/branches/single_player_map .
no conflicts

Location:

trunk/src/world_entities/weapons

Files:

• fps_sniper_rifle.cc (modified) (3 diffs)
• fps_sniper_rifle.h (modified) (2 diffs)

trunk/src/world_entities/weapons/fps_sniper_rifle.cc

@@ -67 +67 @@
 {
   // model will be deleted from WorldEntity-destructor
+  if( this->material != NULL)
+    delete this->material;
 }
 
@@ -74 +76 @@
   this->setClassID(CL_FPS_SNIPER_RIFLE, "FPSSniperRifle");
 
-  this->loadModel("models/guns/fps_sniper_rifle.obj", 0.1);
+  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);
@@ -149 +155 @@
 
 
+
+
+/**
+ *  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();
+
+}
+
+
+

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