Changeset 5766 in orxonox.OLD for trunk

Timestamp:

Nov 24, 2005, 6:03:24 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the GuidedMissiles to the trunk, without the changed aiming_turret

Location:

trunk

Files:

• aclocal.m4 (modified) (2 diffs)
• src/Makefile.am (modified) (2 diffs)
• src/defs/class_id.h (modified) (1 diff)
• src/lib/gui/gtk_gui/gui_keys.cc (modified) (1 diff)
• src/lib/gui/gtk_gui/gui_update.cc (modified) (1 diff)
• src/world_entities/weapons/guided_missile.cc (copied) (copied from branches/guidedmissile/src/world_entities/weapons/guided_missile.cc)
• src/world_entities/weapons/guided_missile.h (copied) (copied from branches/guidedmissile/src/world_entities/weapons/guided_missile.h)
• src/world_entities/weapons/projectile.cc (modified) (2 diffs)
• src/world_entities/weapons/projectile.h (modified) (2 diffs)
• src/world_entities/weapons/turret.cc (modified) (1 diff)

trunk/aclocal.m4

@@ -1 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -29 +29 @@
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-         [AM_AUTOMAKE_VERSION([1.9.6])])
+         [AM_AUTOMAKE_VERSION([1.9.5])])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-

trunk/src/Makefile.am

@@ -68 +68 @@
                   world_entities/weapons/test_bullet.cc \
                   world_entities/weapons/rocket.cc \
+                  world_entities/weapons/guided_missile.cc \
                   world_entities/weapons/laser.cc \
                   world_entities/weapons/aim.cc \
@@ -106 +107 @@
                  world_entities/weapons/test_bullet.h \
                  world_entities/weapons/rocket.h \
+                 world_entities/weapons/guided_missile.h \
                  world_entities/weapons/laser.h \
                  world_entities/weapons/aim.h \

trunk/src/defs/class_id.h

@@ -143 +143 @@
   CL_BOMB                       =    0x00000243,
   CL_GROUND_TURRET              =    0x00000244,
+  CL_GUIDED_MISSILE             =    0x00000245,
 
   // gamePlay (range from 0x00000500 0x000005ff)

trunk/src/lib/gui/gtk_gui/gui_keys.cc

@@ -119 +119 @@
         pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_LEFT, "LEFT"));
         pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_RIGHT, "RIGHT"));
-        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_FIRE, "BUTTON_LEFT"));
+        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_FIRE, "MOUSE_LEFT"));
         pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_NEXT_WEAPON, "m"));
         pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_PREV_WEAPON, "n"));

trunk/src/lib/gui/gtk_gui/gui_update.cc

@@ -29 +29 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include "globals.h"
 
 using namespace std;

trunk/src/world_entities/weapons/projectile.cc

@@ -38 +38 @@
   this->lifeCycle = 0.0;
   this->lifeSpan = 1.0f; /* sec */
+  this->target = NULL;
 
   this->remove();
@@ -98 +99 @@
 }
 
+
+
+void Projectile::setTarget(PNode* target)
+{
+
+  if (this->target == NULL)
+     this->target = new PNode();
+  this->target->setParent(target);
+}
+
+
 /**
  * signal tick, time dependent things will be handled here

trunk/src/world_entities/weapons/projectile.h

@@ -31 +31 @@
     inline bool isChageable() { return this->bChargeable; };
 
+    void setTarget(PNode* target);
 
     /** @brief This is called, when the Projectile is Emitted */
@@ -54 +55 @@
 
     Vector                velocity;                  //!< velocity of the projectile.
+
+    PNode*                target;                    //!< A target for guided Weapons.
 };
 

trunk/src/world_entities/weapons/turret.cc

@@ -138 +138 @@
     pj->setVelocity(this->getVelocity()+(this->getAbsDir().apply(Vector(1,0,0))*100.0 + VECTOR_RAND(13)
             /*target->getAbsCoor() - this->getAbsCoor()*/)*.5);//this->getVelocity());
+  
 
   pj->setParent(NullParent::getInstance());