Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4976 in orxonox.OLD


Ignore:
Timestamp:
Aug 9, 2005, 12:48:44 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: flotilia

Location:
orxonox/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/Makefile.am

    r4962 r4976  
    55EXTRA_DIST = CODING-STANDARDS \
    66             IDEAS \
     7             NEWS \
    78             doc/CREDITS \
    89             doc/doxyconf/build \

  • orxonox/trunk/Makefile.in

    r4962 r4976  
    184184EXTRA_DIST = CODING-STANDARDS \
    185185             IDEAS \
     186             NEWS \
    186187             doc/CREDITS \
    187188             doc/doxyconf/build \

  • orxonox/trunk/src/Makefile.am

    r4975 r4976  
    5252                  world_entities/camera.cc \
    5353                  world_entities/player.cc \
     54                  world_entities/npc.cc \
    5455                  world_entities/environment.cc \
    5556                  world_entities/skysphere.cc \

  • orxonox/trunk/src/Makefile.in

    r4975 r4976  
    6565        orxonox-world.$(OBJEXT) orxonox-world_entity.$(OBJEXT) \
    6666        orxonox-camera.$(OBJEXT) orxonox-player.$(OBJEXT) \
    67         orxonox-environment.$(OBJEXT) orxonox-skysphere.$(OBJEXT) \
    68         orxonox-skybox.$(OBJEXT) orxonox-terrain.$(OBJEXT) \
    69         orxonox-satellite.$(OBJEXT) \
     67        orxonox-npc.$(OBJEXT) orxonox-environment.$(OBJEXT) \
     68        orxonox-skysphere.$(OBJEXT) orxonox-skybox.$(OBJEXT) \
     69        orxonox-terrain.$(OBJEXT) orxonox-satellite.$(OBJEXT) \
    7070        orxonox-character_attributes.$(OBJEXT) \
    7171        orxonox-test_entity.$(OBJEXT) orxonox-weapon_manager.$(OBJEXT) \
    … …  
    108108@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-light.Po \
    109109@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-load_param.Po \
     110@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-npc.Po \
    110111@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-null_parent.Po \
    111112@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-orxonox.Po \
    … …  
    304305                  world_entities/camera.cc \
    305306                  world_entities/player.cc \
     307                  world_entities/npc.cc \
    306308                  world_entities/environment.cc \
    307309                  world_entities/skysphere.cc \
    … …  
    502504@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-light.Po@am__quote@
    503505@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-load_param.Po@am__quote@
     506@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-npc.Po@am__quote@
    504507@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-null_parent.Po@am__quote@
    505508@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-orxonox.Po@am__quote@
    … …  
    865868@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    866869@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-player.obj `if test -f 'world_entities/player.cc'; then $(CYGPATH_W) 'world_entities/player.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/player.cc'; fi`
     870
     871orxonox-npc.o: world_entities/npc.cc
     872@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-npc.o -MD -MP -MF "$(DEPDIR)/orxonox-npc.Tpo" -c -o orxonox-npc.o `test -f 'world_entities/npc.cc' || echo '$(srcdir)/'`world_entities/npc.cc; \
     873@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-npc.Tpo" "$(DEPDIR)/orxonox-npc.Po"; else rm -f "$(DEPDIR)/orxonox-npc.Tpo"; exit 1; fi
     874@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npc.cc' object='orxonox-npc.o' libtool=no @AMDEPBACKSLASH@
     875@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-npc.Po' tmpdepfile='$(DEPDIR)/orxonox-npc.TPo' @AMDEPBACKSLASH@
     876@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     877@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-npc.o `test -f 'world_entities/npc.cc' || echo '$(srcdir)/'`world_entities/npc.cc
     878
     879orxonox-npc.obj: world_entities/npc.cc
     880@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-npc.obj -MD -MP -MF "$(DEPDIR)/orxonox-npc.Tpo" -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`; \
     881@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-npc.Tpo" "$(DEPDIR)/orxonox-npc.Po"; else rm -f "$(DEPDIR)/orxonox-npc.Tpo"; exit 1; fi
     882@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npc.cc' object='orxonox-npc.obj' libtool=no @AMDEPBACKSLASH@
     883@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-npc.Po' tmpdepfile='$(DEPDIR)/orxonox-npc.TPo' @AMDEPBACKSLASH@
     884@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     885@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`
    867886
    868887orxonox-environment.o: world_entities/environment.cc

  • orxonox/trunk/src/ai/ai.h

    r3544 r4976  
    33#define _AI_H
    44
    5 #include "data_tank.h"
    65
    76class AI {

  • orxonox/trunk/src/story_entities/world.cc

    r4969 r4976  
    7171
    7272#include "cd_engine.h"
    73 
     73#include "npc.h"
    7474
    7575using namespace std;
    … …  
    521521  PhysicsEngine::getInstance()->debug();
    522522
     523  for(int i = 0; i < 100; i++)
     524  {
     525    WorldEntity* tmp = new NPC();
     526    tmp->setAbsCoor(((float)rand()/RAND_MAX) * 2000, 40+ (float)rand()/RAND_MAX*30, ((float)rand()/RAND_MAX -.5) *500);
     527    this->spawn(tmp);
     528
     529
     530  }
     531
     532
    523533
    524534  ClassList::debug();

  • orxonox/trunk/src/world_entities/npc.cc

    r4597 r4976  
    2020
    2121#include "ai.h"
    22 #include "data_tank.h"
    2322
    2423#include "npc.h"
    … …  
    2726
    2827
    29 NPC::NPC() : WorldEntity()
     28NPC::NPC()
    3029{
    3130  this->setClassID(CL_NPC, "NPC");
    3231  hasDied = 0;
     32
     33  this->loadModel("models/bolido.obj");
    3334}
    3435
    … …  
    5960
    6061
    61 void NPC::addAI(AI* ai)
    62 {}
    63 
    64 void NPC::paint()
    65 {
    66   //cout << "WorldEntity::WorldEntity();" << endl;
    67   /* fix: died flag approach is very stupid, just to show @ convention */
    68   if( hasDied == 0 ) {
    69     glPushMatrix();
    70     glTranslatef(xCor, yCor, 3.0);
    71     //glScalef(1.0, 3.0, 1.0);
    72     glutWireSphere(1.0, 10, 10);
    73     glPopMatrix();
    74   }
    75 }
    76 
    77 void NPC::drawNPC()
    78 {
    79 
    80 }
    81 
    8262
    8363/* define the reaction, if the ship is been hit */
Note: See TracChangeset for help on using the changeset viewer.