Updated ChangeLog

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/branches/OpenSceneGraph-3.2@15107 16af8721-9629-0410-8352-f15c8da7e697

AUTHORS.txt

@@ -1,6 +1,6 @@
-OpenSceneGraph Library 3.2.0
+OpenSceneGraph Library 3.2.2
 
-511 Contributors:
+529 Contributors:
 
 Firstname Surname
 -----------------
@@ -9,14 +9,14 @@ Don Burns
 Stephan Huber
 Paul Martz
 Mathias Fr<46>hlich
-Marco Jez
 Farshid Lashkari
+Marco Jez
 Wang Rui
 Jean-S<>bastien Guay
-Mike Weiblen
 Ulrich Hertlein
+Mike Weiblen
+Sukender
 Eric Wing
-Sukender 
 Cedric Pinson
 Brede Johansen
 Bob Kuehne
@@ -25,58 +25,59 @@ Geoff Michel
 Wojciech Lewandowski
 Eric Sokolowsky
 David Callu
-Trajce Nikolov
+Laurens Voerman
 Colin McDonald
+Trajce Nikolov
 Tim Moore
 Martin Lavery
-Laurens Voerman
-Tree 
+Tree
 Luigi Calori
 Mike Wittman
+Jason Beverage
 Chris Hanson
 Roland Smeenk
 Roger James
-Jeremy Moles
-Jason Beverage
-Jan Peciva
-J.P. Delport
 Mattias Helsing
+Jeremy Moles
+Jan Peciva
+Alberto Luaces
+J.P. Delport
 Magnus Kessler
 David Fries
 Andy Skinner
-Paul Melis
-Alberto Luaces
-Luc Frauciel
 Tom Jolley
+Paul Melis
+Luc Frauciel
 Pavel Moloshtan
 Brad Christiansen
 Olaf Flebbe
 Mathieu Marache
 Jason Daly
+Aurelien Albert
 Art Tevs
 Philip Lowman
 Per Fahlberg
 Norman Vine
+Lionel Lagarde
 Terry Welsh
 Serge Lages
-Lionel Lagarde
+Romano Jos<6F> Magacho da Silva
+Pjotr Svetachov
 Chris Denham
 Alberto Farre
+Torben Dannhauer
 Sherman Wilcox
 Robert Michael
 Mourad Boufarguine
+Glenn Waldron
 Andr<EFBFBD> Garneau
 Adrian Egli
 Ruben Lopez
 Randall Hopper
 Jan Ciger
-Torben Dannhauer
-Glenn Waldron
 Gideon May
 Don Tidrow
-Aurelien Albert
 Stephane Lamoliatte
-Romano Jos<6F> Magacho da Silva
 Michael Gronager
 Martin Naylor
 Joakim Simonsson
@@ -85,10 +86,12 @@ Daniel Sj
 Bryan Thrall
 Fabien Lavignotte
 Andreas Ekstrand
+Riccardo Corsi
 Mike Connell
 Melchior Franz
 Johannes Baeuerle
-Riccardo Corsi
+Thomas Hogarth
+Sebastian Messerschmidt
 Rafa Gaitan
 Neil Hughes
 Martin Beckett
@@ -101,7 +104,6 @@ Cory Riddell
 Chuck Seberino
 Boris Bralo
 Yefei He
-Thomas Hogarth
 Sondra Iverson
 Simon Julier
 Rune Schmidt Jensen
@@ -119,13 +121,16 @@ Thibault Genessay
 Sasa Bistrovic
 Ravi Mathur
 Ralf Habacker
-Pjotr Svetachov
 Neil Groves
+Mikhail Izmestev
 Markus Trenkwalder
 Loic Dachary
 Joseph Steel
+Jordi Torres
 John Shue
 Brad Colbert
+Bj<EFBFBD>rn Blissing
+Alexander Sinditskiy
 Vivek Rajan
 Uwe Woessner
 Tony Horrobin
@@ -133,6 +138,7 @@ Thom DeCarlo
 Tatsuhiro Nishioka
 Tanguy Fautr<74>
 Sean Spicer
+Ryan Kawicki
 Richard Schmidt
 Peter Hrenka
 Paul de Repentigny
@@ -141,25 +147,24 @@ Neil Salter
 Mihai Radu
 Michael Hartman
 Martins Innus
+Marc Helbling
 Maciej Krol
 Lilin Xiong
 Leandro Motta Barros
-Jordi Torres
 Johan Nouvel
 Hartwig Wiesmann
 Donn Mielcarek
 Corbin Holtz
 Blasius Czink
-Alexander Sinditskiy
 Alexander Irion
 Toshiyuki Takahei
 Sebastien Grignard
-Ryan Kawicki
 Rudolf Wiedemann
-Romano Magacho
-Mikhail Izmestev
+Robert Milharcic
 Maria Ten
 Liang Aibin
+Kristofer Tingdahl
+Konstantin Matveyev
 Katharina Plugge
 John Vidar Larring
 John Kelso
@@ -177,14 +182,13 @@ Alok Priyadarshi
 Alberto Barbati
 Alan Dickinson
 Vladimir Shabanov
+Vladimir Chebaev
 Tugkan Calapoglu
 Tim Daoust
 Sohey Yamamoto
 Sergey Leontyev
-Sebastian Messerschmidt
 Santosh Gaikwad
 Ryan Pavlik
-Robert Milharcic
 Rene Molenaar
 Piotr Domagalski
 Phil Atkin
@@ -194,6 +198,7 @@ Mattias Linde
 Mark Sciabica
 Marcin Prus
 Lee Butler
+Lars Nilsson
 Konstantin Sinitsyn
 Ken Sewell
 Julian Ortiz
@@ -211,6 +216,7 @@ Doug McCorkle
 Donald Cipperly
 Don Leich
 Dietmar Funck
+Colin Cochran
 Christian Buchner
 Charles Cole
 Blake Williams
@@ -224,9 +230,8 @@ Zach Deedler
 Yuzhong Shen
 Wee See
 Warren Macchi
-Vladimir Chebaev
 Vincent Bourdier
-Terrex 
+Terrex
 Tassilo Glander
 Sylvain Marie
 Steve Lunsford
@@ -242,6 +247,7 @@ Perry Miller
 Pawel Ksiezopolski
 Paul Palumbo
 Paul Obermeier
+Patrick Neary
 Nguyen Van Truong
 Nathan Cournia
 Morten Haukness
@@ -258,11 +264,11 @@ Martin Lambers
 Martijn Kragtwijk
 Marius Heise
 Marcin Hajder
+Marcel Pursche
 Lilith Bryant
-Lars Nilsson
-Kristofer Tingdahl
 Kevin Moiule
 Keith Steffen
+Julien Valentin
 Julen Garcia
 Joseph Winston
 John Aughey
@@ -270,6 +276,8 @@ Johannes Scholz
 Joachim Pouderoux
 Jean-Christophe Lombardo
 Javier Taibo
+Jannik Heller
+Jan Klimke
 James Moliere
 Jaap Glas
 Igor Kravtchenko
@@ -279,6 +287,7 @@ Guy Volckaert
 Gustavo Wagner
 Guillaume Taze
 Guillaume Chouvenc
+Giuseppe Donvito
 Gill Peacegood
 Gerrick Bivins
 George Tarantilis
@@ -287,7 +296,7 @@ Eric Buehler
 Eduardo Poyart
 Edgar Ellis
 Dimi Christopoulos
-Diane Delallée
+Diane Delall<EFBFBD>e
 David Longest
 David Ergo
 Daniel Trstenjak
@@ -295,7 +304,9 @@ Craig Bosma
 Claus Scheiblauer
 Christophe Loustaunau
 Christian Ruzicka
+Bradley Baker Searles
 Brad Anderegg
+Bj<EFBFBD>rn Hein
 Aric Aumann
 Andrew Sampson
 Andrew Lorino
@@ -322,6 +333,7 @@ Tomas Hnilica
 Todd Furlong
 Tobias Ottenweller
 Tino Schwarze
+Tim George
 Thorsten Brehm
 Thomas Weidner
 Tan Dunning
@@ -334,6 +346,7 @@ Simon Buckley
 Sid Byce
 Shuxing Xiao
 Shane Arnott
+Sergey Kurdakov
 Sebastien Kuntz
 Ruth Lang
 Ruben Smelik
@@ -348,6 +361,7 @@ Rob Radtke
 Rob Bloemkool
 Rick Pingry
 Rick Appleton
+Remo Eichenberger
 Reinhard Sainitzer
 Rein Kadijk
 Ragnar Hammarqvist
@@ -377,18 +391,20 @@ Nicolas Brodu
 Nick Black
 Mojtaba Fathi
 Mirko Viviani
-Mikkel Gjøl
+Mikkel Gj<EFBFBD>l
+Mike Krus
 Mike Garrity
-Miha Ravsel
+Miha Rav<EFBFBD>elj
+Michael Schanne
 Michael Polak
 Michael Morrison
+Michael Mc Donnell
 Michael Logan
 Michael Kapelko
 Michael Bach Jensen
 Max Rhiener
 Max Behensky
 Mauricio Hofmam
-Matthias Helsing
 Matthew May
 Matthew Johnson-Roberson
 Matt Green
@@ -403,7 +419,6 @@ Marius Kintel
 Mario Guimaraes
 Marco Sciabica
 Marco Lehmann
-Marcel Pursche
 Maik Keller
 Lukas Diduch
 Louis Hamilton
@@ -411,10 +426,8 @@ Lewis Harmon
 Leigh Stivers
 Laurence Muller
 Laura Cerritelli
-Lars Nillson
 Kyle Centers
 Kristopher Bixler
-Konstantin Matveyev
 Kim Seokhwan
 Kim Bale
 Karsten Weiss
@@ -437,7 +450,6 @@ Jeroen den Dekker
 Jay Zuckerman
 Jason Howlett
 Jason Ballenger
-Jan Klimke
 James Turner
 James Killian
 James Athey
@@ -472,6 +484,7 @@ Duvan Cope
 Duncan Cavens
 Drew Whitehouse
 Douglas A. Pouk
+Dmitry Marakasov
 Dean Iverson
 David Jung
 Danny Valente
@@ -479,9 +492,12 @@ Daniel Stien
 Dan Minor
 C<EFBFBD>sar L. B. Silveira
 Cyril Brulebois
+Cl<EFBFBD>ment B<>sch
 Clay Fowler
+Claus Steuer
 Chuck Sembroski
 Christopher Blaesius
+Christopher Baker
 Christophe Herreman
 Christian Noon
 Christian Kaser
@@ -493,8 +509,6 @@ Bruno Herbelin
 Brian Keener
 Brandon Hamm
 Bora Utka
-Bj<EFBFBD>rn Hein
-Bjorn Blissing
 Bill Prendergast
 Bernardt Duvenhage
 Benoit Laniel
@@ -502,7 +516,9 @@ Benjamin Wasty
 Ben van Basten
 Bart Gallet
 Axel Volley
+Arjun Ramamurthy
 Anthousis Andreadis
+Anish Thomas
 Andy Preece
 Andrew Reyonolds
 Andreas Roth
@@ -514,4 +530,6 @@ Alberto Jaspe
 Alan Purvis
 Alan Ott
 Alan Harris
+Adrien Grandemange
+Adrian Clark
 Adam Richard

CMakeLists.txt

@@ -22,25 +22,30 @@ if(COMMAND cmake_policy)
 
     # tell CMake to prefer CMake's own CMake modules when available
     # only available from cmake-2.8.4
-    if(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 8 AND ${CMAKE_PATCH_VERSION} GREATER 3)
+    if(${CMAKE_MAJOR_VERSION} GREATER 2 OR
+        (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 8) OR
+        (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 8 AND ${CMAKE_PATCH_VERSION} GREATER 3))
         cmake_policy(SET CMP0017 NEW)
     endif()
 
     # cmake-2.6.1 introduces policy cmp0008 decide how to treat full path libraries that do not appear to be valid library file names
     # quote from cvslog "Such libraries worked by accident in the VS IDE and Xcode generators in CMake 2.4 and below."
-    if(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4 AND ${CMAKE_PATCH_VERSION} GREATER 0)
+    if(${CMAKE_MAJOR_VERSION} GREATER 2 OR
+        (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 6) OR
+        (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 6 AND ${CMAKE_PATCH_VERSION} GREATER 0))
         cmake_policy(SET CMP0008 OLD)
     endif()
 
     # disable autolinking to qtmain as we have our own main() functions (new in Qt 5.1)
-    if((${CMAKE_MAJOR_VERSION} EQUAL 2 OR ${CMAKE_MAJOR_VERSION} GREATER 2) AND
-       (${CMAKE_MINOR_VERSION} EQUAL 8 OR ${CMAKE_MINOR_VERSION} GREATER 8) AND
-        ${CMAKE_PATCH_VERSION} GREATER 10)
+    if(${CMAKE_MAJOR_VERSION} GREATER 2 OR
+        (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 8) OR
+        (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 8 AND ${CMAKE_PATCH_VERSION} GREATER 10))
         cmake_policy(SET CMP0020 OLD)
     endif()
     # nicer version check - but needs at least CMake 2.6.2? Worth upgrading the requirements?
     #if("${CMAKE_VERSION}" VERSION_GREATER 2.8.10)
-
+    # or even easier (available in cmake-2.6)
+    #if(POLICY CMPxyzw)
 
 endif()
 
@@ -48,7 +53,7 @@ PROJECT(OpenSceneGraph)
 
 SET(OPENSCENEGRAPH_MAJOR_VERSION 3)
 SET(OPENSCENEGRAPH_MINOR_VERSION 2)
-SET(OPENSCENEGRAPH_PATCH_VERSION 0)
+SET(OPENSCENEGRAPH_PATCH_VERSION 3)
 SET(OPENSCENEGRAPH_SOVERSION 100)
 
 # set to 0 when not a release candidate, non zero means that any generated
@@ -80,6 +85,13 @@ SET(OpenThreads_SOURCE_DIR ${OpenSceneGraph_SOURCE_DIR})
 # Maybe this can be used override existing behavior if needed?
 SET(CMAKE_MODULE_PATH "${OpenSceneGraph_SOURCE_DIR}/CMakeModules;${CMAKE_MODULE_PATH}")
 
+
+# Change the default build type to Release
+IF(NOT CMAKE_BUILD_TYPE)
+    SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE)
+ENDIF(NOT CMAKE_BUILD_TYPE)
+
+
 ## Option to enable Android build using AndroidNDK
 OPTION(OSG_BUILD_PLATFORM_ANDROID OFF)
 IF(OSG_BUILD_PLATFORM_ANDROID)
@@ -234,8 +246,12 @@ IF(APPLE)
     EXECUTE_PROCESS(COMMAND "/usr/bin/sw_vers" "-productVersion"
                     OUTPUT_VARIABLE OSG_OSX_SDK_NAME
                     OUTPUT_STRIP_TRAILING_WHITESPACE)
-    STRING(SUBSTRING "${OSG_OSX_SDK_NAME}" 0 4 OSG_OSX_SDK_NAME)
-    SET(OSG_OSX_SDK_NAME "macosx${OSG_OSX_SDK_NAME}")
+    STRING(REPLACE "." ";" MACOS_VERSION_LIST ${OSG_OSX_SDK_NAME})
+    LIST(GET MACOS_VERSION_LIST 0 MACOS_VERSION_MAJOR)
+    LIST(GET MACOS_VERSION_LIST 1 MACOS_VERSION_MINOR)
+    LIST(GET MACOS_VERSION_LIST 2 MACOS_VERSION_PATCH)
+
+    SET(OSG_OSX_SDK_NAME "macosx${MACOS_VERSION_MAJOR}.${MACOS_VERSION_MINOR}")
 
     # Trying to get CMake to generate an XCode IPhone project, current efforts are to get iphoneos sdk 3.1 working
     # Added option which needs manually setting to select the IPhone SDK for building. We can only have one of the below
@@ -247,13 +263,16 @@ IF(APPLE)
 
         #you need to manually set the default sdk version here
         SET (IPHONE_SDKVER "6.0" CACHE STRING "IOS SDK-Version")
+        SET (IPHONE_VERSION_MIN "4.2" CACHE STRING "IOS minimum os version, use 7.0 or greater to get 64bit support")
 
         #the below is taken from ogre, it states the gcc stuff needs to happen before PROJECT() is called. I've no clue if we even need it
         # Force gcc <= 4.2 on iPhone
-        include(CMakeForceCompiler)
-        CMAKE_FORCE_C_COMPILER(llvm-gcc-4.2 GNU)
-        CMAKE_FORCE_CXX_COMPILER(llvm-gcc-4.2 GNU)
-        SET(GCC_THUMB_SUPPORT NO)
+        IF(IPHONE_VERSION_MIN LESS "6.0")
+            include(CMakeForceCompiler)
+            CMAKE_FORCE_C_COMPILER(llvm-gcc-4.2 GNU)
+            CMAKE_FORCE_CXX_COMPILER(llvm-gcc-4.2 GNU)
+            SET(GCC_THUMB_SUPPORT NO)
+        ENDIF()
 
         #set either the device sdk or the simulator sdk. Can't find away to separate these in the same project
         IF(OSG_BUILD_PLATFORM_IPHONE)
@@ -508,11 +527,17 @@ IF(WIN32 AND NOT ANDROID)
     INCLUDE(Find3rdPartyDependencies)
 ENDIF()
 
+#
+# If you want to prevent CMake from picking up on any of the following optional 3rd Party dependencies in CMake 2.8 onwards
+# you can use the following style of command line option when invoking Cmake (here illustrating ignoring PythonLibs) :
+# cmake -DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=1 .
+#
+
 IF(ANDROID)
     ANDROID_3RD_PARTY()
 ELSE()
 # Common to all platforms except android:
-    FIND_PACKAGE(FreeType)
+    FIND_PACKAGE(Freetype)
     FIND_PACKAGE(Inventor)
     FIND_PACKAGE(Jasper)
     FIND_PACKAGE(OpenEXR)
@@ -592,7 +617,14 @@ IF(OSG_USE_QT AND NOT ANDROID)
 
     #If we have found Qt5, let's try to top off by getting the webkit as well
     IF ( Qt5Widgets_FOUND )
-        FIND_PACKAGE(Qt5WebKitWidgets)
+        FIND_PACKAGE(Qt5WebKitWidgets QUIET)
+
+        IF(COMMAND cmake_policy)
+            IF(${CMAKE_MAJOR_VERSION} GREATER 2)
+                # Qt5 qt5_use_modules usage was causing "Policy CMP0043 is not set: Ignore COMPILE_DEFINITIONS_<Config> properties." warnings
+                cmake_policy(SET CMP0043 NEW)
+            ENDIF()
+        ENDIF()
     ENDIF()
 
 ENDIF()
@@ -792,11 +824,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
     # returns too many hits.
     # FYI, if we do implement GNUCC, then -Wmissing-prototypes in another
     # interesting C-specific flag.
-    # Also, there is a bug in gcc 4.0. Under C++, -pedantic will create
-    # errors instead of warnings for certain issues, including superfluous
-    # semicolons and commas, and the use of long long. -fpermissive seems
-    # to be the workaround.
-    SET(OSG_AGGRESSIVE_WARNING_FLAGS -Wall -Wparentheses -Wno-long-long -Wno-import -pedantic -Wreturn-type -Wmissing-braces -Wunknown-pragmas -Wunused -fpermissive)
+    SET(OSG_AGGRESSIVE_WARNING_FLAGS -Wall -Wparentheses -Wno-long-long -Wno-import -pedantic -Wreturn-type -Wmissing-braces -Wunknown-pragmas -Wunused)
 
     # Previous included -Wformat=2 in OSG_AGGRESSIVE_WARNING_FLAGS but had to remove it due to standard library errors
 
@@ -813,6 +841,14 @@ ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
         # CMake lacks an elseif, so other non-gcc, non-VS compilers need
         # to be listed below. If unhandled, OSG_AGGRESSIVE_WARNING_FLAGS should
         # remain unset.
+
+        IF (APPLE)
+            # set standard lib, clang defaults to c++0x
+            set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++98")
+            set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libstdc++")
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98 -stdlib=libstdc++ -Wno-overloaded-virtual -Wno-conversion")
+            set(WARNING_CFLAGS "")
+        ENDIF()
 ENDIF()
 
 # This part is for the CMake menu option to toggle the warnings on/off.
@@ -872,8 +908,14 @@ IF(APPLE AND NOT ANDROID)
 
         #set iphone arch and flags taken from http://sites.google.com/site/michaelsafyan/coding/resources/how-to-guides/cross-compile-for-the-iphone/how-to-cross-compile-for-the-iphone-using-cmake
         IF(OSG_BUILD_PLATFORM_IPHONE)
-            SET(CMAKE_OSX_ARCHITECTURES "armv6;armv7" CACHE STRING "Build architectures for iOS" FORCE)
-            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -miphoneos-version-min=4.1 -mno-thumb -arch armv6 -pipe -no-cpp-precomp" CACHE STRING "Flags used by the compiler during all build types." FORCE)
+            IF(${IPHONE_VERSION_MIN} LESS "7.0")
+                SET(CMAKE_OSX_ARCHITECTURES "armv6;armv7" CACHE STRING "Build architectures for iOS" FORCE)
+                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -miphoneos-version-min=${IPHONE_VERSION_MIN} -mno-thumb -pipe -no-cpp-precomp" CACHE STRING "Flags used by the compiler during all build types." FORCE)
+            ELSE()
+                SET(CMAKE_OSX_ARCHITECTURES "armv7;armv7s;arm64" CACHE STRING "Build architectures for iOS" FORCE)
+                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -miphoneos-version-min=${IPHONE_VERSION_MIN} -pipe -no-cpp-precomp" CACHE STRING "Flags used by the compiler during all build types." FORCE)
+            ENDIF()
+
         ELSE()
             #simulator uses i386 architectures
             SET(CMAKE_OSX_ARCHITECTURES "i386" CACHE STRING "Build architectures for iOS Simulator" FORCE)
@@ -905,7 +947,7 @@ IF(APPLE AND NOT ANDROID)
         # FORCE is used because the options are not reflected in the UI otherwise.
         # Seems like a good place to add version specific compiler flags too.
         IF(NOT OSG_CONFIG_HAS_BEEN_RUN_BEFORE)
-            IF(${OSG_OSX_SDK_NAME} STREQUAL "macosx10.8")
+            IF(${OSG_OSX_SDK_NAME} STREQUAL "macosx10.8" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.9" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.10")
                 SET(OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX "imageio" CACHE STRING "Forced imageio default image plugin for OSX" FORCE)
                 # 64 Bit Works, i386,ppc is not supported any more
                 SET(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "Build architectures for OSX" FORCE)

CMakeModules/CheckAtomicOps.cmake

@@ -1,4 +1,4 @@
-# Check for availability of atomic operations 
+# Check for availability of atomic operations
 # This module defines
 # OPENTHREADS_HAVE_ATOMIC_OPS
 
@@ -15,123 +15,143 @@ IF (OPENTHREADS_ATOMIC_USE_MUTEX)
     SET(_OPENTHREADS_ATOMIC_USE_MUTEX 1)
 
 ELSE()
+    # as the test does not work for IOS hardcode the ATOMIC implementation
+    IF(OSG_BUILD_PLATFORM_IPHONE_SIMULATOR OR OSG_BUILD_PLATFORM_IPHONE)
+       SET(_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS 0)
+       SET(_OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS 0)
+       SET(_OPENTHREADS_ATOMIC_USE_SUN 0)
+       SET(_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED 0)
+       SET(_OPENTHREADS_ATOMIC_USE_MUTEX 0)
 
-    INCLUDE(CheckCXXSourceRuns)
+       SET(_OPENTHREADS_ATOMIC_USE_BSD_ATOMIC 1)
 
