Changeset 9193 in orxonox.OLD for branches

Timestamp:

Jul 5, 2006, 8:13:35 AM (18 years ago)

Author:

snellen

Message:

added setName scriptable method to script trigger, added loadModel to spaceship

Location:

branches/presentation/src

Files:

• lib/script_engine/script.cc (modified) (1 diff)
• world_entities/script_trigger.cc (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (1 diff)
• world_entities/world_entity.h (modified) (1 diff)

branches/presentation/src/lib/script_engine/script.cc

@@ -358 +358 @@
    bool success = false;
    
-   //success = this->registerClass(std::string("Vector"));
-    success = this->registerClass("ScriptTrigger");
+   //this->registerClass(std::string("Vector"));
+    this->registerClass("ScriptTrigger");
+    this->registerClass("AttractorMine");
 
    return success;

branches/presentation/src/world_entities/script_trigger.cc

@@ -29 +29 @@
              ->addMethod("getAbsCoorZ", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorZ))
             //Properties
+             ->addMethod("setName", ExecutorLua1<BaseObject, const std::string&>(&BaseObject::setName))
              ->addMethod("setTarget", ExecutorLua1<ScriptTrigger, const std::string&>(&ScriptTrigger::setTarget))
              ->addMethod("setTriggerParent", ExecutorLua1<ScriptTrigger, const std::string&>(&ScriptTrigger::setTriggerParent))

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("loadModel", ExecutorLua2<WorldEntity,const std::string& ,float>(&WorldEntity::loadModel2))
                         ->addMethod("setName", ExecutorLua1<BaseObject,const std::string&>(&BaseObject::setName))
                        //Coordinates

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 loadModel2(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; };