Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3473 in orxonox.OLD for orxonox/trunk/src


Ignore:
Timestamp:
Mar 10, 2005, 5:30:16 PM (20 years ago)
Author:
patrick
Message:

orxonox/trunk: redesigning directory structure - created mathlib and added all important classes

Location:
orxonox/trunk/src
Files:
1 added
3 edited
6 moved

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/Makefile.am

    r3472 r3473  
    11AM_CXXFLAGS="-I./world_entities"
    22AM_CXXFLAGS+="-I./story_entities"
     3AM_CXXFLAGS+="-I./mathlib"
    34
    45AM_LDFLAGS= $(MWINDOWS)
    … …  
    1516                 data_tank.cc \
    1617                 world_entities/world_entity.cc \
    17                  vector.cc \
     18                 mathlib/vector.cc \
    1819                 camera.cc \
    1920                 command_node.cc \
    … …  
    3637                 helper_parent.cc \
    3738                 track_manager.cc \
    38                  matrix.cc \
    39                  curve.cc \
     39                 mathlib/matrix.cc \
     40                 mathlib/curve.cc \
    4041                 glmenu_imagescreen.cc \
    4142                 skysphere.cc \
    … …  
    5960                 ini_parser.h \
    6061                 power_up.h \
    61                  vector.h \
     62                 mathlib/vector.h \
    6263                 keynames.h \
    6364                 proto_class.h \
    … …  
    7980                 helper_parent.h \
    8081                 track_manager.h \
    81                  matrix.h \
    82                  curve.h \
     82                 mathlib/matrix.h \
     83                 mathlib/curve.h \
    8384                 glmenu_imagescreen.h \
    8485                 debug.h \

  • orxonox/trunk/src/Makefile.in

    r3472 r3473  
    214214target_os = @target_os@
    215215target_vendor = @target_vendor@
    216 AM_CXXFLAGS = "-I./world_entities" "-I./story_entities"
     216AM_CXXFLAGS = "-I./world_entities" "-I./story_entities" "-I./mathlib"
    217217AM_LDFLAGS = $(MWINDOWS)
    218218orxonox_SOURCES = orxonox.cc \
    … …  
    222222                 data_tank.cc \
    223223                 world_entities/world_entity.cc \
    224                  vector.cc \
     224                 mathlib/vector.cc \
    225225                 camera.cc \
    226226                 command_node.cc \
    … …  
    243243                 helper_parent.cc \
    244244                 track_manager.cc \
    245                  matrix.cc \
    246                  curve.cc \
     245                 mathlib/matrix.cc \
     246                 mathlib/curve.cc \
    247247                 glmenu_imagescreen.cc \
    248248                 skysphere.cc \
    … …  
    266266                 ini_parser.h \
    267267                 power_up.h \
    268                  vector.h \
     268                 mathlib/vector.h \
    269269                 keynames.h \
    270270                 proto_class.h \
    … …  
    286286                 helper_parent.h \
    287287                 track_manager.h \
    288                  matrix.h \
    289                  curve.h \
     288                 mathlib/matrix.h \
     289                 mathlib/curve.h \
    290290                 glmenu_imagescreen.h \
    291291                 debug.h \
    … …  
    455455@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o world_entity.obj `if test -f 'world_entities/world_entity.cc'; then $(CYGPATH_W) 'world_entities/world_entity.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/world_entity.cc'; fi`
    456456
     457vector.o: mathlib/vector.cc
     458@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT vector.o -MD -MP -MF "$(DEPDIR)/vector.Tpo" -c -o vector.o `test -f 'mathlib/vector.cc' || echo '$(srcdir)/'`mathlib/vector.cc; \
     459@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/vector.Tpo" "$(DEPDIR)/vector.Po"; else rm -f "$(DEPDIR)/vector.Tpo"; exit 1; fi
     460@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='mathlib/vector.cc' object='vector.o' libtool=no @AMDEPBACKSLASH@
     461@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/vector.Po' tmpdepfile='$(DEPDIR)/vector.TPo' @AMDEPBACKSLASH@
     462@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     463@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o vector.o `test -f 'mathlib/vector.cc' || echo '$(srcdir)/'`mathlib/vector.cc
     464
     465vector.obj: mathlib/vector.cc
     466@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT vector.obj -MD -MP -MF "$(DEPDIR)/vector.Tpo" -c -o vector.obj `if test -f 'mathlib/vector.cc'; then $(CYGPATH_W) 'mathlib/vector.cc'; else $(CYGPATH_W) '$(srcdir)/mathlib/vector.cc'; fi`; \
     467@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/vector.Tpo" "$(DEPDIR)/vector.Po"; else rm -f "$(DEPDIR)/vector.Tpo"; exit 1; fi
     468@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='mathlib/vector.cc' object='vector.obj' libtool=no @AMDEPBACKSLASH@
     469@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/vector.Po' tmpdepfile='$(DEPDIR)/vector.TPo' @AMDEPBACKSLASH@
     470@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     471@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o vector.obj `if test -f 'mathlib/vector.cc'; then $(CYGPATH_W) 'mathlib/vector.cc'; else $(CYGPATH_W) '$(srcdir)/mathlib/vector.cc'; fi`
     472
    457473campaign.o: story_entities/campaign.cc
    458474@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT campaign.o -MD -MP -MF "$(DEPDIR)/campaign.Tpo" -c -o campaign.o `test -f 'story_entities/campaign.cc' || echo '$(srcdir)/'`story_entities/campaign.cc; \
    … …  
    582598@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    583599@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o texture.obj `if test -f 'importer/texture.cc'; then $(CYGPATH_W) 'importer/texture.cc'; else $(CYGPATH_W) '$(srcdir)/importer/texture.cc'; fi`
     600
     601matrix.o: mathlib/matrix.cc
     602@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT matrix.o -MD -MP -MF "$(DEPDIR)/matrix.Tpo" -c -o matrix.o `test -f 'mathlib/matrix.cc' || echo '$(srcdir)/'`mathlib/matrix.cc; \
     603@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/matrix.Tpo" "$(DEPDIR)/matrix.Po"; else rm -f "$(DEPDIR)/matrix.Tpo"; exit 1; fi
     604@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='mathlib/matrix.cc' object='matrix.o' libtool=no @AMDEPBACKSLASH@
     605@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/matrix.Po' tmpdepfile='$(DEPDIR)/matrix.TPo' @AMDEPBACKSLASH@
     606@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     607@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o matrix.o `test -f 'mathlib/matrix.cc' || echo '$(srcdir)/'`mathlib/matrix.cc
     608
     609matrix.obj: mathlib/matrix.cc
     610@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT matrix.obj -MD -MP -MF "$(DEPDIR)/matrix.Tpo" -c -o matrix.obj `if test -f 'mathlib/matrix.cc'; then $(CYGPATH_W) 'mathlib/matrix.cc'; else $(CYGPATH_W) '$(srcdir)/mathlib/matrix.cc'; fi`; \
     611@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/matrix.Tpo" "$(DEPDIR)/matrix.Po"; else rm -f "$(DEPDIR)/matrix.Tpo"; exit 1; fi
     612@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='mathlib/matrix.cc' object='matrix.obj' libtool=no @AMDEPBACKSLASH@
     613@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/matrix.Po' tmpdepfile='$(DEPDIR)/matrix.TPo' @AMDEPBACKSLASH@
     614@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     615@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o matrix.obj `if test -f 'mathlib/matrix.cc'; then $(CYGPATH_W) 'mathlib/matrix.cc'; else $(CYGPATH_W) '$(srcdir)/mathlib/matrix.cc'; fi`
     616
     617curve.o: mathlib/curve.cc
     618@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT curve.o -MD -MP -MF "$(DEPDIR)/curve.Tpo" -c -o curve.o `test -f 'mathlib/curve.cc' || echo '$(srcdir)/'`mathlib/curve.cc; \
     619@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/curve.Tpo" "$(DEPDIR)/curve.Po"; else rm -f "$(DEPDIR)/curve.Tpo"; exit 1; fi
     620@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='mathlib/curve.cc' object='curve.o' libtool=no @AMDEPBACKSLASH@
     621@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/curve.Po' tmpdepfile='$(DEPDIR)/curve.TPo' @AMDEPBACKSLASH@
     622@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     623@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o curve.o `test -f 'mathlib/curve.cc' || echo '$(srcdir)/'`mathlib/curve.cc
     624
     625curve.obj: mathlib/curve.cc
     626@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT curve.obj -MD -MP -MF "$(DEPDIR)/curve.Tpo" -c -o curve.obj `if test -f 'mathlib/curve.cc'; then $(CYGPATH_W) 'mathlib/curve.cc'; else $(CYGPATH_W) '$(srcdir)/mathlib/curve.cc'; fi`; \
     627@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/curve.Tpo" "$(DEPDIR)/curve.Po"; else rm -f "$(DEPDIR)/curve.Tpo"; exit 1; fi
     628@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='mathlib/curve.cc' object='curve.obj' libtool=no @AMDEPBACKSLASH@
     629@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/curve.Po' tmpdepfile='$(DEPDIR)/curve.TPo' @AMDEPBACKSLASH@
     630@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     631@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o curve.obj `if test -f 'mathlib/curve.cc'; then $(CYGPATH_W) 'mathlib/curve.cc'; else $(CYGPATH_W) '$(srcdir)/mathlib/curve.cc'; fi`
    584632
    585633fontset.o: sfont/fontset.cc
    … …  
    721769
    722770distdir: $(DISTFILES)
    723         $(mkdir_p) $(distdir)/sfont $(distdir)/story_entities $(distdir)/world_entities
     771        $(mkdir_p) $(distdir)/mathlib $(distdir)/sfont $(distdir)/story_entities $(distdir)/world_entities
    724772        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    725773        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

  • orxonox/trunk/src/importer/model.cc

    r3454 r3473  
    2020
    2121#include "array.h"
    22 #include "../vector.h"
     22#include "vector.h"
    2323
    2424using namespace std;
Note: See TracChangeset for help on using the changeset viewer.