Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3961 in orxonox.OLD


Ignore:
Timestamp:
Apr 25, 2005, 6:15:02 PM (19 years ago)
Author:
patrick
Message:

orxonox/branches/physics: just implemented the class hirarchy of the physics engine

Location:
orxonox/branches/physics/src
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/physics/src/Makefile.am

    r3953 r3961  
    2020AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/animation
    2121AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/common
     22AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/physics
    2223
    2324
    … …  
    7475                 util/common/list.cc \
    7576                 util/resource_manager.cc \
     77                 util/physics/i_physics.cc \
     78                 util/physics/physics_engine.cc \
     79                 util/physics/physical_interaction.cc \
     80                 util/physics/physical_interaction_sym.cc \
     81                 util/physics/physical_interaction_asym.cc \
    7682                 lib/math/vector.cc \
    7783                 lib/math/curve.cc \
    78                  glmenu/glmenu_imagescreen.cc 
     84                 glmenu/glmenu_imagescreen.cc
    7985
    8086noinst_HEADERS = orxonox.h \
    … …  
    131137                 util/common/list_template.h \
    132138                 util/resource_manager.h \
     139                 util/physics/i_physics.h \
     140                 util/physics/physics_engine.h \
     141                 util/physics/physical_interaction.h \
     142                 util/physics/physical_interaction_sym.h \
     143                 util/physics/physical_interaction_asym.h \
    133144                 lib/util/ini_parser.h \
    134145                 lib/math/vector.h \

  • orxonox/branches/physics/src/Makefile.in

    r3953 r3961  
    7070        texture.$(OBJEXT) base_entity.$(OBJEXT) base_object.$(OBJEXT) \
    7171        ini_parser.$(OBJEXT) list.$(OBJEXT) resource_manager.$(OBJEXT) \
    72         vector.$(OBJEXT) curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT)
     72        i_physics.$(OBJEXT) physics_engine.$(OBJEXT) \
     73        physical_interaction.$(OBJEXT) \
     74        physical_interaction_sym.$(OBJEXT) \
     75        physical_interaction_asym.$(OBJEXT) vector.$(OBJEXT) \
     76        curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT)
    7377orxonox_OBJECTS = $(am_orxonox_OBJECTS)
    7478orxonox_LDADD = $(LDADD)
    … …  
    9195@AMDEP_TRUE@    ./$(DEPDIR)/graphics_engine.Po \
    9296@AMDEP_TRUE@    ./$(DEPDIR)/helper_parent.Po \
    93 @AMDEP_TRUE@    ./$(DEPDIR)/ini_parser.Po ./$(DEPDIR)/keynames.Po \
    94 @AMDEP_TRUE@    ./$(DEPDIR)/light.Po ./$(DEPDIR)/list.Po \
    95 @AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/model.Po \
    96 @AMDEP_TRUE@    ./$(DEPDIR)/null_parent.Po ./$(DEPDIR)/objModel.Po \
    97 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox.Po ./$(DEPDIR)/p_node.Po \
     97@AMDEP_TRUE@    ./$(DEPDIR)/i_physics.Po ./$(DEPDIR)/ini_parser.Po \
     98@AMDEP_TRUE@    ./$(DEPDIR)/keynames.Po ./$(DEPDIR)/light.Po \
     99@AMDEP_TRUE@    ./$(DEPDIR)/list.Po ./$(DEPDIR)/material.Po \
     100@AMDEP_TRUE@    ./$(DEPDIR)/model.Po ./$(DEPDIR)/null_parent.Po \
     101@AMDEP_TRUE@    ./$(DEPDIR)/objModel.Po ./$(DEPDIR)/orxonox.Po \
     102@AMDEP_TRUE@    ./$(DEPDIR)/p_node.Po \
     103@AMDEP_TRUE@    ./$(DEPDIR)/physical_interaction.Po \
     104@AMDEP_TRUE@    ./$(DEPDIR)/physical_interaction_asym.Po \
     105@AMDEP_TRUE@    ./$(DEPDIR)/physical_interaction_sym.Po \
     106@AMDEP_TRUE@    ./$(DEPDIR)/physics_engine.Po \
    98107@AMDEP_TRUE@    ./$(DEPDIR)/player.Po \
    99108@AMDEP_TRUE@    ./$(DEPDIR)/primitive_model.Po \
    … …  
    237246target_vendor = @target_vendor@
    238247MAINSRCDIR = .
    239 AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common
     248AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common -I$(MAINSRCDIR)/util/physics
    240249AM_LDFLAGS = $(MWINDOWS)
    241250orxonox_SOURCES = orxonox.cc \
    … …  
    284293                 util/common/list.cc \
    285294                 util/resource_manager.cc \
     295                 util/physics/i_physics.cc \
     296                 util/physics/physics_engine.cc \
     297                 util/physics/physical_interaction.cc \
     298                 util/physics/physical_interaction_sym.cc \
     299                 util/physics/physical_interaction_asym.cc \
    286300                 lib/math/vector.cc \
    287301                 lib/math/curve.cc \
    288                  glmenu/glmenu_imagescreen.cc 
     302                 glmenu/glmenu_imagescreen.cc
    289303
    290304noinst_HEADERS = orxonox.h \
    … …  
    341355                 util/common/list_template.h \
    342356                 util/resource_manager.h \
     357                 util/physics/i_physics.h \
     358                 util/physics/physics_engine.h \
     359                 util/physics/physical_interaction.h \
     360                 util/physics/physical_interaction_sym.h \
     361                 util/physics/physical_interaction_asym.h \
    343362                 lib/util/ini_parser.h \
    344363                 lib/math/vector.h \
    … …  
    444463@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graphics_engine.Po@am__quote@
    445464@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helper_parent.Po@am__quote@
     465@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i_physics.Po@am__quote@
    446466@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ini_parser.Po@am__quote@
    447467@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keynames.Po@am__quote@
    … …  
    454474@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox.Po@am__quote@
    455475@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/p_node.Po@am__quote@
     476@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/physical_interaction.Po@am__quote@
     477@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/physical_interaction_asym.Po@am__quote@
     478@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/physical_interaction_sym.Po@am__quote@
     479@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/physics_engine.Po@am__quote@
    456480@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player.Po@am__quote@
    457481@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/primitive_model.Po@am__quote@
    … …  
    10971121@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    10981122@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resource_manager.obj `if test -f 'util/resource_manager.cc'; then $(CYGPATH_W) 'util/resource_manager.cc'; else $(CYGPATH_W) '$(srcdir)/util/resource_manager.cc'; fi`
     1123
     1124i_physics.o: util/physics/i_physics.cc
     1125@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT i_physics.o -MD -MP -MF "$(DEPDIR)/i_physics.Tpo" -c -o i_physics.o `test -f 'util/physics/i_physics.cc' || echo '$(srcdir)/'`util/physics/i_physics.cc; \
     1126@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/i_physics.Tpo" "$(DEPDIR)/i_physics.Po"; else rm -f "$(DEPDIR)/i_physics.Tpo"; exit 1; fi
     1127@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/physics/i_physics.cc' object='i_physics.o' libtool=no @AMDEPBACKSLASH@
     1128@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/i_physics.Po' tmpdepfile='$(DEPDIR)/i_physics.TPo' @AMDEPBACKSLASH@
     1129@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1130@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o i_physics.o `test -f 'util/physics/i_physics.cc' || echo '$(srcdir)/'`util/physics/i_physics.cc
     1131
     1132i_physics.obj: util/physics/i_physics.cc
     1133@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT i_physics.obj -MD -MP -MF "$(DEPDIR)/i_physics.Tpo" -c -o i_physics.obj `if test -f 'util/physics/i_physics.cc'; then $(CYGPATH_W) 'util/physics/i_physics.cc'; else $(CYGPATH_W) '$(srcdir)/util/physics/i_physics.cc'; fi`; \
     1134@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/i_physics.Tpo" "$(DEPDIR)/i_physics.Po"; else rm -f "$(DEPDIR)/i_physics.Tpo"; exit 1; fi
     1135@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/physics/i_physics.cc' object='i_physics.obj' libtool=no @AMDEPBACKSLASH@
     1136@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/i_physics.Po' tmpdepfile='$(DEPDIR)/i_physics.TPo' @AMDEPBACKSLASH@
     1137@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1138@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o i_physics.obj `if test -f 'util/physics/i_physics.cc'; then $(CYGPATH_W) 'util/physics/i_physics.cc'; else $(CYGPATH_W) '$(srcdir)/util/physics/i_physics.cc'; fi`
     1139
     1140physics_engine.o: util/physics/physics_engine.cc
     1141@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT physics_engine.o -MD -MP -MF "$(DEPDIR)/physics_engine.Tpo" -c -o physics_engine.o `test -f 'util/physics/physics_engine.cc' || echo '$(srcdir)/'`util/physics/physics_engine.cc; \
     1142@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/physics_engine.Tpo" "$(DEPDIR)/physics_engine.Po"; else rm -f "$(DEPDIR)/physics_engine.Tpo"; exit 1; fi
     1143@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/physics/physics_engine.cc' object='physics_engine.o' libtool=no @AMDEPBACKSLASH@
     1144@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/physics_engine.Po' tmpdepfile='$(DEPDIR)/physics_engine.TPo' @AMDEPBACKSLASH@
     1145@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1146@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o physics_engine.o `test -f 'util/physics/physics_engine.cc' || echo '$(srcdir)/'`util/physics/physics_engine.cc
     1147
     1148physics_engine.obj: util/physics/physics_engine.cc
     1149@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT physics_engine.obj -MD -MP -MF "$(DEPDIR)/physics_engine.Tpo" -c -o physics_engine.obj `if test -f 'util/physics/physics_engine.cc'; then $(CYGPATH_W) 'util/physics/physics_engine.cc'; else $(CYGPATH_W) '$(srcdir)/util/physics/physics_engine.cc'; fi`; \
     1150@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/physics_engine.Tpo" "$(DEPDIR)/physics_engine.Po"; else rm -f "$(DEPDIR)/physics_engine.Tpo"; exit 1; fi
     1151@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/physics/physics_engine.cc' object='physics_engine.obj' libtool=no @AMDEPBACKSLASH@
     1152@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/physics_engine.Po' tmpdepfile='$(DEPDIR)/physics_engine.TPo' @AMDEPBACKSLASH@
     1153@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1154@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o physics_engine.obj `if test -f 'util/physics/physics_engine.cc'; then $(CYGPATH_W) 'util/physics/physics_engine.cc'; else $(CYGPATH_W) '$(srcdir)/util/physics/physics_engine.cc'; fi`
     1155
     1156physical_interaction.o: util/physics/physical_interaction.cc
     1157@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT physical_interaction.o -MD -MP -MF "$(DEPDIR)/physical_interaction.Tpo" -c -o physical_interaction.o `test -f 'util/physics/physical_interaction.cc' || echo '$(srcdir)/'`util/physics/physical_interaction.cc; \
     1158@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/physical_interaction.Tpo" "$(DEPDIR)/physical_interaction.Po"; else rm -f "$(DEPDIR)/physical_interaction.Tpo"; exit 1; fi
     1159@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/physics/physical_interaction.cc' object='physical_interaction.o' libtool=no @AMDEPBACKSLASH@
     1160@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/physical_interaction.Po' tmpdepfile='$(DEPDIR)/physical_interaction.TPo' @AMDEPBACKSLASH@
     1161@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1162@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o physical_interaction.o `test -f 'util/physics/physical_interaction.cc' || echo '$(srcdir)/'`util/physics/physical_interaction.cc
     1163
     1164physical_interaction.obj: util/physics/physical_interaction.cc
     1165@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT physical_interaction.obj -MD -MP -MF "$(DEPDIR)/physical_interaction.Tpo" -c -o physical_interaction.obj `if test -f 'util/physics/physical_interaction.cc'; then $(CYGPATH_W) 'util/physics/physical_interaction.cc'; else $(CYGPATH_W) '$(srcdir)/util/physics/physical_interaction.cc'; fi`; \
     1166@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/physical_interaction.Tpo" "$(DEPDIR)/physical_interaction.Po"; else rm -f "$(DEPDIR)/physical_interaction.Tpo"; exit 1; fi
     1167@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/physics/physical_interaction.cc' object='physical_interaction.obj' libtool=no @AMDEPBACKSLASH@
     1168@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/physical_interaction.Po' tmpdepfile='$(DEPDIR)/physical_interaction.TPo' @AMDEPBACKSLASH@
     1169@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1170@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o physical_interaction.obj `if test -f 'util/physics/physical_interaction.cc'; then $(CYGPATH_W) 'util/physics/physical_interaction.cc'; else $(CYGPATH_W) '$(srcdir)/util/physics/physical_interaction.cc'; fi`
     1171
     1172physical_interaction_sym.o: util/physics/physical_interaction_sym.cc
     1173@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT physical_interaction_sym.o -MD -MP -MF "$(DEPDIR)/physical_interaction_sym.Tpo" -c -o physical_interaction_sym.o `test -f 'util/physics/physical_interaction_sym.cc' || echo '$(srcdir)/'`util/physics/physical_interaction_sym.cc; \
     1174@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/physical_interaction_sym.Tpo" "$(DEPDIR)/physical_interaction_sym.Po"; else rm -f "$(DEPDIR)/physical_interaction_sym.Tpo"; exit 1; fi
     1175@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/physics/physical_interaction_sym.cc' object='physical_interaction_sym.o' libtool=no @AMDEPBACKSLASH@
     1176@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/physical_interaction_sym.Po' tmpdepfile='$(DEPDIR)/physical_interaction_sym.TPo' @AMDEPBACKSLASH@
     1177@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1178@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o physical_interaction_sym.o `test -f 'util/physics/physical_interaction_sym.cc' || echo '$(srcdir)/'`util/physics/physical_interaction_sym.cc
     1179
     1180physical_interaction_sym.obj: util/physics/physical_interaction_sym.cc
     1181@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT physical_interaction_sym.obj -MD -MP -MF "$(DEPDIR)/physical_interaction_sym.Tpo" -c -o physical_interaction_sym.obj `if test -f 'util/physics/physical_interaction_sym.cc'; then $(CYGPATH_W) 'util/physics/physical_interaction_sym.cc'; else $(CYGPATH_W) '$(srcdir)/util/physics/physical_interaction_sym.cc'; fi`; \
     1182@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/physical_interaction_sym.Tpo" "$(DEPDIR)/physical_interaction_sym.Po"; else rm -f "$(DEPDIR)/physical_interaction_sym.Tpo"; exit 1; fi
     1183@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/physics/physical_interaction_sym.cc' object='physical_interaction_sym.obj' libtool=no @AMDEPBACKSLASH@
     1184@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/physical_interaction_sym.Po' tmpdepfile='$(DEPDIR)/physical_interaction_sym.TPo' @AMDEPBACKSLASH@
     1185@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1186@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o physical_interaction_sym.obj `if test -f 'util/physics/physical_interaction_sym.cc'; then $(CYGPATH_W) 'util/physics/physical_interaction_sym.cc'; else $(CYGPATH_W) '$(srcdir)/util/physics/physical_interaction_sym.cc'; fi`
     1187
     1188physical_interaction_asym.o: util/physics/physical_interaction_asym.cc
     1189@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT physical_interaction_asym.o -MD -MP -MF "$(DEPDIR)/physical_interaction_asym.Tpo" -c -o physical_interaction_asym.o `test -f 'util/physics/physical_interaction_asym.cc' || echo '$(srcdir)/'`util/physics/physical_interaction_asym.cc; \
     1190@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/physical_interaction_asym.Tpo" "$(DEPDIR)/physical_interaction_asym.Po"; else rm -f "$(DEPDIR)/physical_interaction_asym.Tpo"; exit 1; fi
     1191@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/physics/physical_interaction_asym.cc' object='physical_interaction_asym.o' libtool=no @AMDEPBACKSLASH@
     1192@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/physical_interaction_asym.Po' tmpdepfile='$(DEPDIR)/physical_interaction_asym.TPo' @AMDEPBACKSLASH@
     1193@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1194@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o physical_interaction_asym.o `test -f 'util/physics/physical_interaction_asym.cc' || echo '$(srcdir)/'`util/physics/physical_interaction_asym.cc
     1195
     1196physical_interaction_asym.obj: util/physics/physical_interaction_asym.cc
     1197@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT physical_interaction_asym.obj -MD -MP -MF "$(DEPDIR)/physical_interaction_asym.Tpo" -c -o physical_interaction_asym.obj `if test -f 'util/physics/physical_interaction_asym.cc'; then $(CYGPATH_W) 'util/physics/physical_interaction_asym.cc'; else $(CYGPATH_W) '$(srcdir)/util/physics/physical_interaction_asym.cc'; fi`; \
     1198@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/physical_interaction_asym.Tpo" "$(DEPDIR)/physical_interaction_asym.Po"; else rm -f "$(DEPDIR)/physical_interaction_asym.Tpo"; exit 1; fi
     1199@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/physics/physical_interaction_asym.cc' object='physical_interaction_asym.obj' libtool=no @AMDEPBACKSLASH@
     1200@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/physical_interaction_asym.Po' tmpdepfile='$(DEPDIR)/physical_interaction_asym.TPo' @AMDEPBACKSLASH@
     1201@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1202@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o physical_interaction_asym.obj `if test -f 'util/physics/physical_interaction_asym.cc'; then $(CYGPATH_W) 'util/physics/physical_interaction_asym.cc'; else $(CYGPATH_W) '$(srcdir)/util/physics/physical_interaction_asym.cc'; fi`
    10991203
    11001204vector.o: lib/math/vector.cc
    … …  
    12681372
    12691373distdir: $(DISTFILES)
    1270         $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/graphics $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/network $(distdir)/proto $(distdir)/story_entities $(distdir)/util $(distdir)/util/animation $(distdir)/util/common $(distdir)/world_entities
     1374        $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/graphics $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/network $(distdir)/proto $(distdir)/story_entities $(distdir)/util $(distdir)/util/animation $(distdir)/util/common $(distdir)/util/physics $(distdir)/world_entities
    12711375        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    12721376        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

  • orxonox/branches/physics/src/util/physics/i_physics.cc

    r3954 r3961  
    1212
    1313   ### File Specific:
    14    main-programmer: ...
     14   main-programmer: Patrick Boenzli
    1515   co-programmer: ...
    1616*/
    1717
    18 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
     18#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_PHYSICS
    1919
    20 #include "proto_class.h"
     20#include "i_physics.h"
    2121
    22 #include "stdincl.h" // maybe
     22#include "stdincl.h"
    2323
    2424using namespace std;
    … …  
    2727/**
    2828   \brief standard constructor
    29    \todo this constructor is not jet implemented - do it
    3029*/
    31 ProtoClass::ProtoClass ()
     30IPhysics::IPhysics ()
    3231{
    33    this->setClassName ("ProtoClass");
     32   this->setClassName ("IPhysics");
    3433}
    3534
    … …  
    3938
    4039*/
    41 ProtoClass::~ProtoClass ()
     40IPhysics::~IPhysics ()
    4241{
    4342  // delete what has to be deleted here
    4443}
    45 
    46 /**
    47    \brief nonsense - delete this method
    48    \param realy nothing to give
    49    \returns true or false - probably nothing?
    50 
    51    this is just to show the doxygen abilities (this for example is an extension for a long comment)
    52 */
    53 bool ProtoClass::doNonSense (int nothing) {}

  • orxonox/branches/physics/src/util/physics/i_physics.h

    r3954 r3961  
    11/*!
    2     \file proto_class.h
    3     \brief Definition of the proto class template, used quickly start work
    4     \todo Example: this shows how to use simply add a Marker that here has to be done something.
    5 
    6     The Protoclass exists, to help you quikly getting the run for how to develop in orxonox.
    7     It is an example for the CODING-CONVENTION, and a starting-point for every class.
     2    \file i_physics.h
     3    \brief a physics interface
    84*/
    95
    10 #ifndef _PROTO_CLASS_H
    11 #define _PROTO_CLASS_H
     6#ifndef _I_PHYSICS_H
     7#define _I_PHYSICS_H
    128
    13 #include "what realy has to be included"
    149#include "base_object.h"
    1510
    16 // FORWARD DEFINITION \\
    17 class someClassWeNeed;
    1811
    1912
    20 /*class Test;*/ /* forward definition of class Test (without including it here!)*/
    21 
    22 //! A default class that aids you to start creating a new class
     13//! A Physics interface
    2314/**
    2415   here can be some longer description of this class
    2516*/
    26 class ProtoClass : public BaseObject {
     17class IPhysics : public BaseObject {
    2718
    2819 public:
    29   ProtoClass();
    30   virtual ~ProtoClass();
    31 
    32   bool doNonSense (int nothing);
     20  IPhysics();
     21  virtual ~IPhysics();
    3322
    3423 private:
    35   int nonSense;  //!< doxygen tag here like this for all the variables - delete this variable if you use this
     24
    3625
    3726};
    3827
    39 #endif /* _PROTO_CLASS_H */
     28#endif /* _I_PHYSICS_H */

  • orxonox/branches/physics/src/util/physics/physical_interaction.cc

    r3954 r3961  
    1212
    1313   ### File Specific:
    14    main-programmer: ...
     14   main-programmer: Patrick Boenzli
    1515   co-programmer: ...
    1616*/
    1717
    18 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
     18#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_PHYSICS
    1919
    20 #include "proto_class.h"
     20#include "physical_interaction.h"
    2121
    22 #include "stdincl.h" // maybe
     22#include "stdincl.h"
    2323
    2424using namespace std;
    … …  
    2727/**
    2828   \brief standard constructor
    29    \todo this constructor is not jet implemented - do it
    3029*/
    31 ProtoClass::ProtoClass ()
     30PhysicalInteraction::PhysicalInteraction ()
    3231{
    33    this->setClassName ("ProtoClass");
     32   this->setClassName ("PhysicalInteraction");
    3433}
    3534
    … …  
    3938
    4039*/
    41 ProtoClass::~ProtoClass ()
     40PhysicalInteraction::~PhysicalInteraction ()
    4241{
    4342  // delete what has to be deleted here
    4443}
    45 
    46 /**
    47    \brief nonsense - delete this method
    48    \param realy nothing to give
    49    \returns true or false - probably nothing?
    50 
    51    this is just to show the doxygen abilities (this for example is an extension for a long comment)
    52 */
    53 bool ProtoClass::doNonSense (int nothing) {}

  • orxonox/branches/physics/src/util/physics/physical_interaction.h

    r3954 r3961  
    88*/
    99
    10 #ifndef _PROTO_CLASS_H
    11 #define _PROTO_CLASS_H
     10#ifndef _PHYSICAL_INTERACTION_H
     11#define _PHYSICAL_INTERACTION_H
    1212
    13 #include "what realy has to be included"
     13
    1414#include "base_object.h"
    1515
    16 // FORWARD DEFINITION \\
    17 class someClassWeNeed;
    18 
    19 
    20 /*class Test;*/ /* forward definition of class Test (without including it here!)*/
    21 
    22 //! A default class that aids you to start creating a new class
     16//! An abstract definition of a physics relation
    2317/**
    2418   here can be some longer description of this class
    2519*/
    26 class ProtoClass : public BaseObject {
     20class PhysicalInteraction : public BaseObject {
    2721
    2822 public:
    29   ProtoClass();
    30   virtual ~ProtoClass();
    31 
    32   bool doNonSense (int nothing);
     23  PhysicalInteraction();
     24  virtual ~PhysicalInteraction();
    3325
    3426 private:
    35   int nonSense;  //!< doxygen tag here like this for all the variables - delete this variable if you use this
    3627
    3728};
    3829
    39 #endif /* _PROTO_CLASS_H */
     30#endif /* _PHYSICAL_INTERACTION_H */

  • orxonox/branches/physics/src/util/physics/physical_interaction_asym.cc

    r3954 r3961  
    1616*/
    1717
    18 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
     18#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_PHYSICS
    1919
    20 #include "proto_class.h"
     20#include "physical_interaction_asym.h"
    2121
    22 #include "stdincl.h" // maybe
     22#include "stdincl.h"
    2323
    2424using namespace std;
    … …  
    2727/**
    2828   \brief standard constructor
    29    \todo this constructor is not jet implemented - do it
    3029*/
    31 ProtoClass::ProtoClass ()
     30PhysicalInteractionAsym::PhysicalInteractionAsym ()
    3231{
    33    this->setClassName ("ProtoClass");
     32   this->setClassName ("PhysicalInteractionAsym");
    3433}
    3534
    … …  
    3938
    4039*/
    41 ProtoClass::~ProtoClass ()
     40PhysicalInteractionAsym::~PhysicalInteractionAsym ()
    4241{
    4342  // delete what has to be deleted here
    4443}
    45 
    46 /**
    47    \brief nonsense - delete this method
    48    \param realy nothing to give
    49    \returns true or false - probably nothing?
    50 
    51    this is just to show the doxygen abilities (this for example is an extension for a long comment)
    52 */
    53 bool ProtoClass::doNonSense (int nothing) {}

  • orxonox/branches/physics/src/util/physics/physical_interaction_asym.h

    r3954 r3961  
    11/*!
    2     \file proto_class.h
    3     \brief Definition of the proto class template, used quickly start work
    4     \todo Example: this shows how to use simply add a Marker that here has to be done something.
    5 
    6     The Protoclass exists, to help you quikly getting the run for how to develop in orxonox.
    7     It is an example for the CODING-CONVENTION, and a starting-point for every class.
     2    \file physical_interaction_asym.h
     3    \brief Definition a asymmertrical physical interaction like force field that (in our implementation)
     4    hast no reactio
    85*/
    96
    10 #ifndef _PROTO_CLASS_H
    11 #define _PROTO_CLASS_H
     7#ifndef _PHYSICAL_INTERACTION_ASYM_H
     8#define _PHYSICAL_INTERACTION_ASYM_H
    129
    13 #include "what realy has to be included"
    1410#include "base_object.h"
    1511
    16 // FORWARD DEFINITION \\
    17 class someClassWeNeed;
    1812
    19 
    20 /*class Test;*/ /* forward definition of class Test (without including it here!)*/
    21 
    22 //! A default class that aids you to start creating a new class
     13//! An asymmetrical force
    2314/**
    24    here can be some longer description of this class
     15   forces, that only work in one firection
    2516*/
    26 class ProtoClass : public BaseObject {
     17class PhysicalInteractionAsym : public BaseObject {
    2718
    2819 public:
    29   ProtoClass();
    30   virtual ~ProtoClass();
    31 
    32   bool doNonSense (int nothing);
     20  PhysicalInteractionAsym();
     21  virtual ~PhysicalInteractionAsym();
    3322
    3423 private:
    35   int nonSense;  //!< doxygen tag here like this for all the variables - delete this variable if you use this
    3624
    3725};
    3826
    39 #endif /* _PROTO_CLASS_H */
     27#endif /* _PHYSICAL_INTERACTION_ASYM_H */

  • orxonox/branches/physics/src/util/physics/physical_interaction_sym.cc

    r3954 r3961  
    1212
    1313   ### File Specific:
    14    main-programmer: ...
     14   main-programmer: Patrick Boenzli
    1515   co-programmer: ...
    1616*/
    1717
    18 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
     18#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_PHYSICS
    1919
    20 #include "proto_class.h"
     20#include "physical_interaction_sym.h"
    2121
    22 #include "stdincl.h" // maybe
     22#include "stdincl.h"
    2323
    2424using namespace std;
    … …  
    2727/**
    2828   \brief standard constructor
    29    \todo this constructor is not jet implemented - do it
    3029*/
    31 ProtoClass::ProtoClass ()
     30PhysicalInteractionSym::PhysicalInteractionSym ()
    3231{
    33    this->setClassName ("ProtoClass");
     32   this->setClassName ("PhysicalInteractionSym");
    3433}
    3534
    … …  
    3938
    4039*/
    41 ProtoClass::~ProtoClass ()
     40PhysicalInteractionSym::~PhysicalInteractionSym ()
    4241{
    4342  // delete what has to be deleted here
    4443}
    45 
    46 /**
    47    \brief nonsense - delete this method
    48    \param realy nothing to give
    49    \returns true or false - probably nothing?
    50 
    51    this is just to show the doxygen abilities (this for example is an extension for a long comment)
    52 */
    53 bool ProtoClass::doNonSense (int nothing) {}

  • orxonox/branches/physics/src/util/physics/physical_interaction_sym.h

    r3954 r3961  
    11/*!
    2     \file proto_class.h
    3     \brief Definition of the proto class template, used quickly start work
    4     \todo Example: this shows how to use simply add a Marker that here has to be done something.
    5 
    6     The Protoclass exists, to help you quikly getting the run for how to develop in orxonox.
    7     It is an example for the CODING-CONVENTION, and a starting-point for every class.
     2    \file physical_interaction_sym.h
     3    \brief this defines a symmetrical interaction like a spring force on both ends
    84*/
    95
    10 #ifndef _PROTO_CLASS_H
    11 #define _PROTO_CLASS_H
     6#ifndef _PHYSICAL_INTERACTION_SYM_H
     7#define _PHYSICAL_INTERACTION_SYM_H
    128
    13 #include "what realy has to be included"
    149#include "base_object.h"
    1510
    16 // FORWARD DEFINITION \\
    17 class someClassWeNeed;
     11
     12//! A symmetrical physical interaction
     13/**
     14   eg. this can be a spring
     15*/
     16class PhysicalInteractionSym : public BaseObject {
     17
     18 public:
     19  PhysicalInteractionSym();
     20  virtual ~PhysicalInteractionSym();
    1821
    1922
    20 /*class Test;*/ /* forward definition of class Test (without including it here!)*/
    21 
    22 //! A default class that aids you to start creating a new class
    23 /**
    24    here can be some longer description of this class
    25 */
    26 class ProtoClass : public BaseObject {
    27 
    28  public:
    29   ProtoClass();
    30   virtual ~ProtoClass();
    31 
    32   bool doNonSense (int nothing);
    33 
    3423 private:
    35   int nonSense;  //!< doxygen tag here like this for all the variables - delete this variable if you use this
    3624
    3725};
    3826
    39 #endif /* _PROTO_CLASS_H */
     27
     28#endif /* _PHYSICAL_INTERACTION_SYM_H */
Note: See TracChangeset for help on using the changeset viewer.