a little reorganization (maybe more later)

generator.py

@@ -146,7 +146,7 @@ def generateTools(toolFiles, outputCpp, outputH):
 
 #include <vector>
 
-#include "simulation/tools/SimTool.h"
+#include "simulation/simtools/SimTool.h"
 
 """
 	
@@ -156,7 +156,7 @@ def generateTools(toolFiles, outputCpp, outputH):
 		try:
 			f = open(toolFile, "r")
 		except:
-			f = open("src/simulation/tools/"+toolFile, "r")
+			f = open("src/simulation/simtools/"+toolFile, "r")
 		fileData = f.read()
 		f.close()
 		
@@ -230,4 +230,4 @@ if(len(sys.argv) > 3):
     	generateTools(sys.argv[4:], sys.argv[2], sys.argv[3])
 else:
 	generateElements(os.listdir("src/simulation/elements"), "generated/ElementClasses.cpp", "generated/ElementClasses.h")
-	generateTools(os.listdir("src/simulation/tools"), "generated/ToolClasses.cpp", "generated/ToolClasses.h")
+	generateTools(os.listdir("src/simulation/simtools"), "generated/ToolClasses.cpp", "generated/ToolClasses.h")

src/graphics/Renderer.cpp

@@ -10,8 +10,8 @@
 #include "simulation/ElementGraphics.h"
 #include "simulation/Air.h"
 #ifdef LUACONSOLE
-#include "cat/LuaScriptInterface.h"
+#include "lua/LuaScriptInterface.h"
-#include "cat/LuaScriptHelper.h"
+#include "lua/LuaScriptHelper.h"
 #endif
 extern "C"
 {

src/gui/console/ConsoleController.h

@@ -6,7 +6,7 @@
 #include "ConsoleView.h"
 #include "ConsoleModel.h"
 #include "ConsoleCommand.h"
-#include "cat/CommandInterface.h"
+#include "lua/CommandInterface.h"
 
 class ConsoleModel;
 class ConsoleView;

src/gui/game/GameController.cpp

@@ -27,9 +27,9 @@
 #include "simulation/Snapshot.h"
 #include "debug/DebugInfo.h"
 #ifdef LUACONSOLE
-#include "cat/LuaScriptInterface.h"
+#include "lua/LuaScriptInterface.h"
 #else
-#include "cat/TPTScriptInterface.h"
+#include "lua/TPTScriptInterface.h"
 #endif
 //#include "debug/ElementPopulation.h"
 

src/gui/interface/LuaProgressBar.h

@@ -1,30 +0,0 @@
-#pragma once
-
-extern "C" {
-	#include "lua.h"
-	#include "lauxlib.h"
-	#include "lualib.h"
-}
-
-#include "LuaLuna.h"
-#include "LuaComponent.h"
-
-namespace ui
-{
-	class ProgressBar;
-}
-
-class LuaScriptInterface;
-
-class LuaProgressBar: public LuaComponent
-{
-	ui::ProgressBar * progressBar;
-	int onValueChangedFunction;
-	int value(lua_State * l);
-public:
-	static const char className[];
-	static Luna<LuaProgressBar>::RegType methods[];
-
-	LuaProgressBar(lua_State * l);
-	~LuaProgressBar();
-};

src/simulation/Simulation.cpp

@@ -25,8 +25,8 @@
 //#include "StorageClasses.h"
 
 #ifdef LUACONSOLE
-#include "cat/LuaScriptInterface.h"
+#include "lua/LuaScriptInterface.h"
-#include "cat/LuaScriptHelper.h"
+#include "lua/LuaScriptHelper.h"
 #endif
 
 int Simulation::Load(GameSave * save)