Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4531 in orxonox.OLD for orxonox


Ignore:
Timestamp:
Jun 7, 2005, 9:22:30 AM (19 years ago)
Author:
patrick
Message:

orxonox/trunk: some more function skeletons implemented

Location:
orxonox/trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/configure

    r4527 r4531  
    87328732## OUTPUT CONFIGURE ##
    87338733######################
    8734                                                                                                                                                                           ac_config_files="$ac_config_files Makefile src/Makefile src/lib/Makefile src/lib/graphics/Makefile src/lib/graphics/importer/Makefile src/lib/sound/Makefile src/lib/event/Makefile src/lib/physics/Makefile src/lib/particles/Makefile src/lib/collision_detection/Makefile src/lib/gui/Makefile src/lib/tinyxml/Makefile src/subprojects/Makefile src/subprojects/testmain/Makefile src/subprojects/importer/Makefile src/subprojects/particles/Makefile src/subprojects/gui/Makefile"
     8734                                                                                                                                                                                    ac_config_files="$ac_config_files Makefile src/Makefile src/lib/Makefile src/lib/graphics/Makefile src/lib/graphics/importer/Makefile src/lib/sound/Makefile src/lib/event/Makefile src/lib/physics/Makefile src/lib/particles/Makefile src/lib/collision_detection/Makefile src/lib/gui/Makefile src/lib/tinyxml/Makefile src/subprojects/Makefile src/subprojects/testmain/Makefile src/subprojects/importer/Makefile src/subprojects/particles/Makefile src/subprojects/collision_detection/Makefile src/subprojects/gui/Makefile"
    87358735
    87368736
    … …  
    93429342  "src/subprojects/importer/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/subprojects/importer/Makefile" ;;
    93439343  "src/subprojects/particles/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/subprojects/particles/Makefile" ;;
     9344  "src/subprojects/collision_detection/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/subprojects/collision_detection/Makefile" ;;
    93449345  "src/subprojects/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/subprojects/gui/Makefile" ;;
    93459346  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;

  • orxonox/trunk/src/lib/collision_detection/bv_tree.h

    r4528 r4531  
    1212// FORWARD DEFINITION
    1313class BoundingVolume;
    14 
     14class sVec3D;
    1515
    1616//! A class that represents a bounding volume tree
    … …  
    3232  virtual void drawBVBlended(int currentDepth, const int depth) const;
    3333
     34 protected:
     35  sVec3D* vertices;
     36
    3437 private:
    3538  BoundingVolume* firstElement;

  • orxonox/trunk/src/lib/collision_detection/obb.cc

    r4511 r4531  
    3838  // delete what has to be deleted here
    3939}
     40
     41
     42sVect3D* OBB::getVertices() const
     43{}
     44
     45
     46void OBB::mergeWith(const BoundingVolume &bv)
     47{}
     48
     49
     50void OBB::drawBV(int currentDepth, const int depth) const
     51{}
     52
     53
     54void OBB::drawBVPolygon(int currentDepth, const int depth) const
     55{}
     56
     57
     58void OBB::drawBVBlended(int currentDepth, const int depth) const
     59{}

  • orxonox/trunk/src/lib/collision_detection/obb.h

    r4526 r4531  
    2222  inline const sVect3D* getHalfLength() const { return this->halfLength; }
    2323
     24  virtual sVect3D* getVertices() const;
     25  virtual void mergeWith(const BoundingVolume &bv);
     26
     27  virtual void drawBV(int currentDepth, const int depth) const;
     28  virtual void drawBVPolygon(int currentDepth, const int depth) const;
     29  virtual void drawBVBlended(int currentDepth, const int depth) const;
     30
     31
    2432 private:
    2533  Vector*          axis;                       //!< Axes of oriented box [x,y,z]

  • orxonox/trunk/src/lib/collision_detection/obb_tree.cc

    r4528 r4531  
    1717
    1818#include "obb_tree.h"
     19#include "obb.h"
    1920
    2021using namespace std;
    … …  
    4243
    4344void OBBTree::spawnBVTree(int depth)
    44 {}
     45{
     46  OBB obb();
     47 
     48}
    4549
    4650

  • orxonox/trunk/src/lib/collision_detection/obb_tree.h

    r4528 r4531  
    1010#include "base_object.h"
    1111#include "bv_tree.h"
     12
    1213
    1314//! A class for representing an obb tree

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

    r4506 r4531  
    169169SUBDIRS = importer \
    170170          particles \
     171          collision_detection \
    171172          gui \
    172173          testmain

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

    r4506 r4531  
    3939host_triplet = @host@
    4040bin_PROGRAMS = particles$(EXEEXT)
    41 subdir = src/subprojects/particles
     41subdir = src/subprojects/collision_detection
    4242DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
    4343ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    … …  
    5252PROGRAMS = $(bin_PROGRAMS)
    5353am_particles_OBJECTS = particles-framework.$(OBJEXT) \
    54         particles-particle_fun.$(OBJEXT) \
     54        particles-collision_detection.$(OBJEXT) \
    5555        particles-particle_engine.$(OBJEXT) \
    5656        particles-particle_system.$(OBJEXT) \
    … …  
    7777@AMDEP_TRUE@    ./$(DEPDIR)/particles-base_object.Po \
    7878@AMDEP_TRUE@    ./$(DEPDIR)/particles-camera.Po \
     79@AMDEP_TRUE@    ./$(DEPDIR)/particles-collision_detection.Po \
    7980@AMDEP_TRUE@    ./$(DEPDIR)/particles-framework.Po \
    8081@AMDEP_TRUE@    ./$(DEPDIR)/particles-graphics_engine.Po \
    … …  
    8889@AMDEP_TRUE@    ./$(DEPDIR)/particles-particle_emitter.Po \
    8990@AMDEP_TRUE@    ./$(DEPDIR)/particles-particle_engine.Po \
    90 @AMDEP_TRUE@    ./$(DEPDIR)/particles-particle_fun.Po \
    9191@AMDEP_TRUE@    ./$(DEPDIR)/particles-particle_system.Po \
    9292@AMDEP_TRUE@    ./$(DEPDIR)/particles-primitive_model.Po \
    … …  
    225225
    226226particles_SOURCES = ../framework.cc \
    227                    particle_fun.cc \
     227                   collision_detection.cc \
    228228                   $(MAINSRCDIR)/lib/particles/particle_engine.cc \
    229229                   $(MAINSRCDIR)/lib/particles/particle_system.cc \
    … …  
    260260          esac; \
    261261        done; \
    262         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/particles/Makefile'; \
     262        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/collision_detection/Makefile'; \
    263263        cd $(top_srcdir) && \
    264           $(AUTOMAKE) --foreign  src/subprojects/particles/Makefile
     264          $(AUTOMAKE) --foreign  src/subprojects/collision_detection/Makefile
    265265.PRECIOUS: Makefile
    266266Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    316316@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-base_object.Po@am__quote@
    317317@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-camera.Po@am__quote@
     318@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-collision_detection.Po@am__quote@
    318319@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-framework.Po@am__quote@
    319320@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-graphics_engine.Po@am__quote@
    … …  
    327328@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-particle_emitter.Po@am__quote@
    328329@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-particle_engine.Po@am__quote@
    329 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-particle_fun.Po@am__quote@
    330330@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-particle_system.Po@am__quote@
    331331@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-primitive_model.Po@am__quote@
    … …  
    368368@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-framework.obj `if test -f '../framework.cc'; then $(CYGPATH_W) '../framework.cc'; else $(CYGPATH_W) '$(srcdir)/../framework.cc'; fi`
    369369
    370 particles-particle_fun.o: particle_fun.cc
    371 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-particle_fun.o -MD -MP -MF "$(DEPDIR)/particles-particle_fun.Tpo" -c -o particles-particle_fun.o `test -f 'particle_fun.cc' || echo '$(srcdir)/'`particle_fun.cc; \
    372 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/particles-particle_fun.Tpo" "$(DEPDIR)/particles-particle_fun.Po"; else rm -f "$(DEPDIR)/particles-particle_fun.Tpo"; exit 1; fi
    373 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='particle_fun.cc' object='particles-particle_fun.o' libtool=no @AMDEPBACKSLASH@
    374 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particles-particle_fun.Po' tmpdepfile='$(DEPDIR)/particles-particle_fun.TPo' @AMDEPBACKSLASH@
    375 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    376 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-particle_fun.o `test -f 'particle_fun.cc' || echo '$(srcdir)/'`particle_fun.cc
    377 
    378 particles-particle_fun.obj: particle_fun.cc
    379 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-particle_fun.obj -MD -MP -MF "$(DEPDIR)/particles-particle_fun.Tpo" -c -o particles-particle_fun.obj `if test -f 'particle_fun.cc'; then $(CYGPATH_W) 'particle_fun.cc'; else $(CYGPATH_W) '$(srcdir)/particle_fun.cc'; fi`; \
    380 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/particles-particle_fun.Tpo" "$(DEPDIR)/particles-particle_fun.Po"; else rm -f "$(DEPDIR)/particles-particle_fun.Tpo"; exit 1; fi
    381 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='particle_fun.cc' object='particles-particle_fun.obj' libtool=no @AMDEPBACKSLASH@
    382 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particles-particle_fun.Po' tmpdepfile='$(DEPDIR)/particles-particle_fun.TPo' @AMDEPBACKSLASH@
    383 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    384 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-particle_fun.obj `if test -f 'particle_fun.cc'; then $(CYGPATH_W) 'particle_fun.cc'; else $(CYGPATH_W) '$(srcdir)/particle_fun.cc'; fi`
     370particles-collision_detection.o: collision_detection.cc
     371@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-collision_detection.o -MD -MP -MF "$(DEPDIR)/particles-collision_detection.Tpo" -c -o particles-collision_detection.o `test -f 'collision_detection.cc' || echo '$(srcdir)/'`collision_detection.cc; \
     372@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/particles-collision_detection.Tpo" "$(DEPDIR)/particles-collision_detection.Po"; else rm -f "$(DEPDIR)/particles-collision_detection.Tpo"; exit 1; fi
     373@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='collision_detection.cc' object='particles-collision_detection.o' libtool=no @AMDEPBACKSLASH@
     374@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particles-collision_detection.Po' tmpdepfile='$(DEPDIR)/particles-collision_detection.TPo' @AMDEPBACKSLASH@
     375@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     376@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-collision_detection.o `test -f 'collision_detection.cc' || echo '$(srcdir)/'`collision_detection.cc
     377
     378particles-collision_detection.obj: collision_detection.cc
     379@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-collision_detection.obj -MD -MP -MF "$(DEPDIR)/particles-collision_detection.Tpo" -c -o particles-collision_detection.obj `if test -f 'collision_detection.cc'; then $(CYGPATH_W) 'collision_detection.cc'; else $(CYGPATH_W) '$(srcdir)/collision_detection.cc'; fi`; \
     380@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/particles-collision_detection.Tpo" "$(DEPDIR)/particles-collision_detection.Po"; else rm -f "$(DEPDIR)/particles-collision_detection.Tpo"; exit 1; fi
     381@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='collision_detection.cc' object='particles-collision_detection.obj' libtool=no @AMDEPBACKSLASH@
     382@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particles-collision_detection.Po' tmpdepfile='$(DEPDIR)/particles-collision_detection.TPo' @AMDEPBACKSLASH@
     383@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     384@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-collision_detection.obj `if test -f 'collision_detection.cc'; then $(CYGPATH_W) 'collision_detection.cc'; else $(CYGPATH_W) '$(srcdir)/collision_detection.cc'; fi`
    385385
    386386particles-particle_engine.o: $(MAINSRCDIR)/lib/particles/particle_engine.cc
Note: See TracChangeset for help on using the changeset viewer.