Merge branch 'release' of https://github.com/uic-evl/omegalib into release

Conflicts:
	include/version.h

Author: febret

.travis.yml

@@ -14,5 +14,6 @@ before_install:
  - sudo apt-get install -qq git || /bin/true
  - sudo apt-get install -qq libgl1-mesa-dev || /bin/true
  - sudo apt-get install -qq libglewmx1.6-dev || /bin/true
+ - sudo apt-get install -qq libxxf86vm-dev || /bin/true
  - sudo chmod +x external/setup-travis.sh
  - external/setup-travis.sh

Authors.txt

@@ -1,10 +1,11 @@
 INSTITUTIONS
 ---------------------------------------
 Work on Omegalib core and modules was supported by the following institutions:
-    The Electronic Visualization Lab, University of Illinois at Chicago
-    Northwestern University, Chicago
-    Monash University, Melbourne
-    Politecnico di Milano, Milan
+    The Electronic Visualization Lab at the University of Illinois at Chicago, Chicago, US
+    Northwestern University, Evanston, US
+    Monash University, Melbourne, Australia
+    Politecnico di Milano, Milan, Italy
+    Center for Visual Computing at Stony Brook University, Stony Brook, US
 
 
 AUTHORS
@@ -13,28 +14,31 @@ Lead Developer:
     Alessandro Febretti
 
 Contributors:
-    Arthur Nishimoto
+    Dennis Chau
     Victor Mateviitsi
+    Koosha Mirhosseini
     Brad McGinnis
-    Dennis Chau
+    Arthur Nishimoto
     JD Pirtle
+    Qi Sun
 
 Module Contributors:
-    Jason Leigh
-    Andrew Johnson
-    Thomas Marrinan
     David Barnes
+    Daniele Donghi
+    Andrew Johnson
     Owen Kaluza
     Andreas Limbera
-    Daniele Donghi
+    Jason Leigh
+    Thomas Marrinan
+    Matt McCrory
     Alex Simes
 
 Patch Contributors:
-    Shi Yin
-    Cai Shanli
     J Markus Maunus
     Jonathan Khoo
+    Cai Shanli
     Connor Taffe
+    Shi Yin
 
 Academic Supervisors:
     Andrew Johnson

CMakeLists.txt

@@ -22,7 +22,13 @@ execute_process(
   OUTPUT_VARIABLE GIT_BRANCH
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )
-
+if(CMAKE_GENERATOR STREQUAL "Xcode")        
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -stdlib=libstdc++" CACHE STRING "" FORCE)
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -stdlib=libstdc++" CACHE STRING "" FORCE)
+    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libstdc++" CACHE STRING "" FORCE)
+    SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -stdlib=libstdc++" CACHE STRING "" FORCE)
+    SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -stdlib=libstdc++" CACHE STRING "" FORCE)
+endif(CMAKE_GENERATOR STREQUAL "Xcode")
 #-------------------------------------------------------------------------------
 # Create a build name depending on the OS, Toolset and architecture.
 if(CMAKE_GENERATOR STREQUAL "Visual Studio 9 2008")

README.md

@@ -4,7 +4,7 @@
 
 <img src="https://github.com/uic-evl/omegalib/wiki/intro/banner.jpg"/>
 
-A framework for virtual reality and cluster-driven display systems.
+A hybrid visualization framework for desktops, large immersive displays and the web.
 
 - Intro page: http://uic-evl.github.io/omegalib/
 - Wiki: https://github.com/uic-evl/omegalib/wiki

external/UseEqualizer.cmake

@@ -2,6 +2,7 @@ set(EQUALIZER_BASE_DIR ${CMAKE_BINARY_DIR}/3rdparty/equalizer)
 
 # Equalizer support enabled: uncompress and prepare the external project.
 if(APPLE)
