Changeset 5510 in orxonox.OLD for trunk

Timestamp:

Nov 8, 2005, 10:59:28 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: small cleanup in WorldEntity

Location:

trunk/src

Files:

• orxonox.cc (modified) (1 diff)
• world_entities/world_entity.h (modified) (3 diffs)

trunk/src/orxonox.cc

@@ -280 +280 @@
   if (!ResourceManager::getInstance()->verifyDataDir(DEFAULT_DATA_DIR_CHECKFILE))
   {
-    PRINTF(1)("The DataDirectory %s could not be verified\n" \
-              "  Please Change in File %s Section %s Entry %s to a suitable value\n",
+    PRINTF(1)("The DataDirectory %s could not be verified\n\nh" \
+              "!!!  Please Change in File %s Section %s Entry %s to a suitable value !!!\n",
               ResourceManager::getInstance()->getDataDir(),
               this->configFileName,
               CONFIG_SECTION_DATA,
-              CONFIG_NAME_DATADIR);
+              CONFIG_NAME_DATADIR );
     Gui* gui = new Gui(argc, argv);
     gui->startGui();

trunk/src/world_entities/world_entity.h

@@ -26 +26 @@
 
   void loadParams(const TiXmlElement* root);
-
-  /** @see loadModelWithScale(const char*, float) @param fileName the File to load */
   void loadModel(const char* fileName, float scaling = 1.0f);
-
   bool buildObbTree(unsigned int depth);
-
-
-  //void addAbility(Ability* ability);
-  //void removeAbility(Ability* ability);
 
   /** @param visibility if the Entity should be visible (been draw) */
@@ -41 +34 @@
   bool isVisible() const { return this->bVisible; };
 
-//  void setCharacterAttributes(CharacterAttributes* charAttr);
-//  CharacterAttributes* getCharacterAttributes();
 
-  /** @returns a reference to the obb tree of this worldentity */
-  BVTree* getOBBTree() { return this->obbTree; };
 
   virtual void postSpawn ();
@@ -54 +43 @@
   virtual void collidesWith (WorldEntity* entity, const Vector& location);
 
+  void drawBVTree(unsigned int depth, int drawMode) const;
+  /** @returns a reference to the obb tree of this worldentity */
+  BVTree* getOBBTree() const { return this->obbTree; };
 
-  /** @returns the Count of Faces on this WorldEntity */
-  virtual unsigned int getFaceCount () const { if (this->model) return this->model->getFaceCount(); else return 0; };
+  /* @returns the Count of Faces on this WorldEntity */
+  //unsigned int getFaceCount () const { return (this->model != NULL)?this->model->getFaceCount():0; };
+  //  void addAbility(Ability* ability);
+  //  void removeAbility(Ability* ability);
+  //  void setCharacterAttributes(CharacterAttributes* charAttr);
+  //  CharacterAttributes* getCharacterAttributes();
 
-  void drawBVTree(unsigned int depth, int drawMode) const;
 
  protected: