From c20d6008d347f3b243bc7859275dd0c9509866b9 Mon Sep 17 00:00:00 2001
From: hikerstk <hikerstk@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Mon, 1 Dec 2008 22:56:57 +0000
Subject: [PATCH] Moved Particle- and Smoke system into graphics subdir.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2540 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/Makefile.am                        |  4 ++--
 src/{ => graphics}/particle_system.cpp |  0
 src/{ => graphics}/particle_system.hpp |  0
 src/{ => graphics}/smoke.cpp           |  0
 src/{ => graphics}/smoke.hpp           |  0
 src/ide/vc9/supertuxkart.vcproj        | 32 +++++++++++++-------------
 src/karts/kart.cpp                     |  2 +-
 src/utils/coord.hpp                    |  5 ++--
 src/utils/vec3.cpp                     |  2 +-
 9 files changed, 23 insertions(+), 22 deletions(-)
 rename src/{ => graphics}/particle_system.cpp (100%)
 rename src/{ => graphics}/particle_system.hpp (100%)
 rename src/{ => graphics}/smoke.cpp (100%)
 rename src/{ => graphics}/smoke.hpp (100%)

diff --git a/src/Makefile.am b/src/Makefile.am
index 66c3746d2..3b21bd178 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -57,7 +57,9 @@ supertuxkart_SOURCES =     main.cpp  			\
 	material_manager.cpp            material_manager.hpp  	                \
 	grand_prix_manager.cpp	       grand_prix_manager.hpp	                \
         graphics/nitro.cpp             graphics/nitro.hpp                       \
+	graphics/particle_system.cpp   graphics/particle_system.hpp       	\
         graphics/skid_mark.cpp         graphics/skid_mark.hpp                   \
+	graphics.smoke.cpp	       graphics/.smoke.hpp		        \
 	items/attachment.cpp	       items/attachment.hpp	                \
 	items/attachment_manager.cpp   items/attachment_manager.hpp             \
 	items/powerup.cpp              items/powerup.hpp	                \
@@ -77,7 +79,6 @@ supertuxkart_SOURCES =     main.cpp  			\
 	karts/kart_properties_manager.cpp  karts/kart_properties_manager.hpp    \
 	karts/moveable.cpp 		       karts/moveable.hpp                   \
 	karts/player_kart.cpp		   karts/player_kart.hpp	            \
-	smoke.cpp		       smoke.hpp			        \
 	input.hpp 		              \
 	isect.cpp		       isect.hpp                	\
 	track.cpp		       track.hpp                	\
@@ -98,7 +99,6 @@ supertuxkart_SOURCES =     main.cpp  			\
 	moving_texture.hpp	   moving_texture.cpp		    \
 	callback_manager.cpp   callback_manager.hpp         \
 	shadow.cpp		       shadow.hpp	        	    \
-	particle_system.cpp	   particle_system.hpp       	\
 	main_loop.cpp	 	   main_loop.hpp        	    \
 	camera.cpp		       camera.hpp	        	    \
 	sdldrv.cpp		       sdldrv.hpp	        	    \
diff --git a/src/particle_system.cpp b/src/graphics/particle_system.cpp
similarity index 100%
rename from src/particle_system.cpp
rename to src/graphics/particle_system.cpp
diff --git a/src/particle_system.hpp b/src/graphics/particle_system.hpp
similarity index 100%
rename from src/particle_system.hpp
rename to src/graphics/particle_system.hpp
diff --git a/src/smoke.cpp b/src/graphics/smoke.cpp
similarity index 100%
rename from src/smoke.cpp
rename to src/graphics/smoke.cpp
diff --git a/src/smoke.hpp b/src/graphics/smoke.hpp
similarity index 100%
rename from src/smoke.hpp
rename to src/graphics/smoke.hpp
diff --git a/src/ide/vc9/supertuxkart.vcproj b/src/ide/vc9/supertuxkart.vcproj
index 192a3df66..10362d0f1 100644
--- a/src/ide/vc9/supertuxkart.vcproj
+++ b/src/ide/vc9/supertuxkart.vcproj
@@ -743,10 +743,6 @@
 				RelativePath="../../../src\moving_texture.cpp"
 				>
 			</File>
-			<File
-				RelativePath="../../../src\particle_system.cpp"
-				>
-			</File>
 			<File
 				RelativePath="../../../src\race_manager.cpp"
 				>
@@ -779,10 +775,6 @@
 				RelativePath="../../../src\shadow.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\smoke.cpp"
-				>
-			</File>
 			<File
 				RelativePath="../../../src\static_ssg.cpp"
 				>
@@ -1190,10 +1182,18 @@
 					RelativePath="..\..\graphics\nitro.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\graphics\particle_system.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\graphics\skid_mark.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\graphics\smoke.cpp"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
@@ -1297,10 +1297,6 @@
 				RelativePath="../../../src\no_copy.hpp"
 				>
 			</File>
-			<File
-				RelativePath="../../../src\particle_system.hpp"
-				>
-			</File>
 			<File
 				RelativePath="../../../src\player.hpp"
 				>
@@ -1345,10 +1341,6 @@
 				RelativePath="../../../src\shadow.hpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\smoke.hpp"
-				>
-			</File>
 			<File
 				RelativePath="../../../src\ssg_help.hpp"
 				>
@@ -1832,10 +1824,18 @@
 					RelativePath="..\..\graphics\nitro.hpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\graphics\particle_system.hpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\graphics\skid_mark.hpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\graphics\smoke.hpp"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index e65c66725..c5f3bd69c 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -38,13 +38,13 @@
 #include "shadow.hpp"
 #include "track.hpp"
 #include "translation.hpp"
-#include "smoke.hpp"
 #include "material_manager.hpp"
 #include "audio/sound_manager.hpp"
 #include "audio/sfx_manager.hpp"
 #include "audio/sfx_base.hpp"
 #include "graphics/nitro.hpp"
 #include "graphics/skid_mark.hpp"
+#include "graphics/smoke.hpp"
 #include "gui/menu_manager.hpp"
 #include "gui/race_gui.hpp"
 #include "karts/kart_model.hpp"
diff --git a/src/utils/coord.hpp b/src/utils/coord.hpp
index c1e4ceb3a..d1419c70d 100755
--- a/src/utils/coord.hpp
+++ b/src/utils/coord.hpp
@@ -22,10 +22,11 @@
 #define HEADER_COORD_H
 #include <plib/sg.h>
 
-#include "vec3.hpp"
-#include "constants.hpp"
 #include "LinearMath/btTransform.h"
 
+#include "constants.hpp"
+#include "utils/vec3.hpp"
+
 /** A class that stores a translation and rotation. It is used to convert
  *  between bullet data structures and the data structure for the graphics.
  */
diff --git a/src/utils/vec3.cpp b/src/utils/vec3.cpp
index 141b1e344..171fee0da 100755
--- a/src/utils/vec3.cpp
+++ b/src/utils/vec3.cpp
@@ -17,7 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "vec3.hpp"
+#include "utils/vec3.hpp"
 #include "constants.hpp"
 
 void Vec3::setHPR(const btMatrix3x3& m)