stubb for TouchMarker class to render where the contact points are on the screen

modules/touch/CMakeLists.txt

@@ -28,6 +28,7 @@ set(HEADER_FILES
 	${CMAKE_CURRENT_SOURCE_DIR}/ext/levmarq.h
     ${CMAKE_CURRENT_SOURCE_DIR}/include/TuioEar.h
     ${CMAKE_CURRENT_SOURCE_DIR}/include/TouchInteraction.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/TouchMarker.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
@@ -35,6 +36,7 @@ set(SOURCE_FILES
 	${CMAKE_CURRENT_SOURCE_DIR}/ext/levmarq.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/TuioEar.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/TouchInteraction.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/TouchMarker.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 	

modules/touch/include/TouchMarker.h

@@ -0,0 +1,55 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __OPENSPACE_TOUCH___MARKER___H__
+#define __OPENSPACE_TOUCH___MARKER___H__
+
+
+#include <openspace/properties/propertyowner.h>
+#include <openspace/properties/vectorproperty.h>
+#include <openspace/properties/scalar/boolproperty.h>
+
+#include <glm/glm.hpp>
+
+#include <math.h>
+#include <vector>
+#include <mutex>
+#include <numeric>
+#include <algorithm>
+
+
+namespace openspace {
+
+class TouchMarker : public properties::PropertyOwner
+{
+	public:
+		TouchMarker();
+
+	private:
+
+};
+
+} // openspace namespace
+
+#endif // __OPENSPACE_TOUCH___MARKER___H__

modules/touch/include/TuioEar.h

@@ -36,7 +36,6 @@
 #include <vector>
 #include <mutex>
 #include <numeric>
-#include <mutex>
 #include <algorithm>
 
 

modules/touch/src/TouchMarker.cpp

@@ -0,0 +1,44 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014-2017                                                               *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#include <modules/touch/include/TouchMarker.h>
+
+#include <openspace/engine/openspaceengine.h>
+#include <openspace/engine/settingsengine.h>
+#include <openspace/engine/wrapper/windowwrapper.h>
+#include <openspace/interaction/interactionhandler.h>
+#include <openspace/rendering/renderengine.h>
+#include <openspace/rendering/screenspacerenderable.h>
+
+#include <ghoul/logging/logmanager.h>
+
+namespace {
+	const std::string _loggerCat = "TouchMarker";
+}
+namespace openspace {
+
+TouchMarker::TouchMarker() 
+	: properties::PropertyOwner("TouchMarker") { }
+
+} // openspace namespace

modules/touch/touchmodule.cpp

@@ -125,6 +125,12 @@ TouchModule::TouchModule()
 		touch.step(OsEng.windowWrapper().deltaTime());
 	}
 	);
+
+	OsEng.registerModuleCallback(
+		OpenSpaceEngine::CallbackOption::PostDraw,
+		[]() {
+	}
+	);
 }
 
 } // namespace openspace

modules/touch/touchmodule.h

@@ -28,6 +28,7 @@
 #include <openspace/util/openspacemodule.h>
 #include <modules/touch/include/TuioEar.h>
 #include <modules/touch/include/TouchInteraction.h>
+#include <modules/touch/include/TouchMarker.h>
 
 namespace openspace {