- Timestamp:
- Nov 21, 2005, 10:27:33 PM (19 years ago)
- Location:
- branches/world_entities/src
- Files:
-
- 4 edited
- 1 copied
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
branches/world_entities/src/Makefile.am
r5679 r5682 49 49 world_entities/player.cc \ 50 50 world_entities/npc.cc \ 51 world_entities/npc2.cc \ 51 world_entities/npc_test1.cc \ 52 world_entities/npc_test.cc \ 52 53 world_entities/environment.cc \ 53 54 world_entities/skysphere.cc \ … … 87 88 world_entities/player.h \ 88 89 world_entities/npc.h \ 89 world_entities/npc 2.h \90 world_entities/npc_test1.h \ 90 91 world_entities/environment.h \ 91 92 world_entities/skysphere.h \ -
branches/world_entities/src/Makefile.in
r5679 r5682 57 57 orxonox-world.$(OBJEXT) orxonox-world_entity.$(OBJEXT) \ 58 58 orxonox-camera.$(OBJEXT) orxonox-player.$(OBJEXT) \ 59 orxonox-npc.$(OBJEXT) orxonox-npc 2.$(OBJEXT) \60 orxonox- environment.$(OBJEXT) orxonox-skysphere.$(OBJEXT) \61 orxonox-sky box.$(OBJEXT) orxonox-terrain.$(OBJEXT) \62 orxonox- satellite.$(OBJEXT) \59 orxonox-npc.$(OBJEXT) orxonox-npc_test1.$(OBJEXT) \ 60 orxonox-npc_test.$(OBJEXT) orxonox-environment.$(OBJEXT) \ 61 orxonox-skysphere.$(OBJEXT) orxonox-skybox.$(OBJEXT) \ 62 orxonox-terrain.$(OBJEXT) orxonox-satellite.$(OBJEXT) \ 63 63 orxonox-character_attributes.$(OBJEXT) \ 64 64 orxonox-test_entity.$(OBJEXT) orxonox-weapon_manager.$(OBJEXT) \ … … 246 246 world_entities/player.cc \ 247 247 world_entities/npc.cc \ 248 world_entities/npc2.cc \ 248 world_entities/npc_test1.cc \ 249 world_entities/npc_test.cc \ 249 250 world_entities/environment.cc \ 250 251 world_entities/skysphere.cc \ … … 284 285 world_entities/player.h \ 285 286 world_entities/npc.h \ 286 world_entities/npc 2.h \287 world_entities/npc_test1.h \ 287 288 world_entities/environment.h \ 288 289 world_entities/skysphere.h \ … … 418 419 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-laser_power_up.Po@am__quote@ 419 420 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-npc.Po@am__quote@ 420 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-npc2.Po@am__quote@ 421 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-npc_test.Po@am__quote@ 422 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-npc_test1.Po@am__quote@ 421 423 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-orxonox.Po@am__quote@ 422 424 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-player.Po@am__quote@ … … 565 567 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-npc.obj `if test -f 'world_entities/npc.cc'; then $(CYGPATH_W) 'world_entities/npc.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/npc.cc'; fi` 566 568 567 orxonox-npc2.o: world_entities/npc2.cc 568 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-npc2.o -MD -MP -MF "$(DEPDIR)/orxonox-npc2.Tpo" -c -o orxonox-npc2.o `test -f 'world_entities/npc2.cc' || echo '$(srcdir)/'`world_entities/npc2.cc; \ 569 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/orxonox-npc2.Tpo" "$(DEPDIR)/orxonox-npc2.Po"; else rm -f "$(DEPDIR)/orxonox-npc2.Tpo"; exit 1; fi 570 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='world_entities/npc2.cc' object='orxonox-npc2.o' libtool=no @AMDEPBACKSLASH@ 571 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 572 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-npc2.o `test -f 'world_entities/npc2.cc' || echo '$(srcdir)/'`world_entities/npc2.cc 573 574 orxonox-npc2.obj: world_entities/npc2.cc 575 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-npc2.obj -MD -MP -MF "$(DEPDIR)/orxonox-npc2.Tpo" -c -o orxonox-npc2.obj `if test -f 'world_entities/npc2.cc'; then $(CYGPATH_W) 'world_entities/npc2.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/npc2.cc'; fi`; \ 576 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/orxonox-npc2.Tpo" "$(DEPDIR)/orxonox-npc2.Po"; else rm -f "$(DEPDIR)/orxonox-npc2.Tpo"; exit 1; fi 577 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='world_entities/npc2.cc' object='orxonox-npc2.obj' libtool=no @AMDEPBACKSLASH@ 578 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 579 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-npc2.obj `if test -f 'world_entities/npc2.cc'; then $(CYGPATH_W) 'world_entities/npc2.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/npc2.cc'; fi` 569 orxonox-npc_test1.o: world_entities/npc_test1.cc 570 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-npc_test1.o -MD -MP -MF "$(DEPDIR)/orxonox-npc_test1.Tpo" -c -o orxonox-npc_test1.o `test -f 'world_entities/npc_test1.cc' || echo '$(srcdir)/'`world_entities/npc_test1.cc; \ 571 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/orxonox-npc_test1.Tpo" "$(DEPDIR)/orxonox-npc_test1.Po"; else rm -f "$(DEPDIR)/orxonox-npc_test1.Tpo"; exit 1; fi 572 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='world_entities/npc_test1.cc' object='orxonox-npc_test1.o' libtool=no @AMDEPBACKSLASH@ 573 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 574 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-npc_test1.o `test -f 'world_entities/npc_test1.cc' || echo '$(srcdir)/'`world_entities/npc_test1.cc 575 576 orxonox-npc_test1.obj: world_entities/npc_test1.cc 577 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-npc_test1.obj -MD -MP -MF "$(DEPDIR)/orxonox-npc_test1.Tpo" -c -o orxonox-npc_test1.obj `if test -f 'world_entities/npc_test1.cc'; then $(CYGPATH_W) 'world_entities/npc_test1.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/npc_test1.cc'; fi`; \ 578 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/orxonox-npc_test1.Tpo" "$(DEPDIR)/orxonox-npc_test1.Po"; else rm -f "$(DEPDIR)/orxonox-npc_test1.Tpo"; exit 1; fi 579 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='world_entities/npc_test1.cc' object='orxonox-npc_test1.obj' libtool=no @AMDEPBACKSLASH@ 580 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 581 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-npc_test1.obj `if test -f 'world_entities/npc_test1.cc'; then $(CYGPATH_W) 'world_entities/npc_test1.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/npc_test1.cc'; fi` 582 583 orxonox-npc_test.o: world_entities/npc_test.cc 584 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-npc_test.o -MD -MP -MF "$(DEPDIR)/orxonox-npc_test.Tpo" -c -o orxonox-npc_test.o `test -f 'world_entities/npc_test.cc' || echo '$(srcdir)/'`world_entities/npc_test.cc; \ 585 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/orxonox-npc_test.Tpo" "$(DEPDIR)/orxonox-npc_test.Po"; else rm -f "$(DEPDIR)/orxonox-npc_test.Tpo"; exit 1; fi 586 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='world_entities/npc_test.cc' object='orxonox-npc_test.o' libtool=no @AMDEPBACKSLASH@ 587 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 588 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-npc_test.o `test -f 'world_entities/npc_test.cc' || echo '$(srcdir)/'`world_entities/npc_test.cc 589 590 orxonox-npc_test.obj: world_entities/npc_test.cc 591 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-npc_test.obj -MD -MP -MF "$(DEPDIR)/orxonox-npc_test.Tpo" -c -o orxonox-npc_test.obj `if test -f 'world_entities/npc_test.cc'; then $(CYGPATH_W) 'world_entities/npc_test.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/npc_test.cc'; fi`; \ 592 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/orxonox-npc_test.Tpo" "$(DEPDIR)/orxonox-npc_test.Po"; else rm -f "$(DEPDIR)/orxonox-npc_test.Tpo"; exit 1; fi 593 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='world_entities/npc_test.cc' object='orxonox-npc_test.obj' libtool=no @AMDEPBACKSLASH@ 594 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 595 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-npc_test.obj `if test -f 'world_entities/npc_test.cc'; then $(CYGPATH_W) 'world_entities/npc_test.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/npc_test.cc'; fi` 580 596 581 597 orxonox-environment.o: world_entities/environment.cc -
branches/world_entities/src/story_entities/world.cc
r5622 r5682 70 70 71 71 #include "cd_engine.h" 72 #include "npc.h" 73 #include "npc2.h" 72 #include "npc_test1.h" 74 73 #include "shader.h" 75 74 … … 469 468 for(int i = 0; i < 100; i++) 470 469 { 471 WorldEntity* tmp = new NPC ();470 WorldEntity* tmp = new NPCTest1(); 472 471 char npcChar[10]; 473 472 sprintf (npcChar, "NPC_%d", i); -
branches/world_entities/src/util/object_manager.h
r5629 r5682 8 8 9 9 #include "base_object.h" 10 #include <list> 10 11 11 12 // FORWARD DECLARATION 13 14 15 class ObjectGroupList 16 { 17 18 19 20 }; 21 12 22 13 23 //! A default singleton class. … … 19 29 inline static ObjectManager* getInstance(void) { if (!ObjectManager::singletonRef) ObjectManager::singletonRef = new ObjectManager(); return ObjectManager::singletonRef; }; 20 30 31 32 ObjectGroupList* getGroupList( ); 33 21 34 private: 22 35 ObjectManager(void); 23 36 static ObjectManager* singletonRef; 37 38 std::list<ObjectGroupList> groupList; 39 40 24 41 }; 25 42 -
branches/world_entities/src/world_entities/npc_test.cc
r5680 r5682 18 18 19 19 20 #include "npc 2.h"20 #include "npc_test.h" 21 21 #include "obb_tree.h" 22 22 -
branches/world_entities/src/world_entities/npc_test1.cc
r5680 r5682 18 18 19 19 20 #include "npc .h"20 #include "npc_test1.h" 21 21 #include "obb_tree.h" 22 22 … … 30 30 31 31 32 NPC ::NPC()32 NPCTest1::NPCTest1() 33 33 { 34 this->setClassID(CL_NPC, "NPC ");34 this->setClassID(CL_NPC, "NPCTest1"); 35 35 36 36 if ((float)rand()/RAND_MAX > .5f) … … 43 43 44 44 45 NPC ::~NPC() {}45 NPCTest1::~NPCTest1 () {} 46 46 47 47 48 void NPC ::collidesWith(WorldEntity* entity, const Vector& location)48 void NPCTest1::collidesWith(WorldEntity* entity, const Vector& location) 49 49 { 50 50 if (entity->isA(CL_PROJECTILE) && entity != this->collider) … … 78 78 79 79 80 void NPC ::tick(float dt)80 void NPCTest1::tick(float dt) 81 81 { 82 82 // Vector direction = (State::getCameraTarget()->getAbsCoor() - this->getAbsCoor());
Note: See TracChangeset
for help on using the changeset viewer.