Changeset 9869 in orxonox.OLD for trunk/src/world_entities/test_entity.cc

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..

File:

• trunk/src/world_entities/test_entity.cc (modified) (4 diffs)

trunk/src/world_entities/test_entity.cc

@@ -26 +26 @@
 
 #include "test_entity.h"
-
+#include "debug.h"
 
 #include "interactive_model.h"
@@ -35 +35 @@
 
 
-
-CREATE_FACTORY(TestEntity, CL_TEST_ENTITY);
+#include "class_id_DEPRECATED.h"
+ObjectListDefinition(TestEntity);
+CREATE_FACTORY(TestEntity);
 
 #include "script_class.h"
-CREATE_SCRIPTABLE_CLASS(TestEntity, CL_TEST_ENTITY,
-                            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(TestEntity,
+                        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))
                        );
 
@@ -75 +75 @@
 void TestEntity::init()
 {
-  this->setClassID(CL_TEST_ENTITY, "TestEntity");
+  this->registerObject(this, TestEntity::_objectList);
   this->toList(OM_GROUP_00);
 
@@ -91 +91 @@
 
   LoadParam(root, "md2animation", this, TestEntity, setAnim)
-      .describe("sets the animation of the md2 model")
-      .defaultValues(1);
+  .describe("sets the animation of the md2 model")
+  .defaultValues(1);
 
 }