Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9178 in orxonox.OLD for branches


Ignore:
Timestamp:
Jul 4, 2006, 10:47:00 PM (18 years ago)
Author:
snellen
Message:

variaous changes

Location:
branches/presentation/src/world_entities
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/presentation/src/world_entities/npcs/attractor_mine.cc

    r9176 r9178  
    3434
    3535CREATE_FACTORY(AttractorMine, CL_ATTRACTOR_MINE);
     36#include "script_class.h"
     37CREATE_SCRIPTABLE_CLASS(AttractorMine, CL_ATTRACTOR_MINE,
     38                        addMethod("setName", ExecutorLua1<BaseObject,const std::string&>(&BaseObject::setName))
     39                       //Coordinates
     40                        ->addMethod("setAbsCoor", ExecutorLua3<PNode,float,float,float>(&PNode::setAbsCoor))
     41                        ->addMethod("getAbsCoorX", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorX))
     42                        ->addMethod("getAbsCoorY", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorY))
     43                        ->addMethod("getAbsCoorZ", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorZ))
     44                       );
     45
     46
    3647
    3748
  • branches/presentation/src/world_entities/space_ships/space_ship.cc

    r9162 r9178  
    5858CREATE_SCRIPTABLE_CLASS(SpaceShip, CL_SPACE_SHIP,
    5959                        addMethod("hasPlayer", ExecutorLua0ret<Playable,bool>(&Playable::hasPlayer))
     60                        //->addMethod("loadModel", ExecutorLua2<WorldEntity,const std::string& ,float>(&WorldEntity::loadModel))
     61                        ->addMethod("setName", ExecutorLua1<BaseObject,const std::string&>(&BaseObject::setName))
    6062                       //Coordinates
    6163                        ->addMethod("setAbsCoor", ExecutorLua3<PNode,float,float,float>(&PNode::setAbsCoor))
     
    404406  Vector accel(0.0, 0.0, 0.0);
    405407  /*
    406   Vector rot(0.0, 0.0, 0.0); // wird benötigt für Helicopter
     408  Vector rot(0.0, 0.0, 0.0); // wird ben�igt fr Helicopter
    407409  */
    408410  //float rotVal = 0.0;
  • branches/presentation/src/world_entities/world_entity.h

    r9174 r9178  
    4747
    4848  void loadModel(const std::string& fileName, float scaling = 1.0f, unsigned int modelNumber = 0, unsigned int obbTreeDepth = 4);
     49  //void loadModel(const std::string& fileN, float scal = 1.0f){this->loadModel(fileN,scal,0,4);}
    4950  void setModel(Model* model, unsigned int modelNumber = 0);
    5051  Model* getModel(unsigned int modelNumber = 0) const { return (this->models.size() > modelNumber)? this->models[modelNumber] : NULL; };
Note: See TracChangeset for help on using the changeset viewer.