Merge branch 'master' of cgogn:~kraemer/CGoGN

0435b0d5 · Sylvain Thery · d7f201ae · 51b765cb · 0435b0d5 · 0435b0d5
Commit 0435b0d5 authored Nov 19, 2012 by Sylvain Thery
20 changed files
--- a/SCHNApps/CMakeLists.txt
+++ b/SCHNApps/CMakeLists.txt
@@ -3,9 +3,9 @@ cmake_minimum_required(VERSION 2.8)
 project(SCHNApps)

 SET( QT_USE_QTXML TRUE )
-SET (QT_USE_QTDESIGNER TRUE)
-SET (QT_USE_QTGUI TRUE)
-SET(QT_USE_QTPLUGIN TRUE)
+SET( QT_USE_QTDESIGNER TRUE )
+SET( QT_USE_QTGUI TRUE )
+SET( QT_USE_QTPLUGIN TRUE )

 #========CGoGN========#
 SET(CGoGN_ROOT_DIR ${CMAKE_SOURCE_DIR}/.. CACHE STRING "CGoGN root dir")
@@ -16,14 +16,10 @@ INCLUDE(${CGoGN_ROOT_DIR}/apps_cmake.txt)
 find_package(QGLViewer REQUIRED)


-#======Directories=======#
-SET(INC_DIR ${CMAKE_SOURCE_DIR}/include)
-SET(SRC_DIR ${CMAKE_SOURCE_DIR}/src)
-SET(FORMS_DIR ${CMAKE_SOURCE_DIR}/forms)
-SET(RESOURCES_DIR ${CMAKE_SOURCE_DIR}/resources)
-
-SET(PLUGIN_DIR ${CMAKE_SOURCE_DIR}/Plugins)
-SET(PLUGIN_COMPILE_DIR ${EXECUTABLE_OUTPUT_PATH}/plugins)
+#======SCHNApps=======#
+SET(SCHNApps_ROOT_DIR ${CGoGN_ROOT_DIR}/SCHNApps)
+SET(EXECUTABLE_OUTPUT_PATH ${SCHNApps_ROOT_DIR}/bin)
+SET(LIBRARY_OUTPUT_PATH ${SCHNApps_ROOT_DIR}/plugins/lib)

 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/Release Release)
 IF (NOT WIN32)
@@ -43,4 +39,3 @@ add_custom_target(doc
 	COMMENT "Generating API documentation with Doxygen" VERBATIM
 )
 endif(DOXYGEN_FOUND)
-
--- a/SCHNApps/Debug/CMakeLists.txt
+++ b/SCHNApps/Debug/CMakeLists.txt
@@ -14,95 +14,64 @@ INCLUDE_DIRECTORIES(
 	${CMAKE_CURRENT_SOURCE_DIR}
 	${CMAKE_CURRENT_BINARY_DIR}
 	${QGLVIEWER_INCLUDE_DIR}
+	${SCHNApps_ROOT_DIR}/include
 )

