- Timestamp:
- Apr 25, 2005, 6:15:02 PM (20 years ago)
- Location:
- orxonox/branches/physics/src
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/branches/physics/src/Makefile.am
r3953 r3961 20 20 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/animation 21 21 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/common 22 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/physics 22 23 23 24 … … 74 75 util/common/list.cc \ 75 76 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 \ 76 82 lib/math/vector.cc \ 77 83 lib/math/curve.cc \ 78 glmenu/glmenu_imagescreen.cc 84 glmenu/glmenu_imagescreen.cc 79 85 80 86 noinst_HEADERS = orxonox.h \ … … 131 137 util/common/list_template.h \ 132 138 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 \ 133 144 lib/util/ini_parser.h \ 134 145 lib/math/vector.h \ -
orxonox/branches/physics/src/Makefile.in
r3953 r3961 70 70 texture.$(OBJEXT) base_entity.$(OBJEXT) base_object.$(OBJEXT) \ 71 71 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) 73 77 orxonox_OBJECTS = $(am_orxonox_OBJECTS) 74 78 orxonox_LDADD = $(LDADD) … … 91 95 @AMDEP_TRUE@ ./$(DEPDIR)/graphics_engine.Po \ 92 96 @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 \ 98 107 @AMDEP_TRUE@ ./$(DEPDIR)/player.Po \ 99 108 @AMDEP_TRUE@ ./$(DEPDIR)/primitive_model.Po \ … … 237 246 target_vendor = @target_vendor@ 238 247 MAINSRCDIR = . 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 248 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 -I$(MAINSRCDIR)/util/physics 240 249 AM_LDFLAGS = $(MWINDOWS) 241 250 orxonox_SOURCES = orxonox.cc \ … … 284 293 util/common/list.cc \ 285 294 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 \ 286 300 lib/math/vector.cc \ 287 301 lib/math/curve.cc \ 288 glmenu/glmenu_imagescreen.cc 302 glmenu/glmenu_imagescreen.cc 289 303 290 304 noinst_HEADERS = orxonox.h \ … … 341 355 util/common/list_template.h \ 342 356 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 \ 343 362 lib/util/ini_parser.h \ 344 363 lib/math/vector.h \ … … 444 463 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graphics_engine.Po@am__quote@ 445 464 @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@ 446 466 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ini_parser.Po@am__quote@ 447 467 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keynames.Po@am__quote@ … … 454 474 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox.Po@am__quote@ 455 475 @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@ 456 480 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player.Po@am__quote@ 457 481 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/primitive_model.Po@am__quote@ … … 1097 1121 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1098 1122 @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 1124 i_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 1132 i_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 1140 physics_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 1148 physics_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 1156 physical_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 1164 physical_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 1172 physical_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 1180 physical_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 1188 physical_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 1196 physical_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` 1099 1203 1100 1204 vector.o: lib/math/vector.cc … … 1268 1372 1269 1373 distdir: $(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_entities1374 $(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 1271 1375 @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ 1272 1376 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -
orxonox/branches/physics/src/util/physics/i_physics.cc
r3954 r3961 12 12 13 13 ### File Specific: 14 main-programmer: ...14 main-programmer: Patrick Boenzli 15 15 co-programmer: ... 16 16 */ 17 17 18 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_ WORLD_ENTITY18 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_PHYSICS 19 19 20 #include " proto_class.h"20 #include "i_physics.h" 21 21 22 #include "stdincl.h" // maybe22 #include "stdincl.h" 23 23 24 24 using namespace std; … … 27 27 /** 28 28 \brief standard constructor 29 \todo this constructor is not jet implemented - do it30 29 */ 31 ProtoClass::ProtoClass ()30 IPhysics::IPhysics () 32 31 { 33 this->setClassName (" ProtoClass");32 this->setClassName ("IPhysics"); 34 33 } 35 34 … … 39 38 40 39 */ 41 ProtoClass::~ProtoClass ()40 IPhysics::~IPhysics () 42 41 { 43 42 // delete what has to be deleted here 44 43 } 45 46 /**47 \brief nonsense - delete this method48 \param realy nothing to give49 \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 1 1 /*! 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 8 4 */ 9 5 10 #ifndef _ PROTO_CLASS_H11 #define _ PROTO_CLASS_H6 #ifndef _I_PHYSICS_H 7 #define _I_PHYSICS_H 12 8 13 #include "what realy has to be included"14 9 #include "base_object.h" 15 10 16 // FORWARD DEFINITION \\17 class someClassWeNeed;18 11 19 12 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 23 14 /** 24 15 here can be some longer description of this class 25 16 */ 26 class ProtoClass : public BaseObject {17 class IPhysics : public BaseObject { 27 18 28 19 public: 29 ProtoClass(); 30 virtual ~ProtoClass(); 31 32 bool doNonSense (int nothing); 20 IPhysics(); 21 virtual ~IPhysics(); 33 22 34 23 private: 35 int nonSense; //!< doxygen tag here like this for all the variables - delete this variable if you use this 24 36 25 37 26 }; 38 27 39 #endif /* _ PROTO_CLASS_H */28 #endif /* _I_PHYSICS_H */ -
orxonox/branches/physics/src/util/physics/physical_interaction.cc
r3954 r3961 12 12 13 13 ### File Specific: 14 main-programmer: ...14 main-programmer: Patrick Boenzli 15 15 co-programmer: ... 16 16 */ 17 17 18 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_ WORLD_ENTITY18 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_PHYSICS 19 19 20 #include "p roto_class.h"20 #include "physical_interaction.h" 21 21 22 #include "stdincl.h" // maybe22 #include "stdincl.h" 23 23 24 24 using namespace std; … … 27 27 /** 28 28 \brief standard constructor 29 \todo this constructor is not jet implemented - do it30 29 */ 31 P rotoClass::ProtoClass()30 PhysicalInteraction::PhysicalInteraction () 32 31 { 33 this->setClassName ("P rotoClass");32 this->setClassName ("PhysicalInteraction"); 34 33 } 35 34 … … 39 38 40 39 */ 41 P rotoClass::~ProtoClass()40 PhysicalInteraction::~PhysicalInteraction () 42 41 { 43 42 // delete what has to be deleted here 44 43 } 45 46 /**47 \brief nonsense - delete this method48 \param realy nothing to give49 \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 8 8 */ 9 9 10 #ifndef _P ROTO_CLASS_H11 #define _P ROTO_CLASS_H10 #ifndef _PHYSICAL_INTERACTION_H 11 #define _PHYSICAL_INTERACTION_H 12 12 13 #include "what realy has to be included" 13 14 14 #include "base_object.h" 15 15 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 23 17 /** 24 18 here can be some longer description of this class 25 19 */ 26 class P rotoClass: public BaseObject {20 class PhysicalInteraction : public BaseObject { 27 21 28 22 public: 29 ProtoClass(); 30 virtual ~ProtoClass(); 31 32 bool doNonSense (int nothing); 23 PhysicalInteraction(); 24 virtual ~PhysicalInteraction(); 33 25 34 26 private: 35 int nonSense; //!< doxygen tag here like this for all the variables - delete this variable if you use this36 27 37 28 }; 38 29 39 #endif /* _P ROTO_CLASS_H */30 #endif /* _PHYSICAL_INTERACTION_H */ -
orxonox/branches/physics/src/util/physics/physical_interaction_asym.cc
r3954 r3961 16 16 */ 17 17 18 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_ WORLD_ENTITY18 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_PHYSICS 19 19 20 #include "p roto_class.h"20 #include "physical_interaction_asym.h" 21 21 22 #include "stdincl.h" // maybe22 #include "stdincl.h" 23 23 24 24 using namespace std; … … 27 27 /** 28 28 \brief standard constructor 29 \todo this constructor is not jet implemented - do it30 29 */ 31 P rotoClass::ProtoClass()30 PhysicalInteractionAsym::PhysicalInteractionAsym () 32 31 { 33 this->setClassName ("P rotoClass");32 this->setClassName ("PhysicalInteractionAsym"); 34 33 } 35 34 … … 39 38 40 39 */ 41 P rotoClass::~ProtoClass()40 PhysicalInteractionAsym::~PhysicalInteractionAsym () 42 41 { 43 42 // delete what has to be deleted here 44 43 } 45 46 /**47 \brief nonsense - delete this method48 \param realy nothing to give49 \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 1 1 /*! 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 8 5 */ 9 6 10 #ifndef _P ROTO_CLASS_H11 #define _P ROTO_CLASS_H7 #ifndef _PHYSICAL_INTERACTION_ASYM_H 8 #define _PHYSICAL_INTERACTION_ASYM_H 12 9 13 #include "what realy has to be included"14 10 #include "base_object.h" 15 11 16 // FORWARD DEFINITION \\17 class someClassWeNeed;18 12 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 23 14 /** 24 here can be some longer description of this class15 forces, that only work in one firection 25 16 */ 26 class P rotoClass: public BaseObject {17 class PhysicalInteractionAsym : public BaseObject { 27 18 28 19 public: 29 ProtoClass(); 30 virtual ~ProtoClass(); 31 32 bool doNonSense (int nothing); 20 PhysicalInteractionAsym(); 21 virtual ~PhysicalInteractionAsym(); 33 22 34 23 private: 35 int nonSense; //!< doxygen tag here like this for all the variables - delete this variable if you use this36 24 37 25 }; 38 26 39 #endif /* _P ROTO_CLASS_H */27 #endif /* _PHYSICAL_INTERACTION_ASYM_H */ -
orxonox/branches/physics/src/util/physics/physical_interaction_sym.cc
r3954 r3961 12 12 13 13 ### File Specific: 14 main-programmer: ...14 main-programmer: Patrick Boenzli 15 15 co-programmer: ... 16 16 */ 17 17 18 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_ WORLD_ENTITY18 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_PHYSICS 19 19 20 #include "p roto_class.h"20 #include "physical_interaction_sym.h" 21 21 22 #include "stdincl.h" // maybe22 #include "stdincl.h" 23 23 24 24 using namespace std; … … 27 27 /** 28 28 \brief standard constructor 29 \todo this constructor is not jet implemented - do it30 29 */ 31 P rotoClass::ProtoClass()30 PhysicalInteractionSym::PhysicalInteractionSym () 32 31 { 33 this->setClassName ("P rotoClass");32 this->setClassName ("PhysicalInteractionSym"); 34 33 } 35 34 … … 39 38 40 39 */ 41 P rotoClass::~ProtoClass()40 PhysicalInteractionSym::~PhysicalInteractionSym () 42 41 { 43 42 // delete what has to be deleted here 44 43 } 45 46 /**47 \brief nonsense - delete this method48 \param realy nothing to give49 \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 1 1 /*! 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 8 4 */ 9 5 10 #ifndef _P ROTO_CLASS_H11 #define _P ROTO_CLASS_H6 #ifndef _PHYSICAL_INTERACTION_SYM_H 7 #define _PHYSICAL_INTERACTION_SYM_H 12 8 13 #include "what realy has to be included"14 9 #include "base_object.h" 15 10 16 // FORWARD DEFINITION \\ 17 class someClassWeNeed; 11 12 //! A symmetrical physical interaction 13 /** 14 eg. this can be a spring 15 */ 16 class PhysicalInteractionSym : public BaseObject { 17 18 public: 19 PhysicalInteractionSym(); 20 virtual ~PhysicalInteractionSym(); 18 21 19 22 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 class23 /**24 here can be some longer description of this class25 */26 class ProtoClass : public BaseObject {27 28 public:29 ProtoClass();30 virtual ~ProtoClass();31 32 bool doNonSense (int nothing);33 34 23 private: 35 int nonSense; //!< doxygen tag here like this for all the variables - delete this variable if you use this36 24 37 25 }; 38 26 39 #endif /* _PROTO_CLASS_H */ 27 28 #endif /* _PHYSICAL_INTERACTION_SYM_H */
Note: See TracChangeset
for help on using the changeset viewer.