Context Navigation

objects

Timestamp:

Sep 1, 2009, 12:38:36 AM (15 years ago)

Author:

landauf

Message:

Removed /objects/ from all paths (except from those in the objects module of course).
Compiles again.

Location:

code/branches/libraries2/src/modules/objects

Files:

r5730	r5735
35	35	#include <string>
36	36	#include "core/XMLNameListener.h"
37		#include "~~objects/~~worldentities/StaticEntity.h"
	37	#include "worldentities/StaticEntity.h"
38	38
39	39	namespace orxonox

-                      r5728
+                      r5735
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
 #include "objects/worldentities/MobileEntity.h"
+#include "worldentities/MobileEntity.h"
 namespace orxonox
 …
+    {
         SUPER(ForceField, XMLPort, xmlelement, mode);
         //For correct xml import use: position, direction, velocity, scale
         XMLPortParam(ForceField, "velocity", setVelocity, getVelocity, xmlelement, mode).defaultValues(100);

r5730	r5735
34	34
35	35	#include "tools/interfaces/Tickable.h"
36		#include "~~objects/~~worldentities/StaticEntity.h"
	36	#include "worldentities/StaticEntity.h"
37	37
38	38	namespace orxonox

-                      r5730
+                      r5735
 #include "core/GameMode.h"
 #include "core/XMLPort.h"
 #include "objects/Scene.h"
 #include "objects/worldentities/Camera.h"
+#include "Scene.h"
+#include "worldentities/Camera.h"
 #include "CameraManager.h"

r5730	r5735
35	35	#include "tools/BillboardSet.h"
36	36	#include "tools/Mesh.h"
37		#include "~~objects/~~worldentities/MovableEntity.h"
	37	#include "worldentities/MovableEntity.h"
38	38
39	39	namespace orxonox

r5730	r5735
33	33
34	34	#include "util/Math.h"
35		#include "~~objects/~~collisionshapes/CollisionShape.h"
	35	#include "collisionshapes/CollisionShape.h"
36	36
37	37	namespace orxonox

r5730	r5735
31	31
32	32	#include "objects/ObjectsPrereqs.h"
33		#include "~~objects/~~collisionshapes/CollisionShape.h"
	33	#include "collisionshapes/CollisionShape.h"
34	34
35	35	namespace orxonox

r5730	r5735
33	33
34	34	#include "util/Math.h"
35		#include "~~objects/~~collisionshapes/CollisionShape.h"
	35	#include "collisionshapes/CollisionShape.h"
36	36
37	37	namespace orxonox

r5730	r5735
31	31
32	32	#include "objects/ObjectsPrereqs.h"
33		#include "~~objects/~~collisionshapes/CollisionShape.h"
	33	#include "collisionshapes/CollisionShape.h"
34	34
35	35	namespace orxonox

-                      r3325
+                      r5735
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
 #include "objects/gametypes/Asteroids.h"
 #include "objects/worldentities/pawns/Pawn.h"
+#include "gametypes/Asteroids.h"
+#include "worldentities/pawns/Pawn.h"
 namespace orxonox

r5728	r5735
31	31	#include "core/CoreIncludes.h"
32	32	#include "core/XMLPort.h"
33		#include "~~objects/~~worldentities/pawns/Pawn.h"
	33	#include "worldentities/pawns/Pawn.h"
34	34
35	35	namespace orxonox

r5730	r5735
37	37	#include "tools/BillboardSet.h"
38	38	#include "tools/interfaces/Tickable.h"
39		#include "~~objects/~~worldentities/StaticEntity.h"
	39	#include "worldentities/StaticEntity.h"
40	40
41	41	namespace orxonox

Note: See TracChangeset for help on using the changeset viewer.