-SET(SRC_FILES
-	${SRC_DIR}/main.cpp
-	${SRC_DIR}/interface/window.cpp
-	${SRC_DIR}/interface/system.cpp
-	${SRC_DIR}/interface/stateHandler.cpp
-	${SRC_DIR}/visualization/view.cpp
-	${SRC_DIR}/visualization/scene.cpp
-	${SRC_DIR}/visualization/camera.cpp
-	${SRC_DIR}/interface/splitArea.cpp
-	${SRC_DIR}/dialogs/newSceneDialog.cpp
-	${SRC_DIR}/dialogs/sceneSelector.cpp
-	${SRC_DIR}/interface/viewButtonArea.cpp
-	${SRC_DIR}/dialogs/cameraViewDialog.cpp
-	${SRC_DIR}/dialogs/cameraOptionDialog.cpp
-	${SRC_DIR}/dialogs/cameraSceneDialog.cpp
-	${SRC_DIR}/dialogs/globalCameraDialog.cpp
-	${SRC_DIR}/dialogs/pluginDialog.cpp
-	${SRC_DIR}/dialogs/linkViewDialog.cpp
-	${SRC_DIR}/visualization/vboHandler.cpp
-	${SRC_DIR}/visualization/mapHandler.cpp
-	${SRC_DIR}/visualization/context.cpp
-	${SRC_DIR}/dialogs/mapPluginDialog.cpp
+file(
+	GLOB
+	SCHNApps_SRC_FILES
+	${SCHNApps_ROOT_DIR}/src/main.cpp
+	${SCHNApps_ROOT_DIR}/src/interface/*.cpp
+	${SCHNApps_ROOT_DIR}/src/visualization/*.cpp
+	${SCHNApps_ROOT_DIR}/src/dialogs/*.cpp
 )

-SET(H_OBJECT_FILES
-	${INC_DIR}/interface/window.h
-	${INC_DIR}/interface/system.h
-	${INC_DIR}/visualization/view.h
-	${INC_DIR}/visualization/scene.h
-	${INC_DIR}/interface/splitArea.h
-	${INC_DIR}/dialogs/newSceneDialog.h
-	${INC_DIR}/dialogs/sceneSelector.h
-	${INC_DIR}/interface/viewButtonArea.h
-	${INC_DIR}/dialogs/cameraViewDialog.h
-	${INC_DIR}/dialogs/cameraOptionDialog.h
-	${INC_DIR}/dialogs/cameraSceneDialog.h
-	${INC_DIR}/dialogs/globalCameraDialog.h
-	${INC_DIR}/dialogs/pluginDialog.h
-	${INC_DIR}/dialogs/linkViewDialog.h
-	${INC_DIR}/dialogs/mapPluginDialog.h
+SET(SCHNApps_H_OBJECT_FILES
+	${SCHNApps_ROOT_DIR}/include/interface/window.h
+	${SCHNApps_ROOT_DIR}/include/interface/system.h
+	${SCHNApps_ROOT_DIR}/include/interface/viewButtonArea.h
+	${SCHNApps_ROOT_DIR}/include/interface/splitArea.h
+	${SCHNApps_ROOT_DIR}/include/visualization/view.h
+	${SCHNApps_ROOT_DIR}/include/visualization/scene.h
+	${SCHNApps_ROOT_DIR}/include/dialogs/newSceneDialog.h
+	${SCHNApps_ROOT_DIR}/include/dialogs/sceneSelector.h
+	${SCHNApps_ROOT_DIR}/include/dialogs/cameraViewDialog.h
+	${SCHNApps_ROOT_DIR}/include/dialogs/cameraOptionDialog.h
+	${SCHNApps_ROOT_DIR}/include/dialogs/cameraSceneDialog.h
+	${SCHNApps_ROOT_DIR}/include/dialogs/globalCameraDialog.h
+	${SCHNApps_ROOT_DIR}/include/dialogs/pluginDialog.h
+	${SCHNApps_ROOT_DIR}/include/dialogs/linkViewDialog.h
+	${SCHNApps_ROOT_DIR}/include/dialogs/mapPluginDialog.h
 )

-SET(FORMS_FILES
-	${FORMS_DIR}/window.ui
-	${FORMS_DIR}/questionSessionDialog.ui
-	${FORMS_DIR}/infoDialog.ui
-	${FORMS_DIR}/newSceneDialog.ui
-	${FORMS_DIR}/cameraViewDialog.ui
-	${FORMS_DIR}/cameraOptionDialog.ui
-	${FORMS_DIR}/cameraSceneDialog.ui
-	${FORMS_DIR}/globalCameraDialog.ui
-	${FORMS_DIR}/pluginDialog.ui
-	${FORMS_DIR}/linkViewDialog.ui
-	${FORMS_DIR}/mapPluginDialog.ui
+file(
+	GLOB
+	SCHNApps_FORM_FILES
+	${SCHNApps_ROOT_DIR}/forms/*.ui
 )

-QT4_WRAP_UI(UI_H_FILES
-	${FORMS_FILES}
+QT4_WRAP_UI( UI_H_FILES
+	${SCHNApps_FORM_FILES}
 )
-QT4_WRAP_CPP(MOC_FILES
-	${H_OBJECT_FILES}
+QT4_WRAP_CPP( MOC_FILES
+	${SCHNApps_H_OBJECT_FILES}
 )
-QT4_ADD_RESOURCES(RCC_FILES
-	${RESOURCES_DIR}/resources.qrc
+QT4_ADD_RESOURCES( RCC_FILES
+	${SCHNApps_ROOT_DIR}/resources/resources.qrc
 )

-INCLUDE_DIRECTORIES(
-	${FORMS}
-	${INC_DIR}
-	${INC_DIR}/interface
-	${INC_DIR}/visualization
-	${INC_DIR}/dialogs
-	${INC_DIR}/plugins
-)
-
-ADD_EXECUTABLE(CGoGN_plugD
-	${SRC_FILES}
+ADD_EXECUTABLE( SCHNAppsD
+	${SCHNApps_SRC_FILES}
 	${UI_H_FILES}
 	${MOC_FILES}
 	${RCC_FILES}
 )

-TARGET_LINK_LIBRARIES(CGoGN_plugD
+TARGET_LINK_LIBRARIES( SCHNAppsD
 	${CGoGN_LIBS_D}
 	${COMMON_LIBS}
 	${QGLVIEWER_LIBRARIES}
 )

-#ADD_SUBDIRECTORY(${PLUGIN_DIR} plugins)

+ADD_SUBDIRECTORY(${SCHNApps_ROOT_DIR}/Plugins PluginsD)
--- a/SCHNApps/Plugins/CMakeLists.txt
+++ b/SCHNApps/Plugins/CMakeLists.txt
+cmake_minimum_required(VERSION 2.8)
+
+ADD_SUBDIRECTORY(firstPlugin)
--- a/SCHNApps/Plugins/firstPlugin/CMakeLists.txt
+++ b/SCHNApps/Plugins/firstPlugin/CMakeLists.txt
+cmake_minimum_required(VERSION 2.8)
+
+INCLUDE_DIRECTORIES(
+	${SCHNApps_ROOT_DIR}/include
+	${SCHNApps_ROOT_DIR}/Plugins/firstPlugin/include
+	${CMAKE_CURRENT_BINARY_DIR}
+)
+
+SET( FIRSTPLUGIN_PLUGIN_SRC
+	${SCHNApps_ROOT_DIR}/src/plugins/visualPlugin.cpp
+    ${SCHNApps_ROOT_DIR}/Plugins/firstPlugin/src/firstPlugin.cpp
+)
+
+SET( FIRSTPLUGIN_PLUGIN_H
+    ${SCHNApps_ROOT_DIR}/include/plugins/visualPlugin.h
+    ${SCHNApps_ROOT_DIR}/Plugins/firstPlugin/include/firstPlugin.h
+)
+
+IF( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
+
+	IF(WIN32)
+		link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
+	ELSE (WIN32)
+		link_directories( ${CGoGN_ROOT_DIR}/lib/Debug ${CGoGN_ROOT_DIR}/lib/Release )
+	ENDIF (WIN32)
+
+	QT4_WRAP_CPP( FIRSTPLUGIN_MOC ${FIRSTPLUGIN_PLUGIN_H} )
+
+	ADD_LIBRARY( FirstPluginD SHARED
+		${FIRSTPLUGIN_PLUGIN_SRC}
+		${FIRSTPLUGIN_MOC}
+	)
+
+	TARGET_LINK_LIBRARIES( FirstPluginD
+		${CGoGN_LIBS_D}
+		${COMMON_LIBS}
+		${QGLVIEWER_INCLUDE_LIBRARY}
+	)
+
+	ADD_DEPENDENCIES( FirstPluginD SCHNAppsD )
+
+	SET_TARGET_PROPERTIES( FirstPluginD PROPERTIES COMPILE_DEFINITIONS "DEBUG" )
+		
+ELSE ( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
+	
+	IF(WIN32)
+	link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
+	ELSE (WIN32)
+		link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
+	ENDIF (WIN32)
+
+	QT4_WRAP_CPP( FIRSTPLUGIN_MOC ${FIRSTPLUGIN_PLUGIN_H} )
+
+	ADD_LIBRARY( FirstPlugin SHARED
+		${FIRSTPLUGIN_PLUGIN_SRC}
+		${FIRSTPLUGIN_MOC}
+	)
+
+	TARGET_LINK_LIBRARIES( FirstPlugin
+		${CGoGN_LIBS_R}
+		${COMMON_LIBS}
+		${QGLVIEWER_INCLUDE_LIBRARY}
+	)
+
+	ADD_DEPENDENCIES( FirstPlugin SCHNApps )
+	
+ENDIF ( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
--- a/SCHNApps/Plugins/firstPlugin/include/firstPlugin.h
+++ b/SCHNApps/Plugins/firstPlugin/include/firstPlugin.h
 #ifndef FIRSTPLUGIN_H_
 #define FIRSTPLUGIN_H_

-
-
-#include "visualPlugin.h"
-
+#include "plugins/visualPlugin.h"

 /**---CGoGN includes **/
-	#include "Utils/Qt/qtSimple.h"
-	#include "Utils/cgognStream.h"
+#include "Utils/Qt/qtSimple.h"
+#include "Utils/cgognStream.h"

-	#include "Topology/generic/parameters.h"
+#include "Topology/generic/parameters.h"

-	#ifdef USE_GMAP
-		#include "Topology/gmap/embeddedGMap2.h"
-	#else
-		#include "Topology/map/embeddedMap2.h"
-	#endif
+#ifdef USE_GMAP
+	#include "Topology/gmap/embeddedGMap2.h"
+#else
+	#include "Topology/map/embeddedMap2.h"
+#endif

-	#include "Algo/Render/GL2/topoRender.h"
+#include "Algo/Render/GL2/topoRender.h"
 /**---CGoGN includes **/

+/**---Definitions specific to CGoGN ---*/
+using namespace CGoGN ;

-/**---Definitions  specific to CGoGN ---*/
-	using namespace CGoGN ;
+/**
+ * Struct that contains some informations about the types of the manipulated objects
+ * Mainly here to be used by the algorithms that are parameterized by it
+ */
+struct PFP: public PFP_STANDARD
+{
+	// definition of the type of the map
+#ifdef USE_GMAP
+	typedef EmbeddedGMap2 MAP;
+#else
+	typedef EmbeddedMap2 MAP;
+#endif
+};

-	/**
-	 * Struct that contains some informations about the types of the manipulated objects
-	 * Mainly here to be used by the algorithms that are parameterized by it
-	 */
-	struct PFP: public PFP_STANDARD
-	{
-		// definition of the type of the map
-	#ifdef USE_GMAP
-		typedef EmbeddedGMap2 MAP;
-	#else
-		typedef EmbeddedMap2 MAP;
-	#endif
-	};
-
-	typedef PFP::MAP MAP;
-	typedef PFP::VEC3 VEC3;
+typedef PFP::MAP MAP;
+typedef PFP::VEC3 VEC3;
 /**---Definitions  specific to CGoGN ---*/

 /**
@@ -58,15 +54,17 @@
 * of the Plugin interface (virtual class). It contains
 * many useful and essantial methods.
 */
-class FirstPlugin : public VisualPlugin{
+class FirstPlugin : public VisualPlugin
+{
 	/**
 	 * Essential Qt macros.
 	 */
 	Q_OBJECT
 	Q_INTERFACES(Plugin)
+
 public:
-	FirstPlugin(){}
-	~FirstPlugin(){}
+	FirstPlugin() {}
+	~FirstPlugin() {}

 	/**
 	 * The classical call back for the initGL method
@@ -92,6 +90,7 @@ public:
 	 * If this methods return 'false', the plugin load will be aborted.
 	 */
 	bool activate();
+
 	/**
 	 * The plugin's disabling method
 	 * Each time the main application will unload the plugin
@@ -99,23 +98,22 @@ public:
 	 */
 	void disable();

-
 protected:
 	/** Attributes that are specific to this plugin **/
-		MAP myMap;
+	MAP myMap;

-		// attribute for vertices positions
-		VertexAttribute<VEC3> position;
+	// attribute for vertices positions
+	VertexAttribute<VEC3> position;

-		// render (for the topo)
-		Algo::Render::GL2::TopoRender* m_render_topo;
+	// render (for the topo)
+	Algo::Render::GL2::TopoRender* m_render_topo;

-		// just for more compact writing
-		inline Dart PHI1(Dart d) { return myMap.phi1(d); }
-		inline Dart PHI_1(Dart d) { return myMap.phi_1(d); }
-		inline Dart PHI2(Dart d) { return myMap.phi2(d); }
-		template<int X>
-		Dart PHI(Dart d) { return myMap.phi<X>(d); }
+	// just for more compact writing
+	inline Dart PHI1(Dart d) { return myMap.phi1(d); }
+	inline Dart PHI_1(Dart d) { return myMap.phi_1(d); }
+	inline Dart PHI2(Dart d) { return myMap.phi2(d); }
+	template<int X>
+	Dart PHI(Dart d) { return myMap.phi<X>(d); }
 	/** Attributes that are specific to this plugin **/
 };


--- a/SCHNApps/Plugins/firstPlugin/src/firstPlugin.cpp
+++ b/SCHNApps/Plugins/firstPlugin/src/firstPlugin.cpp
 #include "firstPlugin.h"
-
 #include "Algo/Geometry/boundingbox.h"

+void FirstPlugin::cb_initGL(Scene* scene)
+{
+	if(scene)
+	{
+		// we fit the first (possibly the only) view of the newly liked
+		// scene to the content of our map

-bool FirstPlugin::activate(){
-	// creation of 2 new faces: 1 triangle and 1 square
-		Dart d1 = myMap.newFace(3);
-		Dart d2 = myMap.newFace(4);
-
-		// sew these faces along one of their edge
-		myMap.sewFaces(d1, d2);
-
-		// creation of a new attribute on vertices of type 3D vector for position.
-		// a handler to this attribute is returned
-		position = myMap.addAttribute<VEC3, VERTEX>("position");
-
-		// affect position by moving in the map
-		position[d1] = VEC3(0, 0, 0);
-		position[PHI1(d1)] = VEC3(2, 0, 0);
-		position[PHI_1(d1)] = VEC3(1, 2, 0);
-		position[PHI<11>(d2)] = VEC3(0, -2, 0);
-		position[PHI_1(d2)] = VEC3(2, -2, 0);
+		// bounding box of scene
+		Geom::BoundingBox<PFP::VEC3> bb = Algo::Geometry::computeBoundingBox<PFP>(myMap, position);

-		m_render_topo=NULL;
+		scene->firstViewFitSphere(bb.center()[0], bb.center()[1], bb.center()[2], bb.maxSize());

-		return true;
-}
+		m_render_topo = new Algo::Render::GL2::TopoRender() ;

-void FirstPlugin::disable(){
-	if(m_render_topo){
-		delete m_render_topo;
+		// render the topo of the map without boundary darts
+		SelectorDartNoBoundary<PFP::MAP> nb(myMap);
+		m_render_topo->updateData<PFP>(myMap, position, 0.9f, 0.9f, nb);
 	}
 }

-void FirstPlugin::cb_redraw(Scene* scene){
+void FirstPlugin::cb_redraw(Scene* scene)
+{
 	m_render_topo->drawTopo();
 }

-void FirstPlugin::cb_initGL(Scene* scene){
-	if(scene){
-		//we fit the first (possibly the only) view of the newly liked
-		//scene to the content of our map
-
-		//  bounding box of scene
-		Geom::BoundingBox<PFP::VEC3> bb = Algo::Geometry::computeBoundingBox<PFP>(myMap, position);
+bool FirstPlugin::activate()
+{
+	// creation of 2 new faces: 1 triangle and 1 square
+	Dart d1 = myMap.newFace(3);
+	Dart d2 = myMap.newFace(4);

-		scene->firstViewFitSphere(bb.center()[0], bb.center()[1], bb.center()[2], bb.maxSize());
+	// sew these faces along one of their edge
+	myMap.sewFaces(d1, d2);

+	// creation of a new attribute on vertices of type 3D vector for position.
+	// a handler to this attribute is returned
+	position = myMap.addAttribute<VEC3, VERTEX>("position");

+	// affect position by moving in the map
+	position[d1] = VEC3(0, 0, 0);
+	position[PHI1(d1)] = VEC3(2, 0, 0);
+	position[PHI_1(d1)] = VEC3(1, 2, 0);
+	position[PHI<11>(d2)] = VEC3(0, -2, 0);
+	position[PHI_1(d2)] = VEC3(2, -2, 0);

-		m_render_topo = new Algo::Render::GL2::TopoRender() ;
+	m_render_topo=NULL;

-		// render the topo of the map without boundary darts
-		SelectorDartNoBoundary<PFP::MAP> nb(myMap);
-		m_render_topo->updateData<PFP>(myMap, position, 0.9f, 0.9f, nb);
+	return true;
+}

+void FirstPlugin::disable()
+{
+	if(m_render_topo)
+	{
+		delete m_render_topo;
 	}
 }

-
 /**
 * If we want to compile this plugin in debug mode,
 * we also define a DEBUG macro at the compilation
 */
 #ifndef DEBUG
-	//essential Qt function:
-	//arguments are
+	// essential Qt function:
+	// arguments are
 	//	- the complied name of the plugin
 	//	- the main class of our plugin (that extends VisualPlugin)
 	Q_EXPORT_PLUGIN2(FirstPlugin, FirstPlugin)

--- a/SCHNApps/Release/CMakeLists.txt
+++ b/SCHNApps/Release/CMakeLists.txt
@@ -16,95 +16,64 @@ INCLUDE_DIRECTORIES(
 	${CMAKE_CURRENT_SOURCE_DIR}
 	${CMAKE_CURRENT_BINARY_DIR}
 	${QGLVIEWER_INCLUDE_DIR}
+	${SCHNApps_ROOT_DIR}/include
 )

-SET(SRC_FILES
-	${SRC_DIR}/main.cpp
-	${SRC_DIR}/interface/window.cpp
-	${SRC_DIR}/interface/system.cpp
-	${SRC_DIR}/interface/stateHandler.cpp
-	${SRC_DIR}/visualization/view.cpp
-	${SRC_DIR}/visualization/scene.cpp
-	${SRC_DIR}/visualization/camera.cpp
-	${SRC_DIR}/interface/splitArea.cpp
-	${SRC_DIR}/dialogs/newSceneDialog.cpp
-	${SRC_DIR}/dialogs/sceneSelector.cpp
-	${SRC_DIR}/interface/viewButtonArea.cpp
-	${SRC_DIR}/dialogs/cameraViewDialog.cpp
-	${SRC_DIR}/dialogs/cameraOptionDialog.cpp
-	${SRC_DIR}/dialogs/cameraSceneDialog.cpp
-	${SRC_DIR}/dialogs/globalCameraDialog.cpp
-	${SRC_DIR}/dialogs/pluginDialog.cpp
-	${SRC_DIR}/dialogs/linkViewDialog.cpp
-	${SRC_DIR}/visualization/vboHandler.cpp
-	${SRC_DIR}/visualization/mapHandler.cpp
-	${SRC_DIR}/visualization/context.cpp
-	${SRC_DIR}/dialogs/mapPluginDialog.cpp
+file(
+	GLOB
+	SCHNApps_SRC_FILES
+	${SCHNApps_ROOT_DIR}/src/main.cpp
+	${SCHNApps_ROOT_DIR}/src/interface/*.cpp
+	${SCHNApps_ROOT_DIR}/src/visualization/*.cpp
+	${SCHNApps_ROOT_DIR}/src/dialogs/*.cpp
 )

-SET(H_OBJECT_FILES
-	${INC_DIR}/interface/window.h
-	${INC_DIR}/interface/system.h
-	${INC_DIR}/visualization/view.h
-	${INC_DIR}/visualization/scene.h
-	${INC_DIR}/interface/splitArea.h
-	${INC_DIR}/dialogs/newSceneDialog.h
-	${INC_DIR}/dialogs/sceneSelector.h
-	${INC_DIR}/interface/viewButtonArea.h
-	${INC_DIR}/dialogs/cameraViewDialog.h
-	${INC_DIR}/dialogs/cameraOptionDialog.h
-	${INC_DIR}/dialogs/cameraSceneDialog.h
-	${INC_DIR}/dialogs/globalCameraDialog.h
-	${INC_DIR}/dialogs/pluginDialog.h
-	${INC_DIR}/dialogs/linkViewDialog.h
-	${INC_DIR}/dialogs/mapPluginDialog.h
+SET(SCHNApps_H_OBJECT_FILES
+	${SCHNApps_ROOT_DIR}/include/interface/window.h
+	${SCHNApps_ROOT_DIR}/include/interface/system.h
+	${SCHNApps_ROOT_DIR}/include/interface/viewButtonArea.h
+	${SCHNApps_ROOT_DIR}/include/interface/splitArea.h
+	${SCHNApps_ROOT_DIR}/include/visualization/view.h
+	${SCHNApps_ROOT_DIR}/include/visualization/scene.h
+	${SCHNApps_ROOT_DIR}/include/dialogs/newSceneDialog.h
+	${SCHNApps_ROOT_DIR}/include/dialogs/sceneSelector.h
+	${SCHNApps_ROOT_DIR}/include/dialogs/cameraViewDialog.h
+	${SCHNApps_ROOT_DIR}/include/dialogs/cameraOptionDialog.h
+	${SCHNApps_ROOT_DIR}/include/dialogs/cameraSceneDialog.h
+	${SCHNApps_ROOT_DIR}/include/dialogs/globalCameraDialog.h
+	${SCHNApps_ROOT_DIR}/include/dialogs/pluginDialog.h
+	${SCHNApps_ROOT_DIR}/include/dialogs/linkViewDialog.h
+	${SCHNApps_ROOT_DIR}/include/dialogs/mapPluginDialog.h
 )

-SET(FORMS_FILES
-	${FORMS_DIR}/window.ui
-	${FORMS_DIR}/questionSessionDialog.ui
-	${FORMS_DIR}/infoDialog.ui
-	${FORMS_DIR}/newSceneDialog.ui
-	${FORMS_DIR}/cameraViewDialog.ui
-	${FORMS_DIR}/cameraOptionDialog.ui
-	${FORMS_DIR}/cameraSceneDialog.ui
-	${FORMS_DIR}/globalCameraDialog.ui
-	${FORMS_DIR}/pluginDialog.ui
-	${FORMS_DIR}/linkViewDialog.ui
-	${FORMS_DIR}/mapPluginDialog.ui
+file(
+	GLOB
+	SCHNApps_FORM_FILES
+	${SCHNApps_ROOT_DIR}/forms/*.ui
 )

-QT4_WRAP_UI(UI_H_FILES
-	${FORMS_FILES}
+QT4_WRAP_UI( UI_H_FILES
+	${SCHNApps_FORM_FILES}
 )
-QT4_WRAP_CPP(MOC_FILES
-	${H_OBJECT_FILES}
+QT4_WRAP_CPP( MOC_FILES
+	${SCHNApps_H_OBJECT_FILES}
 )
-QT4_ADD_RESOURCES(RCC_FILES
-	${RESOURCES_DIR}/resources.qrc
+QT4_ADD_RESOURCES( RCC_FILES
+	${SCHNApps_ROOT_DIR}/resources/resources.qrc
 )

-INCLUDE_DIRECTORIES(
-	${FORMS}
-	${INC_DIR}
-	${INC_DIR}/interface
-	${INC_DIR}/visualization
-	${INC_DIR}/dialogs
-	${INC_DIR}/plugins
-)
-