- Timestamp:
- Nov 8, 2005, 10:59:28 PM (19 years ago)
- Location:
- trunk/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/orxonox.cc
r5488 r5510 280 280 if (!ResourceManager::getInstance()->verifyDataDir(DEFAULT_DATA_DIR_CHECKFILE)) 281 281 { 282 PRINTF(1)("The DataDirectory %s could not be verified\n " \283 " Please Change in File %s Section %s Entry %s to a suitable value\n",282 PRINTF(1)("The DataDirectory %s could not be verified\n\nh" \ 283 "!!! Please Change in File %s Section %s Entry %s to a suitable value !!!\n", 284 284 ResourceManager::getInstance()->getDataDir(), 285 285 this->configFileName, 286 286 CONFIG_SECTION_DATA, 287 CONFIG_NAME_DATADIR );287 CONFIG_NAME_DATADIR ); 288 288 Gui* gui = new Gui(argc, argv); 289 289 gui->startGui(); -
trunk/src/world_entities/world_entity.h
r5501 r5510 26 26 27 27 void loadParams(const TiXmlElement* root); 28 29 /** @see loadModelWithScale(const char*, float) @param fileName the File to load */30 28 void loadModel(const char* fileName, float scaling = 1.0f); 31 32 29 bool buildObbTree(unsigned int depth); 33 34 35 //void addAbility(Ability* ability);36 //void removeAbility(Ability* ability);37 30 38 31 /** @param visibility if the Entity should be visible (been draw) */ … … 41 34 bool isVisible() const { return this->bVisible; }; 42 35 43 // void setCharacterAttributes(CharacterAttributes* charAttr);44 // CharacterAttributes* getCharacterAttributes();45 36 46 /** @returns a reference to the obb tree of this worldentity */47 BVTree* getOBBTree() { return this->obbTree; };48 37 49 38 virtual void postSpawn (); … … 54 43 virtual void collidesWith (WorldEntity* entity, const Vector& location); 55 44 45 void drawBVTree(unsigned int depth, int drawMode) const; 46 /** @returns a reference to the obb tree of this worldentity */ 47 BVTree* getOBBTree() const { return this->obbTree; }; 56 48 57 /** @returns the Count of Faces on this WorldEntity */ 58 virtual unsigned int getFaceCount () const { if (this->model) return this->model->getFaceCount(); else return 0; }; 49 /* @returns the Count of Faces on this WorldEntity */ 50 //unsigned int getFaceCount () const { return (this->model != NULL)?this->model->getFaceCount():0; }; 51 // void addAbility(Ability* ability); 52 // void removeAbility(Ability* ability); 53 // void setCharacterAttributes(CharacterAttributes* charAttr); 54 // CharacterAttributes* getCharacterAttributes(); 59 55 60 void drawBVTree(unsigned int depth, int drawMode) const;61 56 62 57 protected:
Note: See TracChangeset
for help on using the changeset viewer.