Merge branch 'release/v0.8.3'

CMakeLists.txt

@@ -7,7 +7,7 @@ PROJECT(GUACAMOLE CXX)
 # version number
 set(GUACAMOLE_MAJOR 0)
 set(GUACAMOLE_MINOR 8)
-set(GUACAMOLE_PATCH 2)
+set(GUACAMOLE_PATCH 3)
 set(GUACAMOLE_VERSION ${GUACAMOLE_MAJOR}.${GUACAMOLE_MINOR}.${GUACAMOLE_PATCH})
 set(GUACAMOLE_DESCRIPTION "GUACAMOLE - an astonishing virtual reality engine")
 set(GUACAMOLE_HOMEPAGE "http://www.GUACAMOLE.org")

examples/CMakeLists.txt

@@ -1,3 +1,32 @@
 # guacamole examples
 
+set(LIB_PATH
+  ${SCHISM_LIBRARY_DIRS}
+  ${BOOST_LIBRARY_DIRS}
+  ${BULLET_LIBRARY_DIRS}
+  ${GUACAMOLE_LIBRARY_DIRS}
+  ${ASSIMP_LIBRARY_DIRS}
+  ${JSON_LIBRARY_DIRS}
+  )
+link_directories(${LIB_PATH})
 
+set(LIBS
+  ${SCHISM_LIBRARIES}
+  ${BOOST_LIBRARIES}
+  ${BULLET_LIBRARIES}
+  ${GUACAMOLE_LIBRARIES}
+  ${ASSIMP_LIBRARIES}
+  ${JSON_LIBRARIES}
+  )
+#link_libraries(${LIBS})
+
+set(INCLUDE_PATHS
+  ${SCHISM_INCLUDE_DIRS}
+  ${BOOST_INCLUDE_DIRS}
+  ${BULLET_INCLUDE_DIRS}
+  ${GUACAMOLE_INCLUDE_DIRS}
+  ${ASSIMP_INCLUDE_DIRS}
+  ${JSON_INCLUDE_DIRS}
+  )
+
+add_subdirectory(multicontext)

examples/multicontext/CMakeLists.txt

@@ -0,0 +1,31 @@
+# determine source and header files
+
+get_filename_component(_EXE_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME)
+
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR})
+
+list(APPEND LIB_PATHS ${CMAKE_SOURCE_DIR}/lib)
+
+link_directories(${LIB_PATHS})
+
+include_directories( ${INCLUDE_PATHS} ${PROJECT_SOURCE_DIR}/include)
+
+add_executable( ${_EXE_NAME} main.cpp)
+
+add_dependencies(${_EXE_NAME} guacamole)
+
+list(APPEND LIBS guacamole)
+
+target_link_libraries( ${_EXE_NAME} debug ${LIBS} optimized ${LIBS})
+
+# copy runtime libraries as a post-build process
+if (MSVC)
+
+    COPY_RUNTIME_DEPENDENCIES ( ${_EXE_NAME} \"${GLOBAL_EXT_DIR}/bin/$(Configuration)/\" \"${EXECUTABLE_OUTPUT_PATH}/$(Configuration)/\")
+    COPY_RUNTIME_DEPENDENCIES ( ${_EXE_NAME} \"${LIBRARY_OUTPUT_PATH}/$(Configuration)/\" \"${EXECUTABLE_OUTPUT_PATH}/$(Configuration)/\")
+
+    FOREACH (_LIB_DIR ${GUACAMOLE_LIBRARY_DIRS})
+        COPY_RUNTIME_DEPENDENCIES ( ${_EXE_NAME} \"${_LIB_DIR}/$(Configuration)/\" \"${EXECUTABLE_OUTPUT_PATH}/$(Configuration)/\")
+    ENDFOREACH (_LIB_DIR ${GUACAMOLE_LIBRARY_DIRS})
+
+endif (MSVC)

examples/multicontext/data/geometry/box.mtl

@@ -0,0 +1,12 @@
+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# File Created: 14.02.2011 10:57:30
+
+newmtl wire_027177148
+	Ns 32
+	d 1
+	Tr 0
+	Tf 1 1 1
+	illum 2
+	Ka 0.105882 0.694118 0.580392
+	Kd 0.105882 0.694118 0.580392
+	Ks 0.350000 0.350000 0.350000

examples/multicontext/data/geometry/box.obj

@@ -0,0 +1,49 @@
+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# File Created: 14.02.2011 10:57:30
+
+mtllib box.mtl
+
+#
+# object Box01
+#
+
+v  -0.500000 -0.500000 -0.500000
+v  -0.500000 0.500000 -0.500000
+v  0.500000 0.500000 -0.500000
+v  0.500000 -0.500000 -0.500000
+v  -0.500000 -0.500000 0.500000
+v  0.500000 -0.500000 0.500000
+v  0.500000 0.500000 0.500000
+v  -0.500000 0.500000 0.500000
+# 8 vertices
+
+vn 0.000000 0.000000 -1.000000
+vn 0.000000 -0.000000 1.000000
+vn 0.000000 -1.000000 -0.000000
+vn 1.000000 0.000000 -0.000000
+vn 0.000000 1.000000 0.000000
+vn -1.000000 0.000000 -0.000000
+# 6 vertex normals
+
+vt 1.000000 0.000000 0.000000
+vt 1.000000 1.000000 0.000000
+vt 0.000000 1.000000 0.000000
+vt 0.000000 0.000000 0.000000
+# 4 texture coords
+
+g Box01
+usemtl wire_027177148
+f 1/1/1 2/2/1 3/3/1
+f 3/3/1 4/4/1 1/1/1
+f 5/4/2 6/1/2 7/2/2
+f 7/2/2 8/3/2 5/4/2
+f 1/4/3 4/1/3 6/2/3
+f 6/2/3 5/3/3 1/4/3
+f 4/4/4 3/1/4 7/2/4
+f 7/2/4 6/3/4 4/4/4
+f 3/4/5 2/1/5 8/2/5
+f 8/2/5 7/3/5 3/4/5
+f 2/4/6 1/1/6 5/2/6
+f 5/2/6 8/3/6 2/4/6
+# 12 faces
+

examples/multicontext/data/geometry/sphere.mtl

@@ -0,0 +1,12 @@
+# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
+# File Created: 03.03.2011 19:21:25
+
+newmtl wire_227153153
+	Ns 32
+	d 1
+	Tr 0
+	Tf 1 1 1
+	illum 2
+	Ka 0.890196 0.600000 0.600000
+	Kd 0.890196 0.600000 0.600000
+	Ks 0.350000 0.350000 0.350000