Changeset 9178 in orxonox.OLD for branches

Timestamp:

Jul 4, 2006, 10:47:00 PM (18 years ago)

Author:

snellen

Message:

variaous changes

Location:

branches/presentation/src/world_entities

Files:

• npcs/attractor_mine.cc (modified) (1 diff)
• space_ships/space_ship.cc (modified) (2 diffs)
• world_entity.h (modified) (1 diff)

branches/presentation/src/world_entities/npcs/attractor_mine.cc

@@ -34 +34 @@
 
 CREATE_FACTORY(AttractorMine, CL_ATTRACTOR_MINE);
+#include "script_class.h"
+CREATE_SCRIPTABLE_CLASS(AttractorMine, CL_ATTRACTOR_MINE,
+                        addMethod("setName", ExecutorLua1<BaseObject,const std::string&>(&BaseObject::setName))
+                       //Coordinates
+                        ->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))
+                       );
+
+
 
 

branches/presentation/src/world_entities/space_ships/space_ship.cc

@@ -58 +58 @@
 CREATE_SCRIPTABLE_CLASS(SpaceShip, CL_SPACE_SHIP,
                         addMethod("hasPlayer", ExecutorLua0ret<Playable,bool>(&Playable::hasPlayer))
+                        //->addMethod("loadModel", ExecutorLua2<WorldEntity,const std::string& ,float>(&WorldEntity::loadModel))
+                        ->addMethod("setName", ExecutorLua1<BaseObject,const std::string&>(&BaseObject::setName))
                        //Coordinates
                         ->addMethod("setAbsCoor", ExecutorLua3<PNode,float,float,float>(&PNode::setAbsCoor))
@@ -404 +406 @@
   Vector accel(0.0, 0.0, 0.0);
   /*
-  Vector rot(0.0, 0.0, 0.0); // wird benötigt für Helicopter
+  Vector rot(0.0, 0.0, 0.0); // wird ben�igt fr Helicopter
   */
   //float rotVal = 0.0;

branches/presentation/src/world_entities/world_entity.h

@@ -47 +47 @@
 
   void loadModel(const std::string& fileName, float scaling = 1.0f, unsigned int modelNumber = 0, unsigned int obbTreeDepth = 4);
+  //void loadModel(const std::string& fileN, float scal = 1.0f){this->loadModel(fileN,scal,0,4);}
   void setModel(Model* model, unsigned int modelNumber = 0);
   Model* getModel(unsigned int modelNumber = 0) const { return (this->models.size() > modelNumber)? this->models[modelNumber] : NULL; };