Changeset 9193 in orxonox.OLD for branches/presentation/src/world_entities/world_entity.h

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

File:

• branches/presentation/src/world_entities/world_entity.h (modified) (1 diff)

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