Merge pull request #1 from CodingJonas/master

updates von Jonas
CodingJonas · Jan 8, 2018 · a6832ef · a6832ef
2 parents a5d6654 + f269c47
commit a6832ef
Show file tree

Hide file tree

Showing 63 changed files with 67 additions and 63 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,3 +34,6 @@
 # Jonas added that
 *.depend
 *-bin
+export/*
+.torcs.rc
+src/libs/txml/gennmtab/gennmtab
diff --git a/.torcs.rc b/.torcs.rc
@@ -1,2 +1,2 @@
-TORCS_BASE = /home/michaelheinrich/github/torcs-1.3.7
-MAKE_DEFAULT = /home/michaelheinrich/github/torcs-1.3.7/Make-default.mk
+TORCS_BASE = /home/jonas/torcs/torcs-1.3.7
+MAKE_DEFAULT = /home/jonas/torcs/torcs-1.3.7/Make-default.mk
diff --git a/export/include/3D/Basic.h b/export/include/3D/Basic.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Basic.h
+/home/jonas/torcs/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Basic.h
diff --git a/export/include/3D/Matrix.h b/export/include/3D/Matrix.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Matrix.h
+/home/jonas/torcs/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Matrix.h
diff --git a/export/include/3D/Point.h b/export/include/3D/Point.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Point.h
+/home/jonas/torcs/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Point.h
diff --git a/export/include/3D/Quaternion.h b/export/include/3D/Quaternion.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Quaternion.h
+/home/jonas/torcs/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Quaternion.h
diff --git a/export/include/3D/Tuple3.h b/export/include/3D/Tuple3.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Tuple3.h
+/home/jonas/torcs/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Tuple3.h
diff --git a/export/include/3D/Tuple4.h b/export/include/3D/Tuple4.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Tuple4.h
+/home/jonas/torcs/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Tuple4.h
diff --git a/export/include/3D/Vector.h b/export/include/3D/Vector.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Vector.h
+/home/jonas/torcs/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Vector.h
diff --git a/export/include/SOLID/solid.h b/export/include/SOLID/solid.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/SOLID/solid.h
+/home/jonas/torcs/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/SOLID/solid.h
diff --git a/export/include/car.h b/export/include/car.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/interfaces/car.h
+/home/jonas/torcs/torcs-1.3.7/src/interfaces/car.h
diff --git a/export/include/client.h b/export/include/client.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/client/client.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/client/client.h
diff --git a/export/include/controlconfig.h b/export/include/controlconfig.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/confscreens/controlconfig.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/confscreens/controlconfig.h
diff --git a/export/include/driverconfig.h b/export/include/driverconfig.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/confscreens/driverconfig.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/confscreens/driverconfig.h
diff --git a/export/include/exitmenu.h b/export/include/exitmenu.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/client/exitmenu.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/client/exitmenu.h
diff --git a/export/include/glfeatures.h b/export/include/glfeatures.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/tgfclient/glfeatures.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/tgfclient/glfeatures.h
diff --git a/export/include/graphconfig.h b/export/include/graphconfig.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/confscreens/graphconfig.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/confscreens/graphconfig.h
diff --git a/export/include/graphic.h b/export/include/graphic.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/interfaces/graphic.h
+/home/jonas/torcs/torcs-1.3.7/src/interfaces/graphic.h
diff --git a/export/include/joystickconfig.h b/export/include/joystickconfig.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/confscreens/joystickconfig.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/confscreens/joystickconfig.h
diff --git a/export/include/learning/ANN.h b/export/include/learning/ANN.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/learning/ANN.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/learning/ANN.h
diff --git a/export/include/learning/Distribution.h b/export/include/learning/Distribution.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/learning/Distribution.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/learning/Distribution.h
diff --git a/export/include/learning/List.h b/export/include/learning/List.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/learning/List.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/learning/List.h
diff --git a/export/include/learning/MathFunctions.h b/export/include/learning/MathFunctions.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/learning/MathFunctions.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/learning/MathFunctions.h
diff --git a/export/include/learning/ann_policy.h b/export/include/learning/ann_policy.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/learning/ann_policy.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/learning/ann_policy.h
diff --git a/export/include/learning/learn_debug.h b/export/include/learning/learn_debug.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/learning/learn_debug.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/learning/learn_debug.h
diff --git a/export/include/learning/policy.h b/export/include/learning/policy.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/learning/policy.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/learning/policy.h
diff --git a/export/include/learning/real.h b/export/include/learning/real.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/learning/real.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/learning/real.h
diff --git a/export/include/learning/string_utils.h b/export/include/learning/string_utils.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/learning/string_utils.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/learning/string_utils.h
diff --git a/export/include/mouseconfig.h b/export/include/mouseconfig.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/confscreens/mouseconfig.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/confscreens/mouseconfig.h
diff --git a/export/include/musicplayer/OggSoundStream.h b/export/include/musicplayer/OggSoundStream.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/musicplayer/OggSoundStream.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/musicplayer/OggSoundStream.h
diff --git a/export/include/musicplayer/OpenALMusicPlayer.h b/export/include/musicplayer/OpenALMusicPlayer.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/musicplayer/OpenALMusicPlayer.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/musicplayer/OpenALMusicPlayer.h
diff --git a/export/include/musicplayer/SoundStream.h b/export/include/musicplayer/SoundStream.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/musicplayer/SoundStream.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/musicplayer/SoundStream.h
diff --git a/export/include/musicplayer/musicplayer.h b/export/include/musicplayer/musicplayer.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/musicplayer/musicplayer.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/musicplayer/musicplayer.h
diff --git a/export/include/openglconfig.h b/export/include/openglconfig.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/confscreens/openglconfig.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/confscreens/openglconfig.h
diff --git a/export/include/os.h b/export/include/os.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/tgf/os.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/tgf/os.h
diff --git a/export/include/osspec.h b/export/include/osspec.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/linux/osspec.h
+/home/jonas/torcs/torcs-1.3.7/src/linux/osspec.h
diff --git a/export/include/playerpref.h b/export/include/playerpref.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/interfaces/playerpref.h
+/home/jonas/torcs/torcs-1.3.7/src/interfaces/playerpref.h
diff --git a/export/include/portability.h b/export/include/portability.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/portability/portability.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/portability/portability.h
diff --git a/export/include/raceinit.h b/export/include/raceinit.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/raceengineclient/raceinit.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/raceengineclient/raceinit.h
diff --git a/export/include/raceman.h b/export/include/raceman.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/interfaces/raceman.h
+/home/jonas/torcs/torcs-1.3.7/src/interfaces/raceman.h
diff --git a/export/include/racescreens.h b/export/include/racescreens.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/racescreens/racescreens.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/racescreens/racescreens.h
diff --git a/export/include/replay.h b/export/include/replay.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/interfaces/replay.h
+/home/jonas/torcs/torcs-1.3.7/src/interfaces/replay.h
diff --git a/export/include/robot.h b/export/include/robot.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/interfaces/robot.h
+/home/jonas/torcs/torcs-1.3.7/src/interfaces/robot.h
diff --git a/export/include/robottools.h b/export/include/robottools.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/robottools/robottools.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/robottools/robottools.h
diff --git a/export/include/screen_properties.h b/export/include/screen_properties.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/tgfclient/screen_properties.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/tgfclient/screen_properties.h
diff --git a/export/include/simu.h b/export/include/simu.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/interfaces/simu.h
+/home/jonas/torcs/torcs-1.3.7/src/interfaces/simu.h
diff --git a/export/include/simuconfig.h b/export/include/simuconfig.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/confscreens/simuconfig.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/confscreens/simuconfig.h
diff --git a/export/include/singleplayer.h b/export/include/singleplayer.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/raceengineclient/singleplayer.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/raceengineclient/singleplayer.h
diff --git a/export/include/soundconfig.h b/export/include/soundconfig.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/confscreens/soundconfig.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/confscreens/soundconfig.h
diff --git a/export/include/telemetry.h b/export/include/telemetry.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/interfaces/telemetry.h
+/home/jonas/torcs/torcs-1.3.7/src/interfaces/telemetry.h
diff --git a/export/include/tgf.h b/export/include/tgf.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/tgf/tgf.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/tgf/tgf.h
diff --git a/export/include/tgfclient.h b/export/include/tgfclient.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/tgfclient/tgfclient.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/tgfclient/tgfclient.h
diff --git a/export/include/tmath/linalg_t.h b/export/include/tmath/linalg_t.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/math/linalg_t.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/math/linalg_t.h
diff --git a/export/include/tmath/straight2_t.h b/export/include/tmath/straight2_t.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/math/straight2_t.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/math/straight2_t.h
diff --git a/export/include/tmath/v2_t.h b/export/include/tmath/v2_t.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/math/v2_t.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/math/v2_t.h
diff --git a/export/include/tmath/v3_t.h b/export/include/tmath/v3_t.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/math/v3_t.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/math/v3_t.h
diff --git a/export/include/tmath/v4_t.h b/export/include/tmath/v4_t.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/math/v4_t.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/math/v4_t.h
diff --git a/export/include/track.h b/export/include/track.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/interfaces/track.h
+/home/jonas/torcs/torcs-1.3.7/src/interfaces/track.h
diff --git a/export/include/xml.h b/export/include/xml.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/txml/xml.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/txml/xml.h
diff --git a/export/include/xmlparse.h b/export/include/xmlparse.h
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/libs/txml/xmlparse.h
+/home/jonas/torcs/torcs-1.3.7/src/libs/txml/xmlparse.h
diff --git a/export/lib/libsolid.a b/export/lib/libsolid.a
@@ -1 +1 @@
-/home/michaelheinrich/github/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/src/libsolid.a
+/home/jonas/torcs/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/src/libsolid.a
diff --git a/src/drivers/pid_driver/driver.cpp b/src/drivers/pid_driver/driver.cpp
@@ -65,8 +65,9 @@ void Driver::drive(tCarElt *car, tSituation *s) {
         // std::cout << "SpeedY " << i << ": " << getSpeed() << std::endl;
         // std::cout << "SpeedDiffX " << i << ": " << getOpponentSpeedDiffX(opponent[i]) << std::endl;
         // std::cout << "SpeedDiffY " << i << ": " << getOpponentSpeedDiffY(opponent[i]) << std::endl;
-        std::cout << "DistanceY " << i << ": " << getOpponentDistanceY(opponent[i]) << std::endl;
-        std::cout << "DistanceX " << i << ": " << getOpponentDistanceX(opponent[i]) << std::endl;
+        // std::cout << "DistanceY " << i << ": " << getOpponentDistanceY(opponent[i]) << std::endl;
+        // std::cout << "DistanceX " << i << ": " << getOpponentDistanceX(opponent[i]) << std::endl;
+        std::cout << getOpponentDistanceX(opponent[i]) << ", " << getOpponentDistanceY(opponent[i]) << std::endl;
     }
 
     // std::cout << "AI car ----" << std::endl;

diff --git a/src/libs/txml/gennmtab/gennmtab b/src/libs/txml/gennmtab/gennmtab
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/home/michaelheinrich/github/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Basic.h
		/home/jonas/torcs/torcs-1.3.7/src/modules/simu/simuv2/SOLID-2.0/include/3D/Basic.h
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/home/michaelheinrich/github/torcs-1.3.7/src/interfaces/car.h
		/home/jonas/torcs/torcs-1.3.7/src/interfaces/car.h
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/home/michaelheinrich/github/torcs-1.3.7/src/libs/client/client.h
		/home/jonas/torcs/torcs-1.3.7/src/libs/client/client.h
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/home/michaelheinrich/github/torcs-1.3.7/src/libs/tgfclient/glfeatures.h
		/home/jonas/torcs/torcs-1.3.7/src/libs/tgfclient/glfeatures.h
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/home/michaelheinrich/github/torcs-1.3.7/src/libs/learning/ANN.h
		/home/jonas/torcs/torcs-1.3.7/src/libs/learning/ANN.h
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/home/michaelheinrich/github/torcs-1.3.7/src/libs/musicplayer/OggSoundStream.h
		/home/jonas/torcs/torcs-1.3.7/src/libs/musicplayer/OggSoundStream.h
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/home/michaelheinrich/github/torcs-1.3.7/src/linux/osspec.h
		/home/jonas/torcs/torcs-1.3.7/src/linux/osspec.h
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/home/michaelheinrich/github/torcs-1.3.7/src/libs/portability/portability.h
		/home/jonas/torcs/torcs-1.3.7/src/libs/portability/portability.h
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/home/michaelheinrich/github/torcs-1.3.7/src/libs/raceengineclient/raceinit.h
		/home/jonas/torcs/torcs-1.3.7/src/libs/raceengineclient/raceinit.h