Changeset 9869 in orxonox.OLD for trunk/src/world_entities/creatures

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

Location:

trunk/src/world_entities/creatures

Files:

• fps_player.cc (modified) (4 diffs)
• fps_player.h (modified) (1 diff)
• md2_creature.cc (modified) (5 diffs)
• md2_creature.h (modified) (1 diff)

trunk/src/world_entities/creatures/fps_player.cc

@@ -32 +32 @@
 
 #include "aabb.h"
-
+#include "bsp_entity.h"
 
 #include "key_mapper.h"
@@ -41 +41 @@
 
 
-
-CREATE_FACTORY(FPSPlayer, CL_FPS_PLAYER);
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(FPSPlayer, CL_FPS_PLAYER);
+CREATE_FACTORY(FPSPlayer);
 
 #include "script_class.h"
-CREATE_SCRIPTABLE_CLASS(FPSPlayer, CL_FPS_PLAYER,
-                        addMethod("setAbsCoor", ExecutorLua3<PNode,float,float,float>(&PNode::setAbsCoor))
-                            ->addMethod("getAbsCoorX", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorX))
-                            ->addMethod("getAbsCoorY", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorY))
-                            ->addMethod("getAbsCoorZ", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorZ))
+CREATE_SCRIPTABLE_CLASS(FPSPlayer,
+                        addMethod("setAbsCoor", Executor3<PNode, lua_State*,float,float,float>(&PNode::setAbsCoor))
+                            ->addMethod("getAbsCoorX", Executor0ret<PNode, lua_State*, float>(&PNode::getAbsCoorX))
+                            ->addMethod("getAbsCoorY", Executor0ret<PNode, lua_State*, float>(&PNode::getAbsCoorY))
+                            ->addMethod("getAbsCoorZ", Executor0ret<PNode, lua_State*, float>(&PNode::getAbsCoorZ))
                        );
 
@@ -85 +86 @@
 void FPSPlayer::init()
 {
-  this->setClassID(CL_FPS_PLAYER, "FPSPlayer");
+  this->registerObject(this, FPSPlayer::_objectList);
 
   this->bLeft = false;
@@ -166 +167 @@
 
     //subscribe to collision reaction
-  this->subscribeReaction(CREngine::CR_PHYSICS_FULL_WALK, CL_BSP_ENTITY);
+  this->subscribeReaction(CREngine::CR_PHYSICS_FULL_WALK, BspEntity::staticClassID());
 
   this->initWeapon = false;

trunk/src/world_entities/creatures/fps_player.h

@@ -16 +16 @@
 class FPSPlayer : public Playable
 {
+  ObjectListDeclaration(FPSPlayer);
 
   public:

trunk/src/world_entities/creatures/md2_creature.cc

@@ -22 +22 @@
 #include "objModel.h"
 #include "md2/md2Model.h"
-#include "util/loading/resource_manager.h"
 #include "state.h"
 
@@ -37 +36 @@
 #include "debug.h"
 
-CREATE_FACTORY(MD2Creature, CL_MD2_CREATURE);
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(MD2Creature, CL_MD2_CREATURE);
+CREATE_FACTORY(MD2Creature);
 
 /**
@@ -86 +87 @@
   PRINTF(4)("MD2CREATURE INIT\n");
   //  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
-  this->setClassID(CL_MD2_CREATURE, "MD2Creature");
+  this->registerObject(this, MD2Creature::_objectList);
 
   this->toList(OM_GROUP_01);
@@ -95 +96 @@
   Weapon* wpLeft = new TestGun(1);
   wpLeft->setName("testGun Left");
-  Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_CANNON));
+  Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate("Cannon"));
 
   cannon->setName("BFG");
@@ -112 +113 @@
   this->cameraConnNode.addChild(State::getCameraNode());
   State::getCameraTargetNode()->setRelCoor(10,0,0);
- 
+
 
 

trunk/src/world_entities/creatures/md2_creature.h

@@ -16 +16 @@
 class MD2Creature : public Playable
 {
+  ObjectListDeclaration(MD2Creature);
 
   public: