Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4615 in orxonox.OLD for orxonox/trunk/src/subprojects


Ignore:
Timestamp:
Jun 13, 2005, 1:26:25 AM (19 years ago)
Author:
patrick
Message:

orxonox/trunk: modified the cd subproject, so it loads an md2 file now. the polygons are rendered black, so the bounding box is not viewable! Must render them in another color:)

Location:
orxonox/trunk/src/subprojects/collision_detection
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r4612 r4615  
    1313                  $(MAINSRCDIR)/lib/newmat/libnewmat.a \
    1414                  $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) \
    15                   -lpthread
     15                  -lpthread
    1616
    1717collision_CPPFLAGS =  -DGUI_MODULE \
    18                       $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
     18                      $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
    1919
    2020collision_SOURCES= ../framework.cc \
    21                    collision_detection.cc \
    22                    $(MAINSRCDIR)/util/loading/load_param.cc \
    23                    $(MAINSRCDIR)/lib/util/substring.cc \                   
    24                    $(MAINSRCDIR)/lib/util/ini_parser.cc \
    25                    $(MAINSRCDIR)/lib/graphics/light.cc \
    26                    $(MAINSRCDIR)/util/state.cc \
    27                    $(MAINSRCDIR)/world_entities/camera.cc \
    28                    $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
    29                    $(MAINSRCDIR)/lib/lang/base_object.cc \
    30                    $(MAINSRCDIR)/lib/math/vector.cc \
    31                    $(MAINSRCDIR)/util/resource_manager.cc \
    32                    $(MAINSRCDIR)/lib/graphics/text_engine.cc \
    33                    $(MAINSRCDIR)/lib/coord/p_node.cc \
    34                    $(MAINSRCDIR)/lib/coord/null_parent.cc \
    35                    $(MAINSRCDIR)/lib/gui/gui_gtk.cc \
    36                    $(MAINSRCDIR)/lib/newmat/include.h \
    37                    $(MAINSRCDIR)/lib/newmat/newmat.h \
    38                    $(MAINSRCDIR)/lib/newmat/newmatap.h \
    39                    $(MAINSRCDIR)/lib/newmatio.h
     21                   collision_detection.cc \
     22                   $(MAINSRCDIR)/util/loading/load_param.cc \
     23                   $(MAINSRCDIR)/lib/util/substring.cc \
     24                   $(MAINSRCDIR)/lib/util/ini_parser.cc \
     25                   $(MAINSRCDIR)/lib/graphics/light.cc \
     26                   $(MAINSRCDIR)/lib/graphics/importer/md2Model.cc \
     27                   $(MAINSRCDIR)/util/state.cc \
     28                   $(MAINSRCDIR)/world_entities/camera.cc \
     29                   $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
     30                   $(MAINSRCDIR)/lib/lang/base_object.cc \
     31                   $(MAINSRCDIR)/lib/math/vector.cc \
     32                   $(MAINSRCDIR)/util/resource_manager.cc \
     33                   $(MAINSRCDIR)/lib/graphics/text_engine.cc \
     34                   $(MAINSRCDIR)/lib/coord/p_node.cc \
     35                   $(MAINSRCDIR)/lib/coord/null_parent.cc \
     36                   $(MAINSRCDIR)/lib/gui/gui_gtk.cc \
     37                   $(MAINSRCDIR)/lib/newmat/include.h \
     38                   $(MAINSRCDIR)/lib/newmat/newmat.h \
     39                   $(MAINSRCDIR)/lib/newmat/newmatap.h \
     40                   $(MAINSRCDIR)/lib/newmatio.h

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

    r4612 r4615  
    5555        collision-load_param.$(OBJEXT) collision-substring.$(OBJEXT) \
    5656        collision-ini_parser.$(OBJEXT) collision-light.$(OBJEXT) \
    57         collision-state.$(OBJEXT) collision-camera.$(OBJEXT) \
    58         collision-graphics_engine.$(OBJEXT) \
     57        collision-md2Model.$(OBJEXT) collision-state.$(OBJEXT) \
     58        collision-camera.$(OBJEXT) collision-graphics_engine.$(OBJEXT) \
    5959        collision-base_object.$(OBJEXT) collision-vector.$(OBJEXT) \
    6060        collision-resource_manager.$(OBJEXT) \
    … …  
    8383@AMDEP_TRUE@    ./$(DEPDIR)/collision-light.Po \
    8484@AMDEP_TRUE@    ./$(DEPDIR)/collision-load_param.Po \
     85@AMDEP_TRUE@    ./$(DEPDIR)/collision-md2Model.Po \
    8586@AMDEP_TRUE@    ./$(DEPDIR)/collision-null_parent.Po \
    8687@AMDEP_TRUE@    ./$(DEPDIR)/collision-p_node.Po \
    … …  
    221222                  $(MAINSRCDIR)/lib/newmat/libnewmat.a \
    222223                  $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) \
    223                   -lpthread
     224                  -lpthread
    224225
    225226collision_CPPFLAGS = -DGUI_MODULE \
    226                       $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
     227                      $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
    227228
    228229collision_SOURCES = ../framework.cc \
    229                    collision_detection.cc \
    230                    $(MAINSRCDIR)/util/loading/load_param.cc \
    231                    $(MAINSRCDIR)/lib/util/substring.cc \
    232                    $(MAINSRCDIR)/lib/util/ini_parser.cc \
    233                    $(MAINSRCDIR)/lib/graphics/light.cc \
    234                    $(MAINSRCDIR)/util/state.cc \
    235                    $(MAINSRCDIR)/world_entities/camera.cc \
    236                    $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
    237                    $(MAINSRCDIR)/lib/lang/base_object.cc \
    238                    $(MAINSRCDIR)/lib/math/vector.cc \
    239                    $(MAINSRCDIR)/util/resource_manager.cc \
    240                    $(MAINSRCDIR)/lib/graphics/text_engine.cc \
    241                    $(MAINSRCDIR)/lib/coord/p_node.cc \
    242                    $(MAINSRCDIR)/lib/coord/null_parent.cc \
    243                    $(MAINSRCDIR)/lib/gui/gui_gtk.cc \
    244                    $(MAINSRCDIR)/lib/newmat/include.h \
    245                    $(MAINSRCDIR)/lib/newmat/newmat.h \
    246                    $(MAINSRCDIR)/lib/newmat/newmatap.h \
    247                    $(MAINSRCDIR)/lib/newmatio.h
     230                   collision_detection.cc \
     231                   $(MAINSRCDIR)/util/loading/load_param.cc \
     232                   $(MAINSRCDIR)/lib/util/substring.cc \
     233                   $(MAINSRCDIR)/lib/util/ini_parser.cc \
     234                   $(MAINSRCDIR)/lib/graphics/light.cc \
     235                   $(MAINSRCDIR)/lib/graphics/importer/md2Model.cc \
     236                   $(MAINSRCDIR)/util/state.cc \
     237                   $(MAINSRCDIR)/world_entities/camera.cc \
     238                   $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
     239                   $(MAINSRCDIR)/lib/lang/base_object.cc \
     240                   $(MAINSRCDIR)/lib/math/vector.cc \
     241                   $(MAINSRCDIR)/util/resource_manager.cc \
     242                   $(MAINSRCDIR)/lib/graphics/text_engine.cc \
     243                   $(MAINSRCDIR)/lib/coord/p_node.cc \
     244                   $(MAINSRCDIR)/lib/coord/null_parent.cc \
     245                   $(MAINSRCDIR)/lib/gui/gui_gtk.cc \
     246                   $(MAINSRCDIR)/lib/newmat/include.h \
     247                   $(MAINSRCDIR)/lib/newmat/newmat.h \
     248                   $(MAINSRCDIR)/lib/newmat/newmatap.h \
     249                   $(MAINSRCDIR)/lib/newmatio.h
    248250
    249251all: all-am
    … …  
    322324@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-light.Po@am__quote@
    323325@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-load_param.Po@am__quote@
     326@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-md2Model.Po@am__quote@
    324327@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-null_parent.Po@am__quote@
    325328@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-p_node.Po@am__quote@
    … …  
    441444@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    442445@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-light.obj `if test -f '$(MAINSRCDIR)/lib/graphics/light.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/light.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/light.cc'; fi`
     446
     447collision-md2Model.o: $(MAINSRCDIR)/lib/graphics/importer/md2Model.cc
     448@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-md2Model.o -MD -MP -MF "$(DEPDIR)/collision-md2Model.Tpo" -c -o collision-md2Model.o `test -f '$(MAINSRCDIR)/lib/graphics/importer/md2Model.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/importer/md2Model.cc; \
     449@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/collision-md2Model.Tpo" "$(DEPDIR)/collision-md2Model.Po"; else rm -f "$(DEPDIR)/collision-md2Model.Tpo"; exit 1; fi
     450@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/importer/md2Model.cc' object='collision-md2Model.o' libtool=no @AMDEPBACKSLASH@
     451@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision-md2Model.Po' tmpdepfile='$(DEPDIR)/collision-md2Model.TPo' @AMDEPBACKSLASH@
     452@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     453@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-md2Model.o `test -f '$(MAINSRCDIR)/lib/graphics/importer/md2Model.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/importer/md2Model.cc
     454
     455collision-md2Model.obj: $(MAINSRCDIR)/lib/graphics/importer/md2Model.cc
     456@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-md2Model.obj -MD -MP -MF "$(DEPDIR)/collision-md2Model.Tpo" -c -o collision-md2Model.obj `if test -f '$(MAINSRCDIR)/lib/graphics/importer/md2Model.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/importer/md2Model.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/importer/md2Model.cc'; fi`; \
     457@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/collision-md2Model.Tpo" "$(DEPDIR)/collision-md2Model.Po"; else rm -f "$(DEPDIR)/collision-md2Model.Tpo"; exit 1; fi
     458@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/importer/md2Model.cc' object='collision-md2Model.obj' libtool=no @AMDEPBACKSLASH@
     459@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision-md2Model.Po' tmpdepfile='$(DEPDIR)/collision-md2Model.TPo' @AMDEPBACKSLASH@
     460@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     461@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-md2Model.obj `if test -f '$(MAINSRCDIR)/lib/graphics/importer/md2Model.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/importer/md2Model.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/importer/md2Model.cc'; fi`
    443462
    444463collision-state.o: $(MAINSRCDIR)/util/state.cc

  • orxonox/trunk/src/subprojects/collision_detection/collision_detection.cc

    r4552 r4615  
    1 /* 
     1/*
    22   orxonox - the future of 3D-vertical-scrollers
    33
    … …  
    2424#include "cd_engine.h"
    2525
     26#include "md2Model.h"
     27
     28MD2Model* model;
     29
    2630void Framework::moduleInit(int argc, char** argv)
    2731{
    2832  CDEngine::getInstance();
    29   CDEngine::getInstance()->debug();
    30  
     33  //CDEngine::getInstance()->debug();
    3134
     35  model = new MD2Model("models/tris.md2", "models/tris.pcx");
     36  model->tick(0.1f);
     37  CDEngine::getInstance()->debugSpawnTree(1, model->data->pVertices, model->data->numVertices);
    3238
    3339  LightManager* lightMan = LightManager::getInstance();
    … …  
    4551    case SDL_KEYDOWN:
    4652      switch (event->key.keysym.sym)
    47         {
    48         case SDLK_i:
    49           break;
    50         }
     53        {
     54        case SDLK_i:
     55          break;
     56        }
    5157    }
    5258}
    … …  
    6369
    6470  LightManager::getInstance()->draw();
     71
     72  model->draw();
    6573}
    6674
    … …  
    7785{
    7886  Window* guiMainWindow = NULL;
    79  
     87
    8088  initGUI(0, NULL);
    81  
     89
    8290  guiMainWindow = new Window("Collision_detection");
    8391  {
Note: See TracChangeset for help on using the changeset viewer.