Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Mar 10, 2005, 7:01:53 PM (20 years ago)
Author:
patrick
Message:

orxonox/trunk: redesigning directory structure - created defs and added all importand classes. Moved sfont to font since sfont is the name of an other font library.

Location:
orxonox/trunk/src
Files:
1 added
1 deleted
5 edited
7 moved

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/Makefile.am

    r3474 r3475  
    33AM_CXXFLAGS+="-I./mathlib"
    44AM_CXXFLAGS+="-I./lib"
     5AM_CXXFLAGS+="-I./defs"
     6AM_CXXFLAGS+="-I./font"
    57
    68AM_LDFLAGS= $(MWINDOWS)
    … …  
    1214
    1315orxonox_SOURCES= orxonox.cc \
    14                  world.cc \
     16                 story_entities/world.cc \
    1517                 world_entities/player.cc \
    1618                 data_tank.cc \
    … …  
    4042                 mathlib/curve.cc \
    4143                 glmenu_imagescreen.cc \
    42                  skysphere.cc \
     44                 world_entities/skysphere.cc \
    4345                 light.cc \
    44                  sfont/fontset.cc
     46                 font/fontset.cc
    4547
    4648noinst_HEADERS = ability.h \
    4749                 data_tank.h \
    4850                 world_entities/npc.h \
    49                  stdincl.h \
     51                 defs/stdincl.h \
    5052                 glincl.h \
    5153                 ai.h \
    … …  
    5456                 synchronisable.h \
    5557                 base_entity.h \
    56                  error.h \
     58                 defs/error.h \
    5759                 world_entities/player.h \
    5860                 camera.h \
    … …  
    6264                 keynames.h \
    6365                 proto_class.h \
    64                  world.h \
     66                 story_entities/world.h \
    6567                 command_node.h \
    6668                 lib/list.h \
    … …  
    8284                 mathlib/curve.h \
    8385                 glmenu_imagescreen.h \
    84                  debug.h \
    85                  skysphere.h \
     86                 defs/debug.h \
     87                 world_entities/skysphere.h \
    8688                 light.h \
    87                  sfont/fontset.h
     89                 font/fontset.h
    8890
    8991## orxonox.conf will be used from home-dir instead.

  • orxonox/trunk/src/Makefile.in

    r3474 r3475  
    214214target_os = @target_os@
    215215target_vendor = @target_vendor@
    216 AM_CXXFLAGS = "-I./world_entities" "-I./story_entities" "-I./mathlib" "-I./lib"
     216AM_CXXFLAGS = "-I./world_entities" "-I./story_entities" "-I./mathlib" "-I./lib" "-I./defs" "-I./font"
    217217AM_LDFLAGS = $(MWINDOWS)
    218218orxonox_SOURCES = orxonox.cc \
    219                  world.cc \
     219                 story_entities/world.cc \
    220220                 world_entities/player.cc \
    221221                 data_tank.cc \
    … …  
    245245                 mathlib/curve.cc \
    246246                 glmenu_imagescreen.cc \
    247                  skysphere.cc \
     247                 world_entities/skysphere.cc \
    248248                 light.cc \
    249                  sfont/fontset.cc
     249                 font/fontset.cc
    250250
    251251noinst_HEADERS = ability.h \
    252252                 data_tank.h \
    253253                 world_entities/npc.h \
    254                  stdincl.h \
     254                 defs/stdincl.h \
    255255                 glincl.h \
    256256                 ai.h \
    … …  
    259259                 synchronisable.h \
    260260                 base_entity.h \
    261                  error.h \
     261                 defs/error.h \
    262262                 world_entities/player.h \
    263263                 camera.h \
    … …  
    267267                 keynames.h \
    268268                 proto_class.h \
    269                  world.h \
     269                 story_entities/world.h \
    270270                 command_node.h \
    271271                 lib/list.h \
    … …  
    287287                 mathlib/curve.h \
    288288                 glmenu_imagescreen.h \
    289                  debug.h \
    290                  skysphere.h \
     289                 defs/debug.h \
     290                 world_entities/skysphere.h \
    291291                 light.h \
    292                  sfont/fontset.h
     292                 font/fontset.h
    293293
    294294EXTRA_DIST = orxonox.conf
    … …  
    420420@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    421421
     422world.o: story_entities/world.cc
     423@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT world.o -MD -MP -MF "$(DEPDIR)/world.Tpo" -c -o world.o `test -f 'story_entities/world.cc' || echo '$(srcdir)/'`story_entities/world.cc; \
     424@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/world.Tpo" "$(DEPDIR)/world.Po"; else rm -f "$(DEPDIR)/world.Tpo"; exit 1; fi
     425@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='story_entities/world.cc' object='world.o' libtool=no @AMDEPBACKSLASH@
     426@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/world.Po' tmpdepfile='$(DEPDIR)/world.TPo' @AMDEPBACKSLASH@
     427@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     428@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o world.o `test -f 'story_entities/world.cc' || echo '$(srcdir)/'`story_entities/world.cc
     429
     430world.obj: story_entities/world.cc
     431@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT world.obj -MD -MP -MF "$(DEPDIR)/world.Tpo" -c -o world.obj `if test -f 'story_entities/world.cc'; then $(CYGPATH_W) 'story_entities/world.cc'; else $(CYGPATH_W) '$(srcdir)/story_entities/world.cc'; fi`; \
     432@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/world.Tpo" "$(DEPDIR)/world.Po"; else rm -f "$(DEPDIR)/world.Tpo"; exit 1; fi
     433@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='story_entities/world.cc' object='world.obj' libtool=no @AMDEPBACKSLASH@
     434@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/world.Po' tmpdepfile='$(DEPDIR)/world.TPo' @AMDEPBACKSLASH@
     435@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     436@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o world.obj `if test -f 'story_entities/world.cc'; then $(CYGPATH_W) 'story_entities/world.cc'; else $(CYGPATH_W) '$(srcdir)/story_entities/world.cc'; fi`
     437
    422438player.o: world_entities/player.cc
    423439@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT player.o -MD -MP -MF "$(DEPDIR)/player.Tpo" -c -o player.o `test -f 'world_entities/player.cc' || echo '$(srcdir)/'`world_entities/player.cc; \
    … …  
    660676@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`
    661677
    662 fontset.o: sfont/fontset.cc
    663 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fontset.o -MD -MP -MF "$(DEPDIR)/fontset.Tpo" -c -o fontset.o `test -f 'sfont/fontset.cc' || echo '$(srcdir)/'`sfont/fontset.cc; \
     678skysphere.o: world_entities/skysphere.cc
     679@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT skysphere.o -MD -MP -MF "$(DEPDIR)/skysphere.Tpo" -c -o skysphere.o `test -f 'world_entities/skysphere.cc' || echo '$(srcdir)/'`world_entities/skysphere.cc; \
     680@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/skysphere.Tpo" "$(DEPDIR)/skysphere.Po"; else rm -f "$(DEPDIR)/skysphere.Tpo"; exit 1; fi
     681@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/skysphere.cc' object='skysphere.o' libtool=no @AMDEPBACKSLASH@
     682@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/skysphere.Po' tmpdepfile='$(DEPDIR)/skysphere.TPo' @AMDEPBACKSLASH@
     683@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     684@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o skysphere.o `test -f 'world_entities/skysphere.cc' || echo '$(srcdir)/'`world_entities/skysphere.cc
     685
     686skysphere.obj: world_entities/skysphere.cc
     687@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT skysphere.obj -MD -MP -MF "$(DEPDIR)/skysphere.Tpo" -c -o skysphere.obj `if test -f 'world_entities/skysphere.cc'; then $(CYGPATH_W) 'world_entities/skysphere.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/skysphere.cc'; fi`; \
     688@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/skysphere.Tpo" "$(DEPDIR)/skysphere.Po"; else rm -f "$(DEPDIR)/skysphere.Tpo"; exit 1; fi
     689@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/skysphere.cc' object='skysphere.obj' libtool=no @AMDEPBACKSLASH@
     690@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/skysphere.Po' tmpdepfile='$(DEPDIR)/skysphere.TPo' @AMDEPBACKSLASH@
     691@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     692@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o skysphere.obj `if test -f 'world_entities/skysphere.cc'; then $(CYGPATH_W) 'world_entities/skysphere.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/skysphere.cc'; fi`
     693
     694fontset.o: font/fontset.cc
     695@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fontset.o -MD -MP -MF "$(DEPDIR)/fontset.Tpo" -c -o fontset.o `test -f 'font/fontset.cc' || echo '$(srcdir)/'`font/fontset.cc; \
    664696@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/fontset.Tpo" "$(DEPDIR)/fontset.Po"; else rm -f "$(DEPDIR)/fontset.Tpo"; exit 1; fi
    665 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='sfont/fontset.cc' object='fontset.o' libtool=no @AMDEPBACKSLASH@
     697@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='font/fontset.cc' object='fontset.o' libtool=no @AMDEPBACKSLASH@
    666698@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/fontset.Po' tmpdepfile='$(DEPDIR)/fontset.TPo' @AMDEPBACKSLASH@
    667699@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    668 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fontset.o `test -f 'sfont/fontset.cc' || echo '$(srcdir)/'`sfont/fontset.cc
    669 
    670 fontset.obj: sfont/fontset.cc
    671 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fontset.obj -MD -MP -MF "$(DEPDIR)/fontset.Tpo" -c -o fontset.obj `if test -f 'sfont/fontset.cc'; then $(CYGPATH_W) 'sfont/fontset.cc'; else $(CYGPATH_W) '$(srcdir)/sfont/fontset.cc'; fi`; \
     700@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fontset.o `test -f 'font/fontset.cc' || echo '$(srcdir)/'`font/fontset.cc
     701
     702fontset.obj: font/fontset.cc
     703@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT fontset.obj -MD -MP -MF "$(DEPDIR)/fontset.Tpo" -c -o fontset.obj `if test -f 'font/fontset.cc'; then $(CYGPATH_W) 'font/fontset.cc'; else $(CYGPATH_W) '$(srcdir)/font/fontset.cc'; fi`; \
    672704@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/fontset.Tpo" "$(DEPDIR)/fontset.Po"; else rm -f "$(DEPDIR)/fontset.Tpo"; exit 1; fi
    673 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='sfont/fontset.cc' object='fontset.obj' libtool=no @AMDEPBACKSLASH@
     705@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='font/fontset.cc' object='fontset.obj' libtool=no @AMDEPBACKSLASH@
    674706@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/fontset.Po' tmpdepfile='$(DEPDIR)/fontset.TPo' @AMDEPBACKSLASH@
    675707@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    676 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fontset.obj `if test -f 'sfont/fontset.cc'; then $(CYGPATH_W) 'sfont/fontset.cc'; else $(CYGPATH_W) '$(srcdir)/sfont/fontset.cc'; fi`
     708@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o fontset.obj `if test -f 'font/fontset.cc'; then $(CYGPATH_W) 'font/fontset.cc'; else $(CYGPATH_W) '$(srcdir)/font/fontset.cc'; fi`
    677709uninstall-info-am:
    678710
    … …  
    798830
    799831distdir: $(DISTFILES)
    800         $(mkdir_p) $(distdir)/lib $(distdir)/mathlib $(distdir)/sfont $(distdir)/story_entities $(distdir)/world_entities
     832        $(mkdir_p) $(distdir)/defs $(distdir)/font $(distdir)/lib $(distdir)/mathlib $(distdir)/story_entities $(distdir)/world_entities
    801833        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    802834        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

  • orxonox/trunk/src/importer/array.h

    r3427 r3475  
    1111extern int verbose; //!< will be obsolete soon
    1212
    13 #include "../stdincl.h"
     13#include "stdincl.h"
    1414
    1515//! Array Class that handles dynamic-float arrays.

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

    r3427 r3475  
    1818#include <fstream>
    1919
    20 #include "../debug.h"
     20#include "debug.h"
    2121
    2222/**

  • orxonox/trunk/src/importer/texture.h

    r3454 r3475  
    1010#define _TEXTURE_H
    1111
    12 #include "../stdincl.h"
     12#include "stdincl.h"
    1313#ifdef HAVE_SDL_SDL_IMAGE_H
    1414#include <SDL/SDL_image.h>

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

    r3474 r3475  
    2828#include "skysphere.h"
    2929#include "light.h"
    30 #include "sfont/fontset.h"
     30#include "fontset.h"
    3131
    3232using namespace std;
Note: See TracChangeset for help on using the changeset viewer.