-    # Do step by step checking,
-    CHECK_CXX_SOURCE_RUNS("
-    #include <cstdlib>
+    ELSE()
+       INCLUDE(CheckCXXSourceRuns)
 
-    int main()
-    {
-       unsigned value = 0;
-       void* ptr = &value;
-       __sync_add_and_fetch(&value, 1);
-       __sync_synchronize();
-       __sync_sub_and_fetch(&value, 1);
-       if (!__sync_bool_compare_and_swap(&value, 0, 1))
-          return EXIT_FAILURE;
+       # Do step by step checking,
+       CHECK_CXX_SOURCE_RUNS("
+       #include <cstdlib>
 
-       if (!__sync_bool_compare_and_swap(&ptr, ptr, ptr))
-          return EXIT_FAILURE;
+       int main()
+       {
+          unsigned value = 0;
+          void* ptr = &value;
+          __sync_add_and_fetch(&value, 1);
+          __sync_synchronize();
+          __sync_sub_and_fetch(&value, 1);
+          if (!__sync_bool_compare_and_swap(&value, 0, 1))
+             return EXIT_FAILURE;
 
-       return EXIT_SUCCESS;
-    }
-    " _OPENTHREADS_ATOMIC_USE_GCC_BUILTINS)
+          if (!__sync_bool_compare_and_swap(&ptr, ptr, ptr))
+             return EXIT_FAILURE;
 
-    CHECK_CXX_SOURCE_RUNS("
-    #include <stdlib.h>
+          return EXIT_SUCCESS;
+       }
+       " _OPENTHREADS_ATOMIC_USE_GCC_BUILTINS)
 
-    int main(int, const char**)
-    {
-       unsigned value = 0;
-       void* ptr = &value;
-       __add_and_fetch(&value, 1);
-       __synchronize(value);
-       __sub_and_fetch(&value, 1);
-       if (!__compare_and_swap(&value, 0, 1))
-          return EXIT_FAILURE;
+       CHECK_CXX_SOURCE_RUNS("
+       #include <stdlib.h>
 
-       if (!__compare_and_swap((unsigned long*)&ptr, (unsigned long)ptr, (unsigned long)ptr))
-          return EXIT_FAILURE;
+       int main(int, const char**)
+       {
+          unsigned value = 0;
+          void* ptr = &value;
+          __add_and_fetch(&value, 1);
+          __synchronize(value);
+          __sub_and_fetch(&value, 1);
+          if (!__compare_and_swap(&value, 0, 1))
+             return EXIT_FAILURE;
 
-       return EXIT_SUCCESS;
-    }
-    " _OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS)
+          if (!__compare_and_swap((unsigned long*)&ptr, (unsigned long)ptr, (unsigned long)ptr))
+             return EXIT_FAILURE;
 
-    CHECK_CXX_SOURCE_RUNS("
-    #include <atomic.h>
-    #include <cstdlib>
+          return EXIT_SUCCESS;
+       }
+       " _OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS)
 
-    int main(int, const char**)
-    {
-       uint_t value = 0;
-       void* ptr = &value;
-       atomic_inc_uint_nv(&value);
-       membar_consumer();
-       atomic_dec_uint_nv(&value);
-       if (0 != atomic_cas_uint(&value, 0, 1))
-          return EXIT_FAILURE;
+       CHECK_CXX_SOURCE_RUNS("
+       #include <atomic.h>
+       #include <cstdlib>
 
-       if (ptr != atomic_cas_ptr(&ptr, ptr, ptr))
-          return EXIT_FAILURE;
+       int main(int, const char**)
+       {
+          uint_t value = 0;
+          void* ptr = &value;
+          atomic_inc_uint_nv(&value);
+          membar_consumer();
+          atomic_dec_uint_nv(&value);
+          if (0 != atomic_cas_uint(&value, 0, 1))
+             return EXIT_FAILURE;
 
-       return EXIT_SUCCESS;
-    }
-    " _OPENTHREADS_ATOMIC_USE_SUN)
+          if (ptr != atomic_cas_ptr(&ptr, ptr, ptr))
+             return EXIT_FAILURE;
 
-    CHECK_CXX_SOURCE_RUNS("
-    #include <windows.h>
-    #include <intrin.h>
-    #include <cstdlib>
+          return EXIT_SUCCESS;
+       }
+       " _OPENTHREADS_ATOMIC_USE_SUN)
 
-    #pragma intrinsic(_InterlockedAnd)
-    #pragma intrinsic(_InterlockedOr)
-    #pragma intrinsic(_InterlockedXor)
+       CHECK_CXX_SOURCE_RUNS("
+       #include <windows.h>
+       #include <intrin.h>
+       #include <cstdlib>
 
-    int main(int, const char**)
-    {
-       volatile long value = 0;
-       long data = 0;
-       long* volatile ptr = &data;
+       #pragma intrinsic(_InterlockedAnd)
+       #pragma intrinsic(_InterlockedOr)
+       #pragma intrinsic(_InterlockedXor)
 
-       InterlockedIncrement(&value);
-       MemoryBarrier();
-       InterlockedDecrement(&value);
+       int main(int, const char**)
+       {
+          volatile long value = 0;
+          long data = 0;
+          long* volatile ptr = &data;
 
-       if (0 != InterlockedCompareExchange(&value, 1, 0))
-          return EXIT_FAILURE;
+          InterlockedIncrement(&value);
+          MemoryBarrier();
+          InterlockedDecrement(&value);
 
-       if (ptr != InterlockedCompareExchangePointer((PVOID volatile*)&ptr, (PVOID)ptr, (PVOID)ptr))
-          return EXIT_FAILURE;
+          if (0 != InterlockedCompareExchange(&value, 1, 0))
+             return EXIT_FAILURE;
 
-       return EXIT_SUCCESS;
-    }
-    " _OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED)
+          if (ptr != InterlockedCompareExchangePointer((PVOID volatile*)&ptr, (PVOID)ptr, (PVOID)ptr))
+             return EXIT_FAILURE;
 
-    CHECK_CXX_SOURCE_RUNS("
-    #include <libkern/OSAtomic.h>
+          return EXIT_SUCCESS;
+       }
+       " _OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED)
 
-    int main()
-    {
-      volatile int32_t value = 0;
-      long data = 0;
-      long * volatile ptr = &data;
+       CHECK_CXX_SOURCE_RUNS("
+       #include <libkern/OSAtomic.h>
 
-      OSAtomicIncrement32(&value);
-      OSMemoryBarrier();
-      OSAtomicDecrement32(&value);
-      OSAtomicCompareAndSwapInt(value, 1, &value);
-      OSAtomicCompareAndSwapPtr(ptr, ptr, (void * volatile *)&ptr);
-    }
-    " _OPENTHREADS_ATOMIC_USE_BSD_ATOMIC)
+       int main()
+       {
+         volatile int32_t value = 0;
+         long data = 0;
+         long * volatile ptr = &data;
+
+         OSAtomicIncrement32(&value);
+         OSMemoryBarrier();
+         OSAtomicDecrement32(&value);
+         OSAtomicCompareAndSwapInt(value, 1, &value);
+         OSAtomicCompareAndSwapPtr(ptr, ptr, (void * volatile *)&ptr);
+       }
+       " _OPENTHREADS_ATOMIC_USE_BSD_ATOMIC)
+
+       IF(NOT _OPENTHREADS_ATOMIC_USE_GCC_BUILTINS AND
+          NOT _OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS AND
+          NOT _OPENTHREADS_ATOMIC_USE_SUN AND
+          NOT _OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED AND
+          NOT _OPENTHREADS_ATOMIC_USE_BSD_ATOMIC)
+                  SET(_OPENTHREADS_ATOMIC_USE_MUTEX 1)
+       ENDIF()
+
+       
+       # MinGW can set both WIN32_INTERLOCKED and GCC_BUILTINS to true which results in compliation errors
+       IF (_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS AND _OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED)
+          # In this case we prefer the GCC_BUILTINS
+          SET(_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS 1)
+          SET(_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED 0)
+       ENDIF()
 
-    IF(NOT _OPENTHREADS_ATOMIC_USE_GCC_BUILTINS AND
-       NOT _OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS AND
-       NOT _OPENTHREADS_ATOMIC_USE_SUN AND
-       NOT _OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED AND
-       NOT _OPENTHREADS_ATOMIC_USE_BSD_ATOMIC)
-               SET(_OPENTHREADS_ATOMIC_USE_MUTEX 1)
     ENDIF()
 
 ENDIF()

CMakeModules/FindAVFoundation.cmake

@@ -1,22 +1,20 @@
 # Locate Apple AVFoundation (next-generation QTKit)
 # This module defines
 # AV_FOUNDATION_LIBRARY
-# AV_FOUNDATION_FOUND, if false, do not try to link to gdal 
-# AV_FOUNDATION_INCLUDE_DIR, where to find the headers
+# AV_FOUNDATION_FOUND, if false, do not try to link to gdal
 #
 # $AV_FOUNDATION_DIR is an environment variable that would
 # correspond to the ./configure --prefix=$AV_FOUNDATION_DIR
 #
-# Created by Stephan Maximilian Huber 
+# Created by Stephan Maximilian Huber
 
 
 IF(APPLE)
-  FIND_PATH(AV_FOUNDATION_INCLUDE_DIR AVFoundation/AVFoundation.h)
   FIND_LIBRARY(AV_FOUNDATION_LIBRARY AVFoundation)
 ENDIF()
 
 SET(AV_FOUNDATION_FOUND "NO")
-IF(AV_FOUNDATION_LIBRARY AND AV_FOUNDATION_INCLUDE_DIR)
+IF(AV_FOUNDATION_LIBRARY)
   SET(AV_FOUNDATION_FOUND "YES")
 ENDIF()
 
@@ -32,11 +30,11 @@ ELSE()
       # AVFoundation exists since 10.7, but only 10.8 has all features necessary for OSG
       # so check the SDK-setting
 
-      IF(${OSG_OSX_SDK_NAME} STREQUAL "macosx10.8")
+      IF(${OSG_OSX_SDK_NAME} STREQUAL "macosx10.8" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.9" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.10")
           # nothing special here ;-)
       ELSE()
           MESSAGE("AVFoundation disabled for SDK < 10.8")
-          SET(AV_FOUNDATION_FOUND "NO")  
+          SET(AV_FOUNDATION_FOUND "NO")
       ENDIF()
   ENDIF()
 ENDIF()

CMakeModules/FindCOLLADA.cmake

@@ -242,7 +242,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
     )
 
     FIND_LIBRARY(COLLADA_BOOST_FILESYSTEM_LIBRARY
-        NAMES libboost_filesystem boost_filesystem boost_filesystem-mt libboost_filesystem-${COLLADA_BUILDNAME}0-mt libboost_filesystem-${COLLADA_BUILDNAME}0-mt-1_54 
+        NAMES libboost_filesystem boost_filesystem boost_filesystem-mt libboost_filesystem-${COLLADA_BUILDNAME}0-mt libboost_filesystem-${COLLADA_BUILDNAME}0-mt-1_54 libboost_filesystem-${COLLADA_BUILDNAME}0-mt-1_55 
         PATHS
         ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
         ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
@@ -250,7 +250,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
     )
 
     FIND_LIBRARY(COLLADA_BOOST_FILESYSTEM_LIBRARY_DEBUG
-        NAMES libboost_filesystem-d boost_filesystem-d boost_filesystem-mt-d libboost_filesystem-${COLLADA_BUILDNAME}0-mt-gd libboost_filesystem-${COLLADA_BUILDNAME}0-mt-gd-1_54 
+        NAMES libboost_filesystem-d boost_filesystem-d boost_filesystem-mt-d libboost_filesystem-${COLLADA_BUILDNAME}0-mt-gd libboost_filesystem-${COLLADA_BUILDNAME}0-mt-gd-1_54 libboost_filesystem-${COLLADA_BUILDNAME}0-mt-gd-1_55 
         PATHS
         ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
         ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
@@ -258,7 +258,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
     )
 
     FIND_LIBRARY(COLLADA_BOOST_SYSTEM_LIBRARY
-        NAMES libboost_system boost_system boost_system-mt libboost_system-${COLLADA_BUILDNAME}0-mt libboost_system-${COLLADA_BUILDNAME}0-mt-1_54 
+        NAMES libboost_system boost_system boost_system-mt libboost_system-${COLLADA_BUILDNAME}0-mt libboost_system-${COLLADA_BUILDNAME}0-mt-1_54 libboost_system-${COLLADA_BUILDNAME}0-mt-1_55 
         PATHS
         ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
         ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
@@ -266,7 +266,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
     )
 
     FIND_LIBRARY(COLLADA_BOOST_SYSTEM_LIBRARY_DEBUG
-        NAMES libboost_system-d boost_system-d boost_system-mt-d libboost_system-${COLLADA_BUILDNAME}0-mt-gd libboost_system-${COLLADA_BUILDNAME}0-mt-gd-1_54 
+        NAMES libboost_system-d boost_system-d boost_system-mt-d libboost_system-${COLLADA_BUILDNAME}0-mt-gd libboost_system-${COLLADA_BUILDNAME}0-mt-gd-1_54 libboost_system-${COLLADA_BUILDNAME}0-mt-gd-1_55 
         PATHS
         ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
         ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw

CMakeModules/FindFBX.cmake

@@ -18,8 +18,10 @@ ELSEIF(MSVC90)
     SET(FBX_LIBDIR "vs2008")
 ELSEIF(MSVC10)
     SET(FBX_LIBDIR "vs2010")
-ELSEIF(MSVC11 OR MSVC_VERSION>1700)
+ELSEIF(MSVC11)
     SET(FBX_LIBDIR "vs2012")
+ELSEIF(MSVC12 OR MSVC_VERSION>1800)
+    SET(FBX_LIBDIR "vs2013")
 ENDIF()
 
 IF(APPLE)
@@ -32,6 +34,8 @@ ELSE()
     SET(FBX_LIBDIR ${FBX_LIBDIR}/x86)
 ENDIF()
 
+#try to use 2015.1 or 2014.2 version
+
 IF(APPLE)
     SET(FBX_LIBNAME "libfbxsdk")
 ELSEIF(CMAKE_COMPILER_IS_GNUCXX)
@@ -44,10 +48,15 @@ SET(FBX_LIBNAME_DEBUG ${FBX_LIBNAME}d)
 
 SET( FBX_SEARCH_PATHS
     $ENV{FBX_DIR}
-    "$ENV{ProgramW6432}/Autodesk/FBX/FBX SDK/2014.1"
-    "$ENV{PROGRAMFILES}/Autodesk/FBX/FBX SDK/2014.1"
+    "$ENV{ProgramW6432}/Autodesk/FBX/FBX SDK/2015.1"
+    "$ENV{PROGRAMFILES}/Autodesk/FBX/FBX SDK/2015.1"
+    /Applications/Autodesk/FBXSDK20151
+    "$ENV{ProgramW6432}/Autodesk/FBX/FBX SDK/2014.2"
+    "$ENV{PROGRAMFILES}/Autodesk/FBX/FBX SDK/2014.2"
+    /Applications/Autodesk/FBXSDK20142
     /Applications/Autodesk/FBXSDK20141
 )
+#I think the last line in the search path is an old typo, but let's search for 2014.1 anyway - LV
 
 # search for headers & debug/release libraries
 FIND_PATH(FBX_INCLUDE_DIR "fbxsdk.h"
@@ -74,21 +83,21 @@ ELSE()
 ENDIF()
 
 IF(NOT FBX_FOUND)
-#try to use 2013.3 version
+#try to use 2014.1 version
     IF(APPLE)
-        SET(FBX_LIBNAME "fbxsdk-2013.3-static")
+        SET(FBX_LIBNAME "fbxsdk-2014.1")
     ELSEIF(CMAKE_COMPILER_IS_GNUCXX)
-        SET(FBX_LIBNAME "fbxsdk-2013.3-static")
+        SET(FBX_LIBNAME "fbxsdk-2014.1")
     ELSE()
-        SET(FBX_LIBNAME "fbxsdk-2013.3-md")
+        SET(FBX_LIBNAME "fbxsdk-2014.1")
     ENDIF()
 
     SET(FBX_LIBNAME_DEBUG ${FBX_LIBNAME}d)
 
     SET( FBX_SEARCH_PATHS
         $ENV{FBX_DIR}
-        $ENV{ProgramW6432}/Autodesk/FBX/FBX SDK/2013.3
-        $ENV{PROGRAMFILES}/Autodesk/FBX/FBX SDK/2013.3
+        $ENV{ProgramW6432}/Autodesk/FBX/FBX SDK/2014.1
+        $ENV{PROGRAMFILES}/Autodesk/FBX/FBX SDK/2014.1
         /Applications/Autodesk/FBXSDK20141
     )
 
@@ -110,3 +119,41 @@ IF(NOT FBX_FOUND)
     ENDIF()
 
 ENDIF()
+
+IF(NOT FBX_FOUND)
+#try to use 2013.3 version
+    IF(APPLE)
+        SET(FBX_LIBNAME "fbxsdk-2013.3-static")
+    ELSEIF(CMAKE_COMPILER_IS_GNUCXX)
+        SET(FBX_LIBNAME "fbxsdk-2013.3-static")
+    ELSE()
+        SET(FBX_LIBNAME "fbxsdk-2013.3-md")
+    ENDIF()
+
+    SET(FBX_LIBNAME_DEBUG ${FBX_LIBNAME}d)
+
+    SET( FBX_SEARCH_PATHS
+        $ENV{FBX_DIR}
+        $ENV{ProgramW6432}/Autodesk/FBX/FBX SDK/2013.3
+        $ENV{PROGRAMFILES}/Autodesk/FBX/FBX SDK/2013.3
+        /Applications/Autodesk/FBXSDK20133
+    )
+
+    # search for headers & debug/release libraries
+    FIND_PATH(FBX_INCLUDE_DIR "fbxsdk.h"
+        PATHS ${FBX_SEARCH_PATHS}
+        PATH_SUFFIXES "include")
+    FIND_LIBRARY( FBX_LIBRARY ${FBX_LIBNAME}
+        PATHS ${FBX_SEARCH_PATHS}
+        PATH_SUFFIXES "lib/${FBX_LIBDIR}")
+
+    FIND_LIBRARY( FBX_LIBRARY_DEBUG ${FBX_LIBNAME_DEBUG}
+        PATHS ${FBX_SEARCH_PATHS}
+        PATH_SUFFIXES "lib/${FBX_LIBDIR}")
+    IF(FBX_LIBRARY AND FBX_LIBRARY_DEBUG AND FBX_INCLUDE_DIR)
+        SET(FBX_FOUND "YES")
+    ELSE()
+        SET(FBX_FOUND "NO")
+    ENDIF()
+
+ENDIF()

CMakeModules/FindFreetype.cmake

@@ -48,7 +48,7 @@ FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
   /opt/csw
   /opt
   /usr/freeware
-  PATH_SUFFIXES include
+  PATH_SUFFIXES include include/freetype2
 )
 
 FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h 
@@ -74,6 +74,20 @@ FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
   /usr/freeware/include/freetype2
 )
 
+FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h 
+  /usr/local/include/freetype2
+  /usr/include/freetype2
+  /usr/local/X11R6/include/freetype2
+  /usr/local/X11/include/freetype2
+  /usr/X11R6/include/freetype2
+  /usr/X11/include/freetype2
+  /sw/include/freetype2
+  /opt/local/include/freetype2
+  /opt/csw/include/freetype2
+  /opt/include/freetype2
+  /usr/freeware/include/freetype2
+)
+
 FIND_LIBRARY(FREETYPE_LIBRARY 
   NAMES freetype libfreetype freetype219
   PATHS

CMakeModules/FindOSG.cmake

@@ -1,13 +1,13 @@
 # Locate gdal
 # This module defines
 # OSG_LIBRARY
-# OSG_FOUND, if false, do not try to link to gdal 
+# OSG_FOUND, if false, do not try to link to gdal
 # OSG_INCLUDE_DIR, where to find the headers
 #
 # $OSG_DIR is an environment variable that would
 # correspond to the ./configure --prefix=$OSG_DIR
 #
-# Created by Robert Osfield. 
+# Created by Robert Osfield.
 
 FIND_PATH(OSG_INCLUDE_DIR osg/Node
     ${OSG_DIR}/include
@@ -59,7 +59,7 @@ MACRO(FIND_OSG_LIBRARY MYLIBRARY MYLIBRARYNAME)
         [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
         /usr/freeware/lib64
     )
-    
+
     FIND_LIBRARY(${MYLIBRARY}
         NAMES "${MYLIBRARYNAME}${CMAKE_RELEASE_POSTFIX}"
         PATHS
@@ -107,7 +107,7 @@ MACRO(FIND_OSG_LIBRARY MYLIBRARY MYLIBRARYNAME)
         ENDIF(NOT MYLIBRARY)
 
     ENDIF( NOT ${MYLIBRARY}_DEBUG )
-           
+
 ENDMACRO(FIND_OSG_LIBRARY LIBRARY LIBRARYNAME)
 
 FIND_OSG_LIBRARY(OSG_LIBRARY osg)
@@ -126,7 +126,7 @@ FIND_OSG_LIBRARY(OSGANIMATION_LIBRARY osgAnimation)
 FIND_OSG_LIBRARY(OSGPARTICLE_LIBRARY osgParticle)
 FIND_OSG_LIBRARY(OSGSHADOW_LIBRARY osgShadow)
 FIND_OSG_LIBRARY(OSGPRESENTATION_LIBRARY osgPresentation)
-FIND_OSG_LIBRARY(OSGSIM osgSim)
+FIND_OSG_LIBRARY(OSGSIM_LIBRARY osgSim)
 FIND_OSG_LIBRARY(OPENTHREADS_LIBRARY OpenThreads)
 
 

CMakeModules/FindQuickTime.cmake

@@ -63,8 +63,8 @@ ELSE()
           ENDIF()
       ENDIF()
       # Disable quicktime for >= 10.7, as it's officially deprecated
-      
-      IF(${OSG_OSX_SDK_NAME} STREQUAL "macosx10.7" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.8" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.9")
+
+      IF(${OSG_OSX_SDK_NAME} STREQUAL "macosx10.7" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.8" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.9" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.10")
           MESSAGE("disabling quicktime because it's not supported by the selected SDK ${OSG_OSX_SDK_NAME}")
           SET(QUICKTIME_FOUND "NO")
       ENDIF()

CMakeModules/FindRSVG.cmake

@@ -5,7 +5,9 @@ IF(PKG_CONFIG_FOUND)
 
     INCLUDE(FindPkgConfig)
 
-    PKG_CHECK_MODULES(RSVG librsvg-2.0)
+    #Version 2.35 introduces the rsvg_cleanup function which is used
+    PKG_CHECK_MODULES(RSVG librsvg-2.0>=2.35)
+
     PKG_CHECK_MODULES(CAIRO cairo)
 
     IF (RSVG_FOUND AND NOT CAIRO_FOUND)

CMakeModules/OsgMacroUtils.cmake

@@ -5,7 +5,7 @@
 #  NAME of the variables, so the macro gets as arguments the target name and the following list of parameters
 #  is intended as a list of variable names each one containing  the path of the libraries to link to
 #  The existance of a variable name with _DEBUG appended is tested and, in case it' s value is used
-#  for linking to when in debug mode 
+#  for linking to when in debug mode
 #  the content of this library for linking when in debugging
 #######################################################################################################
 
@@ -87,12 +87,12 @@ MACRO(LINK_CORELIB_DEFAULT CORELIB_NAME)
         SET(ALL_GL_LIBRARIES ${ALL_GL_LIBRARIES} ${OPENGL_egl_LIBRARY})
     ENDIF()
 
-    LINK_EXTERNAL(${CORELIB_NAME} ${ALL_GL_LIBRARIES}) 
+    LINK_EXTERNAL(${CORELIB_NAME} ${ALL_GL_LIBRARIES})
     LINK_WITH_VARIABLES(${CORELIB_NAME} OPENTHREADS_LIBRARY)
     IF(OPENSCENEGRAPH_SONAMES)
       SET_TARGET_PROPERTIES(${CORELIB_NAME} PROPERTIES VERSION ${OPENSCENEGRAPH_VERSION} SOVERSION ${OPENSCENEGRAPH_SOVERSION})
     ENDIF(OPENSCENEGRAPH_SONAMES)
-    
+
 ENDMACRO(LINK_CORELIB_DEFAULT CORELIB_NAME)
 
 
@@ -112,11 +112,11 @@ MACRO(SETUP_LINK_LIBRARIES)
     ######################################################################
     #
     # This set up the libraries to link to, it assumes there are two variable: one common for a group of examples or plugins
-    # kept in the variable TARGET_COMMON_LIBRARIES and an example or plugin specific kept in TARGET_ADDED_LIBRARIES 
-    # they are combined in a single list checked for unicity 
+    # kept in the variable TARGET_COMMON_LIBRARIES and an example or plugin specific kept in TARGET_ADDED_LIBRARIES
+    # they are combined in a single list checked for unicity
     # the suffix ${CMAKE_DEBUG_POSTFIX} is used for differentiating optimized and debug
     #
-    # a second variable TARGET_EXTERNAL_LIBRARIES hold the list of  libraries not differentiated between debug and optimized 
+    # a second variable TARGET_EXTERNAL_LIBRARIES hold the list of  libraries not differentiated between debug and optimized
     ##################################################################################
     SET(TARGET_LIBRARIES ${TARGET_COMMON_LIBRARIES})
 
@@ -151,7 +151,7 @@ MACRO(SETUP_LINK_LIBRARIES)
         ENDIF(TARGET_LIBRARIES_VARS)
     IF(MSVC  AND OSG_MSVC_VERSIONED_DLL)
         #when using full path name to specify linkage, it seems that already linked libs must be specified
-            LINK_EXTERNAL(${TARGET_TARGETNAME} ${ALL_GL_LIBRARIES}) 
+            LINK_EXTERNAL(${TARGET_TARGETNAME} ${ALL_GL_LIBRARIES})
     ENDIF(MSVC AND OSG_MSVC_VERSIONED_DLL)
 
 ENDMACRO(SETUP_LINK_LIBRARIES)
@@ -213,7 +213,7 @@ ENDMACRO(SET_OUTPUT_DIR_PROPERTY_260 TARGET_TARGETNAME RELATIVE_OUTDIR)
 
 MACRO(SETUP_LIBRARY LIB_NAME)
     IF(ANDROID)
-        SETUP_ANDROID_LIBRARY(${LIB_NAME}) 
+        SETUP_ANDROID_LIBRARY(${LIB_NAME})
     ELSE()
         SET(TARGET_NAME ${LIB_NAME} )
         SET(TARGET_TARGETNAME ${LIB_NAME} )
@@ -224,10 +224,13 @@ MACRO(SETUP_LIBRARY LIB_NAME)
             ${TARGET_SRC}
         )
         SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES FOLDER "OSG Core")
+        IF(APPLE)
+            SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES XCODE_ATTRIBUTE_WARNING_CFLAGS "")
+        ENDIF()
         IF(TARGET_LABEL)
             SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}")
         ENDIF(TARGET_LABEL)
-    
+
         IF(TARGET_LIBRARIES)
             LINK_INTERNAL(${LIB_NAME} ${TARGET_LIBRARIES})
         ENDIF()
@@ -238,14 +241,14 @@ MACRO(SETUP_LIBRARY LIB_NAME)
             LINK_WITH_VARIABLES(${LIB_NAME} ${TARGET_LIBRARIES_VARS})
         ENDIF(TARGET_LIBRARIES_VARS)
         LINK_CORELIB_DEFAULT(${LIB_NAME})
-    
+
     ENDIF()
     INCLUDE(ModuleInstall OPTIONAL)
 ENDMACRO(SETUP_LIBRARY LIB_NAME)
 
 MACRO(SETUP_PLUGIN PLUGIN_NAME)
     IF(ANDROID)
-        SETUP_ANDROID_LIBRARY(${TARGET_DEFAULT_PREFIX}${PLUGIN_NAME}) 
+        SETUP_ANDROID_LIBRARY(${TARGET_DEFAULT_PREFIX}${PLUGIN_NAME})
     ELSE()
 
     SET(TARGET_NAME ${PLUGIN_NAME} )
@@ -268,38 +271,33 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME)
       SET(PACKAGE_COMPONENT libopenscenegraph)
     ENDIF(${ARGC} GREATER 1)
 
-    # Add the VisualStudio versioning info    
+    # Add the VisualStudio versioning info
     SET(TARGET_SRC ${TARGET_SRC} ${OPENSCENEGRAPH_VERSIONINFO_RC})
-    
-    # here we use the command to generate the library    
+
+    # here we use the command to generate the library
 
     IF   (DYNAMIC_OPENSCENEGRAPH)
         ADD_LIBRARY(${TARGET_TARGETNAME} MODULE ${TARGET_SRC} ${TARGET_H})
     ELSE (DYNAMIC_OPENSCENEGRAPH)
         ADD_LIBRARY(${TARGET_TARGETNAME} STATIC ${TARGET_SRC} ${TARGET_H})
     ENDIF(DYNAMIC_OPENSCENEGRAPH)
-    
-    #not sure if needed, but for plugins only Msvc need the d suffix
-    IF(NOT MSVC)
-        IF(NOT UNIX)
-            SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_POSTFIX "")
-        ENDIF(NOT UNIX)
-    ELSE(NOT MSVC)
+
+    IF(MSVC)
         IF(NOT CMAKE24)
             SET_OUTPUT_DIR_PROPERTY_260(${TARGET_TARGETNAME} "${OSG_PLUGINS}")        # Sets the ouput to be /osgPlugin-X.X.X ; also ensures the /Debug /Release are removed
         ELSE(NOT CMAKE24)
 
-            IF(OSG_MSVC_VERSIONED_DLL) 
+            IF(OSG_MSVC_VERSIONED_DLL)
 
                 #this is a hack... the build place is set to lib/<debug or release> by LIBARARY_OUTPUT_PATH equal to OUTPUT_LIBDIR
                 #the .lib will be crated in ../ so going straight in lib by the IMPORT_PREFIX property
                 #because we want dll placed in OUTPUT_BINDIR ie the bin folder sibling of lib, we can use ../../bin to go there,
                 #it is hardcoded, we should compute OUTPUT_BINDIR position relative to OUTPUT_LIBDIR ... to be implemented
                 #changing bin to something else breaks this hack
-                #the dll are placed in bin/${OSG_PLUGINS} 
+                #the dll are placed in bin/${OSG_PLUGINS}
 
                 IF(NOT MSVC_IDE)
-                    SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "../bin/${OSG_PLUGINS}/")                     
+                    SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "../bin/${OSG_PLUGINS}/")
                 ELSE(NOT MSVC_IDE)
                     SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "../../bin/${OSG_PLUGINS}/" IMPORT_PREFIX "../")
                 ENDIF(NOT MSVC_IDE)
@@ -313,16 +311,18 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME)
             ENDIF(OSG_MSVC_VERSIONED_DLL)
 
         ENDIF(NOT CMAKE24)
-    ENDIF(NOT MSVC)
+    ENDIF(MSVC)
 
     SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}")
     SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES FOLDER "Plugins")
-
+    IF(APPLE)
+        SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES XCODE_ATTRIBUTE_WARNING_CFLAGS "")
+    ENDIF()
     SETUP_LINK_LIBRARIES()
 
 #the installation path are differentiated for win32 that install in bib versus other architecture that install in lib${LIB_POSTFIX}/${OSG_PLUGINS}
     IF(WIN32)
-        INSTALL(TARGETS ${TARGET_TARGETNAME} 
+        INSTALL(TARGETS ${TARGET_TARGETNAME}
             RUNTIME DESTINATION bin COMPONENT ${PACKAGE_COMPONENT}
             ARCHIVE DESTINATION lib/${OSG_PLUGINS} COMPONENT libopenscenegraph-dev
             LIBRARY DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT})
@@ -350,11 +350,11 @@ MACRO(SETUP_EXE IS_COMMANDLINE_APP)
     ENDIF(NOT TARGET_LABEL)
 
     IF(${IS_COMMANDLINE_APP})
-    
+
         ADD_EXECUTABLE(${TARGET_TARGETNAME} ${TARGET_SRC} ${TARGET_H})
-        
+
     ELSE(${IS_COMMANDLINE_APP})
-    
+
         IF(APPLE)
             # SET(MACOSX_BUNDLE_LONG_VERSION_STRING "${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION}")
             # Short Version is the "marketing version". It is the version
@@ -363,6 +363,8 @@ MACRO(SETUP_EXE IS_COMMANDLINE_APP)
             # Bundle version is the version the OS looks at.
             SET(MACOSX_BUNDLE_BUNDLE_VERSION "${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION}")
             SET(MACOSX_BUNDLE_GUI_IDENTIFIER "org.openscenegraph.${TARGET_TARGETNAME}" )
+            # replace underscore by hyphen
+            STRING(REGEX REPLACE "_" "-" MACOSX_BUNDLE_GUI_IDENTIFIER ${MACOSX_BUNDLE_GUI_IDENTIFIER})
             SET(MACOSX_BUNDLE_BUNDLE_NAME "${TARGET_NAME}" )
             # SET(MACOSX_BUNDLE_ICON_FILE "myicon.icns")
             # SET(MACOSX_BUNDLE_COPYRIGHT "")
@@ -382,7 +384,7 @@ MACRO(SETUP_EXE IS_COMMANDLINE_APP)
         ENDIF(APPLE)
 
         ADD_EXECUTABLE(${TARGET_TARGETNAME} ${PLATFORM_SPECIFIC_CONTROL} ${TARGET_SRC} ${TARGET_H})
-        
+
     ENDIF(${IS_COMMANDLINE_APP})
 
     SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}")
@@ -396,7 +398,11 @@ MACRO(SETUP_EXE IS_COMMANDLINE_APP)
         SET_OUTPUT_DIR_PROPERTY_260(${TARGET_TARGETNAME} "")        # Ensure the /Debug /Release are removed
     ENDIF(MSVC_IDE AND OSG_MSVC_VERSIONED_DLL)
 
-    SETUP_LINK_LIBRARIES()    
+    IF(APPLE)
+        SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES XCODE_ATTRIBUTE_WARNING_CFLAGS "")
+    ENDIF()
+
+    SETUP_LINK_LIBRARIES()
 
 ENDMACRO(SETUP_EXE)
 
@@ -410,11 +416,11 @@ MACRO(SETUP_APPLICATION APPLICATION_NAME)
         ELSE(${ARGC} GREATER 1)
             SET(IS_COMMANDLINE_APP 0)
         ENDIF(${ARGC} GREATER 1)
-            
+
         SETUP_EXE(${IS_COMMANDLINE_APP})
-        
+
         SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES FOLDER "Applications")
-        
+
         IF(APPLE)
             INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin BUNDLE DESTINATION bin)
         ELSE(APPLE)
@@ -439,13 +445,13 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME)
         ELSE(${ARGC} GREATER 1)
             SET(IS_COMMANDLINE_APP 0)
         ENDIF(${ARGC} GREATER 1)
-            
+
         SETUP_EXE(${IS_COMMANDLINE_APP})
-        
+
         SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES FOLDER "Examples")
-        
+
         IF(APPLE)
-            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin )            
+            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin )
         ELSE(APPLE)
             INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples )
         ENDIF(APPLE)
@@ -483,7 +489,7 @@ MACRO(HANDLE_MSVC_DLL)
         ENDIF(${ARGC} GREATER 1)
 
         SET_OUTPUT_DIR_PROPERTY_260(${LIB_NAME} "")        # Ensure the /Debug /Release are removed
-        IF(NOT MSVC_IDE) 
+        IF(NOT MSVC_IDE)
             IF (NOT CMAKE24)
                 BUILDER_VERSION_GREATER(2 8 0)
                 IF(NOT VALID_BUILDER_VERSION)
@@ -516,8 +522,12 @@ MACRO(HANDLE_MSVC_DLL)
             ELSE (NOT CMAKE24)
                 SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../../bin/${LIB_PREFIX}${LIB_SOVERSION}-" IMPORT_PREFIX "../")
             ENDIF (NOT CMAKE24)
-        ENDIF(NOT MSVC_IDE) 
+        ENDIF(NOT MSVC_IDE)
 
 #     SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../../bin/osg${OPENSCENEGRAPH_SOVERSION}-")
 #     SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES IMPORT_PREFIX "../")
 ENDMACRO(HANDLE_MSVC_DLL)
