repairs for recursive source files, move HF meta events to SE

cmake/macros/SetupHifiLibrary.cmake

@@ -12,7 +12,7 @@ macro(SETUP_HIFI_LIBRARY)
   project(${TARGET_NAME})
 
   # grab the implemenation and header files
-  file(GLOB LIB_SRCS src/*.h src/*.cpp)
+  file(GLOB_RECURSE LIB_SRCS "src/*.h" "src/*.cpp")
   set(LIB_SRCS ${LIB_SRCS})
 
   # create a library and set the property so it can be referenced later

interface/CMakeLists.txt

@@ -44,11 +44,7 @@ configure_file(InterfaceConfig.h.in "${PROJECT_BINARY_DIR}/includes/InterfaceCon
 configure_file(InterfaceVersion.h.in "${PROJECT_BINARY_DIR}/includes/InterfaceVersion.h")
 
 # grab the implementation and header files from src dirs
-file(GLOB INTERFACE_SRCS src/*.cpp src/*.h)
-foreach(SUBDIR avatar devices events renderer ui starfield location scripting voxels particles entities gpu)
-  file(GLOB_RECURSE SUBDIR_SRCS src/${SUBDIR}/*.cpp src/${SUBDIR}/*.h)
-  set(INTERFACE_SRCS ${INTERFACE_SRCS} "${SUBDIR_SRCS}")
-endforeach(SUBDIR)
+file(GLOB_RECURSE INTERFACE_SRCS "src/*.cpp" "src/*.h")
 
 # Add SpeechRecognizer if on OS X, otherwise remove
 if (APPLE)

interface/src/Application.cpp

@@ -55,6 +55,7 @@
 #include <AccountManager.h>
 #include <AudioInjector.h>
 #include <EntityScriptingInterface.h>
+#include <HFActionEvent.h>
 #include <LocalVoxelsList.h>
 #include <Logging.h>
 #include <NetworkAccessManager.h>
@@ -77,8 +78,6 @@
 #include "devices/OculusManager.h"
 #include "devices/TV3DManager.h"
 
-#include "events/HFActionEvent.h"
-
 #include "renderer/ProgramObject.h"
 
 #include "scripting/AccountScriptingInterface.h"

interface/src/scripting/ControllerScriptingInterface.h

@@ -46,7 +46,7 @@ private:
 
 signals:
 };
-
+ 
 
 /// handles scripting of input controller commands from JS
 class ControllerScriptingInterface : public AbstractControllerScriptingInterface {

libraries/script-engine/src/AbstractControllerScriptingInterface.h

@@ -88,6 +88,9 @@ public slots:
 signals:
     void keyPressEvent(const KeyEvent& event);
     void keyReleaseEvent(const KeyEvent& event);
+//    
+//    void actionStartEvent(const HFActionEvent& event);
+//    void actionEndEvent(const HFActionEvent& event);
 
     void mouseMoveEvent(const MouseEvent& event, unsigned int deviceID = 0);
     void mousePressEvent(const MouseEvent& event, unsigned int deviceID = 0);

libraries/script-engine/src/ScriptEngine.cpp

@@ -36,12 +36,13 @@
 #include "ArrayBufferViewClass.h"
 #include "DataViewClass.h"
 #include "MenuItemProperties.h"
-#include "MIDIEvent.h"
 #include "LocalVoxels.h"
 #include "ScriptEngine.h"
 #include "TypedArrays.h"
 #include "XMLHttpRequestClass.h"
 
+#include "MIDIEvent.h"
+
 VoxelsScriptingInterface ScriptEngine::_voxelsScriptingInterface;
 EntityScriptingInterface ScriptEngine::_entityScriptingInterface;