Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4539 in orxonox.OLD for orxonox/trunk/src/lib


Ignore:
Timestamp:
Jun 7, 2005, 11:41:06 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: added some missing files to the Makefile.am's

Location:
orxonox/trunk/src/lib
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/lib/collision_detection/Makefile.am

    r4527 r4539  
    1515
    1616noinst_HEADERS =     cd_engine.h \
     17                     collision_defs.h \
    1718                     collision.h \
    1819                     obb.h \

  • orxonox/trunk/src/lib/collision_detection/Makefile.in

    r4527 r4539  
    196196
    197197noinst_HEADERS = cd_engine.h \
     198                     collision_defs.h \
    198199                     collision.h \
    199200                     obb.h \

  • orxonox/trunk/src/lib/graphics/importer/material.cc

    r4371 r4539  
    295295{
    296296  PRINTF(4)("setting Diffuse Map %s\n", dMap);
     297  if (this->diffuseTexture)
     298    ResourceManager::getInstance()->unload(this->diffuseTexture);
    297299
    298300  //! \todo check if RESOURCE MANAGER is availiable

  • orxonox/trunk/src/lib/lang/base_object.h

    r4470 r4539  
    2828  void loadParams(const TiXmlElement* root);
    2929
    30   void setClassID(int id);
    31   void setClassName(const char* className);
    32   void setClassID(int id, const char* className);
     30  void setName (const char* newName);
     31  /** \brief returns the Name of this Object */
     32  const char* getName (void)const { return this->objectName; };
    3333
    3434  /** \returns the className of the corresponding Object */
    … …  
    4141  /** \returns if the object is finalized */
    4242  inline bool isFinalized() { return this->finalized; }
     43
     44
     45 protected:
     46  void setClassID(int id);
     47  void setClassName(const char* className);
     48  void setClassID(int id, const char* className);
     49
    4350  /** \brief this finalizes an object and makes it ready to be garbage collected */
    4451  void finalize(void) { this->finalized = true; };
    45 
    46   void setName (const char* newName);
    47   /** \brief returns the Name of this Object */
    48   const char* getName (void)const { return this->objectName; };
    4952
    5053 private:

  • orxonox/trunk/src/lib/physics/Makefile.am

    r4428 r4539  
    1515                physics_connection.h \
    1616                physics_engine.h \
     17                fields/fields.h \
    1718                fields/field.h \
    1819                fields/gravity.h \

  • orxonox/trunk/src/lib/physics/Makefile.in

    r4506 r4539  
    199199                physics_connection.h \
    200200                physics_engine.h \
     201                fields/fields.h \
    201202                fields/field.h \
    202203                fields/gravity.h \
Note: See TracChangeset for help on using the changeset viewer.