+
+MACRO(REMOVE_CXX_FLAG flag)
+  STRING(REPLACE "${flag}" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ENDMACRO()

NEWS.txt

@@ -1,6 +1,63 @@
 OSG News
 ========
 
+
+= OpenSceneGraph 3.2.2 maintance release provides a number of bug and build fixes over the 3.2.1 stable release
+
+PERTHSHIRE, Scotland - 4th August 2015 - OpenSceneGraph Professional Services announces the release of OpenSceneGraph 3.2.2, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. OpenSceneGraph 3.2.2 is written entirely in Standard C++ and built upon OpenGL, offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modeling markets - a real-time visualization tool which eclipses commercial scene graph toolkits in functionality, stability and performance. OpenSceneGraph 3.2.2 runs on all Microsoft Windows platforms, Apple OS/X, IOS, GNU/Linux, Android, IRIX, Solaris, HP-UX, AIX and FreeBSD operating systems.
+
+=== Open-source development delivers industry-leading features and performance ===
+The OpenSceneGraph 3.2.2 stable release is the culmination of 16 years of work by the open-source community that has grown up around the project. This point release is fully binary compatible with the 3.2.0 and 3.2.1 stable releases.  The changes made are focused on addressing bugs and improving build support for latest compilers, OS updates and 3rd changes to Party Libraries.
+
+=== Downloads and Licensing ===
+OpenSceneGraph is open-source, so full source code is provided, and can be copied, modified and used free of charge for commercial and non-commercial use. Access to the source allows end users greater flexibility in how they develop, debug and deploy their applications.  They gain productivity and freedom by being able to leverage the tool chain in accordance with their own release cycles. Downloads of binaries and source can be found in the [http://www.openscenegraph.org/index.php/download-section/stable-releases Downloads] section of the openscenegraph.org website.
+
+OpenSceneGraph is released under the [http://www.openscenegraph.org/projects/osg/wiki/Legal OpenSceneGraph Public License], which is based on the Lesser GNU Public License (LGPL), permitting the software to be used free of charge across the full spectrum of commercial and open-source applications.  Furthermore, it allows both static and dynamic linking of the OpenSceneGraph libraries without restricting the licensing of the user's software.
+
+=== Professional support and services ===
+OpenSceneGraph project is backed up with professional services by [http://www.openscenegraph.com OpenSceneGraph Professional Services], based in Scotland, and [http://www.alphapixel.com AlphaPixel] based in the USA, and a range of [wiki:Community/Contractors Contractors] from around the world.  Services available include:
+
+ * Confidential Professional Support
+ * Bespoke development
+ * Consultancy
+ * Training
+
+=== Community support and contributions ===
+The diverse and growing community of over 5000 developers is centred around the public osg-users mailing list/forum, where members discuss how best to use OpenSceneGraph, provide mutual support, and coordinate development of new features and bug fixes. Members of this community come from many different countries with backgrounds ranging from some of the world's largest aerospace companies, game companies, and visual simulation specialists to university researchers, students and hobbyists.
+
+The OpenSceneGraph project owes a great deal to the community for its development and support, in particular we wish to thank the [http://www.openscenegraph.org/index.php/about/197-contributors-to-openscenegraph-3-2-2 individuals] from around the world that have directly contributed to the development and refinement of the OpenSceneGraph code base.
+
+
+
+= OpenSceneGraph 3.2.1 stable release provides a number of bug and build fixes to the 3.2.0 stable release
+
+PERTHSHIRE, Scotland - 4th July 2014 - OpenSceneGraph Professional Services announces the release of OpenSceneGraph 3.2.1, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. OpenSceneGraph 3.2 written entirely in Standard C++ and built upon OpenGL, offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modeling markets - a real-time visualization tool which eclipses commercial scene graph toolkits in functionality, stability and performance. OpenSceneGraph 3.2 runs on all Microsoft Windows platforms, Apple OS/X, IOS, GNU/Linux, Android, IRIX, Solaris, HP-UX, AIX and FreeBSD operating systems.
+
+=== Open-source development delivers industry-leading features and performance ===
+The OpenSceneGraph 3.2.1 stable release is the culmination of 15 years of work by the open-source community that has grown up around the project. This point release is fully binary compatible with the 3.2.0 stable release.  The changes made are focused on addressing bugs and improving build support for latest compilers, OS updates and 3rd changes to Party Libraries.
+
+=== Downloads and Licensing ===
+OpenSceneGraph is open-source, so full source code is provided, and can be copied, modified and used free of charge for commercial and non-commercial use. Access to the source allows end users greater flexibility in how they develop, debug and deploy their applications.  They gain productivity and freedom by being able to leverage the tool chain in accordance with their own release cycles. Downloads of binaries and source can be found in the [http://www.openscenegraph.org/index.php/download-section/stable-releases Downloads] section of the openscenegraph.org website.
+
+OpenSceneGraph is released under the [http://www.openscenegraph.org/projects/osg/wiki/Legal OpenSceneGraph Public License], which is based on the Lesser GNU Public License (LGPL), permitting the software to be used free of charge across the full spectrum of commercial and open-source applications.  Furthermore, it allows both static and dynamic linking of the OpenSceneGraph libraries without restricting the licensing of the user's software.
+
+=== Professional support and services ===
+OpenSceneGraph project is backed up with professional services by [http://www.openscenegraph.com OpenSceneGraph Professional Services], based in Scotland, and [http://www.skew-matrix.com Skew-Matrix] and [http://www.alphapixel.com AlphaPixel] both based in the USA, and a range of [wiki:Community/Contractors Contractors] from around the world.  Services available include:
+
+ * Confidential Professional Support
+ * Bespoke development
+ * Consultancy
+ * Training
+
+=== Community support and contributions ===
+The diverse and growing community of over 5000 developers is centred around the public osg-users mailing list/forum, where members discuss how best to use OpenSceneGraph, provide mutual support, and coordinate development of new features and bug fixes. Members of this community come from many different countries with backgrounds ranging from some of the world's largest aerospace companies, game companies, and visual simulation specialists to university researchers, students and hobbyists.
+
+The OpenSceneGraph project owes a great deal to the community for its development and support, in particular we wish to thank the [http://www.openscenegraph.org/index.php/about/56-contributors/162-contributors-to-openscenegraph-3-2-1 individuals] from around the world that have directly contributed to the development and refinement of the OpenSceneGraph code base.
+
+
+
+
+
 = !OpenSceneGraph 3.2 release improves support iOS and Android, supports a range of new OpenGL features much more.
 
 PERTHSHIRE, Scotland - 24th July 2013 - !OpenSceneGraph Professional Services announces the release of !OpenSceneGraph 3.2, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. !OpenSceneGraph 3.2 written entirely in Standard C++ and built upon OpenGL, offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modeling markets - a real-time visualization tool which eclipses commercial scene graph toolkits in functionality, stability and performance. !OpenSceneGraph 3.2 runs on all Microsoft Windows platforms, Apple OS/X, IOS, GNU/Linux, Android, IRIX, Solaris, HP-UX, AIX and FreeBSD operating systems.

PlatformSpecifics/Android/Application.mk.master.in

@@ -4,7 +4,7 @@ APP_PROJECT_PATH := $(call my-dir)
 
 APP_OPTIM := ${ANDROID_RELEASE_OPTIM}
 
-APP_PLATFORM := ${ANDROID_PLATFORM}
+APP_PLATFORM := android-${ANDROID_PLATFORM}
 APP_STL := ${ANDROID_STL}
 APP_CPPFLAGS := -fexceptions -frtti
 #APP_CPPFLAGS := -Os -mthumb-interwork -fno-short-enums

README.txt

@@ -23,7 +23,7 @@ more indepth instructions.
 
 Robert Osfield.
 Project Lead.
-24th July 2013.
+12th August 2015.
 
 --
 

applications/osgconv/osgconv.cpp

@@ -557,6 +557,7 @@ int main( int argc, char **argv )
     // if user request help write it out to cout.
     if (arguments.read("-h") || arguments.read("--help"))
     {
+        osg::setNotifyLevel(osg::NOTICE);
         usage( arguments.getApplicationName().c_str(), 0 );
         //arguments.getApplicationUsage()->write(std::cout);
         return 1;

applications/osgversion/Contributors.cpp

@@ -254,7 +254,14 @@ const char* invalidNames[] =
     "GraphicsContext*",
     "Apple",
     "GeometryNew",
-    "FrameBufferObject"
+    "FrameBufferObject",
+    "Lua",
+    "VolumeTile",
+    "PushStackValueVisitor",
+    "RayIntersector",
+    "OpenSceneGraph-Data",
+    "Node",
+    "AlphaFunc"
 };
 
 
@@ -347,6 +354,7 @@ TypoCorrection typoCorrections[] =
     {"Krulthof",       "Kruithof"},
     {"Lagrade",        "Lagarde"},
     {"Largade",        "Lagarde"},
+    {"Largarde",       "Lagarde"},
     {"Larshkari",      "Lashkari"},
     {"Lashakari",      "Lashkari"},
     {"Lashari",        "Lashkari"},
@@ -454,7 +462,29 @@ TypoCorrection typoCorrections[] =
     {"Eskland","Ekstrand"},
     {"Baeuerele","Baeuerle"},
     {"Bauerle","Baeuerle"},
-    {"Baeurele","Baeuerle"}
+    {"Baeurele","Baeuerle"},
+    {"Nillson","Nilsson"},
+    {"Bjorn","Bj<EFBFBD>rn"},
+    {"Björn","Bj<EFBFBD>rn"},
+    {"Stepan","Stephan"},
+    {"Kristoger","Kristofer"},
+    {"Blessing","Blissing"},
+    {"Dannahuer","Dannhauer"},
+    {"Chebeav", "Chebaev"},
+    {"Messershmidt","Messerschmidt"},
+    {"Auelien","Aurelien"},
+    {"Aurélien","Aur<EFBFBD>lien"},
+    {"McDonnel","Mc Donnell"},
+    {"McDonnell","Mc Donnell"},
+    {"Delallée","Delall<EFBFBD>e"},
+    {"Gjøl","Gj<EFBFBD>l"},
+    {"Ravšelj","Rav<EFBFBD>elj"},
+    {"Ravsel",  "Rav<EFBFBD>elj"},
+    {"Ravselj", "Rav<EFBFBD>elj"},
+    {"Janik", "Jannik"},
+    {"Viganò", "Vigan<EFBFBD>"},
+    {"Vigano", "Vigan<EFBFBD>"},
+    {"Frashud", "Farshid"}
 };
 
 
@@ -562,6 +592,8 @@ NameCorrection nameCorrections[] =
      "Melchior",       "Franz"},
     {"Glen",           "Waldon",
      "Glenn",          "Waldron"},
+    {"Glen",           "Waldron",
+     "Glenn",          "Waldron"},
     {"Ralf",           "Karn",
      "Ralf",           "Kern"},
     {"Donny",          "Cipperly",
@@ -594,6 +626,8 @@ NameCorrection nameCorrections[] =
      "Romano",         "Jos<EFBFBD> Magacho da Silva"},
     {"Rommano",        "Silva",
      "Romano",         "Jos<EFBFBD> Magacho da Silva"},
+    {"Romano",         "Magacho",
+     "Romano",         "Jos<EFBFBD> Magacho da Silva"},
     {"Leandro",        "Motta",
      "Leandro",        "Motta Barros"},
     {"Leandro",        "Motto",
@@ -619,7 +653,27 @@ NameCorrection nameCorrections[] =
     {"Tyge",           "",
      "Tyge",           "L<EFBFBD>vset"},
     {"Ricard",         "Schmidt",
-     "Richard",        "Schmidt"}
+     "Richard",        "Schmidt"},
+    {"Matthias",       "Helsing",
+     "Mattias",        "Helsing"},
+    {"Clement",        "Boesch",
+     "Cl<EFBFBD>ment",        "B<EFBFBD>sch"},
+    {"Lauren",         "Voerman",
+     "Laurens",        "Voerman"},
+    {"Pjotr",          "Sventachov",
+     "Pjotr",          "Svetachov"},
+     {"Bradley",       "Baker",
+      "Bradley",       "Baker Searles"},
+     {"PawelKsiezopolski", "",
+      "Pawel",          "Ksiezopolski"},
+     {"Albert", "Luaces",
+      "Alberto","Luaces"},
+     {"KOS", "",
+      "Konstantin","Matveyev"},
+     {"WeSee", "",
+       "Alois", "Wismer"},
+     {"We", "See",
+       "Alois", "Wismer"}
 };
 
 
@@ -951,7 +1005,9 @@ void printContributors(const std::string& changeLog, bool printNumEntries)
         cout << "-------------------------" << endl;
         for (SortedNameMap::reverse_iterator sitr = sortedNames.rbegin(); sitr != sortedNames.rend(); ++sitr)
         {
-            cout << sitr->first << "\t" << sitr->second.first << " " << sitr->second.second << endl;
+            cout << sitr->first << "\t" << sitr->second.first;
+            if (!sitr->second.second.empty()) cout << " " << sitr->second.second;
+            cout << endl;
         }
     }
     else
@@ -960,7 +1016,9 @@ void printContributors(const std::string& changeLog, bool printNumEntries)
         cout << "-----------------" << endl;
         for (SortedNameMap::reverse_iterator sitr = sortedNames.rbegin(); sitr != sortedNames.rend(); ++sitr)
         {
-            cout << sitr->second.first << " " << sitr->second.second << endl;
+            cout << sitr->second.first;
+            if (!sitr->second.second.empty()) cout << " " << sitr->second.second;
+            cout << endl;
         }
     }
 }

applications/osgviewer/osgviewer.cpp

@@ -31,6 +31,7 @@
 #include <osgGA/Device>
 
 #include <iostream>
+#include <stdint.h>
 
 #include <osg/GLExtensions>
 
@@ -90,7 +91,7 @@ public:
         if (!_extensionInitialized) setUpExtensions();
 
         if (_glClientWaitSync)
-        {        
+        {
             if (_previousSync)
             {
                 unsigned int num_seconds = 1;
@@ -126,7 +127,7 @@ public:
     typedef void (GL_APIENTRY * PFNGLGETSYNCIVPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
 
     bool                        _extensionInitialized;
-    
+
     PFNGLFENCESYNCPROC          _glFenceSync;
     PFNGLISSYNCPROC             _glIsSync;
     PFNGLDELETESYNCPROC         _glDeleteSync;
@@ -187,7 +188,7 @@ int main(int argc, char** argv)
             );
         }
     }
-    
+
     std::string device;
     while(arguments.read("--device", device))
     {

applications/present3D/Cluster.cpp

@@ -1,12 +1,12 @@
-/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield 
+/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield
  *
- * This software is open source and may be redistributed and/or modified under  
+ * This software is open source and may be redistributed and/or modified under
  * the terms of the GNU General Public License (GPL) version 2.0.
  * The full license is in LICENSE.txt file included with this distribution,.
- * 
+ *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * include LICENSE.txt for more details.
 */
 
@@ -39,9 +39,9 @@
 #elif defined(__sgi)
     #include <unistd.h>
     #include <net/soioctl.h>
-#elif defined(__CYGWIN__) 
+#elif defined(__CYGWIN__)
     #include <unistd.h>
-#elif defined(__sun) 
+#elif defined(__sun)
     #include <unistd.h>
     #include <sys/sockio.h>
 #elif defined (__APPLE__)
@@ -249,7 +249,7 @@ void CameraPacket::writeEventQueue(osgViewer::Viewer& viewer)
 
 //////////////////////////////////////////////////////////////////////////////
 //
-//  Reciever 
+//  Reciever
 //
 Receiver::Receiver( void )
 {
@@ -338,7 +338,7 @@ void Receiver::sync( void )
 
 #if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ ) || \
     defined(__DragonFly__)
-    socklen_t 
+    socklen_t
 #else
     int
 #endif
@@ -381,7 +381,7 @@ void Receiver::sync( void )
 
 //////////////////////////////////////////////////////////////////////////////
 //
-//  Broadcaster 
+//  Broadcaster
 //
 Broadcaster::Broadcaster( void )
 {

applications/present3D/Cluster.h

@@ -1,12 +1,12 @@
-/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield 
+/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield
  *
- * This software is open source and may be redistributed and/or modified under  
+ * This software is open source and may be redistributed and/or modified under
  * the terms of the GNU General Public License (GPL) version 2.0.
  * The full license is in LICENSE.txt file included with this distribution,.
- * 
+ *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * include LICENSE.txt for more details.
 */
 
@@ -29,7 +29,7 @@
 //
 // Class definition for the recipient of a broadcasted message
 //
-class Receiver 
+class Receiver
 {
     public :
 
@@ -68,7 +68,7 @@ class Receiver
 //
 // Class definition for broadcasting a buffer to a LAN
 //
-class Broadcaster  
+class Broadcaster
 {
     public :
 
@@ -84,7 +84,7 @@ class Broadcaster
 	// Set a recipient host.  If this is used, the Broadcaster
 	// no longer broadcasts, but rather directs UDP packets at
 	// host.
-	void setHost( const char *hostname ); 
+	void setHost( const char *hostname );
 
 	// Sync broadcasts the buffer
 	void sync( void );
@@ -112,15 +112,15 @@ class Broadcaster
 
 class CameraPacket {
     public:
-    
+
         static const unsigned int MAX_NUM_EVENTS;
         static const unsigned int SWAP_BYTES_COMPARE;
-    
-        CameraPacket():_masterKilled(false) 
+
+        CameraPacket():_masterKilled(false)
         {
             _byte_order = SWAP_BYTES_COMPARE;
         }
-        
+
         void setPacket(const osg::Matrix& matrix,const osg::FrameStamp* frameStamp)
         {
             _matrix = matrix;
@@ -129,20 +129,20 @@ class CameraPacket {
                 _frameStamp    = *frameStamp;
             }
         }
-        
+
         void getModelView(osg::Matrix& matrix,float angle_offset=0.0f)
         {
-        
+
             matrix = _matrix * osg::Matrix::rotate(osg::DegreesToRadians(angle_offset),0.0f,1.0f,0.0f);
         }
-        
+
         void readEventQueue(osgViewer::Viewer& viewer);
-        
+
         void writeEventQueue(osgViewer::Viewer& viewer);
 
         void setMasterKilled(const bool flag) { _masterKilled = flag; }
         const bool getMasterKilled() const { return _masterKilled; }
-        
+
         unsigned int    _byte_order;
         bool            _masterKilled;
         osg::Matrix     _matrix;
@@ -150,11 +150,11 @@ class CameraPacket {
         // note don't use a ref_ptr as used elsewhere for FrameStamp
         // since we don't want to copy the pointer - but the memory.
         // FrameStamp doesn't have a private destructor to allow
-        // us to do this, even though its a reference counted object.    
+        // us to do this, even though its a reference counted object.
         osg::FrameStamp  _frameStamp;
-        
+
         osgGA::EventQueue::Events _events;
-        
+
 };
 
 class DataConverter
@@ -186,22 +186,22 @@ class DataConverter
         {
             if (_currentPtr+1>=_endPtr) return;
 
-            *(_currentPtr++) = *(ptr); 
+            *(_currentPtr++) = *(ptr);
         }
 
         inline void read1(char* ptr)
         {
             if (_currentPtr+1>=_endPtr) return;
 
-            *(ptr) = *(_currentPtr++); 
+            *(ptr) = *(_currentPtr++);
         }
 
         inline void write2(char* ptr)
         {
             if (_currentPtr+2>=_endPtr) return;
 
-            *(_currentPtr++) = *(ptr++); 
-            *(_currentPtr++) = *(ptr); 
+            *(_currentPtr++) = *(ptr++);
+            *(_currentPtr++) = *(ptr);
         }
 
         inline void read2(char* ptr)
@@ -210,13 +210,13 @@ class DataConverter
 
             if (_swapBytes)
             {
-                *(ptr+1) = *(_currentPtr++); 
-                *(ptr) = *(_currentPtr++); 
+                *(ptr+1) = *(_currentPtr++);
+                *(ptr) = *(_currentPtr++);
             }
             else
             {
-                *(ptr++) = *(_currentPtr++); 
-                *(ptr) = *(_currentPtr++); 
+                *(ptr++) = *(_currentPtr++);
+                *(ptr) = *(_currentPtr++);
             }
         }
 
@@ -224,10 +224,10 @@ class DataConverter
         {
             if (_currentPtr+4>=_endPtr) return;
 
-            *(_currentPtr++) = *(ptr++); 
-            *(_currentPtr++) = *(ptr++); 
-            *(_currentPtr++) = *(ptr++); 
-            *(_currentPtr++) = *(ptr); 
+            *(_currentPtr++) = *(ptr++);
+            *(_currentPtr++) = *(ptr++);
+            *(_currentPtr++) = *(ptr++);
+            *(_currentPtr++) = *(ptr);
         }
 
         inline void read4(char* ptr)
@@ -236,17 +236,17 @@ class DataConverter
 
             if (_swapBytes)
             {
-                *(ptr+3) = *(_currentPtr++); 
-                *(ptr+2) = *(_currentPtr++); 
-                *(ptr+1) = *(_currentPtr++); 
-                *(ptr) = *(_currentPtr++); 
+                *(ptr+3) = *(_currentPtr++);
+                *(ptr+2) = *(_currentPtr++);
+                *(ptr+1) = *(_currentPtr++);
+                *(ptr) = *(_currentPtr++);
             }
             else
             {
-                *(ptr++) = *(_currentPtr++); 
-                *(ptr++) = *(_currentPtr++); 
-                *(ptr++) = *(_currentPtr++); 
-                *(ptr) = *(_currentPtr++); 
+                *(ptr++) = *(_currentPtr++);
+                *(ptr++) = *(_currentPtr++);
+                *(ptr++) = *(_currentPtr++);
+                *(ptr) = *(_currentPtr++);
             }
         }
 
@@ -254,15 +254,15 @@ class DataConverter
         {
             if (_currentPtr+8>=_endPtr) return;
 
-            *(_currentPtr++) = *(ptr++); 
-            *(_currentPtr++) = *(ptr++); 
-            *(_currentPtr++) = *(ptr++); 
-            *(_currentPtr++) = *(ptr++); 
+            *(_currentPtr++) = *(ptr++);
+            *(_currentPtr++) = *(ptr++);
+            *(_currentPtr++) = *(ptr++);
+            *(_currentPtr++) = *(ptr++);
 
-            *(_currentPtr++) = *(ptr++); 
-            *(_currentPtr++) = *(ptr++); 
-            *(_currentPtr++) = *(ptr++); 
-            *(_currentPtr++) = *(ptr); 
+            *(_currentPtr++) = *(ptr++);
+            *(_currentPtr++) = *(ptr++);
+            *(_currentPtr++) = *(ptr++);
+            *(_currentPtr++) = *(ptr);
         }
 
         inline void read8(char* ptr)
@@ -272,27 +272,27 @@ class DataConverter
 
             if (_swapBytes)
             {
-                *(ptr+7) = *(_currentPtr++); 
-                *(ptr+6) = *(_currentPtr++); 
-                *(ptr+5) = *(_currentPtr++); 
-                *(ptr+4) = *(_currentPtr++); 
+                *(ptr+7) = *(_currentPtr++);
+                *(ptr+6) = *(_currentPtr++);
+                *(ptr+5) = *(_currentPtr++);
+                *(ptr+4) = *(_currentPtr++);
 
-                *(ptr+3) = *(_currentPtr++); 
-                *(ptr+2) = *(_currentPtr++); 
-                *(ptr+1) = *(_currentPtr++); 
-                *(ptr) = *(_currentPtr++); 
+                *(ptr+3) = *(_currentPtr++);
+                *(ptr+2) = *(_currentPtr++);
+                *(ptr+1) = *(_currentPtr++);
+                *(ptr) = *(_currentPtr++);
             }
             else
             {
-                *(ptr++) = *(_currentPtr++); 
-                *(ptr++) = *(_currentPtr++); 
-                *(ptr++) = *(_currentPtr++); 
-                *(ptr++) = *(_currentPtr++); 
+                *(ptr++) = *(_currentPtr++);
+                *(ptr++) = *(_currentPtr++);
+                *(ptr++) = *(_currentPtr++);
+                *(ptr++) = *(_currentPtr++);
 
-                *(ptr++) = *(_currentPtr++); 
-                *(ptr++) = *(_currentPtr++); 
-                *(ptr++) = *(_currentPtr++); 
-                *(ptr) = *(_currentPtr++); 
+                *(ptr++) = *(_currentPtr++);
+                *(ptr++) = *(_currentPtr++);
+                *(ptr++) = *(_currentPtr++);
+                *(ptr) = *(_currentPtr++);
             }
         }
 
@@ -305,14 +305,14 @@ class DataConverter
         inline void writeFloat(float c)             { write4((char*)&c); }
         inline void writeDouble(double c)           { write8((char*)&c); }
 
-        inline char readChar() { char c; read1(&c); return c; }
-        inline unsigned char readUChar() { unsigned char c; read1((char*)&c); return c; }
-        inline short readShort() { short c; read2((char*)&c); return c; }
-        inline unsigned short readUShort() { unsigned short c; read2((char*)&c); return c; }
-        inline int readInt() { int c; read4((char*)&c); return c; }
-        inline unsigned int readUInt() { unsigned int c; read4((char*)&c); return c; }
-        inline float readFloat() { float c; read4((char*)&c); return c; }
-        inline double readDouble() { double c; read8((char*)&c); return c; }
+        inline char readChar() { char c=0; read1(&c); return c; }
+        inline unsigned char readUChar() { unsigned char c=0; read1((char*)&c); return c; }
+        inline short readShort() { short c=0; read2((char*)&c); return c; }
+        inline unsigned short readUShort() { unsigned short c=0; read2((char*)&c); return c; }
+        inline int readInt() { int c=0; read4((char*)&c); return c; }
+        inline unsigned int readUInt() { unsigned int c=0; read4((char*)&c); return c; }
+        inline float readFloat() { float c=0.0f; read4((char*)&c); return c; }
+        inline double readDouble() { double c=0.0; read8((char*)&c); return c; }
 
         void write(const osg::FrameStamp& fs);
         void read(osg::FrameStamp& fs);
@@ -322,13 +322,13 @@ class DataConverter
 
         void write(const osgGA::GUIEventAdapter& event);
         void read(osgGA::GUIEventAdapter& event);
-        
+
         void write(CameraPacket& cameraPacket);
         void read(CameraPacket& cameraPacket);
 
         char* startPtr() { return _startPtr; }
         unsigned int numBytes() { return _numBytes; }
-        
+
     protected:
 
         char* _startPtr;
@@ -341,4 +341,4 @@ class DataConverter
 
 
 
-#endif 
+#endif

applications/present3D/present3D.cpp

@@ -1,12 +1,12 @@
-/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield 
+/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield
  *
- * This software is open source and may be redistributed and/or modified under  
+ * This software is open source and may be redistributed and/or modified under
  * the terms of the GNU General Public License (GPL) version 2.0.
  * The full license is in LICENSE.txt file included with this distribution,.
- * 
+ *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * include LICENSE.txt for more details.
 */
 
@@ -135,14 +135,14 @@ void setViewer(osgViewer::Viewer& viewer, float width, float height, float dista
 class ForwardToDeviceEventHandler : public osgGA::GUIEventHandler {
 public:
     ForwardToDeviceEventHandler(osgGA::Device* device) : osgGA::GUIEventHandler(), _device(device) {}
-    
+
     virtual bool handle (const osgGA::GUIEventAdapter &ea, osgGA::GUIActionAdapter &aa, osg::Object *, osg::NodeVisitor *)
     {
         OSG_INFO<<"ForwardToDeviceEventHandler::setEvent("<<ea.getKey()<<")"<<std::endl;
         _device->sendEvent(ea);
         return false;
     }
-    
+
 private:
     osg::ref_ptr<osgGA::Device> _device;
 };
@@ -161,7 +161,7 @@ class FollowMouseCallback: public osgGA::GUIEventHandler
             if (!transform) return false;
 
             osg::NotifySeverity level = osg::INFO;
-            
+
             switch(ea.getEventType())
             {
                 case(osgGA::GUIEventAdapter::PUSH):
@@ -284,7 +284,7 @@ enum P3DApplicationType
 void processLoadedModel(osg::ref_ptr<osg::Node>& loadedModel, int optimizer_options, const std::string& cursorFileName)
 {
     if (!loadedModel) return;
-    
+
 #if !defined(OSG_GLES2_AVAILABLE) && !defined(OSG_GL3_AVAILABLE)
 
     // add back in enabling of the GL_ALPHA_TEST to get around the core OSG no longer setting it by default for opaque bins.
@@ -312,7 +312,7 @@ void addDeviceTo(osgViewer::Viewer& viewer, const std::string& device_name)
     {
         OSG_INFO << "Adding Device : " << device_name << std::endl;
         viewer.addDevice(dev.get());
-        
+
         if (dev->getCapabilities() & osgGA::Device::SEND_EVENTS)
             viewer.getEventHandlers().push_front(new ForwardToDeviceEventHandler(dev.get()));
     }
@@ -327,7 +327,7 @@ int main( int argc, char **argv )
 {
     // use an ArgumentParser object to manage the program arguments.
     osg::ArgumentParser arguments(&argc,argv);
-    
+
     // set up the usage document, in case we need to print out how to use this program.
     arguments.getApplicationUsage()->setApplicationName(arguments.getApplicationName());
     arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is the application for presenting 3D interactive slide shows.");
@@ -386,10 +386,10 @@ int main( int argc, char **argv )
 
 #ifdef USE_SDL
     SDLIntegration sdlIntegration;
-    
+
     osg::notify(osg::INFO)<<"USE_SDL"<<std::endl;
-#endif    
-    
+#endif
+
     bool doSetViewer = true;
     std::string configurationFile;
 
@@ -402,7 +402,7 @@ int main( int argc, char **argv )
     while (arguments.read("-c",configurationFile)) {}
 
     osg::Vec4 clearColor(0.0f,0.0f,0.0f,0.0f);
-    
+
     while (arguments.read("--clear-color",clearColor[0],clearColor[1],clearColor[2],clearColor[3])) {}
 
     std::string filename;
@@ -441,7 +441,7 @@ int main( int argc, char **argv )
 
     // construct the viewer.
     osgViewer::Viewer viewer(arguments);
-    
+
     // set clear colour to black by default.
     viewer.getCamera()->setClearColor(clearColor);
 
@@ -467,12 +467,12 @@ int main( int argc, char **argv )
     while (arguments.read("--device", device))
     {
         addDeviceTo(viewer, device);
-        
+
     }
 
     if (arguments.read("--http-control"))
     {
-    
+
         std::string server_address = "localhost";
         std::string server_port = "8080";
         std::string document_root = "htdocs";
@@ -489,11 +489,21 @@ int main( int argc, char **argv )
             viewer.addDevice(rest_http_device.get());
         }
     }
-    
+
     // set up stereo masks
-    viewer.getCamera()->setCullMask(0xffffffff);
+
     viewer.getCamera()->setCullMaskLeft(0x00000001);
-    viewer.getCamera()->setCullMaskRight(0x00000002);   
+    viewer.getCamera()->setCullMaskRight(0x00000002);
+
+    bool assignLeftCullMaskForMono = true;
+    if (assignLeftCullMaskForMono)
+    {
+        viewer.getCamera()->setCullMask(viewer.getCamera()->getCullMaskLeft());
+    }
+    else
+    {
+        viewer.getCamera()->setCullMask(0xffffffff);
+    }
 
     // set up the camera manipulators.
     {
@@ -509,7 +519,7 @@ int main( int argc, char **argv )
         while (arguments.read("-p",pathfile))
         {
             osgGA::AnimationPathManipulator* apm = new osgGA::AnimationPathManipulator(pathfile);
-            if (apm || !apm->valid()) 
+            if (apm || !apm->valid())
             {
                 unsigned int num = keyswitchManipulator->getNumMatrixManipulators();
                 keyswitchManipulator->addMatrixManipulator( keyForAnimationPath, "Path", apm );
@@ -547,12 +557,12 @@ int main( int argc, char **argv )
     bool hideCursor = (showCursor=="No" || showCursor=="NO" || showCursor=="no");
 
     while (arguments.read("--set-viewer")) { doSetViewer = true; }
-    
+
     while (arguments.read("--no-set-viewer")) { doSetViewer = false; }
 
     // if we want to hide the cursor override the custom cursor.
     if (hideCursor) cursorFileName.clear();
-    
+
 
     // cluster related entries.
     int socketNumber=8100;
@@ -599,7 +609,7 @@ int main( int argc, char **argv )
         viewer.getUpdateVisitor()->setTraversalMode(updateTraversalMode);
     }
 
-    
+
     // register the slide event handler - which moves the presentation from slide to slide, layer to layer.
     osg::ref_ptr<osgPresentation::SlideEventHandler> seh = new osgPresentation::SlideEventHandler(&viewer);
     viewer.addEventHandler(seh.get());
@@ -620,7 +630,7 @@ int main( int argc, char **argv )
     // set up optimizer options
     unsigned int optimizer_options = osgUtil::Optimizer::DEFAULT_OPTIMIZATIONS;
     bool relase_and_compile = false;
-    while (arguments.read("--release-and-compile")) 
+    while (arguments.read("--release-and-compile"))
     {
         relase_and_compile = true;
     }
@@ -631,7 +641,7 @@ int main( int argc, char **argv )
         viewer.getDatabasePager()->setUnrefImageDataAfterApplyPolicy(true,false);
         optimizer_options &= ~osgUtil::Optimizer::OPTIMIZE_TEXTURE_SETTINGS;
     }
-// 
+//
 //     osgDB::Registry::instance()->getOrCreateDatabasePager()->setUnrefImageDataAfterApplyPolicy(true,false);
 //     optimizer_options &= ~osgUtil::Optimizer::OPTIMIZE_TEXTURE_SETTINGS;
 //     osg::Texture::getTextureObjectManager()->setExpiryDelay(0.0f);
@@ -657,7 +667,7 @@ int main( int argc, char **argv )
     float width = osg::DisplaySettings::instance()->getScreenWidth();
     float height = osg::DisplaySettings::instance()->getScreenHeight();
     float distance = osg::DisplaySettings::instance()->getScreenDistance();
-    while (arguments.read("-s", width, height, distance)) 
+    while (arguments.read("-s", width, height, distance))
     {
         osg::DisplaySettings::instance()->setScreenDistance(distance);
         osg::DisplaySettings::instance()->setScreenHeight(height);
@@ -687,11 +697,11 @@ int main( int argc, char **argv )
         else if (strcmp(str,"master")==0) P3DApplicationType = MASTER;
         else if (strcmp(str,"slave")==0) P3DApplicationType = SLAVE;
     }
-        
+
     while (arguments.read("--viewer")) { P3DApplicationType = VIEWER; }
     while (arguments.read("--master")) { P3DApplicationType = MASTER; }
     while (arguments.read("--slave")) { P3DApplicationType = SLAVE; }
-    
+
     while (arguments.read("--version"))
     {
         std::string appTypeName = "invalid";
@@ -780,7 +790,7 @@ int main( int argc, char **argv )
 
 
     // if no model has been successfully loaded report failure.
-    if (!loadedModel) 
+    if (!loadedModel)
     {
         osg::notify(osg::INFO) << arguments.getApplicationName() <<": No data loaded" << std::endl;
         return 1;
@@ -796,12 +806,12 @@ int main( int argc, char **argv )
         for(unsigned int i=0; i<loadedModel->getNumDescriptions(); ++i)
         {
             const std::string& desc = loadedModel->getDescription(i);
-            if (desc=="loop") 
+            if (desc=="loop")
             {
                 osg::notify(osg::NOTICE)<<"Enabling looping"<<std::endl;
                 seh->setLoopPresentation(true);
             }
-            else if (desc=="auto") 
+            else if (desc=="auto")
             {
                 osg::notify(osg::NOTICE)<<"Enabling auto run"<<std::endl;
                 seh->setAutoSteppingActive(true);
@@ -830,7 +840,7 @@ int main( int argc, char **argv )
     }
 
 
-    
+
 
     // pass the model to the slide event handler so it knows which to manipulate.
     seh->set(loadedModel.get());
@@ -843,7 +853,7 @@ int main( int argc, char **argv )
         osgDB::writeNodeFile(*loadedModel,outputFileName);
         return 0;
     }
-    
+
 
     if (!cursorFileName.empty() || hideCursor)
     {
@@ -865,7 +875,7 @@ int main( int argc, char **argv )
 
     osg::Timer_t startOfFrameTick = osg::Timer::instance()->tick();
     double targetFrameTime = 1.0/targetFrameRate;
-    
+
     if (exportName.empty())
     {
         // objects for managing the broadcasting and recieving of camera packets.
@@ -894,7 +904,7 @@ int main( int argc, char **argv )
 
             startOfFrameTick =  osg::Timer::instance()->tick();
 
-#if 0            
+#if 0
             if (kmcb)
             {
                 double time = kmcb->getTime();
@@ -910,9 +920,9 @@ int main( int argc, char **argv )
             {
                 // take camera zero as the guide.
                 osg::Matrix modelview(viewer.getCamera()->getViewMatrix());
-                
+
                 cp.setPacket(modelview,viewer.getFrameStamp());
-                
+
                 // cp.readEventQueue(viewer);
 
                 scratchPad.reset();
@@ -922,7 +932,7 @@ int main( int argc, char **argv )
                 scratchPad.read(cp);
 
                 bc.setBuffer(scratchPad.startPtr(), scratchPad.numBytes());
-                
+
                 std::cout << "bc.sync()"<<scratchPad.numBytes()<<std::endl;
 
                 bc.sync();
@@ -932,13 +942,13 @@ int main( int argc, char **argv )
                 rc.setBuffer(scratchPad.startPtr(), scratchPad.numBytes());
 
                 rc.sync();
-                
+
                 scratchPad.reset();
                 scratchPad.read(cp);
-    
+
                 // cp.writeEventQueue(viewer);
 
-                if (cp.getMasterKilled()) 
+                if (cp.getMasterKilled())
                 {
                     std::cout << "Received master killed."<<std::endl;
                     // break out of while (!done) loop since we've now want to shut down.
@@ -972,7 +982,7 @@ int main( int argc, char **argv )
                 seh->selectSlide(previous_ActiveSlide, previous_ActiveLayer);
 
                 continue;
-                
+
             }
 
             // update the scene by traversing it with the the update visitor which will
@@ -996,7 +1006,7 @@ int main( int argc, char **argv )
     {
         ExportHTML::write(seh.get(), viewer, exportName);
     }
-    
+
     return 0;
 }
 

examples/osgcluster/osgcluster.cpp

@@ -48,13 +48,13 @@ const unsigned int MAX_NUM_EVENTS = 10;
 const unsigned int SWAP_BYTES_COMPARE = 0x12345678;
 class CameraPacket {
     public:
-    
-    
-        CameraPacket():_masterKilled(false) 
+
+
+        CameraPacket():_masterKilled(false)
         {
             _byte_order = SWAP_BYTES_COMPARE;
         }
-        
+
         void setPacket(const osg::Matrix& matrix,const osg::FrameStamp* frameStamp)
         {
             _matrix = matrix;
@@ -63,20 +63,20 @@ class CameraPacket {
                 _frameStamp    = *frameStamp;
             }
         }
-        
+
         void getModelView(osg::Matrix& matrix,float angle_offset=0.0f)
         {
-        
+
             matrix = _matrix * osg::Matrix::rotate(osg::DegreesToRadians(angle_offset),0.0f,1.0f,0.0f);
         }
-        
+
         void readEventQueue(osgViewer::Viewer& viewer);
-        
+
         void writeEventQueue(osgViewer::Viewer& viewer);
 
         void setMasterKilled(const bool flag) { _masterKilled = flag; }
         const bool getMasterKilled() const { return _masterKilled; }
-        
+
         unsigned int    _byte_order;
         bool            _masterKilled;
         osg::Matrix     _matrix;
@@ -84,11 +84,11 @@ class CameraPacket {
         // note don't use a ref_ptr as used elsewhere for FrameStamp
         // since we don't want to copy the pointer - but the memory.
         // FrameStamp doesn't have a private destructor to allow
-        // us to do this, even though its a reference counted object.    
+        // us to do this, even though its a reference counted object.
         osg::FrameStamp  _frameStamp;
-        
+
         osgGA::EventQueue::Events _events;
-        
+
 };
 
 class DataConverter
@@ -112,7 +112,7 @@ class DataConverter
         bool _swapBytes;
 
         char* _currentPtr;
-        
+
         void reset()
         {
             _currentPtr = _startPtr;
@@ -122,22 +122,22 @@ class DataConverter
         {
             if (_currentPtr+1>=_endPtr) return;
 
-            *(_currentPtr++) = *(ptr); 
+            *(_currentPtr++) = *(ptr);
         }
 
         inline void read1(char* ptr)
         {
             if (_currentPtr+1>=_endPtr) return;
 
-            *(ptr) = *(_currentPtr++); 
+            *(ptr) = *(_currentPtr++);
         }
 
         inline void write2(char* ptr)
         {
             if (_currentPtr+2>=_endPtr) return;
 
-            *(_currentPtr++) = *(ptr++); 
-            *(_currentPtr++) = *(ptr); 
+            *(_currentPtr++) = *(ptr++);
+            *(_currentPtr++) = *(ptr);
         }
 
         inline void read2(char* ptr)
@@ -146,13 +146,13 @@ class DataConverter
 
             if (_swapBytes)
             {
-                *(ptr+1) = *(_currentPtr++); 
-                *(ptr) = *(_currentPtr++); 
+                *(ptr+1) = *(_currentPtr++);
+                *(ptr) = *(_currentPtr++);
             }
             else
             {
-                *(ptr++) = *(_currentPtr++); 
-                *(ptr) = *(_currentPtr++); 
+                *(ptr++) = *(_currentPtr++);
+                *(ptr) = *(_currentPtr++);
             }
         }
 
@@ -160,10 +160,10 @@ class DataConverter
         {
             if (_currentPtr+4>=_endPtr) return;
 
-            *(_currentPtr++) = *(ptr++); 
-            *(_currentPtr++) = *(ptr++); 
-            *(_currentPtr++) = *(ptr++); 
-            *(_currentPtr++) = *(ptr); 
+            *(_currentPtr++) = *(ptr++);
+            *(_currentPtr++) = *(ptr++);
+            *(_currentPtr++) = *(ptr++);
+            *(_currentPtr++) = *(ptr);
         }
 
         inline void read4(char* ptr)
@@ -172,17 +172,17 @@ class DataConverter
 
             if (_swapBytes)
             {
-                *(ptr+3) = *(_currentPtr++); 
-                *(ptr+2) = *(_currentPtr++); 
-                *(ptr+1) = *(_currentPtr++); 
-                *(ptr) = *(_currentPtr++); 
+                *(ptr+3) = *(_currentPtr++);
+                *(ptr+2) = *(_currentPtr++);
+                *(ptr+1) = *(_currentPtr++);
+                *(ptr) = *(_currentPtr++);
             }
             else
             {
-                *(ptr++) = *(_currentPtr++); 
-                *(ptr++) = *(_currentPtr++); 
-                *(ptr++) = *(_currentPtr++); 
-                *(ptr) = *(_currentPtr++); 
+                *(ptr++) = *(_currentPtr++);
+                *(ptr++) = *(_currentPtr++);
+                *(ptr++) = *(_currentPtr++);
+                *(ptr) = *(_currentPtr++);
             }
         }
 
@@ -190,15 +190,15 @@ class DataConverter
         {
             if (_currentPtr+8>=_endPtr) return;
 
-            *(_currentPtr++) = *(ptr++); 
-            *(_currentPtr++) = *(ptr++); 
-            *(_currentPtr++) = *(ptr++); 
-            *(_currentPtr++) = *(ptr++); 
+            *(_currentPtr++) = *(ptr++);
+            *(_currentPtr++) = *(ptr++);
+            *(_currentPtr++) = *(ptr++);
+            *(_currentPtr++) = *(ptr++);
 
-            *(_currentPtr++) = *(ptr++); 
-            *(_currentPtr++) = *(ptr++); 
-            *(_currentPtr++) = *(ptr++); 
-            *(_currentPtr++) = *(ptr); 
+            *(_currentPtr++) = *(ptr++);
+            *(_currentPtr++) = *(ptr++);
+            *(_currentPtr++) = *(ptr++);
+            *(_currentPtr++) = *(ptr);
         }
 
         inline void read8(char* ptr)
@@ -208,27 +208,27 @@ class DataConverter
 
             if (_swapBytes)
             {
-                *(ptr+7) = *(_currentPtr++); 
-                *(ptr+6) = *(_currentPtr++); 
-                *(ptr+5) = *(_currentPtr++); 
-                *(ptr+4) = *(_currentPtr++); 
+                *(ptr+7) = *(_currentPtr++);
+                *(ptr+6) = *(_currentPtr++);
+                *(ptr+5) = *(_currentPtr++);
+                *(ptr+4) = *(_currentPtr++);
 
-                *(ptr+3) = *(_currentPtr++); 
-                *(ptr+2) = *(_currentPtr++); 
-                *(ptr+1) = *(_currentPtr++); 
-                *(ptr) = *(_currentPtr++); 
+                *(ptr+3) = *(_currentPtr++);
+                *(ptr+2) = *(_currentPtr++);
+                *(ptr+1) = *(_currentPtr++);
+                *(ptr) = *(_currentPtr++);
             }
             else
             {
-                *(ptr++) = *(_currentPtr++); 
-                *(ptr++) = *(_currentPtr++); 
-                *(ptr++) = *(_currentPtr++); 
-                *(ptr++) = *(_currentPtr++); 
+                *(ptr++) = *(_currentPtr++);
+                *(ptr++) = *(_currentPtr++);
+                *(ptr++) = *(_currentPtr++);
+                *(ptr++) = *(_currentPtr++);
 
-                *(ptr++) = *(_currentPtr++); 
-                *(ptr++) = *(_currentPtr++); 
-                *(ptr++) = *(_currentPtr++); 
-                *(ptr) = *(_currentPtr++); 
+                *(ptr++) = *(_currentPtr++);
+                *(ptr++) = *(_currentPtr++);
+                *(ptr++) = *(_currentPtr++);
+                *(ptr) = *(_currentPtr++);
             }
         }
 
@@ -241,14 +241,14 @@ class DataConverter
         inline void writeFloat(float c)             { write4((char*)&c); }
         inline void writeDouble(double c)           { write8((char*)&c); }
 
-        inline char readChar() { char c; read1(&c); return c; }
-        inline unsigned char readUChar() { unsigned char c; read1((char*)&c); return c; }
-        inline short readShort() { short c; read2((char*)&c); return c; }
-        inline unsigned short readUShort() { unsigned short c; read2((char*)&c); return c; }
-        inline int readInt() { int c; read4((char*)&c); return c; }
-        inline unsigned int readUInt() { unsigned int c; read4((char*)&c); return c; }
-        inline float readFloat() { float c; read4((char*)&c); return c; }
-        inline double readDouble() { double c; read8((char*)&c); return c; }
+        inline char readChar() { char c=0; read1(&c); return c; }
+        inline unsigned char readUChar() { unsigned char c=0; read1((char*)&c); return c; }
+        inline short readShort() { short c=0; read2((char*)&c); return c; }
+        inline unsigned short readUShort() { unsigned short c=0; read2((char*)&c); return c; }
+        inline int readInt() { int c=0; read4((char*)&c); return c; }
+        inline unsigned int readUInt() { unsigned int c=0; read4((char*)&c); return c; }
+        inline float readFloat() { float c=0.0f; read4((char*)&c); return c; }
+        inline double readDouble() { double c=0.0; read8((char*)&c); return c; }
 
         void write(const osg::FrameStamp& fs)
         {
@@ -361,16 +361,16 @@ class DataConverter
             event.setModKeyMask(readUInt());
             event.setTime(readDouble());
         }
-        
+
         void write(CameraPacket& cameraPacket)
         {
             writeUInt(cameraPacket._byte_order);
-            
+
             writeUInt(cameraPacket._masterKilled);
-            
+
             write(cameraPacket._matrix);
             write(cameraPacket._frameStamp);
-        
+
             writeUInt(cameraPacket._events.size());
             for(osgGA::EventQueue::Events::iterator itr = cameraPacket._events.begin();
                 itr != cameraPacket._events.end();
@@ -387,12 +387,12 @@ class DataConverter
             {
                 _swapBytes = !_swapBytes;
             }
-            
+
             cameraPacket._masterKilled = readUInt()!=0;
-            
+
             read(cameraPacket._matrix);
             read(cameraPacket._frameStamp);
-        
+
             cameraPacket._events.clear();
             unsigned int numEvents = readUInt();
             for(unsigned int i=0;i<numEvents;++i)
@@ -409,7 +409,7 @@ void CameraPacket::readEventQueue(osgViewer::Viewer& viewer)
     _events.clear();
 
     osgViewer::ViewerBase::Contexts contexts;
-    viewer.getContexts(contexts);   
+    viewer.getContexts(contexts);
 
     for(osgViewer::ViewerBase::Contexts::iterator citr =contexts.begin();  citr != contexts.end(); ++citr)
     {
@@ -423,7 +423,7 @@ void CameraPacket::readEventQueue(osgViewer::Viewer& viewer)
         }
         _events.insert(_events.end(), gw_events.begin(), gw_events.end());
     }
-    
+
     viewer.getEventQueue()->copyEvents(_events);
 
     osg::notify(osg::INFO)<<"written events = "<<_events.size()<<std::endl;
@@ -449,7 +449,7 @@ int main( int argc, char **argv )
 {
     // use an ArgumentParser object to manage the program arguments.
     osg::ArgumentParser arguments(&argc,argv);
-    
+
     // set up the usage document, in case we need to print out how to use this program.
     arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is the example which demonstrates how to approach implementation of clustering.");
     arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] filename ...");
@@ -459,7 +459,7 @@ int main( int argc, char **argv )
     arguments.getApplicationUsage()->addCommandLineOption("-n <int>","Socket number to transmit packets");
     arguments.getApplicationUsage()->addCommandLineOption("-f <float>","Field of view of camera");
     arguments.getApplicationUsage()->addCommandLineOption("-o <float>","Offset angle of camera");
-    
+
     // construct the viewer.
     osgViewer::Viewer viewer;
 
@@ -468,12 +468,12 @@ int main( int argc, char **argv )
     ViewerMode viewerMode = STAND_ALONE;
     while (arguments.read("-m")) viewerMode = MASTER;
     while (arguments.read("-s")) viewerMode = SLAVE;
-    
+
     int socketNumber=8100;
     while (arguments.read("-n",socketNumber)) ;
 
     float camera_fov=-1.0f;
-    while (arguments.read("-f",camera_fov)) 
+    while (arguments.read("-f",camera_fov))
     {
     }
 
@@ -497,7 +497,7 @@ int main( int argc, char **argv )
         arguments.writeErrorMessages(std::cout);
         return 1;
     }
-    
+
     if (arguments.argc()<=1)
     {
         arguments.getApplicationUsage()->write(std::cout,osg::ApplicationUsage::COMMAND_LINE_OPTION);
@@ -514,13 +514,13 @@ int main( int argc, char **argv )
     {
         double fovy, aspectRatio, zNear, zFar;
         viewer.getCamera()->getProjectionMatrixAsPerspective(fovy, aspectRatio,zNear, zFar);
-        
+
         double original_fov = atan(tan(osg::DegreesToRadians(fovy)*0.5)*aspectRatio)*2.0;
         std::cout << "setting lens perspective : original "<<original_fov<<"  "<<fovy<<std::endl;
-        
+
         fovy = atan(tan(osg::DegreesToRadians(camera_fov)*0.5)/aspectRatio)*2.0;
         viewer.getCamera()->setProjectionMatrixAsPerspective(fovy, aspectRatio,zNear, zFar);
-    
+
         viewer.getCamera()->getProjectionMatrixAsPerspective(fovy, aspectRatio,zNear, zFar);
         original_fov = atan(tan(osg::DegreesToRadians(fovy)*0.5)*aspectRatio)*2.0;
         std::cout << "setting lens perspective : new "<<original_fov<<"  "<<fovy<<std::endl;
@@ -549,13 +549,13 @@ int main( int argc, char **argv )
     rc.setPort(static_cast<short int>(socketNumber));
 
     bool masterKilled = false;
-    
+
     DataConverter scratchPad(1024);
 
     while( !viewer.done() && !masterKilled )
     {
         osg::Timer_t startTick = osg::Timer::instance()->tick();
-                 
+
         viewer.advance();
 
         // special handling for working as a cluster.
@@ -563,12 +563,12 @@ int main( int argc, char **argv )
         {
         case(MASTER):
             {
-                
+
                 // take camera zero as the guide.
                 osg::Matrix modelview(viewer.getCamera()->getViewMatrix());
-                
+
                 cp->setPacket(modelview,viewer.getFrameStamp());
-                
+
                 cp->readEventQueue(viewer);
 
                 scratchPad.reset();
@@ -578,11 +578,11 @@ int main( int argc, char **argv )
                 scratchPad.read(*cp);
 
                 bc.setBuffer(scratchPad._startPtr, scratchPad._numBytes);
-                
+
                 std::cout << "bc.sync()"<<scratchPad._numBytes<<std::endl;
 
                 bc.sync();
-                
+
             }
             break;
         case(SLAVE):
@@ -591,13 +591,13 @@ int main( int argc, char **argv )
                 rc.setBuffer(scratchPad._startPtr, scratchPad._numBytes);
 
                 rc.sync();
-                
+
                 scratchPad.reset();
                 scratchPad.read(*cp);
-    
+
                 cp->writeEventQueue(viewer);
 
-                if (cp->getMasterKilled()) 
+                if (cp->getMasterKilled())
                 {
                     std::cout << "Received master killed."<<std::endl;
                     // break out of while (!done) loop since we've now want to shut down.
@@ -609,9 +609,9 @@ int main( int argc, char **argv )
             // no need to anything here, just a normal interactive viewer.
             break;
         }
-         
+
         osg::Timer_t endTick = osg::Timer::instance()->tick();
-        
+
         osg::notify(osg::INFO)<<"Time to do cluster sync "<<osg::Timer::instance()->delta_m(startTick,endTick)<<std::endl;
 
         // update the scene by traversing it with the the update visitor which will
@@ -623,14 +623,14 @@ int main( int argc, char **argv )
         {
             osg::Matrix modelview;
             cp->getModelView(modelview,camera_offset);
-        
+
             viewer.getCamera()->setViewMatrix(modelview);
         }
 
         // fire off the cull and draw traversals of the scene.
         if(!masterKilled)
             viewer.renderingTraversals();
-        
+
     }
 
     // if we are master clean up by telling all slaves that we're going down.
@@ -638,7 +638,7 @@ int main( int argc, char **argv )
     {
         // need to broadcast my death.
         cp->setPacket(osg::Matrix::identity(),viewer.getFrameStamp());
-        cp->setMasterKilled(true); 
+        cp->setMasterKilled(true);
 
         scratchPad.reset();
         scratchPad.write(*cp);

examples/osgcomputeshaders/osgcomputeshaders.cpp

@@ -30,7 +30,7 @@
 static const char* computeSrc = {
     "#version 430\n"
     "uniform float osg_FrameTime;\n"
-    "uniform image2D targetTex;\n"
+    "layout (r32f, binding =0) uniform image2D targetTex;\n"
     "layout (local_size_x = 16, local_size_y = 16) in;\n"
     "void main() {\n"
     "   ivec2 storePos = ivec2(gl_GlobalInvocationID.xy);\n"

examples/osghangglide/terrain.cpp

@@ -99,12 +99,14 @@ Node *makeTerrain( void )
 
     for( i = 0; i < m * n; i++ )
     {
-        v[i][0] = vertex[i][0] - dbcenter[0];
-        v[i][1] = vertex[i][1] - dbcenter[1];
-        v[i][2] = vertex[i][2];
+        float* vc = vertex[i];
+        v[i][0] = vc[0] - dbcenter[0];
+        v[i][1] = vc[1] - dbcenter[1];
+        v[i][2] = vc[2];
 
-        t[i][0] = texcoord[i][0] + 0.025;
-        t[i][1] = texcoord[i][1];
+        float* tc = texcoord[i];
+        t[i][0] = tc[0];
+        t[i][1] = tc[1];
     }
 
     Geometry *geom = new Geometry;

examples/osgmultiplemovies/CMakeLists.txt

@@ -1,14 +1,3 @@
-# INCLUDE_DIRECTORIES( ${OPENAL_INCLUDE_DIR} )
-# SET(TARGET_EXTERNAL_LIBRARIES ${OPENAL_LIBRARY} alut)
-
-IF (SDL_FOUND)
-    SET(TARGET_EXTERNAL_LIBRARIES ${SDL_LIBRARY} )
-    INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR} )
-    ADD_DEFINITIONS(-DUSE_SDL)
-    IF (MINGW)
-        SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} winmm dinput ddraw dxguid)
-    ENDIF()
-ENDIF(SDL_FOUND)
 
 SET(TARGET_SRC osgmultiplemovies.cpp )
 SET(TARGET_ADDED_LIBRARIES osgGA )

examples/osgsimplegl3/osgsimplegl3.cpp

@@ -20,7 +20,7 @@
 
 void configureShaders( osg::StateSet* stateSet )
 {
-    const std::string vertexSource = 
+    const std::string vertexSource =
         "#version 140 \n"
         " \n"
         "uniform mat4 osg_ModelViewProjectionMatrix; \n"
@@ -41,7 +41,7 @@ void configureShaders( osg::StateSet* stateSet )
         "} \n";
     osg::Shader* vShader = new osg::Shader( osg::Shader::VERTEX, vertexSource );
 
-    const std::string fragmentSource = 
+    const std::string fragmentSource =
         "#version 140 \n"
         " \n"
         "in vec4 color; \n"
@@ -90,16 +90,16 @@ int main( int argc, char** argv )
         return( 1 );
     }
 
+    osgViewer::Viewer viewer;
+
     // Create a Camera that uses the above OpenGL context.
-    osg::Camera* cam = new osg::Camera;
+    osg::Camera* cam = viewer.getCamera();
     cam->setGraphicsContext( gc.get() );
     // Must set perspective projection for fovy and aspect.
     cam->setProjectionMatrix( osg::Matrix::perspective( 30., (double)width/(double)height, 1., 100. ) );
     // Unlike OpenGL, OSG viewport does *not* default to window dimensions.
     cam->setViewport( new osg::Viewport( 0, 0, width, height ) );
 
-    osgViewer::Viewer viewer;
-    viewer.setCamera( cam );
     viewer.setSceneData( root );
 
     // for non GL3/GL4 and non GLES2 platforms we need enable the osg_ uniforms that the shaders will use,
@@ -118,7 +118,7 @@ OSG currently support OpenGL 3.x on Windows. This comment block describes the
 necessary configuration steps.
 
 Get the draft gl3.h header file from OpenGL.org and put it in a folder called
-<EFBFBD>GL3<EFBFBD> somewhere on your hard drive. OSG includes this header as <GL3/gl3.h>. Get
+GL3 somewhere on your hard drive. OSG includes this header as <GL3/gl3.h>. Get
 gl3.h from here:
 http://www.opengl.org/registry/
 
@@ -128,7 +128,7 @@ several changes.
  * Add the path to <GL3/gl3.h> to the CMake compiler flags, CMAKE_CXX_FLAGS and
    CMAKE_CXX_FLAGS_DEBUG (for release and debug builds; others if you use other
    build configurations). The text to add should look something like this:
-     /I <EFBFBD>C:\GLHeader<EFBFBD>
+     /I C:\GLHeader
    The folder GLHeader should contain a subfolder GL3, which in turn contains
    gl3.h.
 

examples/osgtessellationshaders/osgtessellationshaders.cpp

@@ -1,6 +1,13 @@
 /* A demonstration of Tessellation Shaders in OpenScenegraph.
+ *
+ * Instructions:
+ *   Press plus to increase tesselation and minus to decrease it.
+ *   Press right arrow to increase inner tesselation and left arrow to decrease it.
+ *   Press up arrow to increase outer tesselation and down arrow to decrease it.
+ *
  * Original code by Philip Rideout
  * Adapted to OpenScenegraph by John Kaniarz
+ * Additional work by Michael Mc Donnell
  */
 
 #include <osg/Program>
@@ -113,7 +120,8 @@ static const char* fragSource = {
 "}\n"
 };
 
-osg::ref_ptr<osg::Geode> CreateIcosahedron(osg::Program *program){
+osg::ref_ptr<osg::Geode> CreateIcosahedron(osg::Program *program)
+{
     osg::Geode *geode=new osg::Geode();
     osg::Geometry *geometry = new osg::Geometry();
     const unsigned int Faces[] = {
@@ -163,10 +171,16 @@ osg::ref_ptr<osg::Geode> CreateIcosahedron(osg::Program *program){
     geometry->setVertexArray(vertices);
     geometry->addPrimitiveSet(new osg::DrawElementsUInt(osg::PrimitiveSet::PATCHES,IndexCount,Faces));
 
+    // Expand the bounding box, otherwise the geometry is clipped in front when tessellating.
+    osg::BoundingBox bbox(osg::Vec3(-1.0f, -1.9f, -1.0f), osg::Vec3(1.0f, 1.0f, 1.0f));
+    geometry->setInitialBound(bbox);
+
     geode->addDrawable(geometry);
     return geode;
 }
-osg::ref_ptr<osg::Program> createProgram(){
+
+osg::ref_ptr<osg::Program> createProgram()
+{
     osg::Program *program = new osg::Program();
     program->addShader(new osg::Shader(osg::Shader::VERTEX,vertSource));
     program->addShader(new osg::Shader(osg::Shader::TESSCONTROL,tessControlSource));
@@ -179,38 +193,74 @@ osg::ref_ptr<osg::Program> createProgram(){
     return program;
 }
 
-float tessInner=1.0f;
-float tessOuter=1.0f;
-osg::ref_ptr<osg::Uniform> tessInnerU = new osg::Uniform("TessLevelInner",tessInner);
-osg::ref_ptr<osg::Uniform> tessOuterU = new osg::Uniform("TessLevelOuter",tessOuter);
-
-class KeyboardEventHandler : public osgGA::GUIEventHandler {
+class KeyboardEventHandler : public osgGA::GUIEventHandler
+{
 public:
-    KeyboardEventHandler():osgGA::GUIEventHandler(){}
-    virtual bool handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter& gaa){
+    KeyboardEventHandler(osg::ref_ptr<osg::Uniform> tessInnerU, osg::ref_ptr<osg::Uniform> tessOuterU):
+        _tessInnerU(tessInnerU),
+        _tessOuterU(tessOuterU)
+    {
+        tessInnerU->get(_tessInner);
+        tessOuterU->get(_tessOuter);
+    }
+
+    virtual bool handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter& gaa)
+    {
         if(ea.getEventType()==osgGA::GUIEventAdapter::KEYDOWN){
             switch (ea.getKey()){
                 case osgGA::GUIEventAdapter::KEY_Up:
-                    tessOuter++;
-                    tessOuterU->set(tessOuter);
+                    increaseOuterTesselation();
                     return true;
                 case osgGA::GUIEventAdapter::KEY_Down:
-                    tessOuter--;
-                    tessOuter=std::max(1.0f,tessOuter);
-                    tessOuterU->set(tessOuter);
+                    decreaseOuterTesselation();
                     return true;
                 case osgGA::GUIEventAdapter::KEY_Left:
-                    tessInner--;
-                    tessInner=std::max(1.0f,tessInner);
-                    tessInnerU->set(tessInner);
+                    decreaseInnerTesselation();
                     return true;
                 case osgGA::GUIEventAdapter::KEY_Right:
-                    tessInner++;
-                    tessInnerU->set(tessInner);
+                    increaseInnerTesselation();
+                    return true;
+                case osgGA::GUIEventAdapter::KEY_Plus:
+                case osgGA::GUIEventAdapter::KEY_KP_Add:
+                    increaseInnerTesselation();
+                    increaseOuterTesselation();
+                    return true;
+                case osgGA::GUIEventAdapter::KEY_Minus:
+                case osgGA::GUIEventAdapter::KEY_KP_Subtract:
+                    decreaseInnerTesselation();
+                    decreaseOuterTesselation();
                     return true;
             }
         }
-        return osgGA::GUIEventHandler::handle(ea,gaa);
+        return osgGA::GUIEventHandler::handle(ea, gaa);
+    }
+
+private:
+    osg::ref_ptr<osg::Uniform> _tessInnerU;
+    osg::ref_ptr<osg::Uniform> _tessOuterU;
+    float _tessInner;
+    float _tessOuter;
+
+    void increaseInnerTesselation()
+    {
+        _tessInnerU->set(++_tessInner);
+    }
+
+    void decreaseInnerTesselation()
+    {
+        _tessInner = std::max(1.0f, _tessInner-1.0f);
+        _tessInnerU->set(_tessInner);
+    }
+
+    void increaseOuterTesselation()
+    {
+        _tessOuterU->set(++_tessOuter);
+    }
+
+    void decreaseOuterTesselation()
+    {
+        _tessOuter = std::max(1.0f, _tessOuter-1.0f);
+        _tessOuterU->set(_tessOuter);
     }
 };
 
@@ -220,6 +270,9 @@ int main(int argc, char* argv[])
     viewer.setUpViewInWindow(100,100,800,600);
     osg::ref_ptr<osg::Program> program = createProgram();
     osg::ref_ptr<osg::Geode> geode = CreateIcosahedron(program.get());
+    osg::ref_ptr<osg::Uniform> tessInnerU = new osg::Uniform("TessLevelInner", 1.0f);
+    osg::ref_ptr<osg::Uniform> tessOuterU = new osg::Uniform("TessLevelOuter", 1.0f);
+
     osg::StateSet *state;
     state = geode->getOrCreateStateSet();
     state->addUniform(new osg::Uniform("AmbientMaterial",osg::Vec3(0.04f, 0.04f, 0.04f)));
@@ -229,7 +282,7 @@ int main(int argc, char* argv[])
     state->addUniform(tessOuterU.get());
     state->setAttribute(new osg::PatchParameter(3));
     state->setAttribute(program.get());
-    
+
     // switch on the uniforms that track the modelview and projection matrices
     osgViewer::Viewer::Windows windows;
     viewer.getWindows(windows);
@@ -241,8 +294,8 @@ int main(int argc, char* argv[])
         s->setUseModelViewAndProjectionUniforms(true);
         s->setUseVertexAttributeAliasing(true);
     }
-    
-    viewer.addEventHandler(new KeyboardEventHandler());
+
+    viewer.addEventHandler(new KeyboardEventHandler(tessInnerU, tessOuterU));
     viewer.setSceneData(geode.get());
     return viewer.run();
 }

examples/osgviewerCocoa/CMakeLists.txt

@@ -1,6 +1,6 @@
 FILE(GLOB ui_files_1 "English.lproj/*.strings")
 FILE(GLOB ui_files_2 "English.lproj/MainMenu.nib/*.nib")
-SET(TARGET_SRC ViewerCocoa.mm main.m Info.plist ${ui_files_1} ${ui_files_2})
+SET(TARGET_SRC ViewerCocoa.mm main.mm Info.plist ${ui_files_1} ${ui_files_2})
 
 SET(TARGET_EXTERNAL_LIBRARIES osg ${COCOA_LIBRARY})
 SET_SOURCE_FILES_PROPERTIES(Info.plist PROPERTIES MACOSX_PACKAGE_LOCATION .)

examples/osgviewerCocoa/main.mm

@@ -17,7 +17,7 @@
 */
 
 //
-//  main.m
+//  main.mm
 //  osgsimpleviewerCocoa
 //
 //  Created by Eric Wing on 11/13/06.

examples/osgviewerIPhone/CMakeLists.txt

@@ -1,17 +1,19 @@
-SET(TARGET_SRC 
-    iphoneViewerAppDelegate.h 
+SET(TARGET_SRC
+    iphoneViewerAppDelegate.h
     iphoneViewerAppDelegate.mm
     main.m
     osgPlugins.h
     osgIPhoneViewer-Info.plist
 )
 
-SET(TARGET_ADDED_LIBRARIES osgdb_osg osgdb_freetype osgdb_imageio)
+SET(TARGET_ADDED_LIBRARIES osgdb_osg osgdb_imageio osgdb_avfoundation)
 
 #backup setting
 SET(TMP_OSG_BUILD_APPLICATION_BUNDLES {$OSG_BUILD_APPLICATION_BUNDLES})
 SET(OSG_BUILD_APPLICATION_BUNDLES TRUE)
 SETUP_EXAMPLE(osgViewerIPhone)
+SET_TARGET_PROPERTIES(example_osgViewerIPhone PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "iPhone Developer")
+
 #restore setting
 SET(OSG_BUILD_APPLICATION_BUNDLES {$TMP_OSG_BUILD_APPLICATION_BUNDLES})
-SET(CMAKE_EXE_LINKER_FLAGS "-framework QuartzCore -framework Foundation -framework OpenGLES  -framework UIKit")
+SET(CMAKE_EXE_LINKER_FLAGS "-framework QuartzCore -framework Foundation -framework OpenGLES  -framework UIKit -framework ImageIO -framework CoreImage  -framework MobileCoreServices -framework CoreGraphics")

examples/osgviewerIPhone/iphoneViewerAppDelegate.h

@@ -5,7 +5,6 @@
 
 #include <osgDB/ReadFile>
 #include <osg/MatrixTransform>
-#include <osg/CameraNode>
 #include <osgText/Text>
 #include <osgViewer/Viewer>
 
@@ -17,7 +16,7 @@
     
     UIWindow* _window; //main application window
     
-    UIAccelerationValue        accel[3];
+    CADisplayLink* _displayLink;
     
     osg::ref_ptr<osgViewer::Viewer> _viewer;
     osg::ref_ptr<osg::MatrixTransform> _root;

examples/osgviewerIPhone/iphoneViewerAppDelegate.mm

@@ -1,39 +1,243 @@
-//Created by Thomas Hogarth 2009
+// Created by Thomas Hogarth 2009
+// cleaned up by Stephan Huber 2013
+//
 
-//
-//This exampe shows how to render osg into an existing windw. Apple recommends apps only have one window on IPhone so this
-// will be your best bet.
-//
+// this example will create a fullscreen window showing a grey box. You can interact with it via
+// multi-touch gestures.
 
 #import "iphoneViewerAppDelegate.h"
-#include <osgGA/TrackballManipulator>
+#include <osgGA/MultiTouchTrackballManipulator>
 #include <osg/ShapeDrawable>
-//inckude the iphone specific windowing stuff
+
+//include the iphone specific windowing stuff
 #include <osgViewer/api/IOS/GraphicsWindowIOS> 
 
 
-#define kAccelerometerFrequency        30.0 // Hz
-#define kFilteringFactor            0.1
-
 @implementation iphoneViewerAppDelegate
 
 @synthesize _window;
 
 
+osg::Camera* createHUD(unsigned int w, unsigned int h)
+{
+    // create a camera to set up the projection and model view matrices, and the subgraph to draw in the HUD
+    osg::Camera* camera = new osg::Camera;
+    
+    // set the projection matrix
+    camera->setProjectionMatrix(osg::Matrix::ortho2D(0,w,0,h));
+    
+    // set the view matrix
+    camera->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
+    camera->setViewMatrix(osg::Matrix::identity());
+    
+    // only clear the depth buffer
+    camera->setClearMask(GL_DEPTH_BUFFER_BIT);
+    
+    // draw subgraph after main camera view.
+    camera->setRenderOrder(osg::Camera::POST_RENDER);
+    
+    // we don't want the camera to grab event focus from the viewers main camera(s).
+    camera->setAllowEventFocus(false);
+    
+    
+    
+    // add to this camera a subgraph to render
+    {
+        
+        osg::Geode* geode = new osg::Geode();
+        
+        std::string timesFont("fonts/arial.ttf");
+        
+        // turn lighting off for the text and disable depth test to ensure it's always ontop.
+        osg::StateSet* stateset = geode->getOrCreateStateSet();
+        stateset->setMode(GL_LIGHTING,osg::StateAttribute::OFF);
+        
+        osg::Vec3 position(50.0f,h-50,0.0f);
+        
+        {
+            osgText::Text* text = new  osgText::Text;
+            geode->addDrawable( text );
+            
+            text->setFont(timesFont);
+            text->setPosition(position);
+            text->setText("A simple multi-touch-example\n1 touch = rotate, \n2 touches = drag + scale, \n3 touches = home");
+        }
+        
+        camera->addChild(geode);
+    }
+    
+    return camera;
+}
+
+
+class TestMultiTouchEventHandler : public osgGA::GUIEventHandler {
+public:
+    TestMultiTouchEventHandler(osg::Group* parent_group)
+    :   osgGA::GUIEventHandler(),
+    _cleanupOnNextFrame(false)
+    {
+        createTouchRepresentations(parent_group, 10);
+    }
+    
+private:
+    void createTouchRepresentations(osg::Group* parent_group, unsigned int num_objects)
+    {
+        // create some geometry which is shown for every touch-point
+        for(unsigned int i = 0; i != num_objects; ++i)
+        {
+            std::ostringstream ss;
+            
+            osg::Geode* geode = new osg::Geode();
+            
+            osg::ShapeDrawable* drawable = new osg::ShapeDrawable(new osg::Box(osg::Vec3(0,0,0), 100));
+            drawable->setColor(osg::Vec4(0.5, 0.5, 0.5,1));
+            geode->addDrawable(drawable);
+            
+            ss << "Touch " << i;
+            
+            osgText::Text* text = new  osgText::Text;
+            geode->addDrawable( text );
+            drawable->setDataVariance(osg::Object::DYNAMIC);
+            _drawables.push_back(drawable);
+            
+            
+            text->setFont("fonts/arial.ttf");
+            text->setPosition(osg::Vec3(110,0,0));
+            text->setText(ss.str());
+            _texts.push_back(text);
+            text->setDataVariance(osg::Object::DYNAMIC);
+            
+            
+            
+            osg::MatrixTransform* mat = new osg::MatrixTransform();
+            mat->addChild(geode);
+            mat->setNodeMask(0x0);
+            
+            _mats.push_back(mat);
+            
+            parent_group->addChild(mat);
+        }
+        
+        parent_group->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+    }
+    
+    virtual bool handle (const osgGA::GUIEventAdapter &ea, osgGA::GUIActionAdapter &aa, osg::Object *, osg::NodeVisitor *)
+    {
+        switch(ea.getEventType())
+        {
+            case osgGA::GUIEventAdapter::FRAME:
+                if (_cleanupOnNextFrame) {
+                    cleanup(0);
+                    _cleanupOnNextFrame = false;
+                }
+                break;
+                
+            case osgGA::GUIEventAdapter::PUSH:
+            case osgGA::GUIEventAdapter::DRAG:
+            case osgGA::GUIEventAdapter::RELEASE:
+            {
+                // is this a multi-touch event?
+                if (!ea.isMultiTouchEvent())
+                    return false;
+                
+                unsigned int j(0);
+                
+                // iterate over all touch-points and update the geometry
+                unsigned num_touch_ended(0);
+                
+                for(osgGA::GUIEventAdapter::TouchData::iterator i = ea.getTouchData()->begin(); i != ea.getTouchData()->end(); ++i, ++j)
+                {
+                    const osgGA::GUIEventAdapter::TouchData::TouchPoint& tp = (*i);
+                    _mats[j]->setMatrix(osg::Matrix::translate(tp.x, ea.getWindowHeight() - tp.y, 0));
+                    _mats[j]->setNodeMask(0xffff);
+                    
+                    std::ostringstream ss;
+                    ss << "Touch " << tp.id;
+                    _texts[j]->setText(ss.str());
+                    
+                    switch (tp.phase)
+                    {
+                        case osgGA::GUIEventAdapter::TOUCH_BEGAN:
+                            _drawables[j]->setColor(osg::Vec4(0,1,0,1));
+                            std::cout << "touch began: " << ss.str() << std::endl;
+                            break;
+                            
+                        case osgGA::GUIEventAdapter::TOUCH_MOVED:
+                            //std::cout << "touch moved: " << ss.str() << std::endl;
+                            _drawables[j]->setColor(osg::Vec4(1,1,1,1));
+                            break;
+                            
+                        case osgGA::GUIEventAdapter::TOUCH_ENDED:
+                            _drawables[j]->setColor(osg::Vec4(1,0,0,1));
+                            std::cout << "touch ended: " << ss.str() << std::endl;
+                            ++num_touch_ended;
+                            break;
+                            
+                        case osgGA::GUIEventAdapter::TOUCH_STATIONERY:
+                            _drawables[j]->setColor(osg::Vec4(0.8,0.8,0.8,1));
+                            break;
+                            
+                        default:
+                            break;
+                            
+                    }
+                }
+                
+                // hide unused geometry
+                cleanup(j);
+                
+                //check if all touches ended
+                if ((ea.getTouchData()->getNumTouchPoints() > 0) && (ea.getTouchData()->getNumTouchPoints() == num_touch_ended))
+                {
+                    _cleanupOnNextFrame = true;
+                }
+                
+                // reposition mouse-pointer
+                aa.requestWarpPointer((ea.getWindowX() + ea.getWindowWidth()) / 2.0, (ea.getWindowY() + ea.getWindowHeight()) / 2.0);
+            }
+                break;
+                
+            default:
+                break;
+        }
+        
+        return false;
+    }
+    
+    void cleanup(unsigned int j)
+    {
+        for(unsigned k = j; k < _mats.size(); ++k) {
+            _mats[k]->setNodeMask(0x0);
+        }
+    }
+    
+    std::vector<osg::ShapeDrawable*> _drawables;
+    std::vector<osg::MatrixTransform*> _mats;
+    std::vector<osgText::Text*> _texts;
+    bool _cleanupOnNextFrame;
+    
+};
+
+
 //
-//Called once app has finished launching, create the viewer then realize. Can't call viewer->run as will 
+//Called once app has finished launching, create the viewer then realize. Can't call viewer->run as will
 //block the final inialization of the windowing system
 //
 - (void)applicationDidFinishLaunching:(UIApplication *)application {
     
-    std::string test_string;
-    test_string = "huhu";
-    
     //get the screen size
     CGRect lFrame = [[UIScreen mainScreen] bounds];
     unsigned int w = lFrame.size.width;
     unsigned int h = lFrame.size.height;
     
+    //create the viewer
+    _viewer = new osgViewer::Viewer();
+    
+    
+    /*
+     
+    // If you want full control over the graphics context / window creation, please uncomment this section
+     
     // create the main window at screen size
     self._window = [[UIWindow alloc] initWithFrame: lFrame]; 
     
@@ -41,7 +245,7 @@
     [_window makeKeyAndVisible];
 
     
-//create our graphics context directly so we can pass our own window 
+    //create our graphics context directly so we can pass our own window
     osg::ref_ptr<osg::GraphicsContext::Traits> traits = new osg::GraphicsContext::Traits;
     
     // Init the Windata Variable that holds the handle for the Window to display OSG in.
@@ -53,97 +257,65 @@
     traits->width = w;
     traits->height = h;
     traits->depth = 16; //keep memory down, default is currently 24
-    //traits->alpha = 8;
-    //traits->stencil = 8;
     traits->windowDecoration = false;
     traits->doubleBuffer = true;
     traits->sharedContext = 0;
     traits->setInheritedWindowPixelFormat = true;
-    //traits->windowName = "osgViewer";
-
+    traits->samples = 4;
+    traits->sampleBuffers = 1;
+    
     traits->inheritedWindowData = windata;
 
     // Create the Graphics Context
     osg::ref_ptr<osg::GraphicsContext> graphicsContext = osg::GraphicsContext::createGraphicsContext(traits.get());
-
-    //create the viewer    
-    _viewer = new osgViewer::Viewer();
-    //if the context was created then attach to our viewer
+    
+    // if the context was created then attach to our viewer
     if(graphicsContext)
     {
         _viewer->getCamera()->setGraphicsContext(graphicsContext);
         _viewer->getCamera()->setViewport(new osg::Viewport(0, 0, traits->width, traits->height));
     }
+     */
         
-    //create scene and attch to viewer
     
     //create root
     _root = new osg::MatrixTransform();    
     
     //load and attach scene model
     osg::ref_ptr<osg::Node> model = (osgDB::readNodeFile("hog.osg"));
-    _root->addChild(model);
+    if (model) {
+        _root->addChild(model);
+    }
+    else {
+        osg::Geode* geode = new osg::Geode();
+        osg::ShapeDrawable* drawable = new osg::ShapeDrawable(new osg::Box(osg::Vec3(1,1,1), 1));
+        geode->addDrawable(drawable);
+        _root->addChild(geode);
+    }
     
-    osg::Geode* geode = new osg::Geode();
-    osg::ShapeDrawable* drawable = new osg::ShapeDrawable(new osg::Box(osg::Vec3(1,1,1), 1));
-    geode->addDrawable(drawable);
-    _root->addChild(geode);
-
+    osg::Camera* hud_camera = createHUD(w,h);
+    _root->addChild(hud_camera);
     
-    //create and attach ortho camera for hud text
-    osg::ref_ptr<osg::CameraNode> _hudCamera = new osg::CameraNode;
-    
-    // set the projection matrix
-    _hudCamera->setProjectionMatrix(osg::Matrix::ortho2D(0,w,0,h));
-    
-    // set the view matrix    
-    _hudCamera->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
-    _hudCamera->setViewMatrix(osg::Matrix::identity());
-    
-    // only clear the depth buffer
-    _hudCamera->setClearMask(GL_DEPTH_BUFFER_BIT);
-    
-    // draw subgraph after main camera view.
-    _hudCamera->setRenderOrder(osg::CameraNode::POST_RENDER);
-    _root->addChild(_hudCamera.get());
-    
-    //attcg text to hud
-    /*osg::ref_ptr<osgText::Text> text = new osgText::Text; 
-    osg::ref_ptr<osg::Geode> textGeode = new osg::Geode();
-    osg::StateSet* stateset = textGeode->getOrCreateStateSet();
-    stateset->setMode(GL_LIGHTING,osg::StateAttribute::OFF);
-
-    textGeode->addDrawable( text );
-    _hudCamera->addChild(textGeode.get());
-    std::string timesFont("arial.ttf");
-    osg::Vec3 position = osg::Vec3(w/2.0f, h/2.0f, 0.0f);
-    osg::Vec3 delta(0.0f,-120.0f,0.0f);
-
-        
-    text->setFont(timesFont);
-    text->setCharacterSize(20.0,1.0);
-    text->setColor(osg::Vec4(0.8,0.8,0.8,1.0)); 
-    text->setPosition(position);
-    text->setMaximumHeight(480);
-    text->setMaximumWidth(320);
-    text->setAlignment(osgText::Text::CENTER_CENTER );  
-    text->setText("It's a Hogs life...");*/
-        
         
     _viewer->setSceneData(_root.get());
-    _viewer->setCameraManipulator(new osgGA::TrackballManipulator);
-    _viewer->setThreadingModel(osgViewer::Viewer::SingleThreaded);//SingleThreaded DrawThreadPerContext
+    _viewer->setCameraManipulator(new osgGA::MultiTouchTrackballManipulator());
     
-    //
-    //_viewer->realize();
+    _viewer->addEventHandler(new TestMultiTouchEventHandler(hud_camera));
+
     
-    osg::setNotifyLevel(osg::DEBUG_FP);
+    // sun single-threaded
+    _viewer->setThreadingModel(osgViewer::Viewer::SingleThreaded);
     
-    [NSTimer scheduledTimerWithTimeInterval:1.0/30.0 target:self selector:@selector(updateScene) userInfo:nil repeats:YES]; 
+    _viewer->realize();
+    
+    // render a frame so the window-manager shows some content and not only an empty + black window
+    _viewer->frame();
+    
+    
+    // create a display link, which will update our scene on every screen-refresh
+    _displayLink = [application.keyWindow.screen displayLinkWithTarget:self selector:@selector(updateScene)];
+    [_displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSDefaultRunLoopMode];
     
-    //Configure and start accelerometer
-    [[UIAccelerometer sharedAccelerometer] setUpdateInterval:(1.0 / kAccelerometerFrequency)];
-    [[UIAccelerometer sharedAccelerometer] setDelegate:self];
 }
 
 
@@ -165,21 +337,15 @@
 }
 
 
--(void)applicationWillTerminate:(UIApplication *)application{
+-(void)applicationWillTerminate:(UIApplication *)application {
+    if (_displayLink)
+        [_displayLink invalidate];
+    _displayLink = NULL;
     _root = NULL;
     _viewer = NULL;
 } 
 
-//
-//Accelorometer
-//
-- (void)accelerometer:(UIAccelerometer*)accelerometer didAccelerate:(UIAcceleration*)acceleration
-{
-    //Use a basic low-pass filter to only keep the gravity in the accelerometer values
-    accel[0] = acceleration.x * kFilteringFactor + accel[0] * (1.0 - kFilteringFactor);
-    accel[1] = acceleration.y * kFilteringFactor + accel[1] * (1.0 - kFilteringFactor);
-    accel[2] = acceleration.z * kFilteringFactor + accel[2] * (1.0 - kFilteringFactor);
-}
+
 
 
 - (void)dealloc {

examples/osgviewerIPhone/osgPlugins.h

@@ -14,6 +14,6 @@ USE_GRAPICSWINDOW_IMPLEMENTATION(IOS)
 USE_OSGPLUGIN(osg)
 
 USE_OSGPLUGIN(imageio)
-
-USE_OSGPLUGIN(freetype)
+USE_OSGPLUGIN(avfoundation)
+//USE_OSGPLUGIN(freetype)
 

examples/osgviewerMFC/MFC_OSG.cpp

@@ -97,8 +97,8 @@ void cOSG::InitCameraConfig(void)
     // Create the Graphics Context
     osg::GraphicsContext* gc = osg::GraphicsContext::createGraphicsContext(traits.get());
 
-    // Init a new Camera (Master for this View)
-    osg::ref_ptr<osg::Camera> camera = new osg::Camera;
+    // Init Master Camera for this View
+    osg::ref_ptr<osg::Camera> camera = mViewer->getCamera();
 
     // Assign Graphics Context to the Camera
     camera->setGraphicsContext(gc);

examples/osgviewerQt/osgviewerQt.cpp

@@ -93,7 +93,13 @@ int main( int argc, char** argv )
 {
     osg::ArgumentParser arguments(&argc, argv);
 
+#if QT_VERSION >= 0x050000
+    // Qt5 is currently crashing and reporting "Cannot make QOpenGLContext current in a different thread" when the viewer is run multi-threaded, this is regression from Qt4
+    osgViewer::ViewerBase::ThreadingModel threadingModel = osgViewer::ViewerBase::SingleThreaded;
+#else
     osgViewer::ViewerBase::ThreadingModel threadingModel = osgViewer::ViewerBase::CullDrawThreadPerContext;
+#endif
+
     while (arguments.read("--SingleThreaded")) threadingModel = osgViewer::ViewerBase::SingleThreaded;
     while (arguments.read("--CullDrawThreadPerContext")) threadingModel = osgViewer::ViewerBase::CullDrawThreadPerContext;
     while (arguments.read("--DrawThreadPerContext")) threadingModel = osgViewer::ViewerBase::DrawThreadPerContext;

examples/osgvolume/osgvolume.cpp

@@ -1115,7 +1115,8 @@ int main( int argc, char **argv )
             if (image_3d.valid())
             {
                 image_3d->setFileName(name_no_ext + ".dds");
-                osgDB::writeImageFile(*image_3d, image_3d->getFileName());
+                osg::ref_ptr<osgDB::Options> options = new osgDB::Options("ddsNoAutoFlipWrite");;
+                osgDB::writeImageFile(*image_3d, image_3d->getFileName(), options.get());
             }
             osgDB::writeNodeFile(*volume, outputFile);
         }

include/OpenThreads/Version

@@ -20,8 +20,8 @@ extern "C" {
 
 #define OPENTHREADS_MAJOR_VERSION 3
 #define OPENTHREADS_MINOR_VERSION 2
-#define OPENTHREADS_PATCH_VERSION 0
-#define OPENTHREADS_SOVERSION 13
+#define OPENTHREADS_PATCH_VERSION 1
+#define OPENTHREADS_SOVERSION 20
 
 /** OpenThreadsGetVersion() returns the library version number.
  * Numbering convention : OpenThreads-1.0 will return 1.0 from OpenThreadsGetVersion. */

include/osg/BoundingBox

@@ -51,6 +51,12 @@ class BoundingBoxImpl
                  -FLT_MAX)
         {}
 
+        template<typename BT>
+        inline BoundingBoxImpl(const BoundingBoxImpl<BT>& bb) :
+            _min(bb._min),
+            _max(bb._max)
+        {}
+
         /** Creates a bounding box initialized to the given extents. */
         inline BoundingBoxImpl(value_type xmin, value_type ymin, value_type zmin,
                            value_type xmax, value_type ymax, value_type zmax) :
@@ -73,6 +79,9 @@ class BoundingBoxImpl
                      -FLT_MAX);
         }
 
+        inline bool operator == (const BoundingBoxImpl& rhs) const { return _min==rhs._min && _max==rhs._max; }
+        inline bool operator != (const BoundingBoxImpl& rhs) const { return _min!=rhs._min || _max!=rhs._max; }
+
         /** Returns true if the bounding box extents are valid, false otherwise. */
         inline bool valid() const
         {
@@ -189,7 +198,8 @@ class BoundingBoxImpl
 
         /** Expands this bounding box to include the given sphere.
           * If this box is uninitialized, set it to include sh. */
-        void expandBy(const BoundingSphereImpl<VT>& sh)
+        template<typename BST>
+        void expandBy(const BoundingSphereImpl<BST>& sh)
         {
             if (!sh.valid()) return;
 
@@ -227,6 +237,15 @@ class BoundingBoxImpl
                    (v.y()>=_min.y() && v.y()<=_max.y()) &&
                    (v.z()>=_min.z() && v.z()<=_max.z());
         }
+
+        /** Returns true if this bounding box contains the specified coordinate allowing for specific epsilon. */
+        inline bool contains(const vec_type& v, value_type epsilon) const
+        {
+            return valid() &&
+                   ((v.x()+epsilon)>=_min.x() && (v.x()-epsilon)<=_max.x()) &&
+                   ((v.y()+epsilon)>=_min.y() && (v.y()-epsilon)<=_max.y()) &&
+                   ((v.z()+epsilon)>=_min.z() && (v.z()-epsilon)<=_max.z());
+        }
 };
 
 typedef BoundingBoxImpl<Vec3f> BoundingBoxf;

include/osg/BoundingSphere

@@ -63,6 +63,9 @@ class BoundingSphereImpl
           * otherwise. */
         inline bool valid() const { return _radius>=0.0; }
 
+        inline bool operator == (const BoundingSphereImpl& rhs) const { return _center==rhs._center && _radius==rhs._radius; }
+        inline bool operator != (const BoundingSphereImpl& rhs) const { return _center!=rhs._center || _radius==rhs._radius; }
+
         /** Set the bounding sphere to the given center/radius using floats. */
         inline void set(const vec_type& center,value_type radius)
         {
@@ -110,11 +113,13 @@ class BoundingSphereImpl
 
         /** Expands the sphere to encompass the given box. Repositions the
           * sphere center to minimize the radius increase. */
-        void expandBy(const BoundingBoxImpl<VT>& bb);
+        template<typename BBT>
+        void expandBy(const BoundingBoxImpl<BBT>& bb);
 
         /** Expands the sphere to encompass the given box. Does not
           * repositions the sphere center. */
-        void expandRadiusBy(const BoundingBoxImpl<VT>& bb);
+        template<typename BBT>
+        void expandRadiusBy(const BoundingBoxImpl<BBT>& bb);
 
         /** Returns true if v is within the sphere. */
         inline bool contains(const vec_type& v) const
@@ -135,12 +140,12 @@ class BoundingSphereImpl
 
 
 template<typename VT>
- template<typename vector_type>
+template<typename vector_type>
 void BoundingSphereImpl<VT>::expandBy(const vector_type& v)
 {
     if (valid())
     {
-        vec_type dv = v-_center;
+        vec_type dv = vec_type(v)-_center;
         value_type r = dv.length();
         if (r>_radius)
         {
@@ -157,12 +162,12 @@ void BoundingSphereImpl<VT>::expandBy(const vector_type& v)
 }
 
 template<typename VT>
- template<typename vector_type>
+template<typename vector_type>
 void BoundingSphereImpl<VT>::expandRadiusBy(const vector_type& v)
 {
     if (valid())
     {
-        value_type r = (v-_center).length();
+        value_type r = (vec_type(v)-_center).length();
         if (r>_radius) _radius = r;
         // else do nothing as vertex is within sphere.
     }
@@ -244,7 +249,8 @@ void BoundingSphereImpl<VT>::expandRadiusBy(const BoundingSphereImpl& sh)
 }
 
 template<typename VT>
-void BoundingSphereImpl<VT>::expandBy(const BoundingBoxImpl<VT>& bb)
+template<typename BBT>
+void BoundingSphereImpl<VT>::expandBy(const BoundingBoxImpl<BBT>& bb)
 {
     if (bb.valid())
     {
@@ -274,7 +280,8 @@ void BoundingSphereImpl<VT>::expandBy(const BoundingBoxImpl<VT>& bb)
 }
 
 template<typename VT>
-void BoundingSphereImpl<VT>::expandRadiusBy(const BoundingBoxImpl<VT>& bb)
+template<typename BBT>
+void BoundingSphereImpl<VT>::expandRadiusBy(const BoundingBoxImpl<BBT>& bb)
 {
     if (bb.valid())
     {

include/osg/BoundsChecking

@@ -27,7 +27,7 @@ inline void clampGEQUAL(T& value,const T minValue,const char* valueName)
 {
     if (value<minValue)
     {
-        notify(WARN) << "Warning: "<<valueName<<" of "<<value<<" is below permitted minimum, clampping to "<<minValue<<"."<< std::endl;
+        notify(WARN) << "Warning: "<<valueName<<" of "<<value<<" is below permitted minimum, clamping to "<<minValue<<"."<< std::endl;
         value = minValue;
     }
 }
@@ -40,7 +40,7 @@ inline void clampLEQUAL(T& value,const T maxValue,const char* valueName)
 {
     if (value>maxValue)
     {
-        notify(WARN) << "Warning: "<<valueName<<" of "<<value<<" is above permitted maximum, clampping to "<<maxValue<<"."<< std::endl;
+        notify(WARN) << "Warning: "<<valueName<<" of "<<value<<" is above permitted maximum, clamping to "<<maxValue<<"."<< std::endl;
         value = maxValue;
     }
 }
@@ -55,13 +55,13 @@ inline void clampBetweenRange(T& value,const T minValue,const T maxValue,const c
 {
     if (value<minValue)
     {
-        notify(WARN) << "Warning: "<<valueName<<" of "<<value<<" is below permitted minimum, clampping to "<<minValue<<"."<< std::endl;
+        notify(WARN) << "Warning: "<<valueName<<" of "<<value<<" is below permitted minimum, clamping to "<<minValue<<"."<< std::endl;
         value = minValue;
     }
     else
     if (value>maxValue)
     {
-        notify(WARN) << "Warning: "<<valueName<<" of "<<value<<" is above permitted maximum, clampping to "<<maxValue<<"."<< std::endl;
+        notify(WARN) << "Warning: "<<valueName<<" of "<<value<<" is above permitted maximum, clamping to "<<maxValue<<"."<< std::endl;
         value = maxValue;
     }
 
@@ -75,7 +75,7 @@ inline void clampArrayElementGEQUAL(A& value,unsigned int i,const T minValue,con
 {
     if (value[i]<minValue)
     {
-        notify(WARN) << "Warning: "<<valueName<<"["<<i<<"] of "<<value[i]<<" is below permitted minimum, clampping to "<<minValue<<"."<< std::endl;
+        notify(WARN) << "Warning: "<<valueName<<"["<<i<<"] of "<<value[i]<<" is below permitted minimum, clamping to "<<minValue<<"."<< std::endl;
         value[i] = minValue;
     }
 }
@@ -88,7 +88,7 @@ inline void clampArrayElementLEQUAL(A& value,unsigned int i,const T maxValue,con
 {
     if (value[i]>maxValue)
     {
-        notify(WARN) << "Warning: "<<valueName<<"["<<i<<"] of "<<value[i]<<" is above permitted maximum, clampping to "<<maxValue<<"."<< std::endl;
+        notify(WARN) << "Warning: "<<valueName<<"["<<i<<"] of "<<value[i]<<" is above permitted maximum, clamping to "<<maxValue<<"."<< std::endl;
         value = maxValue;
     }
 }
@@ -103,13 +103,13 @@ inline void clampArrayElementBetweenRange(A& value,unsigned int i,const T minVal
 {
     if (value[i]<minValue)
     {
-        notify(WARN) << "Warning: "<<valueName<<"["<<i<<"] of "<<value[i]<<" is below permitted minimum, clampping to "<<minValue<<"."<< std::endl;
+        notify(WARN) << "Warning: "<<valueName<<"["<<i<<"] of "<<value[i]<<" is below permitted minimum, clamping to "<<minValue<<"."<< std::endl;
         value[i] = minValue;
     }
     else
     if (value[i]>maxValue)
     {
-        notify(WARN) << "Warning: "<<valueName<<"["<<i<<"] of "<<value[i]<<" is above permitted maximum, clampping to "<<maxValue<<"."<< std::endl;
+        notify(WARN) << "Warning: "<<valueName<<"["<<i<<"] of "<<value[i]<<" is above permitted maximum, clamping to "<<maxValue<<"."<< std::endl;
         value[i] = maxValue;
     }
 

include/osg/Camera

@@ -680,6 +680,19 @@ class OSG_EXPORT Camera : public Transform, public CullSettings
         ref_ptr<DrawCallback>               _finalDrawCallback;
 };
 
+
+/** Functor to assist with ordering camers in the order they should be rendered in.*/
+struct CameraRenderOrderSortOp
+{
+    inline bool operator() (const Camera* lhs,const Camera* rhs) const
+    {
+        if (lhs->getRenderOrder()<rhs->getRenderOrder()) return true;
+        if (rhs->getRenderOrder()<lhs->getRenderOrder()) return false;
+        return lhs->getRenderOrderNum()<rhs->getRenderOrderNum();
+    }
+};
+
+
 }
 
 #endif

include/osg/FrameBufferObject

@@ -418,6 +418,11 @@ namespace osg
 
         void apply(State &state) const;
 
+        inline GLuint getHandle(unsigned int contextID) const
+        {
+            return _fboID[contextID];
+        }
+
         enum BindTarget
         {
             READ_FRAMEBUFFER = GL_READ_FRAMEBUFFER_EXT,

include/osg/GL

@@ -96,7 +96,7 @@
         #endif
 
         // XXX This is from Win32's <ctype.h>
-        #if !defined(_WCHAR_T_DEFINED) && !(defined(__GNUC__)&&((__GNUC__ == 3)||(__GNUC__ == 4)))
+        #if !defined(_WCHAR_T_DEFINED) && !(defined(__GNUC__)&&(__GNUC__ >2))
             typedef unsigned short wchar_t;
             #define _WCHAR_T_DEFINED
         #endif

include/osg/GL2Extensions

@@ -385,8 +385,6 @@ typedef char GLchar;
 #define GL_TEXTURE_BINDING_RECTANGLE      0x84F6
 #define GL_PROXY_TEXTURE_RECTANGLE        0x84F7
 #define GL_MAX_RECTANGLE_TEXTURE_SIZE     0x84F8
-#define GL_RED_SNORM                      0x8F90
-#define GL_RG_SNORM                       0x8F91
 #define GL_RGB_SNORM                      0x8F92
 #define GL_RGBA_SNORM                     0x8F93
 #define GL_R8_SNORM                       0x8F94
@@ -402,6 +400,14 @@ typedef char GLchar;
 #define GL_PRIMITIVE_RESTART_INDEX        0x8F9E
 #endif
 
+#ifndef GL_RED_SNORM
+#define GL_RED_SNORM                      0x8F90
+#endif
+#ifndef GL_RG_SNORM
+#define GL_RG_SNORM                       0x8F91
+#endif
+
+
 #ifndef GL_VERSION_4_0
 #define GL_SAMPLER_CUBE_MAP_ARRAY         0x900C
 #define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW  0x900D

include/osg/Image

@@ -302,13 +302,13 @@ class OSG_EXPORT Image : public BufferData
           * take care to access the data per row rather than treating the whole data as a single block. */
         inline const unsigned char* data() const { return _data; }
 
-        inline unsigned char* data(int column, int row=0,int image=0)
+        inline unsigned char* data(unsigned int column, unsigned int row = 0, unsigned int image = 0)
         {
             if (!_data) return NULL;
             return _data+(column*getPixelSizeInBits())/8+row*getRowStepInBytes()+image*getImageSizeInBytes();
         }
 
-        inline const unsigned char* data(int column, int row=0,int image=0) const
+        inline const unsigned char* data(unsigned int column, unsigned int row = 0, unsigned int image = 0) const
         {
             if (!_data) return NULL;
             return _data+(column*getPixelSizeInBits())/8+row*getRowStepInBytes()+image*getImageSizeInBytes();

include/osg/Math

@@ -34,10 +34,6 @@ const double LN_2 = 0.69314718055994530942;
 const double INVLN_2 = 1.0 / LN_2;
 
 
-/** return the minimum of two values, equivalent to std::min.
-  * std::min not used because of STL implementation under IRIX not
-  * containing std::min.
-*/
 template<typename T>
 inline T absolute(T v) { return v<(T)0?-v:v; }
 

include/osg/Node

@@ -201,7 +201,12 @@ class OSG_EXPORT Node : public Object
         /** Convenience method that removes a given callback from a node, even if that callback is nested. There is no error return in case the given callback is not found. */
         inline void removeUpdateCallback(NodeCallback* nc) {
             if (nc != NULL && _updateCallback.valid()) {
-                if (_updateCallback == nc) setUpdateCallback(nc->getNestedCallback());        // replace the callback by the nested one
+                if (_updateCallback == nc)
+                {
+                    ref_ptr<NodeCallback> new_nested_callback = nc->getNestedCallback();
+                    nc->setNestedCallback(0);
+                    setUpdateCallback(new_nested_callback.get());
+                }
                 else _updateCallback->removeNestedCallback(nc);
             }
         }
@@ -231,7 +236,12 @@ class OSG_EXPORT Node : public Object
         /** Convenience method that removes a given callback from a node, even if that callback is nested. There is no error return in case the given callback is not found. */
         inline void removeEventCallback(NodeCallback* nc) {
             if (nc != NULL && _eventCallback.valid()) {
-                if (_eventCallback == nc) setEventCallback(nc->getNestedCallback());        // replace the callback by the nested one
+                if (_eventCallback == nc)
+                {
+                    ref_ptr<NodeCallback> new_nested_callback = nc->getNestedCallback();
+                    nc->setNestedCallback(0);
+                    setEventCallback(new_nested_callback.get()); // replace the callback by the nested one
+                }
                 else _eventCallback->removeNestedCallback(nc);
             }
         }
@@ -261,7 +271,12 @@ class OSG_EXPORT Node : public Object
         /** Convenience method that removes a given callback from a node, even if that callback is nested. There is no error return in case the given callback is not found. */
         inline void removeCullCallback(NodeCallback* nc) {
             if (nc != NULL && _cullCallback.valid()) {
-                if (_cullCallback == nc) setCullCallback(nc->getNestedCallback());        // replace the callback by the nested one
+                if (_cullCallback == nc)
+                {
+                    ref_ptr<NodeCallback> new_nested_callback = nc->getNestedCallback();
+                    nc->setNestedCallback(0);
+                    setCullCallback(new_nested_callback.get()); // replace the callback by the nested one
+                }
                 else _cullCallback->removeNestedCallback(nc);
             }
         }

include/osg/State

@@ -1203,6 +1203,13 @@ class OSG_EXPORT State : public Referenced, public Observer
         }
 
 
+        /// For GL>=2.0 uses GL_MAX_TEXTURE_COORDS, for GL<2 uses GL_MAX_TEXTURE_UNITS
+        inline GLint getMaxTextureCoords() const { return _glMaxTextureCoords; }
+
+        /// For GL>=2.0 uses GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, for GL<2 uses GL_MAX_TEXTURE_UNITS
+        inline GLint getMaxTextureUnits() const { return _glMaxTextureUnits; }
+
+
         /** Set the current texture unit, return true if selected,
           * false if selection failed such as when multi texturing is not supported.
           * note, only updates values that change.*/
@@ -1329,11 +1336,6 @@ class OSG_EXPORT State : public Referenced, public Observer
             if (_lastAppliedProgramObject!=program)
             {
                 _lastAppliedProgramObject = program;
-                if (program && _appliedProgramObjectSet.count(program)==0)
-                {
-                    _appliedProgramObjectSet.insert(program);
-                    program->addObserver(this);
-                }
             }
         }
         inline const Program::PerContextProgram* getLastAppliedProgramObject() const { return _lastAppliedProgramObject; }

include/osg/Texture

@@ -305,6 +305,25 @@
     #define GL_RGBA_INTEGER_MODE_EXT                           0x8D9E
 #endif
 
+#ifndef GL_VERSION_1_1
+#define GL_R3_G3_B2                       0x2A10
+#define GL_RGB4                           0x804F
+#define GL_RGB5                           0x8050
+#define GL_RGB8                           0x8051
+#define GL_RGB10                          0x8052
+#define GL_RGB12                          0x8053
+#define GL_RGB16                          0x8054
+#define GL_RGBA2                          0x8055
+#define GL_RGBA4                          0x8056
+#define GL_RGB5_A1                        0x8057
+#define GL_RGBA8                          0x8058
+#define GL_RGB10_A2                       0x8059
+#define GL_RGBA12                         0x805A
+#define GL_RGBA16                         0x805B
+#define GL_BGR_EXT                        0x80E0
+#define GL_BGRA_EXT                       0x80E1
+#endif
+
 #ifndef GL_ARB_texture_rg
     #define GL_RG                             0x8227
     #define GL_RG_INTEGER                     0x8228

include/osg/Version

@@ -20,7 +20,7 @@ extern "C" {
 
 #define OPENSCENEGRAPH_MAJOR_VERSION    3
 #define OPENSCENEGRAPH_MINOR_VERSION    2
-#define OPENSCENEGRAPH_PATCH_VERSION    0
+#define OPENSCENEGRAPH_PATCH_VERSION    3
 #define OPENSCENEGRAPH_SOVERSION        100
 
 /* Convenience macro that can be used to decide whether a feature is present or not i.e.

include/osg/ref_ptr

@@ -94,6 +94,10 @@ class ref_ptr
         bool operator!() const   { return _ptr==0; } // not required
         bool valid() const       { return _ptr!=0; }
 
+        /** release the pointer from ownership by this ref_ptr<>, decrementing the objects refencedCount() via unref_nodelete() to prevent the Object
+          * object from being deleted even if the reference count goes to zero.  Use when using a local ref_ptr<> to an Object that you want to return
+          * from a function/method via a C pointer, whilst preventing the normal ref_ptr<> destructor from cleaning up the object. When using release()
+          * you are implicitly expecting other code to take over managment of the object, otherwise a memory leak will result. */
         T* release() { T* tmp=_ptr; if (_ptr) _ptr->unref_nodelete(); _ptr=0; return tmp; }
 
         void swap(ref_ptr& rp) { T* tmp=_ptr; _ptr=rp._ptr; rp._ptr=tmp; }

include/osgDB/OutputStream

@@ -89,6 +89,7 @@ public:
     // Serialization related functions
     OutputStream& operator<<( bool b ) { _out->writeBool(b); return *this; }
     OutputStream& operator<<( char c ) { _out->writeChar(c); return *this; }
+    OutputStream& operator<<( signed char c) { _out->writeChar(c); return *this; }
     OutputStream& operator<<( unsigned char c ) { _out->writeUChar(c); return *this; }
     OutputStream& operator<<( short s ) { _out->writeShort(s); return *this; }
     OutputStream& operator<<( unsigned short s ) { _out->writeUShort(s); return *this; }

include/osgManipulator/TranslatePlaneDragger

@@ -21,8 +21,7 @@
 namespace osgManipulator {
 
 /**
- * Tab plane dragger consists of a plane with tabs on it's corners and edges
- * for scaling. And the plane is used as a 2D translate dragger.
+ * Translate plane dragger consists of a wireframe box representing a plane that can be dragged to translate along the plane.
  */
 class OSGMANIPULATOR_EXPORT TranslatePlaneDragger : public CompositeDragger
 {

include/osgShadow/ShadowSettings

@@ -38,7 +38,7 @@ class OSGSHADOW_EXPORT ShadowSettings : public osg::Object
         void setComputeNearFarModeOverride(osg::CullSettings::ComputeNearFarMode cnfn) { _computeNearFearModeOverride = cnfn; }
         osg::CullSettings::ComputeNearFarMode getComputeNearFarModeOverride() const { return _computeNearFearModeOverride; }
 
-        
+
         /** Set the LightNum of the light in the scene to assign a shadow for.
           * Default value is -1, which signifies that shadow technique should automatically select an active light
           * to assign a shadow, typically this will be the first active light found. */
@@ -67,7 +67,7 @@ class OSGSHADOW_EXPORT ShadowSettings : public osg::Object
 
         void setMaximumShadowMapDistance(double distance) { _maximumShadowMapDistance = distance; }
         double getMaximumShadowMapDistance() const { return _maximumShadowMapDistance; }
-        
+
 
         enum ShadowMapProjectionHint
         {
@@ -144,4 +144,4 @@ class OSGSHADOW_EXPORT ShadowSettings : public osg::Object
 
 }
 
-#endif
+#endif

include/osgUtil/SceneView

@@ -51,7 +51,7 @@ class OSGUTIL_EXPORT SceneView : public osg::Object, public osg::CullSettings
             SKY_LIGHT = 0x2,
             COMPILE_GLOBJECTS_AT_INIT = 0x4,
             APPLY_GLOBAL_DEFAULTS = 0x8,
-            CLEAR_GLOBAL_STATESET = 0x16,
+            CLEAR_GLOBAL_STATESET = 0x10,
             STANDARD_SETTINGS = HEADLIGHT |
                                 COMPILE_GLOBJECTS_AT_INIT |
                                 APPLY_GLOBAL_DEFAULTS |
@@ -495,7 +495,7 @@ class OSGUTIL_EXPORT SceneView : public osg::Object, public osg::CullSettings
         bool getAutomaticFlush() const { return _automaticFlush; }
 
         void setResetColorMaskToAllOn(bool enable) { _resetColorMaskToAllEnabled = enable; }
-        bool setResetColorMaskToAllOn() const { return _resetColorMaskToAllEnabled; }
+        bool getResetColorMaskToAllOn() const { return _resetColorMaskToAllEnabled; }
 
     protected:
 

include/osgUtil/StateGraph

@@ -207,6 +207,7 @@ class OSGUTIL_EXPORT StateGraph : public osg::Referenced
 
                 // use return path to trace back steps to sg_new.
                 std::vector<StateGraph*> return_path;
+                return_path.reserve(sg_new->_depth+1);
 
                 // need to pop back root render graph.
                 do
@@ -248,6 +249,7 @@ class OSGUTIL_EXPORT StateGraph : public osg::Referenced
 
             // use return path to trace back steps to sg_new.
             std::vector<StateGraph*> return_path;
+            return_path.reserve(sg_new->_depth+1);
 
             // need to pop back up to the same depth as the curr state group.
             while (sg_new->_depth>sg_curr->_depth)

include/osgViewer/Keystone

@@ -24,23 +24,23 @@
 
 namespace osgViewer
 {
-    
+
 class OSGVIEWER_EXPORT Keystone : public osg::Object
 {
 public:
     Keystone();
 
     Keystone(const Keystone& rhs, const osg::CopyOp& copop=osg::CopyOp::SHALLOW_COPY);
-        
+
     META_Object(osgViewer, Keystone)
 
     void reset();
 
     Keystone& operator = (const Keystone& rhs);
-    
+
     void setKeystoneEditingEnabled(bool flag) { keystoneEditingEnabled = flag; }
     bool getKeystoneEditingEnabled() const { return keystoneEditingEnabled; }
-    
+
     void setGridColor(const osg::Vec4& color) { gridColour = color; }
     osg::Vec4& getGridColor() { return gridColour; }
     const osg::Vec4& getGridColor() const { return gridColour; }
@@ -61,23 +61,23 @@ public:
     osg::Vec2d& getTopRight() { return top_right; }
     const osg::Vec2d& getTopRight() const { return top_right; }
 
-    
-    
+
+
     void compute3DPositions(osg::DisplaySettings* ds, osg::Vec3& tl, osg::Vec3& tr, osg::Vec3& br, osg::Vec3& bl) const;
-    
+
     osg::Geode* createKeystoneDistortionMesh();
-    
+
     osg::Node* createGrid();
-    
+
     /** Write the file specified by the "filename" user value field. Return true if file successfully written. */
     bool writeToFile();
-    
+
     /** convinience function that loads and assigns any keystone files specified in the DisplaySettings::KeystoneFileNames list, return true if Keystone's assigned to DisplaySettings.*/
     static bool loadKeystoneFiles(osg::DisplaySettings* ds);
 
 
-protected:    
-    
+protected:
+
     bool        keystoneEditingEnabled;
 
     osg::Vec4   gridColour;
@@ -91,8 +91,8 @@ protected:
 protected:
 
     virtual ~Keystone() {}
-    
-    
+
+
 };
 
 class OSGVIEWER_EXPORT KeystoneHandler : public osgGA::GUIEventHandler
@@ -125,7 +125,7 @@ public:
     osg::Vec2d incrementScale(const osgGA::GUIEventAdapter& ea) const;
     Region computeRegion(const osgGA::GUIEventAdapter& ea) const;
     void move(Region region, const osg::Vec2d& delta);
-    
+
 protected:
 
 
@@ -138,7 +138,7 @@ protected:
 
     osg::Vec2d                          _startPosition;
     osg::ref_ptr<Keystone>              _startControlPoints;
-    
+
     Region                              _selectedRegion;
     osg::ref_ptr<Keystone>              _currentControlPoints;
 
@@ -146,4 +146,4 @@ protected:
 
 }
 
-#endif
+#endif

include/osgViewer/ViewerBase

@@ -335,6 +335,12 @@ class OSGVIEWER_EXPORT ViewerBase : public virtual osg::Object
         osg::ref_ptr<osgUtil::IncrementalCompileOperation>  _incrementalCompileOperation;
 
         osg::observer_ptr<osg::GraphicsContext>             _currentContext;
+        
+    private:
+        
+        // Define private copy constructor
+        // otherwsie VS2015 will construct it's own which will call the private copy operator from osg::Object resulting in an compile error.
+        ViewerBase& operator = (const ViewerBase&) { return *this; }
 };
 
 }

src/OpenThreads/CMakeLists.txt

@@ -4,8 +4,8 @@ ADD_DEFINITIONS(-DOPENTHREADS_EXPORTS)
 
 SET(OPENTHREADS_MAJOR_VERSION 3)
 SET(OPENTHREADS_MINOR_VERSION 2)
-SET(OPENTHREADS_PATCH_VERSION 0)
-SET(OPENTHREADS_SOVERSION 13)
+SET(OPENTHREADS_PATCH_VERSION 1)
+SET(OPENTHREADS_SOVERSION 20)
 
 SET(OPENTHREADS_VERSION ${OPENTHREADS_MAJOR_VERSION}.${OPENTHREADS_MINOR_VERSION}.${OPENTHREADS_PATCH_VERSION})
 

src/OpenThreads/pthreads/PThread.cpp

@@ -149,7 +149,30 @@ private:
 #endif
 #endif
         }
+#if defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
+        else
+        {
+            // BUG-fix for linux:
+            // Each thread inherits the processor affinity mask from its parent thread.
+            // We need to explicitly set it to all CPUs, if no affinity was specified.
 
+            cpu_set_t cpumask;
+            CPU_ZERO( &cpumask );
+
+            for (int i = 0; i < OpenThreads::GetNumberOfProcessors(); ++i)
+            {
+                CPU_SET( i, &cpumask );
+            }
+
+#if defined(HAVE_PTHREAD_SETAFFINITY_NP)
+            pthread_setaffinity_np( pthread_self(), sizeof(cpumask), &cpumask);
+#elif defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY)
+            sched_setaffinity( 0, sizeof(cpumask), &cpumask );
+#elif defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
+            sched_setaffinity( 0, &cpumask );
+#endif
+        }
+#endif
 
         ThreadCleanupStruct tcs;
         tcs.thread = thread;

src/osg/ApplicationUsage.cpp

@@ -15,6 +15,7 @@
 #include <string.h>
 
 #include <osg/ApplicationUsage>
+#include <osg/Object>
 #include <osg/Math>
 #include <osg/ref_ptr>
 
@@ -33,6 +34,8 @@ ApplicationUsage* ApplicationUsage::instance()
     return s_applicationUsage.get();
 }
 
+OSG_INIT_SINGLETON_PROXY(ApplicationUsageSingletonProxy, ApplicationUsage::instance())
+
 void ApplicationUsage::addUsageExplanation(Type type,const std::string& option,const std::string& explanation)
 {
     switch(type)
@@ -69,7 +72,7 @@ void ApplicationUsage::addKeyboardMouseBinding(const std::string& prefix, int ke
     {
         std::ostringstream ostr;
         ostr<<prefix;
-        
+
         if (key==' ')
         {
             ostr<<"Space";

src/osg/CollectOccludersVisitor.cpp

@@ -225,21 +225,26 @@ void CollectOccludersVisitor::removeOccludedOccluders()
                 break;
             }
 
-            // now check all the holes in the occludee against the occluder,
-            // do so in reverse order so that the iterators remain valid.
-            for(ShadowVolumeOccluder::HoleList::reverse_iterator holeItr=holeList.rbegin();
-                holeItr!=holeList.rend();
-                )
+            // now check all the holes in the occludee against the occluder, and remove the ones that won't be valid
+            unsigned int previous_valid_hole_i = 0;
+            for(unsigned int i=0; i<holeList.size(); ++i)
             {
-                if (occluder->contains((*holeItr).getReferenceVertexList()))
+                if (!occluder->contains(holeList[i].getReferenceVertexList()))
                 {
-                    holeList.erase((++holeItr).base());
-                }
-                else
-                {
-                    ++holeItr;
-                }
+                    if (previous_valid_hole_i<i)
+                    {
+                        // copy valid holes into gaps left by invalid ones
+                        holeList[previous_valid_hole_i] = holeList[i];
+                    }
 
+                    previous_valid_hole_i++;
+                }
+            }
+
+            // remove the tail of the holeList if holes have been removed.
+            if (previous_valid_hole_i<holeList.size())
+            {
+                holeList.erase(holeList.begin()+previous_valid_hole_i,holeList.end());
             }
 
         }

src/osg/FrameBufferObject.cpp

@@ -105,7 +105,8 @@ FBOExtensions::FBOExtensions(unsigned int contextID)
 #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE)
     _supported = _supported &&
         glFramebufferTexture1D != 0 &&
-        glFramebufferTexture3D != 0;
+        glFramebufferTexture3D != 0 &&
+        isGLExtensionOrVersionSupported(contextID, "GL_EXT_framebuffer_object",3.0f);
 #endif
 
     LOAD_FBO_EXT(glBlitFramebuffer);
@@ -913,16 +914,19 @@ void FrameBufferObject::apply(State &state, BindTarget target) const
     ext->glBindFramebuffer(target, fboID);
 
     // enable drawing buffers to render the result to fbo
-    if (_drawBuffers.size() > 0)
+    if ( (target == READ_DRAW_FRAMEBUFFER) || (target == DRAW_FRAMEBUFFER) )
     {
-        GL2Extensions *gl2e = GL2Extensions::Get(state.getContextID(), true );
-        if (gl2e && gl2e->isDrawBuffersSupported())
+        if (_drawBuffers.size() > 0)
         {
-            gl2e->glDrawBuffers(_drawBuffers.size(), &(_drawBuffers[0]));
-        }
-        else
-        {
-            OSG_WARN <<"Warning: FrameBufferObject: could not set draw buffers, glDrawBuffers is not supported!" << std::endl;
+            GL2Extensions *gl2e = GL2Extensions::Get(state.getContextID(), true );
+            if (gl2e && gl2e->isDrawBuffersSupported())
+            {
+                gl2e->glDrawBuffers(_drawBuffers.size(), &(_drawBuffers[0]));
+            }
+            else
+            {
+                OSG_WARN <<"Warning: FrameBufferObject: could not set draw buffers, glDrawBuffers is not supported!" << std::endl;
+            }
         }
     }
 

src/osg/Geometry.cpp

@@ -1427,7 +1427,7 @@ void Geometry::fixDeprecatedData()
             case(PrimitiveSet::DrawArraysPrimitiveType):
             {
                 const DrawArrays* drawArray = static_cast<const DrawArrays*>(primitiveset);
-                numVertices = drawArray->getCount();
+                numVertices += drawArray->getCount();
                 break;
             }
             case(PrimitiveSet::DrawArrayLengthsPrimitiveType):
@@ -1439,7 +1439,6 @@ void Geometry::fixDeprecatedData()
                 {
                     unsigned int localNumVertices = *primItr;
                     numVertices += localNumVertices;
-                    primItr += localNumVertices;
                 }
                 break;
             }
@@ -1540,7 +1539,8 @@ void Geometry::fixDeprecatedData()
 
     // start the primitiveNum at -1 as we increment it the first time through when
     // we start processing the primitive sets.
-    int primitiveNum = -1;
+    int target_vindex = 0;
+    int source_pindex = -1; // equals primitiveNum
     for(PrimitiveSetList::iterator itr = _primitives.begin();
         itr != _primitives.end();
         ++itr)
@@ -1559,27 +1559,27 @@ void Geometry::fixDeprecatedData()
         }
 
         // copy the vertex data across to the new arays
-        int source_pindex = -1;
-        int target_vindex = 0;
         switch(primitiveset->getType())
         {
             case(PrimitiveSet::DrawArraysPrimitiveType):
             {
                 if (primLength==0) primLength=primitiveset->getNumIndices();
 
-                const DrawArrays* drawArray = static_cast<const DrawArrays*>(primitiveset);
+                DrawArrays* drawArray = static_cast<DrawArrays*>(primitiveset);
 
                 if (primLength==0) primLength = drawArray->getCount();
 
                 unsigned int primCount=0;
-                unsigned int indexEnd = drawArray->getFirst()+drawArray->getCount();
-                for(unsigned int vindex=drawArray->getFirst();
+                unsigned int startindex=drawArray->getFirst();
+                drawArray->setFirst(target_vindex);
+                unsigned int indexEnd = startindex+drawArray->getCount();
+                for(unsigned int vindex=startindex;
                     vindex<indexEnd;
                     ++vindex, ++target_vindex, ++primCount)
                 {
                     if ((primCount%primLength)==0) ++source_pindex;
 
-                    // copy bind per primitive from primitiveNum
+                    // copy bind per vertex from vindex
                     for(PtrList::iterator itr = perVertexPtrs.begin();
                         itr != perVertexPtrs.end();
                         ++itr)
@@ -1593,7 +1593,7 @@ void Geometry::fixDeprecatedData()
                         }
                     }
 
-                    // copy bind per vertex from vindex
+                    // copy bind per primitive from source_pindex
                     for(PtrList::iterator itr = perPrimitivePtrs.begin();
                         itr != perPrimitivePtrs.end();
                         ++itr)
@@ -1611,23 +1611,22 @@ void Geometry::fixDeprecatedData()
             }
             case(PrimitiveSet::DrawArrayLengthsPrimitiveType):
             {
-                const DrawArrayLengths* drawArrayLengths = static_cast<const DrawArrayLengths*>(primitiveset);
+                DrawArrayLengths* drawArrayLengths = static_cast<DrawArrayLengths*>(primitiveset);
                 unsigned int vindex=drawArrayLengths->getFirst();
-                for(DrawArrayLengths::const_iterator primItr=drawArrayLengths->begin();
+                for(DrawArrayLengths::iterator primItr=drawArrayLengths->begin();
                     primItr!=drawArrayLengths->end();
                     ++primItr)
                 {
                     unsigned int localPrimLength;
                     if (primLength==0) localPrimLength=*primItr;
                     else localPrimLength=primLength;
-
+                    drawArrayLengths->setFirst(target_vindex);
                     for(GLsizei primCount=0;
                         primCount<*primItr;
                         ++vindex, ++target_vindex, ++primCount)
                     {
                         if ((primCount%localPrimLength)==0) ++source_pindex;
-
-                        // copy bind per primitive from primitiveNum
+                        // copy bind per vertex from vindex
                         for(PtrList::iterator itr = perVertexPtrs.begin();
                             itr != perVertexPtrs.end();
                             ++itr)
@@ -1641,7 +1640,7 @@ void Geometry::fixDeprecatedData()
                             }
                         }
 
-                        // copy bind per vertex from vindex
+                        // copy bind per primitive from source_pindex
                         for(PtrList::iterator itr = perPrimitivePtrs.begin();
                             itr != perPrimitivePtrs.end();
                             ++itr)
@@ -1662,16 +1661,17 @@ void Geometry::fixDeprecatedData()
             {
                 if (primLength==0) primLength=primitiveset->getNumIndices();
 
-                const DrawElementsUByte* drawElements = static_cast<const DrawElementsUByte*>(primitiveset);
+                DrawElementsUByte* drawElements = static_cast<DrawElementsUByte*>(primitiveset);
                 unsigned int primCount=0;
-                for(DrawElementsUByte::const_iterator primItr=drawElements->begin();
+                for(DrawElementsUByte::iterator primItr=drawElements->begin();
                     primItr!=drawElements->end();
                     ++primCount, ++target_vindex, ++primItr)
                 {
                     if ((primCount%primLength)==0) ++source_pindex;
                     unsigned int vindex=*primItr;
+                    *primItr=target_vindex;
 
-                    // copy bind per primitive from primitiveNum
+                    // copy bind per vertex from vindex
                     for(PtrList::iterator itr = perVertexPtrs.begin();
                         itr != perVertexPtrs.end();
                         ++itr)
@@ -1685,7 +1685,7 @@ void Geometry::fixDeprecatedData()
                         }
                     }
 
-                    // copy bind per vertex from vindex
+                    // copy bind per primitive from source_pindex
                     for(PtrList::iterator itr = perPrimitivePtrs.begin();
                         itr != perPrimitivePtrs.end();
                         ++itr)
@@ -1705,16 +1705,17 @@ void Geometry::fixDeprecatedData()
             {
                 if (primLength==0) primLength=primitiveset->getNumIndices();
 
-                const DrawElementsUShort* drawElements = static_cast<const DrawElementsUShort*>(primitiveset);
+                DrawElementsUShort* drawElements = static_cast<DrawElementsUShort*>(primitiveset);
                 unsigned int primCount=0;
-                for(DrawElementsUShort::const_iterator primItr=drawElements->begin();
+                for(DrawElementsUShort::iterator primItr=drawElements->begin();
                     primItr!=drawElements->end();
                     ++primCount, ++target_vindex, ++primItr)
                 {
-                    if ((primCount%primLength)==0) ++primitiveNum;
+                    if ((primCount%primLength)==0) ++source_pindex;
                     unsigned int vindex=*primItr;
+                    *primItr=target_vindex;
 
-                    // copy bind per primitive from primitiveNum
+                    // copy bind per vertex from vindex
                     for(PtrList::iterator itr = perVertexPtrs.begin();
                         itr != perVertexPtrs.end();
                         ++itr)
@@ -1727,8 +1728,7 @@ void Geometry::fixDeprecatedData()
                             *target++ = *source++;
                         }
                     }
-
-                    // copy bind per vertex from vindex
+                    // copy bind per primitive from source_pindex
                     for(PtrList::iterator itr = perPrimitivePtrs.begin();
                         itr != perPrimitivePtrs.end();
                         ++itr)
@@ -1748,16 +1748,17 @@ void Geometry::fixDeprecatedData()
             {
                 if (primLength==0) primLength=primitiveset->getNumIndices();
 
-                const DrawElementsUInt* drawElements = static_cast<const DrawElementsUInt*>(primitiveset);
+                DrawElementsUInt* drawElements = static_cast<DrawElementsUInt*>(primitiveset);
                 unsigned int primCount=0;
-                for(DrawElementsUInt::const_iterator primItr=drawElements->begin();
+                for(DrawElementsUInt::iterator primItr=drawElements->begin();
                     primItr!=drawElements->end();
                     ++primCount, ++target_vindex, ++primItr)
                 {
-                    if ((primCount%primLength)==0) ++primitiveNum;
+                    if ((primCount%primLength)==0) ++source_pindex;
                     unsigned int vindex=*primItr;
+                    *primItr=target_vindex;
 
-                    // copy bind per primitive from primitiveNum
+                    // copy bind per vertex from vindex
                     for(PtrList::iterator itr = perVertexPtrs.begin();
                         itr != perVertexPtrs.end();
                         ++itr)
@@ -1771,7 +1772,7 @@ void Geometry::fixDeprecatedData()
                         }
                     }
 
-                    // copy bind per vertex from vindex
+                    // copy bind per primitive from source_pindex
                     for(PtrList::iterator itr = perPrimitivePtrs.begin();
                         itr != perPrimitivePtrs.end();
                         ++itr)

src/osg/GraphicsContext.cpp

@@ -547,6 +547,9 @@ void GraphicsContext::close(bool callCloseImplementation)
     }
 
 
+    bool contextIDValid = _state.valid();
+    unsigned int contextID = _state.valid() ? _state->getContextID() : ~0U;
+
     if (callCloseImplementation && _state.valid() && isRealized())
     {
         OSG_INFO<<"Closing still viable window "<<sharedContextExists<<" _state->getContextID()="<<_state->getContextID()<<std::endl;
@@ -557,7 +560,14 @@ void GraphicsContext::close(bool callCloseImplementation)
             {
                 OSG_INFO<<"Doing delete of GL objects"<<std::endl;
 
-                osg::deleteAllGLObjects(_state->getContextID());
+                _state->reset();
+
+                // Kill the State now so all the (directly or indirectly) referenced GLObjects can make it into delete cache in time.
+                // That way osg::deleteAllGLObjects won't miss them and left them to be deleted afterwards in a new GraphicsContext 
+                // that happens to have the same contextID (see SceneView::draw() and _requiresFlush flag).
+                _state = 0; 
+
+                osg::deleteAllGLObjects(contextID);
 
                 OSG_INFO<<"Done delete of GL objects"<<std::endl;
             }
@@ -567,9 +577,9 @@ void GraphicsContext::close(bool callCloseImplementation)
                 // which have already been deleted
 
                 osg::flushAllDeletedGLObjects(_state->getContextID());
-            }
 
-            _state->reset();
+                _state->reset();
+            }
 
             releaseContext();
         }
@@ -585,18 +595,18 @@ void GraphicsContext::close(bool callCloseImplementation)
     // now discard any deleted deleted OpenGL objects that the are still hanging around - such as due to
     // the the flushDelete*() methods not being invoked, such as when using GraphicContextEmbedded where makeCurrent
     // does not work.
-    if ( !sharedContextExists && _state.valid())
+    if ( !sharedContextExists && contextIDValid)
     {
         OSG_INFO<<"Doing discard of deleted OpenGL objects."<<std::endl;
 
-        osg::discardAllGLObjects(_state->getContextID());
+        osg::discardAllGLObjects(contextID);
     }
 
-    if (_state.valid())
+    if (contextIDValid)
     {
-        decrementContextIDUsageCount(_state->getContextID());
+        decrementContextIDUsageCount(contextID);
 
-        _state = 0;
+        if (_state.valid()) _state = 0;
     }
 }
 
@@ -752,18 +762,6 @@ void GraphicsContext::removeAllOperations()
     _operationsBlock->set(false);
 }
 
-
-struct CameraRenderOrderSortOp
-{
-    inline bool operator() (const Camera* lhs,const Camera* rhs) const
-    {
-        if (lhs->getRenderOrder()<rhs->getRenderOrder()) return true;
-        if (rhs->getRenderOrder()<lhs->getRenderOrder()) return false;
-        return lhs->getRenderOrderNum()<rhs->getRenderOrderNum();
-    }
-};
-
-
 void GraphicsContext::runOperations()
 {
     // sort the cameras into order

src/osg/Image.cpp

@@ -239,7 +239,7 @@ Image::Image(const Image& image,const CopyOp& copyop):
 {
     if (image._data)
     {
-        int size = image.getTotalSizeInBytesIncludingMipmaps();
+        unsigned int size = image.getTotalSizeInBytesIncludingMipmaps();
         setData(new unsigned char [size],USE_NEW_DELETE);
         unsigned char* dest_ptr = _data;
         for(DataIterator itr(&image); itr.valid(); ++itr)
@@ -425,6 +425,8 @@ GLenum Image::computeFormatDataType(GLenum pixelFormat)
 {
     switch (pixelFormat)
     {
+        case GL_R32F:
+        case GL_RG32F:
         case GL_LUMINANCE32F_ARB:
         case GL_LUMINANCE16F_ARB:
         case GL_LUMINANCE_ALPHA32F_ARB:
@@ -466,6 +468,8 @@ GLenum Image::computeFormatDataType(GLenum pixelFormat)
 
         case GL_RGBA:
         case GL_RGB:
+        case GL_RED:
+        case GL_RG:
         case GL_LUMINANCE:
         case GL_LUMINANCE_ALPHA:
         case GL_ALPHA: return GL_UNSIGNED_BYTE;
@@ -515,6 +519,9 @@ unsigned int Image::computeNumComponents(GLenum pixelFormat)
         case(GL_ALPHA32UI_EXT): return 1;
         case(GL_ALPHA16F_ARB): return 1;
         case(GL_ALPHA32F_ARB): return 1;
+        case(GL_R32F): return 1;
+        case(GL_RG): return 2;
+        case(GL_RG32F): return 2;
         case(GL_RGB): return 3;
         case(GL_BGR): return 3;
         case(GL_RGB8I_EXT): return 3;
@@ -799,7 +806,11 @@ int Image::computeNumberOfMipmapLevels(int s,int t, int r)
 {
     int w = maximum(s, t);
     w = maximum(w, r);
-    return 1 + static_cast<int>(floor(logf(w)/logf(2.0f)));
+
+    int n = 0;
+    while (w >>= 1)
+        ++n;
+    return n+1;
 }
 
 bool Image::isCompressed() const
@@ -1510,16 +1521,18 @@ void Image::flipVertical()
             {
                 if (!dxtc_tool::VerticalFlip(s,t,_pixelFormat,_data+_mipmapData[i]))
                 {
-                    OSG_NOTICE << "Notice Image::flipVertical(): Vertical flip do not succeed" << std::endl;
+                    OSG_NOTICE << "Notice Image::flipVertical(): Vertical flip did not succeed" << std::endl;
                 }
             }
             else
             {
-                // its not a compressed image, so implement flip oursleves.
+                // it's not a compressed image, so implement flip ourselves.
+                unsigned int mipRowSize = computeRowWidthInBytes(s, _pixelFormat, _dataType, _packing);
+                unsigned int mipRowStep = mipRowSize;
                 unsigned char* top = _data+_mipmapData[i];
-                unsigned char* bottom = top + (t-1)*rowStep;
+                unsigned char* bottom = top + (t-1)*mipRowStep;
 
-                flipImageVertical(top, bottom, rowSize, rowStep);
+                flipImageVertical(top, bottom, mipRowSize, mipRowStep);
             }
        }
     }

src/osg/ImageSequence.cpp

@@ -396,17 +396,8 @@ void ImageSequence::update(osg::NodeVisitor* nv)
         if (startLoadIndex<0) startLoadIndex = 0;
 
         int endLoadIndex = int(preLoadTime/_timePerImage);
-        if (endLoadIndex>=int(_imageDataList.size()))
-        {
-            if (looping)
-            {
-                endLoadIndex -= int(_imageDataList.size());
-            }
-            else
-            {
-                endLoadIndex = int(_imageDataList.size())-1;
-            }
-        }
+        if (looping && (endLoadIndex>=int(_imageDataList.size()))) endLoadIndex -= int(_imageDataList.size());
+        if (endLoadIndex>=int(_imageDataList.size())) endLoadIndex = int(_imageDataList.size())-1;
         if (endLoadIndex<0) endLoadIndex = 0;
 
         double requestTime = time;

src/osg/KdTree.cpp

@@ -71,7 +71,7 @@ struct TriangleIndicesCollector
         const osg::Vec3& v2 = (*(_buildKdTree->_kdTree.getVertices()))[p2];
 
         // discard degenerate points
-        if (v0==v1 || v1==v2 || v1==v2)
+        if (v0==v1 || v1==v2 || v2==v0)
         {
             //OSG_NOTICE<<"Disgarding degenerate triangle"<<std::endl;
             return;

src/osg/Notify.cpp

@@ -29,7 +29,7 @@ namespace osg
 class NullStreamBuffer : public std::streambuf
 {
 private:
-    std::streamsize xsputn(const std::streambuf::char_type */*str*/, std::streamsize n)
+    std::streamsize xsputn(const std::streambuf::char_type * /*str*/, std::streamsize n)
     {
         return n;
     }

src/osg/PointSprite.cpp

@@ -44,17 +44,31 @@ bool PointSprite::checkValidityOfAssociatedModes(osg::State& state) const
 {
 
     bool modeValid = isPointSpriteSupported(state.getContextID());
-    state.setModeValidity(GL_POINT_SPRITE_ARB, modeValid);
 
+#if defined( OSG_GLES1_AVAILABLE ) //point sprites don't exist on es 2.0
+    state.setModeValidity(GL_POINT_SPRITE_OES, modeValid);
+#else
+    state.setModeValidity(GL_POINT_SPRITE_ARB, modeValid);
+#endif
+    
     return modeValid;
 }
 
 void PointSprite::apply(osg::State& state) const
 {
 #if defined( OSG_GL3_AVAILABLE )
+    
     const Point::Extensions* extensions = Point::getExtensions(state.getContextID(),true);
     extensions->glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN,_coordOriginMode);
+
+#elif defined( OSG_GLES1_AVAILABLE ) //point sprites don't exist on es 2.0
+    
+    if(!isPointSpriteSupported(state.getContextID())) return;
+    
+    glTexEnvi(GL_POINT_SPRITE_OES, GL_COORD_REPLACE_OES, 1);
+    
 #elif defined( OSG_GL_FIXED_FUNCTION_AVAILABLE )
+
     if(!isPointSpriteSupported(state.getContextID())) return;
 
     glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, 1);
@@ -63,8 +77,10 @@ void PointSprite::apply(osg::State& state) const
 
     if (extensions->isPointSpriteCoordOriginSupported())
         extensions->glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN,_coordOriginMode);
+
 #else
     OSG_NOTICE<<"Warning: PointSprite::apply(State&) - not supported."<<std::endl;
+
 #endif
 }
 
@@ -86,7 +102,7 @@ bool PointSprite::isPointSpriteSupported(unsigned int contextID)
     if (!s_extensions[contextID].initialized)
     {
         s_extensions[contextID].initialized = true;
-        s_extensions[contextID].supported = OSG_GL3_FEATURES || isGLExtensionSupported(contextID, "GL_ARB_point_sprite") || isGLExtensionSupported(contextID, "GL_NV_point_sprite");
+        s_extensions[contextID].supported = OSG_GL3_FEATURES || isGLExtensionSupported(contextID, "GL_ARB_point_sprite") || isGLExtensionSupported(contextID, "GL_OES_point_sprite") || isGLExtensionSupported(contextID, "GL_NV_point_sprite");
     }
 
     return s_extensions[contextID].supported;

src/osg/PolygonMode.cpp

@@ -68,18 +68,22 @@ PolygonMode::Mode PolygonMode::getMode(Face face) const
 
 void PolygonMode::apply(State&) const
 {
-#ifdef OSG_GL1_AVAILABLE
+#if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE)
     if (_modeFront==_modeBack)
     {
         glPolygonMode(GL_FRONT_AND_BACK,(GLenum)_modeFront);
     }
     else
     {
-        glPolygonMode(GL_FRONT,(GLenum)_modeFront);
-        glPolygonMode(GL_BACK,(GLenum)_modeBack);
+        #ifdef OSG_GL1_AVAILABLE
+            glPolygonMode(GL_FRONT,(GLenum)_modeFront);
+            glPolygonMode(GL_BACK,(GLenum)_modeBack);
+        #else
+            OSG_NOTICE << "Warning: PolygonMode::apply(State&) - only GL_FRONT_AND_BACK is supported." << std::endl;
+        #endif
     }
 #else
-    OSG_NOTICE<<"Warning: PolygonMode::apply(State&) - not supported."<<std::endl;
+    OSG_NOTICE << "Warning: PolygonMode::apply(State&) - is not supported." << std::endl;
 #endif
 }
 

src/osg/Program.cpp

@@ -674,7 +674,7 @@ void Program::PerContextProgram::linkProgram(osg::State& state)
         _extensions->glGetProgramiv(_glProgramHandle, GL_ACTIVE_UNIFORM_BLOCKS,
                                     reinterpret_cast<GLint*>(&activeUniformBlocks));
         _extensions->glGetProgramiv(_glProgramHandle,
-                                    GL_ACTIVE_UNIFORM_MAX_LENGTH,
+                                    GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH,
                                     &maxBlockNameLen);
         if (maxBlockNameLen > 0)
         {

src/osg/Sequence.cpp

@@ -402,7 +402,7 @@ int Sequence::_getNextValue()
     int _sbegin = osg::minimum(_ubegin,_uend);
     int _send = osg::maximum(_ubegin,_uend);
 
-    int v = _value + _step;
+    int v = _value + _step * static_cast<int>(osg::sign(_speed));
 
     if (_sbegin==_send)
     {

src/osg/State.cpp

@@ -134,25 +134,10 @@ State::~State()
     //_texCoordArrayList.clear();
 
     //_vertexAttribArrayList.clear();
-
-    // OSG_NOTICE<<"State::~State()"<<this<<std::endl;
-    for(AppliedProgramObjectSet::iterator itr = _appliedProgramObjectSet.begin();
-        itr != _appliedProgramObjectSet.end();
-        ++itr)
-    {
-        (*itr)->removeObserver(this);
-    }
 }
 
 void State::objectDeleted(void* object)
 {
-    const Program::PerContextProgram* ppcp = reinterpret_cast<const Program::PerContextProgram*>(object);
-    AppliedProgramObjectSet::iterator itr = _appliedProgramObjectSet.find(ppcp);
-    if (itr != _appliedProgramObjectSet.end())
-    {
-        // OSG_NOTICE<<"Removing _appliedProgramObjectSet entry "<<ppcp<<std::endl;
-        _appliedProgramObjectSet.erase(itr);
-    }
 }
 
 void State::reset()
@@ -239,17 +224,6 @@ void State::reset()
 
     _lastAppliedProgramObject = 0;
 
-    for(AppliedProgramObjectSet::iterator apitr=_appliedProgramObjectSet.begin();
-        apitr!=_appliedProgramObjectSet.end();
-        ++apitr)
-    {
-        (*apitr)->resetAppliedUniforms();
-        (*apitr)->removeObserver(this);
-    }
-
-    _appliedProgramObjectSet.clear();
-
-
     // what about uniforms??? need to clear them too...
     // go through all active Unfirom's, setting to change to force update,
     // the idea is to leave only the global defaults left.
@@ -484,12 +458,18 @@ void State::apply(const StateSet* dstate)
             else if (unit<_textureAttributeMapList.size()) applyAttributeMapOnTexUnit(unit,_textureAttributeMapList[unit]);
         }
 
+        const Program::PerContextProgram* previousLastAppliedProgramObject = _lastAppliedProgramObject;
+
         applyModeList(_modeMap,dstate->getModeList());
         applyAttributeList(_attributeMap,dstate->getAttributeList());
 
         if (_shaderCompositionEnabled)
         {
-            applyShaderComposition();
+            if (previousLastAppliedProgramObject == _lastAppliedProgramObject || _lastAppliedProgramObject==0)
+            {
+                // No program has been applied by the StateSet stack so assume shader composition is required
+                applyShaderComposition();
+            }
         }
 
         if (dstate->getUniformList().empty())
@@ -911,7 +891,10 @@ void State::initializeExtensionProcs()
     if ( osg::getGLVersionNumber() >= 2.0 || osg::isGLExtensionSupported(_contextID,"GL_ARB_vertex_shader") || OSG_GLES2_FEATURES)
     {
         glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS,&_glMaxTextureUnits);
-        glGetIntegerv(GL_MAX_TEXTURE_COORDS,&_glMaxTextureCoords);
+        if(OSG_GLES2_FEATURES)
+            _glMaxTextureCoords = _glMaxTextureUnits;
+        else
+            glGetIntegerv(GL_MAX_TEXTURE_COORDS,&_glMaxTextureCoords);
     }
     else if ( osg::getGLVersionNumber() >= 1.3 ||
                                  osg::isGLExtensionSupported(_contextID,"GL_ARB_multitexture") ||
@@ -1322,6 +1305,9 @@ namespace State_Utils
 {
     bool replace(std::string& str, const std::string& original_phrase, const std::string& new_phrase)
     {
+        // Prevent infinite loop : if original_phrase is empty, do nothing and return false
+        if (original_phrase.empty()) return false;
+
         bool replacedStr = false;
         std::string::size_type pos = 0;
         while((pos=str.find(original_phrase, pos))!=std::string::npos)
@@ -1360,9 +1346,6 @@ bool State::convertVertexShaderSourceToOsgBuiltIns(std::string& source) const
 
     OSG_INFO<<"++Before Converted source "<<std::endl<<source<<std::endl<<"++++++++"<<std::endl;
 
-    // replace ftransform as it only works with built-ins
-    State_Utils::replace(source, "ftransform()", "gl_ModelViewProjectionMatrix * gl_Vertex");
-
     // find the first legal insertion point for replacement declarations. GLSL requires that nothing
     // precede a "#verson" compiler directive, so we must insert new declarations after it.
     std::string::size_type declPos = source.rfind( "#version " );
@@ -1377,22 +1360,31 @@ bool State::convertVertexShaderSourceToOsgBuiltIns(std::string& source) const
         declPos = 0;
     }
 
-    State_Utils::replaceAndInsertDeclaration(source, declPos, _vertexAlias._glName,         _vertexAlias._osgName,         _vertexAlias._declaration);
-    State_Utils::replaceAndInsertDeclaration(source, declPos, _normalAlias._glName,         _normalAlias._osgName,         _normalAlias._declaration);
-    State_Utils::replaceAndInsertDeclaration(source, declPos, _colorAlias._glName,          _colorAlias._osgName,          _colorAlias._declaration);
-    State_Utils::replaceAndInsertDeclaration(source, declPos, _secondaryColorAlias._glName, _secondaryColorAlias._osgName, _secondaryColorAlias._declaration);
-    State_Utils::replaceAndInsertDeclaration(source, declPos, _fogCoordAlias._glName,       _fogCoordAlias._osgName,       _fogCoordAlias._declaration);
-    for (size_t i=0; i<_texCoordAliasList.size(); i++)
+    if (_useModelViewAndProjectionUniforms)
     {
-        const VertexAttribAlias& texCoordAlias = _texCoordAliasList[i];
-        State_Utils::replaceAndInsertDeclaration(source, declPos, texCoordAlias._glName, texCoordAlias._osgName, texCoordAlias._declaration);
+        // replace ftransform as it only works with built-ins
+        State_Utils::replace(source, "ftransform()", "gl_ModelViewProjectionMatrix * gl_Vertex");
+
+        // replace built in uniform
+        State_Utils::replaceAndInsertDeclaration(source, declPos, "gl_ModelViewMatrix", "osg_ModelViewMatrix", "uniform mat4 ");
+        State_Utils::replaceAndInsertDeclaration(source, declPos, "gl_ModelViewProjectionMatrix", "osg_ModelViewProjectionMatrix", "uniform mat4 ");
+        State_Utils::replaceAndInsertDeclaration(source, declPos, "gl_ProjectionMatrix", "osg_ProjectionMatrix", "uniform mat4 ");
+        State_Utils::replaceAndInsertDeclaration(source, declPos, "gl_NormalMatrix", "osg_NormalMatrix", "uniform mat3 ");
     }
 
-    // replace built in uniform
-    State_Utils::replaceAndInsertDeclaration(source, declPos, "gl_ModelViewMatrix", "osg_ModelViewMatrix", "uniform mat4 ");
-    State_Utils::replaceAndInsertDeclaration(source, declPos, "gl_ModelViewProjectionMatrix", "osg_ModelViewProjectionMatrix", "uniform mat4 ");
-    State_Utils::replaceAndInsertDeclaration(source, declPos, "gl_ProjectionMatrix", "osg_ProjectionMatrix", "uniform mat4 ");
-    State_Utils::replaceAndInsertDeclaration(source, declPos, "gl_NormalMatrix", "osg_NormalMatrix", "uniform mat3 ");
+    if (_useVertexAttributeAliasing)
+    {
+        State_Utils::replaceAndInsertDeclaration(source, declPos, _vertexAlias._glName,         _vertexAlias._osgName,         _vertexAlias._declaration);
+        State_Utils::replaceAndInsertDeclaration(source, declPos, _normalAlias._glName,         _normalAlias._osgName,         _normalAlias._declaration);
+        State_Utils::replaceAndInsertDeclaration(source, declPos, _colorAlias._glName,          _colorAlias._osgName,          _colorAlias._declaration);
+        State_Utils::replaceAndInsertDeclaration(source, declPos, _secondaryColorAlias._glName, _secondaryColorAlias._osgName, _secondaryColorAlias._declaration);
+        State_Utils::replaceAndInsertDeclaration(source, declPos, _fogCoordAlias._glName,       _fogCoordAlias._osgName,       _fogCoordAlias._declaration);
+        for (size_t i=0; i<_texCoordAliasList.size(); i++)
+        {
+            const VertexAttribAlias& texCoordAlias = _texCoordAliasList[i];
+            State_Utils::replaceAndInsertDeclaration(source, declPos, texCoordAlias._glName, texCoordAlias._osgName, texCoordAlias._declaration);
+        }
+    }
 
     OSG_INFO<<"-------- Converted source "<<std::endl<<source<<std::endl<<"----------------"<<std::endl;
 
@@ -1698,15 +1690,6 @@ void State::print(std::ostream& fout) const
         }
         fout<<"}"<<std::endl;
 
-#if 0
-        TextureModeMapList                                              _textureModeMapList;
-        TextureAttributeMapList                                         _textureAttributeMapList;
-
-        AppliedProgramObjectSet                                         _appliedProgramObjectSet;
-        const Program::PerContextProgram*                               _lastAppliedProgramObject;
-#endif
-
-
         fout<<"StateSetStack _stateSetStack {"<<std::endl;
         for(StateSetStack::const_iterator itr = _stateStateStack.begin();
             itr != _stateStateStack.end();

src/osg/StateSet.cpp

@@ -54,6 +54,7 @@ class TextureGLModeSet
             _textureModeSet.insert(GL_TEXTURE_CUBE_MAP);
             _textureModeSet.insert(GL_TEXTURE_RECTANGLE_NV);
             _textureModeSet.insert(GL_TEXTURE_2D_ARRAY_EXT);
+            _textureModeSet.insert(GL_TEXTURE_2D_MULTISAMPLE);
 
             _textureModeSet.insert(GL_TEXTURE_GEN_Q);
             _textureModeSet.insert(GL_TEXTURE_GEN_R);
@@ -274,6 +275,32 @@ int StateSet::compare(const StateSet& rhs,bool compareAttributeContents) const
     if (_textureAttributeList.size()<rhs._textureAttributeList.size()) return -1;
     if (_textureAttributeList.size()>rhs._textureAttributeList.size()) return 1;
 
+    if (_textureModeList.size()<rhs._textureModeList.size()) return -1;
+    if (_textureModeList.size()>rhs._textureModeList.size()) return 1;
+
+    if (_attributeList.size()<rhs._attributeList.size()) return -1;
+    if (_attributeList.size()>rhs._attributeList.size()) return 1;
+
+    if (_modeList.size()<rhs._modeList.size()) return -1;
+    if (_modeList.size()>rhs._modeList.size()) return 1;
+
+    if (_uniformList.size()<rhs._uniformList.size()) return -1;
+    if (_uniformList.size()>rhs._uniformList.size()) return 1;
+
+     // check render bin details
+
+    if ( _binMode < rhs._binMode ) return -1;
+    else if ( _binMode > rhs._binMode ) return 1;
+
+    if ( _binMode != INHERIT_RENDERBIN_DETAILS )
+    {
+        if ( _binNum < rhs._binNum ) return -1;
+        else if ( _binNum > rhs._binNum ) return 1;
+
+        if ( _binName < rhs._binName ) return -1;
+        else if ( _binName > rhs._binName ) return 1;
+    }
+
     for(unsigned int ai=0;ai<_textureAttributeList.size();++ai)
     {
         const AttributeList& rhs_attributeList = _textureAttributeList[ai];
@@ -373,10 +400,6 @@ int StateSet::compare(const StateSet& rhs,bool compareAttributeContents) const
 
     // we've got here so attributes must be equal...
 
-
-    if (_textureModeList.size()<rhs._textureModeList.size()) return -1;
-    if (_textureModeList.size()>rhs._textureModeList.size()) return 1;
-
     // check to see how the modes compare.
     // first check the rest of the texture modes
     for(unsigned int ti=0;ti<_textureModeList.size();++ti)
@@ -441,20 +464,6 @@ int StateSet::compare(const StateSet& rhs,bool compareAttributeContents) const
     }
     else if (rhs_uniform_itr == rhs._uniformList.end()) return 1;
 
-    // check render bin details
-
-    if ( _binMode < rhs._binMode ) return -1;
-    else if ( _binMode > rhs._binMode ) return 1;
-
-    if ( _binMode != INHERIT_RENDERBIN_DETAILS )
-    {
-        if ( _binNum < rhs._binNum ) return -1;
-        else if ( _binNum > rhs._binNum ) return 1;
-
-        if ( _binName < rhs._binName ) return -1;
-        else if ( _binName > rhs._binName ) return 1;
-    }
-
     return 0;
 }
 

src/osg/Texture.cpp

@@ -2351,7 +2351,7 @@ bool Texture::isHardwareMipmapGenerationEnabled(const State& state) const
 
         const FBOExtensions* fbo_ext = FBOExtensions::instance(contextID,true);
 
-        if (fbo_ext->glGenerateMipmap)
+        if (fbo_ext->isSupported() && fbo_ext->glGenerateMipmap)
         {
             return true;
         }
@@ -2368,7 +2368,8 @@ Texture::GenerateMipmapMode Texture::mipmapBeforeTexImage(const State& state, bo
         return GENERATE_MIPMAP;
 #else
 
-        bool useGenerateMipMap = FBOExtensions::instance(state.getContextID(), true)->glGenerateMipmap!=0;
+        FBOExtensions* fbo_ext = FBOExtensions::instance(state.getContextID(),true);
+        bool useGenerateMipMap = fbo_ext->isSupported() && fbo_ext->glGenerateMipmap;
 
         if (useGenerateMipMap)
         {
@@ -2440,7 +2441,7 @@ void Texture::generateMipmap(State& state) const
     osg::FBOExtensions* fbo_ext = osg::FBOExtensions::instance(state.getContextID(), true);
 
     // check if the function is supported
-    if (fbo_ext->glGenerateMipmap)
+    if (fbo_ext->isSupported() && fbo_ext->glGenerateMipmap)
     {
         textureObject->bind();
         fbo_ext->glGenerateMipmap(textureObject->target());

src/osg/Texture2DArray.cpp

@@ -32,15 +32,16 @@ Texture2DArray::Texture2DArray(const Texture2DArray& text,const CopyOp& copyop):
             Texture(text,copyop),
             _textureWidth(text._textureWidth),
             _textureHeight(text._textureHeight),
-            _textureDepth(text._textureDepth),
+            _textureDepth(0),
             _numMipmapLevels(text._numMipmapLevels),
             _subloadCallback(text._subloadCallback)
 {
+    setTextureDepth(text._textureDepth);
+
     // copy all images by iterating through all of them
     for (int i=0; i < text._textureDepth; i++)
     {
         setImage(i, copyop(text._images[i].get()));
-        _modifiedCount.push_back(ImageModifiedCount());
     }
 }
 
@@ -249,7 +250,7 @@ void Texture2DArray::apply(State& state) const
             // compute the dimensions of the texture.
             computeRequiredTextureDimensions(state, *image, new_width, new_height, new_numMipmapLevels);
 
-            if (!textureObject->match(GL_TEXTURE_2D_ARRAY_EXT, new_numMipmapLevels, _internalFormat, new_width, new_height, 1, _borderWidth))
+            if (!textureObject->match(GL_TEXTURE_2D_ARRAY_EXT, new_numMipmapLevels, _internalFormat, new_width, new_height, _textureDepth, _borderWidth))
             {
                 Texture::releaseTextureObject(contextID, _textureObjectBuffer[contextID].get());
                 _textureObjectBuffer[contextID] = 0;

src/osg/TransferFunction.cpp

@@ -48,14 +48,15 @@ TransferFunction1D::TransferFunction1D(const TransferFunction1D& tf, const CopyO
     TransferFunction(tf,copyop)
 {
     allocate(tf.getNumberImageCells());
-    assign(_colorMap);
+    assign(tf._colorMap);
 }
 
 void TransferFunction1D::allocate(unsigned int numX)
 {
     _image = new osg::Image;
     _image->allocateImage(numX,1,1,GL_RGBA, GL_FLOAT);
-    if (!_colorMap.empty()) assign(_colorMap);
+    
+    updateImage();
 }
 
 void TransferFunction1D::clear(const osg::Vec4& color)
@@ -177,7 +178,7 @@ osg::Vec4 TransferFunction1D::getColor(float v) const
 
 void TransferFunction1D::assign(const ColorMap& newColours)
 {
-    _colorMap = newColours;
+    if (&_colorMap != &newColours) _colorMap = newColours;
 
     updateImage();
 }

src/osg/Uniform.cpp

@@ -2153,7 +2153,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix2& m2 ) const
 {
     if( index>=getNumElements() || !isCompatibleType(FLOAT_MAT2) ) return false;
     unsigned int j = index * getTypeNumComponents(getType());
-    m2.base_class::set( &((*_floatArray)[j]) );
+    m2.Matrix2::base_class::set( &((*_floatArray)[j]) );
     return true;
 }
 
@@ -2161,7 +2161,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix3& m3 ) const
 {
     if( index>=getNumElements() || !isCompatibleType(FLOAT_MAT3) ) return false;
     unsigned int j = index * getTypeNumComponents(getType());
-    m3.base_class::set( &((*_floatArray)[j]) );
+    m3.Matrix3::base_class::set( &((*_floatArray)[j]) );
     return true;
 }
 
@@ -2177,7 +2177,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix2x3& m2x3 ) const
 {
     if( index>=getNumElements() || !isCompatibleType(FLOAT_MAT2x3) ) return false;
     unsigned int j = index * getTypeNumComponents(getType());
-    m2x3.base_class::set( &((*_floatArray)[j]) );
+    m2x3.Matrix2x3::base_class::set( &((*_floatArray)[j]) );
     return true;
 }
 
@@ -2185,7 +2185,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix2x4& m2x4 ) const
 {
     if( index>=getNumElements() || !isCompatibleType(FLOAT_MAT2x4) ) return false;
     unsigned int j = index * getTypeNumComponents(getType());
-    m2x4.base_class::set( &((*_floatArray)[j]) );
+    m2x4.Matrix2x4::base_class::set( &((*_floatArray)[j]) );
     return true;
 }
 
@@ -2193,7 +2193,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix3x2& m3x2 ) const
 {
     if( index>=getNumElements() || !isCompatibleType(FLOAT_MAT3x2) ) return false;
     unsigned int j = index * getTypeNumComponents(getType());
-    m3x2.base_class::set( &((*_floatArray)[j]) );
+    m3x2.Matrix3x2::base_class::set( &((*_floatArray)[j]) );
     return true;
 }
 
@@ -2201,7 +2201,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix3x4& m3x4 ) const
 {
     if( index>=getNumElements() || !isCompatibleType(FLOAT_MAT3x4) ) return false;
     unsigned int j = index * getTypeNumComponents(getType());
-    m3x4.base_class::set( &((*_floatArray)[j]) );
+    m3x4.Matrix3x4::base_class::set( &((*_floatArray)[j]) );
     return true;
 }
 
@@ -2209,7 +2209,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix4x2& m4x2 ) const
 {
     if( index>=getNumElements() || !isCompatibleType(FLOAT_MAT4x2) ) return false;
     unsigned int j = index * getTypeNumComponents(getType());
-    m4x2.base_class::set( &((*_floatArray)[j]) );
+    m4x2.Matrix4x2::base_class::set( &((*_floatArray)[j]) );
     return true;
 }
 
@@ -2217,7 +2217,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix4x3& m4x3 ) const
 {
     if( index>=getNumElements() || !isCompatibleType(FLOAT_MAT4x3) ) return false;
     unsigned int j = index * getTypeNumComponents(getType());
-    m4x3.base_class::set( &((*_floatArray)[j]) );
+    m4x3.Matrix4x3::base_class::set( &((*_floatArray)[j]) );
     return true;
 }
 
@@ -2263,7 +2263,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix2d& m2 ) const
 {
     if( index>=getNumElements() || !isCompatibleType(DOUBLE_MAT2) ) return false;
     unsigned int j = index * getTypeNumComponents(getType());
-    m2.base_class::set( &((*_doubleArray)[j]) );
+    m2.Matrix2d::base_class::set( &((*_doubleArray)[j]) );
     return true;
 }
 
@@ -2271,7 +2271,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix3d& m3 ) const
 {
     if( index>=getNumElements() || !isCompatibleType(DOUBLE_MAT3) ) return false;
     unsigned int j = index * getTypeNumComponents(getType());
-    m3.base_class::set( &((*_doubleArray)[j]) );
+    m3.Matrix3d::base_class::set( &((*_doubleArray)[j]) );
     return true;
 }
 
@@ -2291,7 +2291,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix2x3d& m2x3 ) const
 {
     if( index>=getNumElements() || !isCompatibleType(DOUBLE_MAT2x3) ) return false;
     unsigned int j = index * getTypeNumComponents(getType());
-    m2x3.base_class::set( &((*_doubleArray)[j]) );
+    m2x3.Matrix2x3d::base_class::set( &((*_doubleArray)[j]) );
     return true;
 }
 
@@ -2299,7 +2299,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix2x4d& m2x4 ) const
 {
     if( index>=getNumElements() || !isCompatibleType(DOUBLE_MAT2x4) ) return false;
     unsigned int j = index * getTypeNumComponents(getType());
-    m2x4.base_class::set( &((*_doubleArray)[j]) );
+    m2x4.Matrix2x4d::base_class::set( &((*_doubleArray)[j]) );
     return true;
 }
 
@@ -2307,7 +2307,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix3x2d& m3x2 ) const
 {
     if( index>=getNumElements() || !isCompatibleType(DOUBLE_MAT3x2) ) return false;
     unsigned int j = index * getTypeNumComponents(getType());
-    m3x2.base_class::set( &((*_doubleArray)[j]) );
+    m3x2.Matrix3x2d::base_class::set( &((*_doubleArray)[j]) );
     return true;
 }
 
@@ -2315,7 +2315,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix3x4d& m3x4 ) const
 {
     if( index>=getNumElements() || !isCompatibleType(DOUBLE_MAT3x4) ) return false;
     unsigned int j = index * getTypeNumComponents(getType());
-    m3x4.base_class::set( &((*_doubleArray)[j]) );
+    m3x4.Matrix3x4d::base_class::set( &((*_doubleArray)[j]) );
     return true;
 }
 
@@ -2323,7 +2323,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix4x2d& m4x2 ) const
 {
     if( index>=getNumElements() || !isCompatibleType(DOUBLE_MAT4x2) ) return false;
     unsigned int j = index * getTypeNumComponents(getType());
-    m4x2.base_class::set( &((*_doubleArray)[j]) );
+    m4x2.Matrix4x2d::base_class::set( &((*_doubleArray)[j]) );
     return true;
 }
 
@@ -2331,7 +2331,7 @@ bool Uniform::getElement( unsigned int index, osg::Matrix4x3d& m4x3 ) const
 {
     if( index>=getNumElements() || !isCompatibleType(DOUBLE_MAT4x3) ) return false;
     unsigned int j = index * getTypeNumComponents(getType());
-    m4x3.base_class::set( &((*_doubleArray)[j]) );
+    m4x3.Matrix4x3d::base_class::set( &((*_doubleArray)[j]) );
     return true;
 }
 

src/osg/glu/libutil/error.cpp

@@ -150,4 +150,4 @@ const GLubyte* gluErrorString(GLenum errorCode)
     return (const GLubyte *) 0;
 }
 
-} // end of namespace osg
+} // end of namespace osg

src/osg/glu/libutil/mipmap.cpp

@@ -908,10 +908,11 @@ static void halveImage_uint(GLint components, GLuint width, GLuint height,
         for (j = 0; j < newwidth; j++) {
             for (k = 0; k < components; k++) {
                 /* need to cast to double to hold large unsigned ints */
-                s[0] = ((double)*(const GLuint*)t +
-                        (double)*(const GLuint*)(t+group_size) +
-                        (double)*(const GLuint*)(t+ysize) +
-                        (double)*(const GLuint*)(t+ysize+group_size))/4 + 0.5;
+                GLdouble buf = (double)*(const GLuint*)t +
+                               (double)*(const GLuint*)(t+group_size) +
+                               (double)*(const GLuint*)(t+ysize) +
+                               (double)*(const GLuint*)(t+ysize+group_size);
+                s[0] = (GLuint)(buf/4.0 + 0.5);
                 s++; t += element_size;
 
             }
@@ -925,12 +926,11 @@ static void halveImage_uint(GLint components, GLuint width, GLuint height,
         for (j = 0; j < newwidth; j++) {
             for (k = 0; k < components; k++) {
                 /* need to cast to double to hold large unsigned ints */
-                GLdouble buf;
-                buf = (GLdouble)__GLU_SWAP_4_BYTES(t) +
-                      (GLdouble)__GLU_SWAP_4_BYTES(t+group_size) +
-                      (GLdouble)__GLU_SWAP_4_BYTES(t+ysize) +
-                      (GLdouble)__GLU_SWAP_4_BYTES(t+ysize+group_size);
-                s[0] = (GLuint)(buf/4 + 0.5);
+                GLdouble buf = (GLdouble)__GLU_SWAP_4_BYTES(t) +
+                               (GLdouble)__GLU_SWAP_4_BYTES(t+group_size) +
+                               (GLdouble)__GLU_SWAP_4_BYTES(t+ysize) +
+                               (GLdouble)__GLU_SWAP_4_BYTES(t+ysize+group_size);
+                s[0] = (GLuint)(buf/4.0 + 0.5);
 
                 s++; t += element_size;
             }

src/osgAnimation/Animation.cpp

@@ -107,7 +107,13 @@ bool Animation::update (double time, int priority)
     {
     case ONCE:
         if (t > _originalDuration)
+        {
+            for (ChannelList::const_iterator chan = _channels.begin();
+                     chan != _channels.end(); ++chan)
+                (*chan)->update(_originalDuration, _weight, priority);
+
             return false;
+        }
         break;
     case STAY:
         if (t > _originalDuration)

src/osgAnimation/LinkVisitor.cpp

@@ -41,7 +41,7 @@ void LinkVisitor::link(AnimationUpdateCallbackBase* cb)
         result += cb->link(_animations[i].get());
         _nbLinkedTarget += result;
     }
-    OSG_NOTICE << "LinkVisitor links " << result << " for \"" << cb->getName() << '"' << std::endl;
+    OSG_DEBUG << "LinkVisitor links " << result << " for \"" << cb->getName() << '"' << std::endl;
 }
 
 void LinkVisitor::handle_stateset(osg::StateSet* stateset)

src/osgAnimation/RigGeometry.cpp

@@ -109,7 +109,7 @@ void RigGeometry::buildVertexInfluenceSet()
 
     _vertexInfluenceSet.buildVertex2BoneList();
     _vertexInfluenceSet.buildUniqVertexSetToBoneSetList();
-    OSG_NOTICE << "uniq groups " << _vertexInfluenceSet.getUniqVertexSetToBoneSetList().size() << " for " << getName() << std::endl;
+    OSG_DEBUG << "uniq groups " << _vertexInfluenceSet.getUniqVertexSetToBoneSetList().size() << " for " << getName() << std::endl;
 }
 
 void RigGeometry::computeMatrixFromRootSkeleton()

src/osgAnimation/RigTransformHardware.cpp

@@ -152,7 +152,7 @@ RigTransformHardware::BoneWeightAttribList RigTransformHardware::createVertexAtt
     arrayList.resize(nbArray);
     for (int i = 0; i < nbArray; i++)
     {
-        osg::ref_ptr<osg::Vec4Array> array = new osg::Vec4Array;
+        osg::ref_ptr<osg::Vec4Array> array = new osg::Vec4Array(osg::Array::BIND_PER_VERTEX);
         arrayList[i] = array;
         int nbVertexes = getNumVertexes();
         array->resize(nbVertexes);

src/osgAnimation/StackedTransform.cpp

@@ -18,8 +18,7 @@ using namespace osgAnimation;
 
 StackedTransform::StackedTransform() {}
 
-StackedTransform::StackedTransform(const StackedTransform& rhs, const osg::CopyOp& co):
-    osg::MixinVector<osg::ref_ptr<StackedTransformElement> >(rhs)
+StackedTransform::StackedTransform(const StackedTransform& rhs, const osg::CopyOp& co)
 {
     reserve(rhs.size());
     for (StackedTransform::const_iterator it = rhs.begin(); it != rhs.end(); ++it)

src/osgDB/CMakeLists.txt

@@ -7,7 +7,7 @@ IF   (DYNAMIC_OPENSCENEGRAPH)
 
     IF(OSG_PLUGIN_SEARCH_INSTALL_DIR_FOR_PLUGINS)
         # Add a default plugin search path component
-        ADD_DEFINITIONS(-DOSG_DEFAULT_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib${LIB_POSTFIX}/${OSG_PLUGINS})
+        ADD_DEFINITIONS(-DOSG_DEFAULT_LIBRARY_PATH=\"${CMAKE_INSTALL_PREFIX}/lib${LIB_POSTFIX}/${OSG_PLUGINS}\")
     ENDIF()
 
     # Set the library extension according to what configuration is being built.
@@ -124,7 +124,7 @@ SET(TARGET_SRC
 IF(APPLE AND NOT ANDROID) 
     IF(NOT OSG_BUILD_PLATFORM_IPHONE AND NOT OSG_BUILD_PLATFORM_IPHONE_SIMULATOR)
         # Needs CoreFoundation calls and a Carbon function
-        SET(OSGDB_PLATFORM_SPECIFIC_LIBRARIES ${CARBON_LIBRARY})
+        SET(OSGDB_PLATFORM_SPECIFIC_LIBRARIES ${CARBON_LIBRARY} ${COCOA_LIBRARY})
     ENDIF()
  
     IF(OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX STREQUAL "quicktime")

src/osgDB/FileUtils.cpp

@@ -209,8 +209,13 @@ bool osgDB::makeDirectory( const std::string &path )
         if( mkdir( dir.c_str(), 0755 )< 0 )
 #endif
         {
-            OSG_DEBUG << "osgDB::makeDirectory(): "  << strerror(errno) << std::endl;
-            return false;
+            // Only return an error if the directory actually doesn't exist.  It's possible that the directory was created
+            // by another thread or process
+            if (!osgDB::fileExists(dir))
+            {
+                OSG_DEBUG << "osgDB::makeDirectory(): "  << strerror(errno) << std::endl;
+                return false;
+            }
         }
         paths.pop();
     }
@@ -500,7 +505,7 @@ static void appendInstallationLibraryFilePaths(osgDB::FilePathList& filepath)
 #ifdef OSG_DEFAULT_LIBRARY_PATH
 
     // Append the install prefix path to the library search path if configured
-    filepath.push_back(ADDQUOTES(OSG_DEFAULT_LIBRARY_PATH));
+    filepath.push_back(OSG_DEFAULT_LIBRARY_PATH);
 #endif
 }
 

src/osgDB/InputStream.cpp

@@ -639,7 +639,7 @@ osg::Image* InputStream::readImage(bool readFromExternal)
                 image = new osg::Image;
                 image->setOrigin( (osg::Image::Origin)origin );
                 image->setImage( s, t, r, internalFormat, pixelFormat, dataType,
-                    (unsigned char*)data, (osg::Image::AllocationMode)mode, packing );
+                    (unsigned char*)data, osg::Image::USE_NEW_DELETE, packing );
             }
 
             // _mipmapData

src/osgDB/ObjectWrapper.cpp

@@ -379,6 +379,9 @@ ObjectWrapperManager::ObjectWrapperManager()
     glTable.add( "GL_LIGHT6", GL_LIGHT6 );
     glTable.add( "GL_LIGHT7", GL_LIGHT7 );
 
+    glTable.add("GL_VERTEX_PROGRAM_POINT_SIZE", GL_VERTEX_PROGRAM_POINT_SIZE);
+    glTable.add("GL_VERTEX_PROGRAM_TWO_SIDE", GL_VERTEX_PROGRAM_TWO_SIDE);
+
     // Functions
     glTable.add( "NEVER", GL_NEVER );
     glTable.add( "LESS", GL_LESS );

src/osgDB/OutputStream.cpp

@@ -19,6 +19,7 @@
 #include <osgDB/ObjectWrapper>
 #include <fstream>
 #include <sstream>
+#include <stdlib.h>
 
 using namespace osgDB;
 

src/osgDB/Registry.cpp

@@ -414,7 +414,7 @@ Registry::Registry()
     addFileExtensionAlias("cid",    "freetype");  // Postscript CID-Fonts
     addFileExtensionAlias("cff",    "freetype");  // OpenType
     addFileExtensionAlias("cef",    "freetype");  // OpenType
-    addFileExtensionAlias("fon",    "freetype");  // Windows bitmap fonts
+    addFileExtensionAlias("fon",    "freetype");  // Windows bitmap fonts
     addFileExtensionAlias("fnt",    "freetype");  // Windows bitmap fonts
     addFileExtensionAlias("text3d", "freetype"); // use 3D Font instead of 2D Font
 
@@ -1040,7 +1040,7 @@ std::string Registry::findDataFileImplementation(const std::string& filename, co
 
         if(fileExists(simpleFileName))
         {
-            OSG_DEBUG << "FindFileInPath(" << filename << "): returning " << filename << std::endl;
+            OSG_DEBUG << "FindFileInPath(" << filename << "): returning " << simpleFileName << std::endl;
             return simpleFileName;
         }
 
@@ -1249,9 +1249,21 @@ ReaderWriter::ReadResult Registry::readImplementation(const ReadFunctor& readFun
         ReaderWriter::ReadResult rr = read(readFunctor);
         if (rr.validObject())
         {
-            // update cache with new entry.
-            OSG_INFO<<"Adding to object cache "<<file<<std::endl;
-            addEntryToObjectCache(file,rr.getObject());
+            // search AGAIN for entry in the object cache.
+            {
+                OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_objectCacheMutex);
+                ObjectCache::iterator oitr = _objectCache.find(file);
+                if (oitr != _objectCache.end())
+                {
+                    OSG_INFO << "returning cached instanced of " << file << std::endl;
+                    if (readFunctor.isValid(oitr->second.first.get())) return ReaderWriter::ReadResult(oitr->second.first.get(), ReaderWriter::ReadResult::FILE_LOADED_FROM_CACHE);
+                    else return ReaderWriter::ReadResult("Error file does not contain an osg::Object");
+                }
+                // update cache with new entry.
+                OSG_INFO<<"Adding to object cache "<<file<<std::endl;
+                //addEntryToObjectCache(file,rr.getObject()); //copy implementation: we already have the _objectCacheMutex lock
+                _objectCache[file] = ObjectTimeStampPair(rr.getObject(), 0.0);
+            }
         }
         else
         {

src/osgDB/XmlParser.cpp

@@ -49,10 +49,12 @@ std::string osgDB::trimEnclosingSpaces(const std::string& str)
 {
     if (str.empty()) return str;
 
-    std::string::size_type start = str.find_first_not_of(' ');
+    const std::string whitespaces(" \t\f\v\n\r");
+
+    std::string::size_type start = str.find_first_not_of(whitespaces);
     if (start==std::string::npos) return std::string();
 
-    std::string::size_type end = str.find_last_not_of(' ');
+    std::string::size_type end = str.find_last_not_of(whitespaces);
     if (end==std::string::npos) return std::string();
 
     return std::string(str, start, (end-start)+1);

src/osgGA/NodeTrackerManipulator.cpp

@@ -275,7 +275,7 @@ bool NodeTrackerManipulator::performMovementLeftMouseButton( const double eventT
     } else
         rotateTrackball( _ga_t0->getXnormalized(), _ga_t0->getYnormalized(),
                          _ga_t1->getXnormalized(), _ga_t1->getYnormalized(),
-                         _thrown ? float( _delta_frame_time / eventTimeDelta ) : 1.f );
+                         getThrowScale( eventTimeDelta ) );
 
     return true;
 }

src/osgGA/OrbitManipulator.cpp

@@ -379,12 +379,12 @@ void OrbitManipulator::OrbitAnimationData::start( const osg::Vec3d& movement, co
     Scale parameter is useful, for example, when manipulator is thrown.
     It scales the amount of rotation based, for example, on the current frame time.*/
 void OrbitManipulator::rotateTrackball( const float px0, const float py0,
-                                        const float px1, const float py1, const float /*scale*/ )
+                                        const float px1, const float py1, const float scale )
 {
     osg::Vec3d axis;
     float angle;
 
-    trackball( axis, angle, px1, py1, px0, py0 );
+    trackball( axis, angle, px0 + (px1-px0)*scale, py0 + (py1-py0)*scale, px0, py0 );
 
     Quat new_rotate;
     new_rotate.makeRotate( angle, axis );

src/osgGA/StandardManipulator.cpp

@@ -154,6 +154,8 @@ bool StandardManipulator::isAnimating() const
 /// Finishes the animation by performing a step that moves it to its final position.
 void StandardManipulator::finishAnimation()
 {
+    _thrown = false;
+
     if( !isAnimating() )
         return;
 
@@ -586,7 +588,12 @@ void StandardManipulator::setAllowThrow( bool allowThrow )
     events that started the animation.*/
 float StandardManipulator::getThrowScale( const double eventTimeDelta ) const
 {
-    if( _thrown )  return float( _delta_frame_time / eventTimeDelta );
+    if( _thrown )
+    {
+        if (eventTimeDelta == 0.f)
+            return 0.f;
+        return float( _delta_frame_time / eventTimeDelta );
+    }
     else  return 1.f;
 }
 

src/osgPlugins/3ds/ReaderWriter3DS.cpp

@@ -31,6 +31,7 @@
 #include <map>
 #include <iostream>
 #include <sstream>
+#include <limits>
 #include <assert.h>
 
 using namespace std;
@@ -238,6 +239,7 @@ ReaderWriter3DS::ReaderWriter3DS()
     //supportsOption("OutputTextureFiles","Write out the texture images to file");
     //supportsOption("flipTexture", "flip texture upside-down");
     supportsOption("extended3dsFilePaths", "(Write option) Keeps long texture filenames (not 8.3) when exporting 3DS, but can lead to compatibility problems.");
+    supportsOption("preserveMaterialNames", "(Write option) Preserve original material names, up to 64 characters. This can lead to compatibility problems.");
     supportsOption("noMatrixTransforms", "(Read option) Set the plugin to apply matrices into the mesh vertices (\"old behaviour\") instead of restoring them (\"new behaviour\"). You may use this option to avoid a few rounding errors.");
     supportsOption("checkForEspilonIdentityMatrices", "(Read option) If not set, then consider \"almost identity\" matrices to be identity ones (in case of rounding errors).");
     supportsOption("restoreMatrixTransformsNoMeshes", "(Read option) Makes an exception to the behaviour when 'noMatrixTransforms' is not set for mesh instances. When a mesh instance has a transform on it, the reader creates a MatrixTransform above the Geode. If you don't want the hierarchy to be modified, then you can use this option to merge the transform into vertices.");
@@ -863,7 +865,7 @@ struct RemappedFace
 {
     Lib3dsFace* face;        // Original face definition.
     osg::Vec3f normal;
-    unsigned short index[3]; // Indices to OSG vertex/normal/texcoord arrays.
+    unsigned int index[3];   // Indices to OSG vertex/normal/texcoord arrays.
 };
 
 struct VertexParams
@@ -883,6 +885,14 @@ static bool isFaceValid(const Lib3dsMesh* mesh, const Lib3dsFace* face)
         face->index[2] < mesh->nvertices;
 }
 
+bool isNumber(float x)
+{
+    // This looks like it should always be true,
+    // but it's false if x is a NaN.
+    return (x == x);
+}
+
+
 /* ChrisD: addVertex handles the averaging of normals and spltting of vertices
    required to implement normals for smoothing groups. When a shared
    vertex is encountered when smoothing is required, normals are added
@@ -895,7 +905,7 @@ static bool isFaceValid(const Lib3dsMesh* mesh, const Lib3dsFace* face)
 static void addVertex(
     const Lib3dsMesh* mesh,
     RemappedFace& remappedFace,
-    unsigned short int i,
+    unsigned int i,
     osg::Geometry* geometry,
     std::vector<int>& origToNewMapping,
     std::vector<int>& splitVertexChain,
@@ -905,7 +915,7 @@ static void addVertex(
     osg::Vec3Array* normals = (osg::Vec3Array*)geometry->getNormalArray();
     osg::Vec2Array* texCoords = (osg::Vec2Array*)geometry->getTexCoordArray(0);
 
-    unsigned short int index = remappedFace.face->index[i];
+    unsigned int index = remappedFace.face->index[i];
     if (origToNewMapping[index] == -1)
     {
         int newIndex = vertices->size();
@@ -926,6 +936,10 @@ static void addVertex(
             osg::Vec2f texCoord(mesh->texcos[index][0], mesh->texcos[index][1]);
             texCoord = componentMultiply(texCoord, params.scaleUV);
             texCoord += params.offsetUV;
+            if (!isNumber(texCoord.x()) || !isNumber(texCoord.y())) {
+                OSG_WARN << "NaN found in texcoord" << std::endl;
+                texCoord.set(0,0);
+            }
             texCoords->push_back(texCoord);
         }
 
@@ -1002,6 +1016,25 @@ static bool addFace(
     }
 }
 
+template <typename Prim>
+void fillTriangles(osg::Geometry & geom, const std::vector<RemappedFace> & remappedFaces, unsigned int numIndices) {
+    //if (m->nvertices < std::numeric_limits<unsigned short>::max()) {
+    osg::ref_ptr<Prim> elements( new Prim(osg::PrimitiveSet::TRIANGLES, numIndices) );
+    typename Prim::iterator index_itr( elements->begin() );
+    for (unsigned int i = 0; i < remappedFaces.size(); ++i)
+    {
+        const RemappedFace& remappedFace = remappedFaces[i];
+        if (remappedFace.face != NULL)
+        {
+            *(index_itr++) = remappedFace.index[0];
+            *(index_itr++) = remappedFace.index[1];
+            *(index_itr++) = remappedFace.index[2];
+        }
+    }
+    geom.addPrimitiveSet(elements.get());
+}
+
+
 /**
 use matrix to pretransform geometry, or NULL to do nothing
 */
@@ -1058,21 +1091,27 @@ osg::Drawable* ReaderWriter3DS::ReaderObject::createDrawable(Lib3dsMesh *m,FaceL
 
     unsigned int faceIndex = 0;
     unsigned int faceCount = 0;
+    unsigned int maxVertexIndex = 0;
     for (FaceList::iterator itr = faceList.begin();
         itr != faceList.end();
         ++itr, ++faceIndex)
     {
-        osg::Vec3 normal = copyLib3dsVec3ToOsgVec3(normals[*itr]);
+        osg::Vec3f normal(copyLib3dsVec3ToOsgVec3(normals[*itr]));
         if (matrix) normal = osg::Matrix::transform3x3(normal, *(params.matrix));
         normal.normalize();
 
         Lib3dsFace& face = m->faces[*itr];
-        remappedFaces[faceIndex].face = &face;
-        remappedFaces[faceIndex].normal = normal;
-        if (addFace(m, remappedFaces[faceIndex], geom, origToNewMapping, splitVertexChain, params))
+        RemappedFace & rf = remappedFaces[faceIndex];
+        rf.face = &face;
+        rf.normal = normal;
+        if (addFace(m, rf, geom, origToNewMapping, splitVertexChain, params))
         {
             ++faceCount;
         }
+        // Get the highest index
+        maxVertexIndex = osg::maximum(maxVertexIndex, rf.index[0]);
+        maxVertexIndex = osg::maximum(maxVertexIndex, rf.index[1]);
+        maxVertexIndex = osg::maximum(maxVertexIndex, rf.index[2]);
     }
 
     // 'Shrink to fit' all vertex arrays because potentially faceList refers to fewer vertices than the whole mesh.
@@ -1087,23 +1126,12 @@ osg::Drawable* ReaderWriter3DS::ReaderObject::createDrawable(Lib3dsMesh *m,FaceL
     geom->setColorArray(osg_colors.get(), osg::Array::BIND_OVERALL);
 
     // Create triangle primitives.
-    int numIndices = faceCount * 3;
-    osg::ref_ptr<DrawElementsUShort> elements = new osg::DrawElementsUShort(osg::PrimitiveSet::TRIANGLES, numIndices);
-    DrawElementsUShort::iterator index_itr = elements->begin();
-
-    for (unsigned int i = 0; i < remappedFaces.size(); ++i)
-    {
-        RemappedFace& remappedFace = remappedFaces[i];
-        if (remappedFace.face != NULL)
-        {
-            *(index_itr++) = remappedFace.index[0];
-            *(index_itr++) = remappedFace.index[1];
-            *(index_itr++) = remappedFace.index[2];
-        }
-    }
-
-    geom->addPrimitiveSet(elements.get());
-
+    // Remapping may create additional vertices, thus creating indices over USHORT_MAX
+    if (maxVertexIndex < std::numeric_limits<unsigned short>::max()) {
+        fillTriangles<DrawElementsUShort>(*geom, remappedFaces, faceCount * 3);
+    } else {
+        fillTriangles<DrawElementsUInt>  (*geom, remappedFaces, faceCount * 3);
+   }
 #if 0
     osgUtil::TriStripVisitor tsv;
     tsv.stripify(*geom);
@@ -1177,7 +1205,7 @@ osg::Texture2D*  ReaderWriter3DS::ReaderObject::createTexture(Lib3dsTextureMap *
         osg_texture->setImage(osg_image.get());
         osg_texture->setName(texture->name);
         // does the texture support transparancy?
-        //transparency = ((texture->flags)&LIB3DS_TEXTURE_ALPHA_SOURCE)!=0;
+        transparency = ((texture->flags)&LIB3DS_TEXTURE_ALPHA_SOURCE)!=0;
 
         // what is the wrap mode of the texture.
         osg::Texture2D::WrapMode wm = ((texture->flags)&LIB3DS_TEXTURE_NO_TILE) ?
@@ -1220,6 +1248,7 @@ ReaderWriter3DS::StateSetInfo ReaderWriter3DS::ReaderObject::createStateSet(Lib3
     osg::Texture2D* texture1_map = createTexture(&(mat->texture1_map),"texture1_map",textureTransparency);
     if (texture1_map)
     {
+        if(textureTransparency) transparency = true;
         stateset->setTextureAttributeAndModes(unit, texture1_map, osg::StateAttribute::ON);
 
         double factor = mat->texture1_map.percent;
@@ -1300,7 +1329,7 @@ ReaderWriter3DS::StateSetInfo ReaderWriter3DS::ReaderObject::createStateSet(Lib3
 
     if ((alpha < 1.0f) || transparency)
     {
-        //stateset->setAttributeAndModes(new osg::BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
+        stateset->setAttributeAndModes(new osg::BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA));
         stateset->setMode(GL_BLEND,osg::StateAttribute::ON);
         stateset->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
     }

src/osgPlugins/3ds/WriterCompareTriangle.cpp

@@ -28,15 +28,15 @@ WriterCompareTriangle::operator()(const std::pair<Triangle, int> & t1,
 }
 
 void
-WriterCompareTriangle::setMaxMin(unsigned int & nbVerticesX,
-                                 unsigned int & nbVerticesY,
-                                 unsigned int & nbVerticesZ) const
+WriterCompareTriangle::setMaxMin(int & nbVerticesX,
+                                 int & nbVerticesY,
+                                 int & nbVerticesZ) const
 {
-    static const unsigned int min = 1;
-    static const unsigned int max = 5;        // Number of blocks used to divide the scene (arbitrary but seems ok)
-    nbVerticesX = osg::clampBetween<unsigned int>(nbVerticesX, min, max);
-    nbVerticesY = osg::clampBetween<unsigned int>(nbVerticesY, min, max);
-    nbVerticesZ = osg::clampBetween<unsigned int>(nbVerticesZ, min, max);
+    static const int min = 1;
+    static const int max = 5;        // Number of blocks used to divide the scene (arbitrary but seems ok)
+    nbVerticesX = osg::clampBetween<int>(nbVerticesX, min, max);
+    nbVerticesY = osg::clampBetween<int>(nbVerticesY, min, max);
+    nbVerticesZ = osg::clampBetween<int>(nbVerticesZ, min, max);
 }
 
 void WriterCompareTriangle::cutscene(int nbVertices, const osg::BoundingBox & sceneBox)
@@ -45,9 +45,9 @@ void WriterCompareTriangle::cutscene(int nbVertices, const osg::BoundingBox & sc
 
     static const float k = 1.3f;        // Arbitrary constant multiplier for density computation ("simulates" non-uniform point distributions)
     // Computes "density" of points, and thus the number of blocks to divide the mesh into
-    unsigned int nbVerticesX = static_cast<unsigned int>( (nbVertices * k) / (length.z() * length.y()) );
-    unsigned int nbVerticesY = static_cast<unsigned int>( (nbVertices * k) / (length.z() * length.x()) );
-    unsigned int nbVerticesZ = static_cast<unsigned int>( (nbVertices * k) / (length.x() * length.y()) );
+    int nbVerticesX = static_cast<int>( (nbVertices * k) / (length.z() * length.y()) );
+    int nbVerticesY = static_cast<int>( (nbVertices * k) / (length.z() * length.x()) );
+    int nbVerticesZ = static_cast<int>( (nbVertices * k) / (length.x() * length.y()) );
 
     setMaxMin (nbVerticesX, nbVerticesY, nbVerticesZ); // This function prevent from cutting the scene in too many blocs
 
@@ -63,9 +63,9 @@ void WriterCompareTriangle::cutscene(int nbVertices, const osg::BoundingBox & sc
     boxList.reserve(nbVerticesX * nbVerticesY * nbVerticesZ);
     short yinc = 1;
     short xinc = 1;
-    unsigned int y = 0;
-    unsigned int x = 0;
-    for (unsigned int z = 0; z < nbVerticesZ; ++z)
+    int y = 0;
+    int x = 0;
+    for (int z = 0; z < nbVerticesZ; ++z)
     {
         while (x < nbVerticesX && x >= 0)
         {