Move EC_Script to TundraCore. EC_Script is core functionality and scr…

…ipting language agnostic. Closes realXtend#763.
Adminotech · Sep 27, 2014 · 68d83a0 · 68d83a0 · jonnenauha · Oct 13, 2014
1 parent 71ba4ee
commit 68d83a0
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 31 deletions.
diff --git a/CMakeBuildConfigTemplate.txt b/CMakeBuildConfigTemplate.txt
@@ -131,7 +131,6 @@ AddEntityComponent(EC_TransformGizmo)
 
 ## Here are the Application level ECs that wont be added if BUILD_SDK_ONLY is TRUE (default is FALSE)
 if (NOT BUILD_SDK_ONLY)
-    AddEntityComponent(EC_Script)                   # Optional but used by both PythonScriptModule and JavascriptModule.
     AddEntityComponent(EC_PlanarMirror)
     AddEntityComponent(EC_ProximityTrigger)
     AddEntityComponent(EC_LaserPointer)

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -435,6 +435,7 @@ macro(UseTundraCore)
     include_directories(${PROJECT_BINARY_DIR}/src/Core/TundraCore/Framework)
     include_directories(${PROJECT_BINARY_DIR}/src/Core/TundraCore/Input)
     include_directories(${PROJECT_BINARY_DIR}/src/Core/TundraCore/Scene)
+    include_directories(${PROJECT_BINARY_DIR}/src/Core/TundraCore/Script)
     include_directories(${PROJECT_BINARY_DIR}/src/Core/TundraCore/Ui)
 endmacro()
 

diff --git a/src/Application/JavascriptModule/CMakeLists.txt b/src/Application/JavascriptModule/CMakeLists.txt
@@ -29,7 +29,6 @@ link_package(QT4)
 link_ogre()
 link_boost()
 link_modules(TundraCore Math TundraProtocolModule)
-link_entity_components(EC_Script)
 
 SetupCompileFlagsWithPCH()
 

diff --git a/src/Core/TundraCore/CMakeLists.txt b/src/Core/TundraCore/CMakeLists.txt
@@ -22,9 +22,9 @@ file(GLOB MOC_FILES
     Input/InputAPI.h Input/InputContext.h Input/KeyEvent.h Input/KeyEventSignal.h Input/MouseEvent.h
     Input/GestureEvent.h Input/EC_InputMapper.h
     Scene/SceneAPI.h Scene/Scene.h Scene/Entity.h Scene/IComponent.h Scene/EntityAction.h
-    Scene/EC_Name.h Scene/EC_DynamicComponent.h Scene/AttributeChangeType.h Scene/ChangeRequest.h
-    Scene/EC_PlaceholderComponent.h
+    Scene/AttributeChangeType.h Scene/ChangeRequest.h Scene/EC_*.h 
     Ui/UiAPI.h Ui/UiGraphicsView.h Ui/UiMainWindow.h Ui/UiProxyWidget.h Ui/QtUiAsset.h Ui/RedirectedPaintWidget.h
+    Script/EC_Script.h Script/IScriptInstance.h Script/ScriptAsset.h
 )
 
 AddSourceFolder(Asset)
@@ -33,6 +33,7 @@ AddSourceFolder(Console)
 AddSourceFolder(Framework)
 AddSourceFolder(Input)
 AddSourceFolder(Scene)
+AddSourceFolder(Script)
 AddSourceFolder(Ui)
 
 set(SOURCE_FILES ${CPP_FILES} ${H_FILES})
@@ -74,3 +75,4 @@ final_target()
 
 # Declare Windows core dependencies
 setup_install_windows_deps ("qjson.dll" Release|RelWithDebInfo|Debug)
+
diff --git a/src/EntityComponents/EC_Script/EC_Script.cpp → src/Core/TundraCore/Script/EC_Script.cpp b/src/EntityComponents/EC_Script/EC_Script.cpp → src/Core/TundraCore/Script/EC_Script.cpp
@@ -1,5 +1,6 @@
 // For conditions of distribution and use, see copyright notice in LICENSE
 
+#include "StableHeaders.h"
 #include "DebugOperatorNew.h"
 
 #include "EC_Script.h"

diff --git a/src/EntityComponents/EC_Script/EC_Script.h → src/Core/TundraCore/Script/EC_Script.h b/src/EntityComponents/EC_Script/EC_Script.h → src/Core/TundraCore/Script/EC_Script.h
diff --git a/...ityComponents/EC_Script/IScriptInstance.h → src/Core/TundraCore/Script/IScriptInstance.h b/...ityComponents/EC_Script/IScriptInstance.h → src/Core/TundraCore/Script/IScriptInstance.h
diff --git a/...ndraCore/Framework/QScriptEngineHelpers.h → .../TundraCore/Script/QScriptEngineHelpers.h b/...ndraCore/Framework/QScriptEngineHelpers.h → .../TundraCore/Script/QScriptEngineHelpers.h
diff --git a/...ntityComponents/EC_Script/ScriptAsset.cpp → src/Core/TundraCore/Script/ScriptAsset.cpp b/...ntityComponents/EC_Script/ScriptAsset.cpp → src/Core/TundraCore/Script/ScriptAsset.cpp
@@ -1,5 +1,6 @@
 // For conditions of distribution and use, see copyright notice in LICENSE
 
+#include "StableHeaders.h"
 #include "DebugOperatorNew.h"
 
 #include "ScriptAsset.h"

diff --git a/src/EntityComponents/EC_Script/ScriptAsset.h → src/Core/TundraCore/Script/ScriptAsset.h b/src/EntityComponents/EC_Script/ScriptAsset.h → src/Core/TundraCore/Script/ScriptAsset.h
diff --git a/src/EntityComponents/EC_Script/CMakeLists.txt b/src/EntityComponents/EC_Script/CMakeLists.txt