+	string(REGEX MATCH "[0-9]+\\.[0-9]+" OSX_FAMILY ${CURRENT_OSX_VERSION} )
     ExternalProject_Add(
 		equalizer
 		URL http://github.com/omega-hub/Equalizer-1.0.2/archive/master.tar.gz
@@ -12,14 +13,14 @@ if(APPLE)
 			-DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
 			-DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
 			#-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE}
-            -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${CURRENT_OSX_VERSION}.sdk
-            -DCMAKE_OSX_DEPLOYMENT_TARGET:VAR=${CURRENT_OSX_VERSION}
+            -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${OSX_FAMILY}.sdk
+            -DCMAKE_OSX_DEPLOYMENT_TARGET:VAR=${OSX_FAMILY}
 			-DEQUALIZER_PREFER_AGL:BOOL=OFF
 			-DEQUALIZER_USE_CUDA:BOOL=OFF
 			-DEQUALIZER_USE_BOOST:BOOL=OFF
             -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
 			INSTALL_COMMAND ""
-            PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/external/equalizer.${CURRENT_OSX_VERSION}.patch
+            PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/external/equalizer.${OSX_FAMILY}.patch
 	    # directories
     	TMP_DIR ${CMAKE_BINARY_DIR}/3rdparty/tmp
     	STAMP_DIR ${CMAKE_BINARY_DIR}/3rdparty/stamp
@@ -79,14 +80,18 @@ if(WIN32)
 
 else()
 	if(APPLE)
-		set(EQUALIZER_EQ_LIB_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/libEqualizer.dylib)
-		set(EQUALIZER_CO_LIB_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/libCollage.dylib)
+		set(EQUALIZER_EQ_LIB_DEBUG debug ${EQUALIZER_BINARY_DIR}/libs/client/Debug/libEqualizer.dylib)
+		set(EQUALIZER_CO_LIB_DEBUG debug ${EQUALIZER_BINARY_DIR}/libs/collage/Debug/libCollage.dylib)
+		set(EQUALIZER_EQ_LIB_RELEASE optimized ${EQUALIZER_BINARY_DIR}/libs/client/Release/libEqualizer.dylib)
+		set(EQUALIZER_CO_LIB_RELEASE optimized ${EQUALIZER_BINARY_DIR}/libs/collage/Release/libCollage.dylib)
 	else()
 		set(EQUALIZER_EQ_LIB_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/libEqualizer.so)
 		set(EQUALIZER_CO_LIB_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/libCollage.so)
+		set(EQUALIZER_EQ_LIB_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/libEqualizer.so)
+		set(EQUALIZER_CO_LIB_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/libCollage.so)
 	endif()	
 	set(EQUALIZER_LIBS_DEBUG ${EQUALIZER_EQ_LIB_DEBUG} ${EQUALIZER_CO_LIB_DEBUG})
-	set(EQUALIZER_LIBS_RELEASE ${EQUALIZER_EQ_LIB_DEBUG} ${EQUALIZER_CO_LIB_DEBUG})
+	set(EQUALIZER_LIBS_RELEASE ${EQUALIZER_EQ_LIB_RELEASE} ${EQUALIZER_CO_LIB_RELEASE})
 endif()
 set(EQUALIZER_LIBS ${EQUALIZER_LIBS_DEBUG} ${EQUALIZER_LIBS_RELEASE})
 set(EQUALIZER_INCLUDES ${EQUALIZER_BINARY_DIR}/include)

external/UseOmicron.cmake

@@ -82,14 +82,19 @@ else()
 
 	###################################################################################################
 	# Set the output directories for libraries and binary files
-	if(MSVC OR CMAKE_GENERATOR STREQUAL "Xcode")
+	if(MSVC)
 		# omicron
 		set(OMICRON_LIB_DEBUG ${OMICRON_LIB_DIR_DEBUG}/omicron.lib)
 		set(OMICRON_LIB_RELEASE ${OMICRON_LIB_DIR_RELEASE}/omicron.lib)
 	else()
 		if(APPLE)
-			set(OMICRON_LIB_DEBUG ${OMICRON_BIN_DIR}/libomicron.dylib)
-			set(OMICRON_LIB_RELEASE ${OMICRON_BIN_DIR}/libomicron.dylib)
+			if(CMAKE_GENERATOR STREQUAL "Xcode")
+				set(OMICRON_LIB_DEBUG ${OMICRON_BIN_DIR}/debug/libomicron.dylib)
+				set(OMICRON_LIB_RELEASE ${OMICRON_BIN_DIR}/release/libomicron.dylib)
+			else(CMAKE_GENERATOR STREQUAL "Xcode")
+				set(OMICRON_LIB_DEBUG ${OMICRON_BIN_DIR}/libomicron.dylib)
+				set(OMICRON_LIB_RELEASE ${OMICRON_BIN_DIR}/libomicron.dylib)
+			endif(CMAKE_GENERATOR STREQUAL "Xcode")
 		else(APPLE)
 			set(OMICRON_LIB_DEBUG ${OMICRON_BIN_DIR}/libomicron.so)
 			set(OMICRON_LIB_RELEASE ${OMICRON_BIN_DIR}/libomicron.so)

external/equalizer.10.10.patch

@@ -20,13 +20,20 @@ diff -Naur Equalizer-1.0.2/CMake/Equalizer.spec equalizer/CMake/Equalizer.spec
 diff -Naur Equalizer-1.0.2/CMakeLists.txt equalizer/CMakeLists.txt
 --- Equalizer-1.0.2/CMakeLists.txt	2013-04-01 15:38:52.000000000 -0500
 +++ equalizer/CMakeLists.txt	2014-03-13 17:29:21.000000000 -0500
-@@ -137,17 +137,17 @@
+@@ -137,17 +137,24 @@
  if(X11_FOUND)
    if(APPLE)
      set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem ") # Disabled by GNU.cmake!?
 -    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.6" )
 -    if(EXISTS /Developer/SDKs/MacOSX10.6.sdk)
 +    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.6 -stdlib=libstdc++" )
++	 if(CMAKE_GENERATOR STREQUAL "Xcode")
++    	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -stdlib=libstdc++" CACHE STRING "" FORCE)
++    	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -stdlib=libstdc++" CACHE STRING "" FORCE)
++    	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libstdc++" CACHE STRING "" FORCE)
++    	SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -stdlib=libstdc++" CACHE STRING "" FORCE)
++    	SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -stdlib=libstdc++" CACHE STRING "" FORCE)
++	 endif(CMAKE_GENERATOR STREQUAL "Xcode")
 +    if(EXISTS /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk)
        if(EQUALIZER_PREFER_AGL)
          set(EQ_AGL_USED 1)
@@ -42,7 +49,7 @@ diff -Naur Equalizer-1.0.2/CMakeLists.txt equalizer/CMakeLists.txt
    else(APPLE)
      set(EQ_GLX_USED 1)
    endif(APPLE)
-@@ -191,7 +191,7 @@
+@@ -191,7 +198,7 @@
        if(_CMAKE_OSX_MACHINE MATCHES "ppc")
          set(CMAKE_OSX_ARCHITECTURES "ppc")
        else()
@@ -51,7 +58,7 @@ diff -Naur Equalizer-1.0.2/CMakeLists.txt equalizer/CMakeLists.txt
        endif()
      endif()
      set(CUDA_64_BIT_DEVICE_CODE OFF) 
-@@ -219,7 +219,7 @@
+@@ -219,7 +226,7 @@
  set(EQ_DEFINITIONS -DEQ_BUILD_DIR="${CMAKE_BINARY_DIR}/" -DEQ_SOURCE_DIR="${CMAKE_SOURCE_DIR}/")
  if(EQUALIZER_RELEASE)
    set(EQ_DEFINITIONS ${EQ_DEFINITIONS} -DEQ_RELEASE)

external/equalizer.10.11.patch

@@ -0,0 +1,139 @@
+diff -Naur Equalizer-1.0.2/CMake/Equalizer.spec equalizer/CMake/Equalizer.spec
+--- Equalizer-1.0.2/CMake/Equalizer.spec	2011-11-09 14:07:20.000000000 -0600
++++ equalizer/CMake/Equalizer.spec	2014-03-11 17:28:48.000000000 -0500
+@@ -1,5 +1,5 @@
+ Name:		Equalizer
+-Version:	1.0.1
++Version:	1.0.2
+ Release:	1%{?dist}
+ Summary:	Middleware to create and deploy parallel OpenGL-based applications
+ 
+@@ -7,7 +7,7 @@
+ License:	LGPLv2, examples are BSD licensed
+ URL:		http://www.equalizergraphics.com/
+ Source0:	http://www.equalizergraphics.com/downloads/%{name}-%{version}.tar.gz
+-Patch0:		Equalizer-1.0.1-build-fix.patch
++Patch0:		Equalizer-1.0.2-build-fix.patch
+ BuildRequires:	cmake bison flex
+ BuildRequires:	boost-devel glew-devel
+ BuildRequires:	libX11-devel mesa-libGL-devel
+diff -Naur Equalizer-1.0.2/CMakeLists.txt equalizer/CMakeLists.txt
+--- Equalizer-1.0.2/CMakeLists.txt	2013-04-01 15:38:52.000000000 -0500
++++ equalizer/CMakeLists.txt	2014-03-13 17:29:21.000000000 -0500
+@@ -137,17 +137,24 @@
+ if(X11_FOUND)
+   if(APPLE)
+     set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem ") # Disabled by GNU.cmake!?
+-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.6" )
+-    if(EXISTS /Developer/SDKs/MacOSX10.6.sdk)
++    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.6 -stdlib=libstdc++" )
++	 if(CMAKE_GENERATOR STREQUAL "Xcode")
++    	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -stdlib=libstdc++" CACHE STRING "" FORCE)
++    	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -stdlib=libstdc++" CACHE STRING "" FORCE)
++    	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libstdc++" CACHE STRING "" FORCE)
++    	SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -stdlib=libstdc++" CACHE STRING "" FORCE)
++    	SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -stdlib=libstdc++" CACHE STRING "" FORCE)
++	 endif(CMAKE_GENERATOR STREQUAL "Xcode")
++    if(EXISTS /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk)
+       if(EQUALIZER_PREFER_AGL)
+         set(EQ_AGL_USED 1)
+       else(EQUALIZER_PREFER_AGL)
+         set(EQ_GLX_USED 1)
+       endif(EQUALIZER_PREFER_AGL)
+-    else(EXISTS /Developer/SDKs/MacOSX10.6.sdk)
++    else(EXISTS /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk)
+       set(EQ_AGL_USED 1)
+       set(EQ_GLX_USED 1)
+-    endif(EXISTS /Developer/SDKs/MacOSX10.6.sdk)
++    endif(EXISTS /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk)
+   else(APPLE)
+     set(EQ_GLX_USED 1)
+   endif(APPLE)
+@@ -191,7 +198,7 @@
+       if(_CMAKE_OSX_MACHINE MATCHES "ppc")
+         set(CMAKE_OSX_ARCHITECTURES "ppc")
+       else()
+-        set(CMAKE_OSX_ARCHITECTURES "i386")
++#        set(CMAKE_OSX_ARCHITECTURES "i386")
+       endif()
+     endif()
+     set(CUDA_64_BIT_DEVICE_CODE OFF) 
+@@ -219,7 +226,7 @@
+ set(EQ_DEFINITIONS -DEQ_BUILD_DIR="${CMAKE_BINARY_DIR}/" -DEQ_SOURCE_DIR="${CMAKE_SOURCE_DIR}/")
+ if(EQUALIZER_RELEASE)
+   set(EQ_DEFINITIONS ${EQ_DEFINITIONS} -DEQ_RELEASE)
+-  set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk CACHE PATH "" FORCE)
++  set(CMAKE_OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk CACHE PATH "" FORCE)
+   if(IS_ABSOLUTE ${CMAKE_INSTALL_PREFIX})
+     set(EQ_DEFINITIONS ${EQ_DEFINITIONS} -DEQ_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}/")
+   else()
+diff -Naur Equalizer-1.0.2/libs/admin/config.cpp equalizer/libs/admin/config.cpp
+--- Equalizer-1.0.2/libs/admin/config.cpp	2011-11-09 14:07:20.000000000 -0600
++++ equalizer/libs/admin/config.cpp	2014-03-11 17:28:47.000000000 -0500
+@@ -15,6 +15,7 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#include "../fabric/config.ipp"
+ #include "config.h"
+ 
+ #include "canvas.h"
+@@ -61,7 +62,6 @@
+ }
+ }
+ 
+-#include "../fabric/config.ipp"
+ #include "../fabric/view.ipp"
+ #include "../fabric/observer.ipp"
+ template class eq::fabric::Config< eq::admin::Server, eq::admin::Config,
+diff -Naur Equalizer-1.0.2/libs/client/CMakeLists.txt equalizer/libs/client/CMakeLists.txt
+--- Equalizer-1.0.2/libs/client/CMakeLists.txt	2011-11-09 14:07:20.000000000 -0600
++++ equalizer/libs/client/CMakeLists.txt	2014-03-13 17:31:33.000000000 -0500
+@@ -30,7 +30,7 @@
+     set(GL_LIBRARIES "${OPENGL_LIBRARIES}")
+   endif(EQ_AGL_USED)
+   if(EQ_GLX_USED)
+-    set(GL_LIBRARIES ${GL_LIBRARIES} GL)
++    set(GL_LIBRARIES /opt/X11/lib/libGL.1.dylib )
+   endif(EQ_GLX_USED)
+ else(APPLE)
+   set(GL_LIBRARIES "${OPENGL_LIBRARIES}")
+diff -Naur Equalizer-1.0.2/libs/client/config.cpp equalizer/libs/client/config.cpp
+--- Equalizer-1.0.2/libs/client/config.cpp	2011-11-09 14:07:20.000000000 -0600
++++ equalizer/libs/client/config.cpp	2014-03-11 17:28:47.000000000 -0500
+@@ -16,6 +16,7 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#include "../fabric/config.ipp"
+ #include "config.h"
+ 
+ #include "canvas.h"
+@@ -929,7 +930,7 @@
+ }
+ }
+ 
+-#include "../fabric/config.ipp"
++//#include "../fabric/config.ipp"
+ #include "../fabric/view.ipp"
+ #include "../fabric/observer.ipp"
+ template class eq::fabric::Config< eq::Server, eq::Config, eq::Observer,
+diff -Naur Equalizer-1.0.2/libs/server/config.cpp equalizer/libs/server/config.cpp
+--- Equalizer-1.0.2/libs/server/config.cpp	2011-11-09 14:07:20.000000000 -0600
++++ equalizer/libs/server/config.cpp	2014-03-11 17:28:47.000000000 -0500
+@@ -16,6 +16,7 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#include "../fabric/config.ipp"
+ #include "config.h"
+ 
+ #include "canvas.h"
+@@ -1124,7 +1125,6 @@
+ }
+ 
+ #include "nodeFactory.h"
+-#include "../fabric/config.ipp"
+ template class eq::fabric::Config< eq::server::Server, eq::server::Config,
+                                    eq::server::Observer, eq::server::Layout,
+                                    eq::server::Canvas, eq::server::Node,

include/omega/ApplicationBase.h

@@ -69,12 +69,23 @@ namespace omega
         // Some useful properties parsed from the command line or settable by
         // an application before calling omain
 
+        //!! Application interactive mode
+        enum InteractiveMode
+        {
+            //!! Use the interactive mode specified in the configuration filesyn s
+            FromConfig,
+            //!! Force interactive mode
+            Interactive,
+            //! Force non-interactive mode
+            NonInteractive
+        };
+
         //! Runs the program in interactive mode, even if the script console 
         //! is not enabled in the system configuration
-        bool interactive;
+        InteractiveMode interactive;
 
     public:
-        ApplicationBase() : interactive(false) {}
+        ApplicationBase() : interactive(FromConfig) {}
 
         virtual const char* getName() { return "OmegaLib"; }
         virtual void setName(const String& name) = 0;