Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5682 in orxonox.OLD


Ignore:
Timestamp:
Nov 21, 2005, 10:27:33 PM (18 years ago)
Author:
bensch
Message:

we: Base for NPC

Location:
branches/world_entities/src
Files:
4 edited
1 copied
2 moved

Legend:

Unmodified
Added
Removed

  • branches/world_entities/src/Makefile.am

    r5679 r5682  
    4949                  world_entities/player.cc \
    5050                  world_entities/npc.cc \
    51                   world_entities/npc2.cc \
     51                  world_entities/npc_test1.cc \
     52                  world_entities/npc_test.cc \
    5253                  world_entities/environment.cc \
    5354                  world_entities/skysphere.cc \
    … …  
    8788                 world_entities/player.h \
    8889                 world_entities/npc.h \
    89                  world_entities/npc2.h \
     90                 world_entities/npc_test1.h \
    9091                 world_entities/environment.h \
    9192                 world_entities/skysphere.h \

  • branches/world_entities/src/Makefile.in

    r5679 r5682  
    5757        orxonox-world.$(OBJEXT) orxonox-world_entity.$(OBJEXT) \
    5858        orxonox-camera.$(OBJEXT) orxonox-player.$(OBJEXT) \
    59         orxonox-npc.$(OBJEXT) orxonox-npc2.$(OBJEXT) \
    60         orxonox-environment.$(OBJEXT) orxonox-skysphere.$(OBJEXT) \
    61         orxonox-skybox.$(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) \
    6363        orxonox-character_attributes.$(OBJEXT) \
    6464        orxonox-test_entity.$(OBJEXT) orxonox-weapon_manager.$(OBJEXT) \
    … …  
    246246                  world_entities/player.cc \
    247247                  world_entities/npc.cc \
    248                   world_entities/npc2.cc \
     248                  world_entities/npc_test1.cc \
     249                  world_entities/npc_test.cc \
    249250                  world_entities/environment.cc \
    250251                  world_entities/skysphere.cc \
    … …  
    284285                 world_entities/player.h \
    285286                 world_entities/npc.h \
    286                  world_entities/npc2.h \
     287                 world_entities/npc_test1.h \
    287288                 world_entities/environment.h \
    288289                 world_entities/skysphere.h \
    … …  
    418419@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-laser_power_up.Po@am__quote@
    419420@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@
    421423@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-orxonox.Po@am__quote@
    422424@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-player.Po@am__quote@
    … …  
    565567@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`
    566568
    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`
     569orxonox-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
     576orxonox-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
     583orxonox-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
     590orxonox-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`
    580596
    581597orxonox-environment.o: world_entities/environment.cc

  • branches/world_entities/src/story_entities/world.cc

    r5622 r5682  
    7070
    7171#include "cd_engine.h"
    72 #include "npc.h"
    73 #include "npc2.h"
     72#include "npc_test1.h"
    7473#include "shader.h"
    7574
    … …  
    469468  for(int i = 0; i < 100; i++)
    470469  {
    471     WorldEntity* tmp = new NPC();
     470    WorldEntity* tmp = new NPCTest1();
    472471    char npcChar[10];
    473472    sprintf (npcChar, "NPC_%d", i);

  • branches/world_entities/src/util/object_manager.h

    r5629 r5682  
    88
    99#include "base_object.h"
     10#include <list>
    1011
    1112// FORWARD DECLARATION
     13
     14
     15class ObjectGroupList
     16{
     17
     18
     19
     20};
     21
    1222
    1323//! A default singleton class.
    … …  
    1929  inline static ObjectManager* getInstance(void) { if (!ObjectManager::singletonRef) ObjectManager::singletonRef = new ObjectManager();  return ObjectManager::singletonRef; };
    2030
     31
     32  ObjectGroupList* getGroupList( );
     33
    2134 private:
    2235  ObjectManager(void);
    2336  static ObjectManager* singletonRef;
     37
     38  std::list<ObjectGroupList>           groupList;
     39
     40
    2441};
    2542

  • branches/world_entities/src/world_entities/npc_test.cc

    r5680 r5682  
    1818
    1919
    20 #include "npc2.h"
     20#include "npc_test.h"
    2121#include "obb_tree.h"
    2222

  • branches/world_entities/src/world_entities/npc_test1.cc

    r5680 r5682  
    1818
    1919
    20 #include "npc.h"
     20#include "npc_test1.h"
    2121#include "obb_tree.h"
    2222
    … …  
    3030
    3131
    32 NPC::NPC()
     32NPCTest1::NPCTest1()
    3333{
    34   this->setClassID(CL_NPC, "NPC");
     34  this->setClassID(CL_NPC, "NPCTest1");
    3535
    3636  if ((float)rand()/RAND_MAX > .5f)
    … …  
    4343
    4444
    45 NPC::~NPC () {}
     45NPCTest1::~NPCTest1 () {}
    4646
    4747
    48 void NPC::collidesWith(WorldEntity* entity, const Vector& location)
     48void NPCTest1::collidesWith(WorldEntity* entity, const Vector& location)
    4949{
    5050  if (entity->isA(CL_PROJECTILE) && entity != this->collider)
    … …  
    7878
    7979
    80 void NPC::tick(float dt)
     80void NPCTest1::tick(float dt)
    8181{
    8282//  Vector direction = (State::getCameraTarget()->getAbsCoor() - this->getAbsCoor());
Note: See TracChangeset for help on using the changeset viewer.