Changeset 4233 in orxonox.OLD
- Timestamp:
- May 20, 2005, 1:37:47 AM (19 years ago)
- Location:
- orxonox/branches/levelLoader/src
- Files:
-
- 3 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/branches/levelLoader/src/Makefile.am
r4231 r4233 22 22 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/animation 23 23 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/common 24 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/loading 24 25 AM_CXXFLAGS+=-I$(MAINSRCDIR)/subprojects 25 26 … … 151 152 util/common/list_template.h \ 152 153 util/resource_manager.h \ 154 util/loading/load_param.h \ 153 155 lib/util/ini_parser.h \ 154 156 lib/util/substring.h \ … … 189 191 190 192 ## orxonox.conf will be used from home-dir instead. 191 EXTRA_DIST = orxonox.conf \ 192 proto/proto_class.h \ 193 EXTRA_DIST = proto/proto_class.h \ 193 194 proto/proto_class.cc \ 194 195 proto/proto_singleton.h \ -
orxonox/branches/levelLoader/src/Makefile.in
r4231 r4233 280 280 target_vendor = @target_vendor@ 281 281 MAINSRCDIR = . 282 AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/graphics/particles -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/gui/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common -I$(MAINSRCDIR)/ subprojects282 AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/graphics/particles -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/gui/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common -I$(MAINSRCDIR)/util/loading -I$(MAINSRCDIR)/subprojects 283 283 noinst_LIBRARIES = libORXgui.a \ 284 284 libtinyxml.a … … 403 403 util/common/list_template.h \ 404 404 util/resource_manager.h \ 405 util/loading/load_param.h \ 405 406 lib/util/ini_parser.h \ 406 407 lib/util/substring.h \ … … 437 438 lib/xmlparser/tinyxmlparser.cc 438 439 439 EXTRA_DIST = orxonox.conf \ 440 proto/proto_class.h \ 440 EXTRA_DIST = proto/proto_class.h \ 441 441 proto/proto_class.cc \ 442 442 proto/proto_singleton.h \ … … 1694 1694 1695 1695 distdir: $(DISTFILES) 1696 $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/graphics $(distdir)/lib/graphics/particles $(distdir)/lib/gui/gui $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/network $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/common $(distdir)/ world_entities1696 $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/graphics $(distdir)/lib/graphics/particles $(distdir)/lib/gui/gui $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/network $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/common $(distdir)/util/loading $(distdir)/world_entities 1697 1697 @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ 1698 1698 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -
orxonox/branches/levelLoader/src/world_entities/world_entity.cc
r4115 r4233 23 23 #include "vector.h" 24 24 25 //#include "stdincl.h" 26 //#include "collision.h" 25 #include "load_param.h" 27 26 28 27 using namespace std; … … 51 50 { 52 51 PRINTF(2)("WorldEntity is missing a proper 'name'\n"); 53 string = "Unknown"; 54 temp = new char[strlen(string + 2)]; 55 strcpy( temp, string); 56 this->setName( temp); 52 this->setName("unknown"); 57 53 } 58 54 else 59 55 { 60 temp = new char[strlen(string + 2)]; 61 strcpy( temp, string); 62 this->setName( temp); 56 LoadParam<WorldEntity> (string, this, &WorldEntity::setName); 63 57 } 64 58 // Model Loading … … 66 60 string = grabParameter( root, "model"); 67 61 if( string != NULL) 68 this->model = (Model*)ResourceManager::getInstance()->load(string, OBJ, RP_CAMPAIGN);62 LoadParam<WorldEntity>(string, this, &WorldEntity::loadModel); 69 63 else 70 64 { … … 87 81 if (this->model) 88 82 ResourceManager::getInstance()->unload(this->model); 83 } 84 85 /** 86 \brief loads a Model onto a WorldEntity 87 \param fileName the name of the model to load 88 */ 89 void WorldEntity::loadModel(const char* fileName) 90 { 91 this->model = (Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN); 89 92 } 90 93 -
orxonox/branches/levelLoader/src/world_entities/world_entity.h
r4010 r4233 27 27 virtual ~WorldEntity (); 28 28 29 void loadModel(const char* fileName); 29 30 30 31 //void setCollision (CollisionCluster* newhull);
Note: See TracChangeset
for help on using the changeset viewer.