Updated ChangeLog

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

.codedocs

@@ -1,11 +0,0 @@
-# CodeDocs.xyz Configuration File
-
-DOXYFILE = doc/Doxyfiles/doxyfile.cmake
-
-PROJECT_NUMBER         =
-PROJECT_LOGO           = examples/osgAndroidExampleGLES1/res/drawable-hdpi/osg.png
-INPUT                  = include
-STRIP_FROM_PATH        = include/
-HTML_FOOTER            =
-SEARCHENGINE           = YES
-

.gitignore

@@ -1,94 +0,0 @@
-doc/all_Doxyfile
-doc/auto_Doxyfile
-doc/core_Doxyfile
-doc/openscenegraph.doxyfile
-doc/openthreads.doxyfile
-
-doc/OpenSceneGraphReferenceDocs/
-doc/OpenThreadsReferenceDocs/
-
-cmake_uninstall.cmake
-
-include/OpenThreads/Config
-include/OpenThreads/Version
-include/osg/Config
-include/osg/GL
-include/osg/Version
-include/osgQt/Version
-src/osgQt/__
-
-lib/
-bin/
-
-*.pc
-*.conf
-CMakeCache.txt
-CMakeFiles
-CMakeScripts
-Makefile
-cmake_install.cmake
-install_manifest*.txt
-
-
-# Compiled Object files
-*.slo
-*.lo
-*.o
-*.obj
-
-# Precompiled Headers
-*.gch
-*.pch
-
-# Compiled Dynamic libraries
-*.so
-*.dylib
-*.dll
-
-# Fortran module files
-*.mod
-
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-*.lib
-
-# Executables
-*.exe
-*.out
-*.app
-
-# Platform Specifics - auto generated files
-PlatformSpecifics/Windows/*.rc
-
-# Visual studio - project files
-*.sln
-*.suo
-*.vcxproj
-*.vcxproj.filters
-*.vcxproj.user
-
-# Visual Studio - Build Results
-[Dd]ebug/
-[Rr]elease/
-[Mm]in[Ss]ize[Rr]el/
-[Rr]el[Ww]ith[Dd]eb[Ii]nfo/
-
-# Visual Studio - Browsing Database File
-*.sdf
-*.opensdf
-
-#osx xcode
-DerivedData/
-*.DS_Store
-*.build
-*.xcodeproj
-
-#CPACK related files
-CPackConfig-*.cmake
-_CPack_Packages/
-
-#packages
-*.tar.gz
-*.zip

.travis.yml

@@ -1,68 +0,0 @@
-env:
-  global:
-   # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
-   #   via the "travis encrypt" command using the project repo's public key
-   - secure: "0ROQiFbsZo33ce2v5VjBxNljemh/HU70ntSSPygYwaDFymubts/62SixXVkbKNIFdrs3uYD6qeA/eMmpqXxLcs+PXNq5NrH7eSWw9oDIKMhq3NQH/IZLdRfXwihHimZ1qEs/TXyWlT2aC4rpBi1py3cJeTh1aBMlz4V/nm16iRAgc596ThNTuPDHa0F9/gZnwccI/Rr9VpiYn7vEBbuY9lYr43D0G3NuuQyvvlHShroH09fh6KyFOWIY38AQtnuVGNC1fIiAUk7TUqDqSBwhIrUV5saHbP0kca6DP32REkv//h4JwM76UHv+ntVEoK/UiztJHMkrw71gXYTyvIvlDBpT+IDoeIwUW2QFNQ5zJZI7FM8k0+oeK+F7k/mkffDzr1zww/PQoxqFBF0PoxAni/L9qkA4X2o1A6mRDbe9besp2LQG6Vniwj3bHpCId2QiiMrANVg0EAqkcL2mVFEaqZsh90qCkr1UDq4WQoYbXh0Fy3UnQpbuxDvCME8u03lwuv6ds/SBxc5cgKv7oWXgezaDg7/OCR+0lIAGuLqmNRD8Xw7a0WZGmSbYCHIZmeyFja2KuUvMiVCt8+QsyZr3e523DwBwnSj1BIYFRstMaSEJgu9B8rfTRRllOOKJXCQtdFVuGu8VI6PniSAkI6c535yOWzsuS8HwIkN2ll+Wn7E="
-
-language: cpp
-cache: ccache
-
-matrix:
-  fast_finish: true
-  include:
-    #Linux build
-    - os: linux
-      dist: trusty
-      language: cpp
-      env:
-          - CMAKECMD_ARGS="-DBUILD_OSG_EXAMPLES=ON -DBUILD_OSG_PLUGINS_BY_DEFAULT=ON -DBUILD_OSG_APPLICATIONS=ON"
-         # - CMAKECMD_ARGS="-DBUILD_OSG_EXAMPLES=OFF -DBUILD_OSG_PLUGINS_BY_DEFAULT=ON -DBUILD_OSG_APPLICATIONS=ON"
-         #- LLVM_VERSION=3.8
-      sudo: false
-      cache:
-        apt: true
-        ccache: true
-      compiler:
-          #- clang
-          - gcc
-      addons:
-        coverity_scan:
-          project:
-            name: "openscenegraph/OpenSceneGraph"
-            description: "OpenSceneGraph build"
-          notification_email: robert@openscenegraph.com
-          build_command_prepend: "cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_OSG_DEPRECATED_SERIALIZERS=OFF -DBUILD_OSG_EXAMPLES=OFF ."
-          build_command:   "make -j 4"
-          branch_pattern: coverity_scan
-        apt:
-          sources:
-            #- llvm-toolchain-precise-3.8
-            - ubuntu-toolchain-r-test
-          packages:
-            #- clang-3.8
-            - g++
-            - cmake
-
-#    # OSX build
-#    - os: osx
-#      before_install:
-#         - brew update
-#      install:
-#         - brew install ccache
-#         - export PATH="/usr/local/opt/ccache/libexec:$PATH"
-#      env:
-#         - CMAKECMD_ARGS="-DBUILD_OSG_EXAMPLES=OFF -DBUILD_OSG_PLUGINS_BY_DEFAULT=ON -DBUILD_OSG_APPLICATIONS=ON"
-#
-#
-#    - os: osx
-#      before_install:
-#         - brew update
-#      install:
-#         - brew install ccache
-#         - export PATH="/usr/local/opt/ccache/libexec:$PATH"
-#      env:
-#         - CMAKECMD_ARGS="-DBUILD_OSG_EXAMPLES=ON -DBUILD_OSG_PLUGINS_BY_DEFAULT=OFF -DBUILD_OSG_APPLICATIONS=OFF  -DBUILD_OSG_DEPRECATED_SERIALIZERS=OFF"
-
-script:
-    - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then mkdir build && cd build && travis_wait 60 cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../product $CMAKECMD_ARGS ../ ; fi
-    - if [ -f CMakeCache.txt ]; then make -j4 ; fi

AUTHORS.txt

@@ -1,6 +1,6 @@
-OpenSceneGraph Library 3.6.0
+OpenSceneGraph Library 3.4.0
 
-568 Contributors:
+550 Contributors:
 
 Firstname Surname
 -----------------
@@ -8,7 +8,6 @@ Robert Osfield
 Don Burns
 Stephan Huber
 Paul Martz
-Laurens Voerman
 Farshid Lashkari
 Mathias Fr<46>hlich
 Marco Jez
@@ -21,25 +20,25 @@ Eric Wing
 Cedric Pinson
 Brede Johansen
 Bob Kuehne
-Wojciech Lewandowski
 Michael Platings
 Geoff Michel
+Wojciech Lewandowski
 Eric Sokolowsky
 David Callu
+Laurens Voerman
 Colin McDonald
 Trajce Nikolov
 Tim Moore
 Martin Lavery
 Mattias Helsing
-Jannik Heller
-Jason Beverage
 Tree
+Jason Beverage
 Pjotr Svetachov
 Luigi Calori
-Alberto Luaces
 Mike Wittman
 Jan Peciva
 Chris Hanson
+Alberto Luaces
 Roland Smeenk
 Roger James
 Jeremy Moles
@@ -49,10 +48,8 @@ Magnus Kessler
 David Fries
 Tom Jolley
 Paul Melis
-Jordi Torres
 Luc Frauciel
 Aurelien Albert
-Torben Dannhauer
 Pavel Moloshtan
 Brad Christiansen
 Terry Welsh
@@ -64,21 +61,23 @@ Art Tevs
 Philip Lowman
 Per Fahlberg
 Norman Vine
+Jannik Heller
 Chris Denham
-Sherman Wilcox
 Serge Lages
 Romano Jos<6F> Magacho da Silva
-Mourad Boufarguine
 Alberto Farre
+Torben Dannhauer
+Sherman Wilcox
+Robert Michael
+Mourad Boufarguine
 Glenn Waldron
 Andr<EFBFBD> Garneau
 Adrian Egli
-Sebastian Messerschmidt
-Randall Hopper
-Kristofer Tingdahl
-Jan Ciger
 Ruben Lopez
-Robert Michael
+Randall Hopper
+Jan Ciger
+Sebastian Messerschmidt
+Kristofer Tingdahl
 Gideon May
 Don Tidrow
 Stephane Lamoliatte
@@ -88,21 +87,21 @@ Joakim Simonsson
 David Spilling
 Daniel Sj<53>lie
 Bryan Thrall
-Andreas Ekstrand
 Rafa Gaitan
 Mike Connell
-Konstantin Matveyev
 Fabien Lavignotte
+Andreas Ekstrand
 Thomas Hogarth
 Riccardo Corsi
 Melchior Franz
+Konstantin Matveyev
 Johannes Baeuerle
-Ravi Mathur
 Neil Hughes
 Martin Beckett
 Marc Helbling
 Joran Jessurun
 Gino van den Bergen
+Frederic Marmond
 David Guthrie
 Csaba Halasz
 Cory Riddell
@@ -112,32 +111,30 @@ Yefei He
 Sondra Iverson
 Simon Julier
 Rune Schmidt Jensen
-Ralf Habacker
 Rainer Oder
 Nico Kruithof
 Martin Aumueller
 Mario Valle
 Lukasz Izdebski
 Jorge Izquierdo Ciges
+Jordi Torres
 Gordon Tomlinson
-Frederic Marmond
 Frederic Bouvier
 Carlo Camporesi
-Bj<EFBFBD>rn Blissing
+Ben Discoe
 Alexander Sinditskiy
-Vladimir Chebaev
 Thibault Genessay
 Sasa Bistrovic
-Raymond de Vries
+Ravi Mathur
+Ralf Habacker
 Neil Groves
 Mikhail Izmestev
 Markus Trenkwalder
 Loic Dachary
 Joseph Steel
 John Shue
-Hartwig Wiesmann
 Brad Colbert
-Ben Discoe
+Bj<EFBFBD>rn Blissing
 Vivek Rajan
 Uwe Woessner
 Tony Horrobin
@@ -157,20 +154,20 @@ Martins Innus
 Maciej Krol
 Lilin Xiong
 Leandro Motta Barros
-Julien Valentin
 Johan Nouvel
 Javier Taibo
+Hartwig Wiesmann
 Donn Mielcarek
 Corbin Holtz
 Blasius Czink
 Alexander Irion
-Wee See
 Toshiyuki Takahei
 Sebastien Grignard
 Rudolf Wiedemann
 Maria Ten
 Liang Aibin
 Katharina Plugge
+Julien Valentin
 John Vidar Larring
 John Kelso
 John Ivar
@@ -185,8 +182,10 @@ Bradley Anderegg
 Andreas Goebel
 Alok Priyadarshi
 Ali Botorabi
+Alberto Barbati
 Alan Dickinson
 Vladimir Shabanov
+Vladimir Chebaev
 Tugkan Calapoglu
 Tim Daoust
 Sylvain Marie
@@ -197,10 +196,8 @@ Ryan Pavlik
 Robert Milharcic
 Rene Molenaar
 Piotr Domagalski
-Philippe Renon
 Phil Atkin
 Pawel Ksiezopolski
-Patrick Neary
 Nathan Monteleone
 Miha Rav<61>elj
 Miguel Escriva
@@ -242,9 +239,9 @@ Andreas Henne
 Anders Backman
 Alexander Wiebel
 Alessandro Terenzi
-Alberto Barbati
 Zach Deedler
 Yuzhong Shen
+Wee See
 Warren Macchi
 Vincent Bourdier
 Terrex
@@ -255,12 +252,15 @@ Stephan Eilemann
 Stanislav Blinov
 Sergey Polischuk
 Roni Zanolli
+Raymond de Vries
 Ralf Kern
 Piotr Gwiazdowski
 Pierre Haritchabalet
+Philippe Renon
 Perry Miller
 Paul Palumbo
 Paul Obermeier
+Patrick Neary
 Nguyen Van Truong
 Nathan Cournia
 Morten Haukness
@@ -268,6 +268,7 @@ Morn
 Michael Mc Donnell
 Michael Henheffer
 Michael Guerrero
+Maya Leonard
 Max Bandazian
 Mathias Fiedler
 Mathew May
@@ -301,6 +302,7 @@ Giampaolo Vigan
 Gerrick Bivins
 George Tarantilis
 Ferdi Smit
+Eric Buehler
 Eduardo Poyart
 Edgar Ellis
 Dmitry Marakasov
@@ -316,7 +318,6 @@ Christian Kehl
 Bradley Baker Searles
 Brad Anderegg
 Aric Aumann
-Anish Thomas
 Andrew Sampson
 Andrew Lorino
 Alexandre Amalric
@@ -339,8 +340,6 @@ Valeriy Dubov
 Vaclav Bilek
 Tyge L<>vset
 Troy Yee
-Torben Dannahauer
-Tony Vasile
 Tomas Hogarth
 Tomas Hnilica
 Todd Furlong
@@ -362,14 +361,11 @@ Shuxing Xiao
 Shane Arnott
 Sergey Kurdakov
 Sebastien Kuntz
-Sandro Mani
 Ruth Lang
-Ruben The
 Ruben Smelik
 Ross Anderson
 Ronny Krueger
 Ronald van Maarseveen
-Romain Ouabdelkader
 Romain Charbit
 Rocco Martino
 Robert Swain
@@ -406,16 +402,13 @@ Orhun Birsoy
 Oren Fromberg
 Oliver Neumann
 Ole-Morten Duesund
-Ognjen Kostic
 Nicolas Brodu
-Nick Thu
 Nick Black
 Mojtaba Fathi
 Mirko Viviani
 Mikkel Gj<47>l
 Mike Krus
 Mike Garrity
-Mick Thu
 Michal Durkovic
 Michael Schanne
 Michael Polak
@@ -423,8 +416,6 @@ Michael Morrison
 Michael Logan
 Michael Kapelko
 Michael Bach Jensen
-Maya Thu
-Maya Leonard
 Max Rhiener
 Max Behensky
 Mauricio Hofmam
@@ -441,9 +432,9 @@ Martin Beck
 Marius Kintel
 Mario Guimaraes
 Marcus Hein
-Marco Thu
 Marco Sciabica
 Marco Lehmann
+Maik Keller
 Lukas Diduch
 Louis Hamilton
 Likasz Izebski
@@ -465,14 +456,11 @@ Juan Hernando
 Josh Portway
 Jonathan Greig
 John Tan
-John Hedström
 John Grant
-John Farrier
 John Donovan
 John Davis
 John Cummings
 John Argentieri
-Joe Thompson
 Joan Abadie
 Jim Brooks
 Jeroen den Dekker
@@ -493,7 +481,6 @@ Gregory Jaegy
 Graeme Harkness
 Gian Lorenzetto
 George Papagiannakis
-Geoff Thu
 Galen Faidley
 Frida Schlaug
 Frederic Smith
@@ -508,8 +495,6 @@ Ferdinand Cornelissen
 Fajran Iman
 Fabien Dachicourt
 Erik Johnson
-Eric Thu
-Eric Buehler
 Eduardo Alberto
 Edmond Gheury
 Ed Ralston
@@ -525,7 +510,6 @@ Daniel Stien
 Dan Minor
 C<EFBFBD>sar L. B. Silveira
 Cyril Brulebois
-Curtis Rubel
 Cory Slep
 Cl<EFBFBD>ment B<>sch
 Clay Fowler
@@ -538,13 +522,12 @@ Christian Noon
 Christian Kaser
 Christian Ehrlicher
 Chris McGlone
-Chris Djali
 Carlos Garcea
 Bryce Eldridge
 Bruno Herbelin
 Brian Keener
-Brede Thu
 Brandon Hamm
+Bora Utka
 Bill Prendergast
 Bernardt Duvenhage
 Benoit Laniel
@@ -554,7 +537,7 @@ Bart Gallet
 Axel Volley
 Arjun Ramamurthy
 Anthousis Andreadis
-Anna Sokol
+Anish Thomas
 Andy Preece
 Andrew Reyonolds
 Andreas Roth
@@ -571,4 +554,3 @@ Alan Harris
 Adrien Grandemange
 Adrian Clark
 Adam Richard
-Abhishek Bansal

CMakeLists.txt

@@ -1,19 +1,15 @@
-#
-# OpenSceneGraph CMake build file
-#
-SET(OPENSCENEGRAPH_MAJOR_VERSION 3)
-SET(OPENSCENEGRAPH_MINOR_VERSION 6)
-SET(OPENSCENEGRAPH_PATCH_VERSION 0)
-SET(OPENSCENEGRAPH_SOVERSION 156)
-
-
-# set to 0 when not a release candidate, non zero means that any generated
-# git tags will be treated as release candidates of given number
-SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 0)
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
+IF(WIN32)
+    CMAKE_MINIMUM_REQUIRED(VERSION 2.4.6 FATAL_ERROR)
+ELSE(WIN32)
+    IF(APPLE)
+        CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
+    ELSE(APPLE)
+        CMAKE_MINIMUM_REQUIRED(VERSION 2.4.4 FATAL_ERROR)
+    ENDIF(APPLE)
+ENDIF(WIN32)
 
 if(COMMAND cmake_policy)
     # Works around warnings libraries linked against that don't
@@ -40,6 +36,12 @@ if(COMMAND cmake_policy)
         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} 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)
@@ -47,84 +49,17 @@ if(COMMAND cmake_policy)
 
 endif()
 
-IF(APPLE)
-  # Get OSX version in MAJOR.MINOR format
-  EXECUTE_PROCESS(COMMAND sw_vers -productVersion
-    OUTPUT_VARIABLE OSG_OSX_VERSION
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-  STRING(REGEX REPLACE "^([0-9]+\\.[0-9]+).*$" "\\1"
-    OSG_OSX_VERSION "${OSG_OSX_VERSION}")
-ENDIF()
-
-# Set OSX architecture flags here, since they must be specified before
-# creating the actual OSG project.
-# Note that the CMAKE_OSX_* variables are not well documented in
-# CMake 2.8, but they do officially exist.
-# See https://cmake.org/Bug/view.php?id=14695#c34953
-# Additionally, OSG_WINDOWING_SYSTEM is set here for OSX since its
-# value is needed to find the correct version of OpenGL (X11 or Cocoa).
-IF(APPLE AND NOT ANDROID)
-
-  # Here we check if the user specified IPhone SDK
-  # These options are formally defined later, but can also be specified
-  # by the user at the command line using the cmake -D switch
-  # Note that FORCE is used since the user will likely enable IPhone
-  # build via CMake GUI after already having configured once
-  IF(OSG_BUILD_PLATFORM_IPHONE OR OSG_BUILD_PLATFORM_IPHONE_SIMULATOR)
-    SET(OSG_WINDOWING_SYSTEM "IOS" CACHE STRING "Windowing system type for graphics window creation, options only IOS.")
-
-    #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)
-      IF(${IPHONE_VERSION_MIN} LESS "7.0")
-        SET(CMAKE_OSX_ARCHITECTURES "armv6;armv7" CACHE STRING "Build architectures for iOS" FORCE)
-      ELSE()
-        SET(CMAKE_OSX_ARCHITECTURES "armv7;armv7s;arm64" CACHE STRING "Build architectures for iOS" FORCE)
-      ENDIF()
-
-    ELSE()
-      #simulator uses i386 and x86_64 architectures
-      SET(CMAKE_OSX_ARCHITECTURES "i386;x86_64" CACHE STRING "Build architectures for iOS Simulator" FORCE)
-    ENDIF()
-
-    #here we set the specific iphone sdk version. We can only set either device or simulator sdk. So if you want both you currently have to have two separate projects
-    SET(CMAKE_OSX_SYSROOT "${IPHONE_SDKROOT}" CACHE STRING "System root for iOS" FORCE)
-
-  ELSE()
-    # OSX >= 10.5 uses Cocoa windowing system, otherwise Carbon
-    IF(OSG_OSX_VERSION VERSION_LESS 10.5)
-      SET(OSG_WINDOWING_SYSTEM "Carbon" CACHE STRING "Windowing system type for graphics window creation, options Carbon, Cocoa or X11.")
-    ELSE()
-      SET(OSG_WINDOWING_SYSTEM "Cocoa" CACHE STRING "Windowing system type for graphics window creation, options Carbon, Cocoa or X11.")
-    ENDIF()
-
-    # Set defaults for Universal Binaries. We want 32-bit Intel/PPC on 10.4
-    # and 32/64-bit Intel/PPC on >= 10.5. Anything <= 10.3 doesn't support.
-    # These are set the first time CMake is run, and can be changed by
-    # the user at any time.
-    IF(OSG_OSX_VERSION VERSION_GREATER 10.7)
-      # 64 Bit Works, i386,ppc is not supported any more
-      SET(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "Build architectures for OSX")
-      SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.8" CACHE STRING "Target OSX version")
-    ELSEIF(OSG_OSX_VERSION VERSION_EQUAL 10.7)
-      # 64 Bit Works, PPC is not supported any more
-      SET(CMAKE_OSX_ARCHITECTURES "i386;x86_64" CACHE STRING "Build architectures for OSX")
-    ELSEIF(OSG_OSX_VERSION VERSION_GREATER 10.4)
-      # 64-bit compiles are not supported with Carbon.
-      SET(CMAKE_OSX_ARCHITECTURES "ppc;i386" CACHE STRING "Build architectures for OSX")
-      SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "Target OSX version")
-    ELSEIF(OSG_OSX_VERSION VERSION_EQUAL 10.4)
-      # 64-bit compiles are not supported with Carbon.
-      SET(CMAKE_OSX_ARCHITECTURES "ppc;i386" CACHE STRING "Build architectures for OSX")
-    ELSE()
-      # No Universal Binary support and SDK detection is too unreliable.
-      # Warn user and continue at their own peril.
-      MESSAGE(WARNING "OSX 10.3 and earlier not supported.")
-    ENDIF()
-  ENDIF()
-ENDIF()
-
 PROJECT(OpenSceneGraph)
 
+SET(OPENSCENEGRAPH_MAJOR_VERSION 3)
+SET(OPENSCENEGRAPH_MINOR_VERSION 4)
+SET(OPENSCENEGRAPH_PATCH_VERSION 0)
+SET(OPENSCENEGRAPH_SOVERSION 130)
+
+# set to 0 when not a release candidate, non zero means that any generated
+# svn tags will be treated as release candidates of given number
+SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 0)
+
 SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})
 
 SET(OSG_PLUGINS osgPlugins-${OPENSCENEGRAPH_VERSION})
@@ -179,15 +114,27 @@ IF(CMAKE_SYSTEM MATCHES IRIX)
     SET(CMAKE_THREAD_LIBS_INIT "" CACHE INTERNAL "")
 ENDIF()
 
-OPTION(OSG_MAINTAINER "Enable OpenSceneGraph maintainer build methods, such as making git branches, tags, updating ChangeLog." OFF)
+OPTION(OSG_MAINTAINER "Enable OpenSceneGraph maintainer build methods, such as making svn branches, tags, updating ChangeLog." OFF)
 IF (OSG_MAINTAINER)
 
+    #SET(OPENSCENEGRAPH_SVN "trunk")
+    SET(OPENSCENEGRAPH_SVN "branches")
     SET(OPENSCENEGRAPH_BRANCH OpenSceneGraph-${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION})
 
     #
     # Provide target for tagging a release
     #
-    SET(GITCOMMAND git)
+    SET(SVNCOMMAND svn)
+    SET(SVNTRUNKDIR     http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk)
+    SET(SVNTAGDIR       http://svn.openscenegraph.org/osg/OpenSceneGraph/tags)
+    SET(SVNBRANCHDIR    http://svn.openscenegraph.org/osg/OpenSceneGraph/branches)
+
+    IF   (OPENSCENEGRAPH_SVN STREQUAL "trunk")
+        SET(SVNSOURCEDIR ${SVNTRUNKDIR})
+    ELSE()
+        SET(SVNSOURCEDIR ${SVNBRANCHDIR}/${OPENSCENEGRAPH_BRANCH})
+    ENDIF()
+
 
     IF   (OPENSCENEGRAPH_RELEASE_CANDIDATE EQUAL 0)
         SET(RELEASE_NAME OpenSceneGraph-${OPENSCENEGRAPH_VERSION})
@@ -195,55 +142,59 @@ IF (OSG_MAINTAINER)
         SET(RELEASE_NAME OpenSceneGraph-${OPENSCENEGRAPH_VERSION}-rc${OPENSCENEGRAPH_RELEASE_CANDIDATE})
     ENDIF()
 
-    SET(RELEASE_MESSAGE "Release ${RELEASE_NAME}")
-    SET(BRANCH_MESSAGE "Branch ${OPENSCENEGRAPH_BRANCH}")
-
 
     ADD_CUSTOM_TARGET(tag-test
-        COMMAND echo ${GITCOMMAND} tag -a ${RELEASE_NAME} -m ${RELEASE_MESSAGE}
+        COMMAND echo ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNTAGDIR}/${RELEASE_NAME} -m "Release ${RELEASE_NAME}"
-        COMMAND echo ${GITCOMMAND} push origin ${RELEASE_NAME}
     )
 
     ADD_CUSTOM_TARGET(tag-run
-        COMMAND ${GITCOMMAND} tag -a ${RELEASE_NAME} -m ${RELEASE_MESSAGE}
+        COMMAND ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNTAGDIR}/${RELEASE_NAME} -m "Release ${RELEASE_NAME}"
-        COMMAND ${GITCOMMAND} push origin ${RELEASE_NAME}
     )
 
     ADD_CUSTOM_TARGET(branch-test
-        COMMAND echo ${GITCOMMAND} branch ${OPENSCENEGRAPH_BRANCH}
+        COMMAND echo ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNBRANCHDIR}/${OPENSCENEGRAPH_BRANCH} -m "Branch ${OPENSCENEGRAPH_BRANCH}"
-        COMMAND echo ${GITCOMMAND} push origin ${OPENSCENEGRAPH_BRANCH}
     )
 
     ADD_CUSTOM_TARGET(branch-run
-        COMMAND ${GITCOMMAND} branch ${OPENSCENEGRAPH_BRANCH}
+        COMMAND ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNBRANCHDIR}/${OPENSCENEGRAPH_BRANCH} -m "Branch ${OPENSCENEGRAPH_BRANCH}"
-        COMMAND ${GITCOMMAND} push origin ${OPENSCENEGRAPH_BRANCH}
     )
 
     #
     # Provide target for generating ChangeLog
     #
-    SET(GITLOGFORMAT "%aD%nAuthor : %an%n%s%b%n")
+    SET(GENERATELOGS svn2cl)
-    SET(GENERATELOGS git log --pretty=format:${GITLOGFORMAT})
 
     ADD_CUSTOM_TARGET(ChangeLog
-        COMMAND ${GENERATELOGS} > ChangeLog
+        COMMAND ${SVNCOMMAND} update
+        COMMAND ${GENERATELOGS} ${SVNSOURCEDIR}
     )
 
 ENDIF(OSG_MAINTAINER)
 
 IF(NOT ANDROID)
 IF(APPLE)
+    # Determine the canonical name of the selected Platform SDK
+    EXECUTE_PROCESS(COMMAND "/usr/bin/sw_vers" "-productVersion"
+                    OUTPUT_VARIABLE OSG_OSX_SDK_NAME
+                    OUTPUT_STRIP_TRAILING_WHITESPACE)
+    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
-    # set to true. Should really have an OSG_BUILD_PLATFORM variable that we set to our desired platform
+    # set to true. Should realy have an OSG_BUILD_PLATFORM variable that we set to our desired platform
     OPTION(OSG_BUILD_PLATFORM_IPHONE "Enable IPhoneSDK Device support" OFF)
     OPTION(OSG_BUILD_PLATFORM_IPHONE_SIMULATOR "Enable IPhoneSDK Simulator support" OFF)
 
     IF(OSG_BUILD_PLATFORM_IPHONE OR OSG_BUILD_PLATFORM_IPHONE_SIMULATOR)
 
         #you need to manually set the default sdk version here
-        SET (IPHONE_SDKVER "10.2" CACHE STRING "IOS SDK-Version")
+        SET (IPHONE_SDKVER "6.0" CACHE STRING "IOS SDK-Version")
-        SET (IPHONE_VERSION_MIN "7.0" CACHE STRING "IOS minimum os version, use 7.0 or greater to get 64bit support")
+        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
@@ -263,40 +214,15 @@ IF(APPLE)
             SET (IPHONE_SDKROOT "${IPHONE_DEVROOT}/SDKs/iPhoneSimulator${IPHONE_SDKVER}.sdk")
         ENDIF()
 
-        SET (IPHONE_ENABLE_BITCODE "NO" CACHE STRING "IOS Enable Bitcode")
-
         # Apple iOS: Find OpenGLES
         FIND_LIBRARY(OPENGLES_LIBRARY OpenGLES)
     ELSE ()
         FIND_LIBRARY(CARBON_LIBRARY Carbon)
         FIND_LIBRARY(COCOA_LIBRARY Cocoa)
 
-        # Apple OS X: Find OpenGL and AGL based on OSG_WINDOWING_SYSTEM
+        # Apple OS X: Find OpenGL and AGL
-        # This is the accepted way of finding X11/OpenGL on OSX, as
-        # documented in CMake's FindOpenGL module.
-        # Note that without this check, libosg would use Cocoa/OpenGL but
-        # libosgViewer would use X11/OpenGL, which causes compatibility
-        # issues for applications using OSG.
-        UNSET(OPENGL_gl_LIBRARY CACHE)
-        UNSET(OPENGL_INCLUDE_DIR CACHE)
-        IF(OSG_WINDOWING_SYSTEM STREQUAL "X11")
-          FIND_PACKAGE(X11)
-          IF(NOT X11_FOUND)
-            MESSAGE(FATAL_ERROR "OSG_WINDOWING_SYSTEM is X11, but no X11 installation was found. Please make sure X11 is properly installed.")
-          ENDIF()
-
-          # Use X11 version of OpenGL as seed for CMake FindOpenGL
-          GET_FILENAME_COMPONENT(X11LIBDIR ${X11_X11_LIB} DIRECTORY)
-          FIND_LIBRARY(OPENGL_gl_LIBRARY GL PATHS ${X11LIBDIR} DOC "OpenGL lib for OSX" NO_DEFAULT_PATH)
-          SET(OPENGL_INCLUDE_DIR ${X11_INCLUDE_DIR} CACHE PATH "Include for OpenGL on OSX" FORCE)
-
-        ELSEIF(OSG_WINDOWING_SYSTEM STREQUAL "Carbon")
-          # AGL needed for Carbon windowing systems
-          FIND_LIBRARY(AGL_LIBRARY AGL)
-        ENDIF()
-
         FIND_PACKAGE(OpenGL)
-        FIND_PACKAGE(EGL)
+        FIND_LIBRARY(AGL_LIBRARY AGL)
     ENDIF ()
 
     OPTION(OSG_COMPILE_FRAMEWORKS "compile frameworks instead of dylibs (experimental)" OFF)
@@ -304,7 +230,6 @@ IF(APPLE)
 ELSE()
     # Non-Apple: Find OpenGL
     FIND_PACKAGE(OpenGL)
-    FIND_PACKAGE(EGL)
 ENDIF()
 ENDIF()
 
@@ -330,29 +255,22 @@ IF(UNIX AND NOT ANDROID)
 
 ENDIF()
 
-INCLUDE_DIRECTORIES(${OpenSceneGraph_SOURCE_DIR}/include/)
+INCLUDE_DIRECTORIES(
+    ${OpenSceneGraph_SOURCE_DIR}/include
+    ${OPENGL_INCLUDE_DIR}
+)
 
 # Make the headers visible to everything
 IF(NOT ${PROJECT_BINARY_DIR} EQUAL ${PROJECT_SOURCE_DIR})
    INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/include)
 ENDIF()
 
-INCLUDE_DIRECTORIES(SYSTEM ${OPENGL_INCLUDE_DIR})
-
 # Common global definitions
 #ADD_DEFINITIONS(-D)
 # Platform specific definitions
 
 
 IF(WIN32 AND NOT ANDROID)
-    OPTION(OSG_DETERMINE_WIN_VERSION "Wheter to automatically determine current Windows version" ON)
-
-    IF(OSG_DETERMINE_WIN_VERSION)
-        # Check window version
-        INCLUDE (OsgDetermineWinVersion)
-        get_WIN32_WINNT(WIN_VERSION)
-        ADD_DEFINITIONS(-D_WIN32_WINNT=${WIN_VERSION})
-    ENDIF(OSG_DETERMINE_WIN_VERSION)
 
     IF(MSVC)
         # This option is to enable the /MP switch for Visual Studio 2005 and above compilers
@@ -421,15 +339,21 @@ IF(WIN32 AND NOT ANDROID)
 ##########################################################################################################
 
     IF(MSVC)
-        OPTION(OSG_MSVC_VERSIONED_DLL "Set to ON to build OpenSceneGraph with versioned dll names" ON)
+        IF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4 AND ${CMAKE_PATCH_VERSION} LESS 7)
-        MARK_AS_ADVANCED(OSG_MSVC_VERSIONED_DLL)
+            MESSAGE("Warning:  disabling versioned options 2.4.6 exibits inconsintencies in .pdb naming, at least under MSVC, suggested upgrading at least to 2.4.7")
-        OPTION(OSG_MSVC_DEBUG_INCREMENTAL_LINK "Set to OFF to build OpenSceneGraph without incremental linking in debug (release is off by default)" ON)
+            SET(OSG_MSVC_VERSIONED_DLL OFF)
-        MARK_AS_ADVANCED(OSG_MSVC_DEBUG_INCREMENTAL_LINK)
+            SET(OSG_MSVC_DEBUG_INCREMENTAL_LINK ON)
-        IF(NOT OSG_MSVC_DEBUG_INCREMENTAL_LINK)
+        ELSE()
-            SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO")
+            OPTION(OSG_MSVC_VERSIONED_DLL "Set to ON to build OpenSceneGraph with versioned dll names" ON)
-            SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO")
+            MARK_AS_ADVANCED(OSG_MSVC_VERSIONED_DLL)
-            SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO")
+            OPTION(OSG_MSVC_DEBUG_INCREMENTAL_LINK "Set to OFF to build OpenSceneGraph without incremental linking in debug (release is off by default)" ON)
-        ENDIF(NOT OSG_MSVC_DEBUG_INCREMENTAL_LINK)
+            MARK_AS_ADVANCED(OSG_MSVC_DEBUG_INCREMENTAL_LINK)
+            IF(NOT OSG_MSVC_DEBUG_INCREMENTAL_LINK)
+                SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO")
+                SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO")
+                SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO")
+            ENDIF(NOT OSG_MSVC_DEBUG_INCREMENTAL_LINK)
+        ENDIF()
     ENDIF(MSVC)
 ENDIF(WIN32 AND NOT ANDROID)
 
@@ -454,8 +378,6 @@ ENDIF(WIN32 AND NOT ANDROID)
 
 OPTION(OSG_NOTIFY_DISABLED "Set to ON to build OpenSceneGraph with the notify() disabled." OFF)
 
-OPTION(OSG_USE_DEPRECATED_API "Set to ON to build OpenSceneGraph with the OSG_USE_DEPREFATED_API #define enabled to allow access to deprecated APIs ." ON)
-
 OPTION(OSG_USE_FLOAT_MATRIX "Set to ON to build OpenSceneGraph with float Matrix instead of double." OFF)
 MARK_AS_ADVANCED(OSG_USE_FLOAT_MATRIX)
 
@@ -476,12 +398,7 @@ ENDIF()
 OPTION(OSG_DISABLE_MSVC_WARNINGS "Set to OFF to not disable MSVC warnings generated by OSG headers." ON)
 MARK_AS_ADVANCED(OSG_DISABLE_MSVC_WARNINGS)
 
-OPTION(OSG_PROVIDE_READFILE "Set to ON for include/osgDB/ReadFile to provide the osgDB::read*File(() methods. " ON)
 OPTION(OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION "Set to ON to use the ref_ptr<> T* operator() output conversion. " ON)
-OPTION(OSG_USE_REF_PTR_SAFE_DEREFERENCE "Set to ON to throw an exception whenever ref_ptr<> is dereferenced or called. " OFF)
-
-OPTION(OSG_ENVVAR_SUPPORTED "Set to ON to build OpenSceneGraph with the #define OSG_ENVVAR_SUPPORTED, found in include/osg/Config, to enable use of getenv() related functions." ON)
-
 
 
 # Map the OPENGL_PROFILE to OSG_GL*_AVAILABLE settings
@@ -501,9 +418,6 @@ ENDIF()
 
 IF ((OPENGL_PROFILE STREQUAL "GL3") OR (OPENGL_PROFILE STREQUAL "GLCORE"))
     OPTION(OSG_GL3_AVAILABLE "Set to OFF to disable use of OpenGL 3.x functions library." ON )
-    if(APPLE)
-        add_definitions(-DGL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED)
-    endif()
 ELSE()
     OPTION(OSG_GL3_AVAILABLE "Set to OFF to disable use of OpenGL 3.x functions library." OFF )
 ENDIF()
@@ -517,8 +431,6 @@ ENDIF()
 IF ((OPENGL_PROFILE STREQUAL "GLES2"))
     OPTION(OSG_GLES2_AVAILABLE "Set to OFF to disable use of OpenGL ES 2.x functions library." ON )
 ELSEIF ((OPENGL_PROFILE STREQUAL "GLES3"))
-    OPTION(OSG_GLES3_AVAILABLE "Set to OFF to disable use of OpenGL ES 3.x functions library." ON )
-ELSEIF ((OPENGL_PROFILE STREQUAL "GLES2+GLES3"))
     OPTION(OSG_GLES2_AVAILABLE "Set to OFF to disable use of OpenGL ES 2.x functions library." ON )
     OPTION(OSG_GLES3_AVAILABLE "Set to OFF to disable use of OpenGL ES 3.x functions library." ON )
 ELSE()
@@ -529,8 +441,10 @@ ENDIF()
 
 OPTION(OSG_GL_LIBRARY_STATIC "Set to ON to statically link with OpenGL/GLES library." OFF)
 
+SET(OPENGL_egl_LIBRARY CACHE STRING "Set the OpenGL egl library.")
+
 # Map the OSG_GL*_AVAILABLE settings to OSG_GL_* settings
-IF (OSG_GLES2_AVAILABLE OR OSG_GLES3_AVAILABLE OR OSG_GL3_AVAILABLE)
+IF (OSG_GLES2_AVAILABLE OR OSG_GL3_AVAILABLE)
     OPTION(OSG_GL_DISPLAYLISTS_AVAILABLE "Set to OFF to disable use of OpenGL display lists." OFF)
     OPTION(OSG_GL_MATRICES_AVAILABLE "Set to OFF to disable use of OpenGL built-in matrices." OFF)
     OPTION(OSG_GL_VERTEX_FUNCS_AVAILABLE "Set to OFF to disable use of OpenGL vertex functions such as glVertex/glColor etc." OFF)
@@ -550,7 +464,7 @@ ELSE()
     OPTION(OSG_GL_FIXED_FUNCTION_AVAILABLE "Set to OFF to disable use of OpenGL fixed function pipeline." ON)
 ENDIF()
 
-IF (OSG_GLES1_AVAILABLE OR OSG_GLES2_AVAILABLE OR OSG_GLES3_AVAILABLE)
+IF (OSG_GLES1_AVAILABLE OR OSG_GLES2_AVAILABLE)
     OPTION(OSG_CPP_EXCEPTIONS_AVAILABLE "Set to OFF to disable compile of OSG components that use C++ exceptions." OFF)
 ELSE()
     OPTION(OSG_CPP_EXCEPTIONS_AVAILABLE "Set to OFF to disable compile of OSG components that use C++ exceptions." ON)
@@ -588,17 +502,11 @@ ELSEIF(OSG_GLES2_AVAILABLE)
     IF (APPLE AND NOT ANDROID)
         SET(OPENGL_HEADER1 "#include \"TargetConditionals.h\"" CACHE STRING "#include<> line for OpenGL Header")
         SET(OPENGL_HEADER2 "#include <OpenGLES/ES2/gl.h>" CACHE STRING "#include<> line for additional OpenGL Headers if required")
+        # TODO: GLES3
     ELSE()
         SET(OPENGL_HEADER1 "#include <GLES2/gl2.h>" CACHE STRING "#include<> line for OpenGL Header")
         SET(OPENGL_HEADER2 "" CACHE STRING "#include<> line for additional OpenGL Headers if required")
-    ENDIF()
+        # TODO: GLES3
-ELSEIF(OSG_GLES3_AVAILABLE)
-    IF (APPLE AND NOT ANDROID)
-        SET(OPENGL_HEADER1 "#include \"TargetConditionals.h\"" CACHE STRING "#include<> line for OpenGL Header")
-        SET(OPENGL_HEADER2 "#include <OpenGLES/ES3/gl.h>" CACHE STRING "#include<> line for additional OpenGL Headers if required")
-    ELSE()
-        SET(OPENGL_HEADER1 "#include <GLES3/gl3.h>" CACHE STRING "#include<> line for OpenGL Header")
-        SET(OPENGL_HEADER2 "" CACHE STRING "#include<> line for additional OpenGL Headers if required")
     ENDIF()
 ELSE()
     IF (APPLE)
@@ -611,39 +519,39 @@ ELSE()
 ENDIF()
 
 IF (OSG_GL1_AVAILABLE)
-    SET(OSG_GL1_FEATURES 1)
+    SET(OSG_GL1_FEATURES "true")
 ELSE()
-    SET(OSG_GL1_FEATURES 0)
+    SET(OSG_GL1_FEATURES "false")
 ENDIF()
 
 IF (OSG_GL2_AVAILABLE)
-    SET(OSG_GL2_FEATURES 1)
+    SET(OSG_GL2_FEATURES "true")
 ELSE()
-    SET(OSG_GL2_FEATURES 0)
+    SET(OSG_GL2_FEATURES "false")
 ENDIF()
 
 IF (OSG_GL3_AVAILABLE)
-    SET(OSG_GL3_FEATURES 1)
+    SET(OSG_GL3_FEATURES "true")
 ELSE()
-    SET(OSG_GL3_FEATURES 0)
+    SET(OSG_GL3_FEATURES "false")
 ENDIF()
 
 IF (OSG_GLES1_AVAILABLE)
-    SET(OSG_GLES1_FEATURES 1)
+    SET(OSG_GLES1_FEATURES "true")
 ELSE()
-    SET(OSG_GLES1_FEATURES 0)
+    SET(OSG_GLES1_FEATURES "false")
 ENDIF()
 
 IF (OSG_GLES2_AVAILABLE)
-    SET(OSG_GLES2_FEATURES 1)
+    SET(OSG_GLES2_FEATURES "true")
 ELSE()
-    SET(OSG_GLES2_FEATURES 0)
+    SET(OSG_GLES2_FEATURES "false")
 ENDIF()
 
 IF (OSG_GLES3_AVAILABLE)
-    SET(OSG_GLES3_FEATURES 1)
+    SET(OSG_GLES3_FEATURES "true")
 ELSE()
-    SET(OSG_GLES3_FEATURES 0)
+    SET(OSG_GLES3_FEATURES "false")
 ENDIF()
 
 IF(ANDROID)
@@ -661,13 +569,6 @@ IF(ANDROID)
         FIND_LIBRARY(OPENGL_gl_LIBRARY  GLESv2
                  PATHS
                      ${ANDROID_SYSROOT}/usr/lib)
-    ELSEIF(OSG_GLES3_AVAILABLE)
-        FIND_PATH(OPENGL_INCLUDE_DIR GLES3/gl3.h
-              PATHS
-              ${ANDROID_SYSROOT}/usr/include)
-        FIND_LIBRARY(OPENGL_gl_LIBRARY  GLESv3
-                 PATHS
-                     ${ANDROID_SYSROOT}/usr/lib)
     ENDIF()
 ENDIF()
 
@@ -733,9 +634,6 @@ OPTION(BUILD_OSG_APPLICATIONS "Enable to build OSG Applications (e.g. osgviewer)
 # OSG Examples
 OPTION(BUILD_OSG_EXAMPLES "Enable to build OSG Examples" OFF)
 
-# OSG Plugins disable option for apple build on travis ci test - full build job runs over time limit of 50 min.
-OPTION(BUILD_OSG_PLUGINS "Build OSG Plugins - Disable for compile testing examples on a time limit" ON)
-mark_as_advanced(BUILD_OSG_PLUGINS)
 ################################################################################
 # 3rd Party Dependency Stuff
 IF(WIN32 AND NOT ANDROID)
@@ -754,21 +652,20 @@ IF(ANDROID)
 ELSE()
 # Common to all platforms except android:
     FIND_PACKAGE(Freetype)
-    FIND_PACKAGE(ilmbase)
     FIND_PACKAGE(Inventor)
     FIND_PACKAGE(Jasper)
     FIND_PACKAGE(OpenEXR)
-    FIND_PACKAGE(OpenCascade)
     FIND_PACKAGE(COLLADA)
     FIND_PACKAGE(FBX)
     FIND_PACKAGE(ZLIB)
     FIND_PACKAGE(Xine)
     FIND_PACKAGE(OpenVRML)
+    FIND_PACKAGE(Performer)
     FIND_PACKAGE(GDAL)
     FIND_PACKAGE(GTA)
     FIND_PACKAGE(CURL)
     FIND_PACKAGE(LibVNCServer)
-    FIND_PACKAGE(DCMTK)
+    FIND_PACKAGE(OurDCMTK)
     FIND_PACKAGE(FFmpeg)
     FIND_PACKAGE(GStreamer COMPONENTS app pbutils)
     FIND_PACKAGE(GLIB COMPONENTS gobject)
@@ -799,15 +696,75 @@ ELSE()
     # FIND_PACKAGE(PythonLibs)
 ENDIF()
 
+IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8)
+    FIND_PACKAGE(ITK)
+ENDIF()
+
 # Include macro utilities here
 INCLUDE(OsgMacroUtils)
 
+OPTION(OSG_USE_QT "Enable to use Qt (build Qt-dependent libraries, plugins and examples)" ON)
+
+IF(OSG_USE_QT AND NOT ANDROID)
+# To select a specific version of QT define DESIRED_QT_VERSION
+# via cmake -DDESIRED_QT_VERSION=5
+# QUIET option disables messages if the package cannot be found.
+
+    IF  (DESIRED_QT_VERSION)
+        IF  (DESIRED_QT_VERSION MATCHES 5)
+            FIND_PACKAGE(Qt5Widgets)
+        ELSEIF (DESIRED_QT_VERSION MATCHES 4)
+            FIND_PACKAGE(Qt4)
+        ELSE()
+            FIND_PACKAGE(Qt3)
+        ENDIF()
+
+    ELSE()
+
+        FIND_PACKAGE(Qt5Widgets QUIET)
+
+        IF ( Qt5Widgets_FOUND )
+            # CMake 2.8.8 or greater required
+            BUILDER_VERSION_GREATER(2 8 7)
+            IF(NOT VALID_BUILDER_VERSION)
+                MESSAGE(
+                SEND_ERROR
+                "Qt5 requires CMake version 2.8.8 or greater!\n"
+                "Update CMake or set DESIRED_QT_VERSION to less than 5
+                or disable OSG_USE_QT."
+                )
+            ENDIF( )
+        ENDIF( )
+
+        IF ( NOT Qt5Widgets_FOUND )
+            FIND_PACKAGE(Qt4)
+
+            IF (NOT QT4_FOUND)
+                FIND_PACKAGE(Qt3)
+            ENDIF()
+        ENDIF()
+    ENDIF()
+
+    #If we have found Qt5, let's try to top off by getting the webkit as well
+    IF ( Qt5Widgets_FOUND )
+        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()
 
 #optional example related dependencies
 IF   (BUILD_OSG_EXAMPLES AND NOT ANDROID)
 
 
     FIND_PACKAGE(FLTK)
+    FIND_PACKAGE(GLUT)
     FIND_PACKAGE(FOX)
 
     SET(wxWidgets_USE_LIBS base core gl net)
@@ -868,17 +825,6 @@ SET(CMAKE_RELEASE_POSTFIX "" CACHE STRING "add a postfix, usually empty on windo
 SET(CMAKE_RELWITHDEBINFO_POSTFIX "rd" CACHE STRING "add a postfix, usually empty on windows")
 SET(CMAKE_MINSIZEREL_POSTFIX "s" CACHE STRING "add a postfix, usually empty on windows")
 
-# Correct any incorrect case usage in CMAKE_BUILD_TYPE
-IF     (CMAKE_BUILD_TYPE MATCHES "release" OR CMAKE_BUILD_TYPE MATCHES "RELEASE")
-    SET(CMAKE_BUILD_TYPE "Release")
-ELSEIF (CMAKE_BUILD_TYPE MATCHES "minsizerel" OR CMAKE_BUILD_TYPE MATCHES "MINSIZEREL")
-    SET(CMAKE_BUILD_TYPE "MinSizeRel")
-ELSEIF (CMAKE_BUILD_TYPE MATCHES "relwithdebinfo" OR CMAKE_BUILD_TYPE MATCHES "RELWITHDEBINFO")
-    SET(CMAKE_BUILD_TYPE "RelWithDebInfo")
-ELSEIF (CMAKE_BUILD_TYPE MATCHES "debug" OR CMAKE_BUILD_TYPE MATCHES "DEBUG")
-    SET(CMAKE_BUILD_TYPE "Debug")
-ENDIF()
-
 # Set the build postfix extension according to what configuration is being built.
 IF (CMAKE_BUILD_TYPE MATCHES "Release")
     SET(CMAKE_BUILD_POSTFIX "${CMAKE_RELEASE_POSTFIX}")
@@ -912,7 +858,7 @@ IF(NOT DEFINED LIB_POSTFIX)
     SET(LIB_POSTFIX "")
 ENDIF()
 
-# Here we apparently do some funky stuff with making the bin/ and lib/
+# Here we apparantly do some funky stuff with making the bin/ and lib/
 # folders which is probably needed to work around a very old CMake bug?
 
 #SET(OUTPUT_BINDIR ${PROJECT_BINARY_DIR}/bin/${CMAKE_SYSTEM_NAME})
@@ -929,32 +875,45 @@ IF(NOT MSVC OR MSVC_IDE)
     MAKE_DIRECTORY(${OUTPUT_LIBDIR}/${OSG_PLUGINS})
 ENDIF(NOT MSVC OR MSVC_IDE)
 
+# On CMake 2.4.x use EXECUTABLE_OUTPUT_PATH and LIBRARY_OUTPUT_PATH and later
+# we work around the DLL placement by use of the PREFIX target property hack
+#
+# On CMake 2.6.x use the newly minted CMAKE_LIBRARY_OUTPUT_DIRECTORY,
+# CMAKE_ARCHIVE_OUTPUT_DIRECTORY & CMAKE_RUNTIME_OUTPUT_DIRECTORY
+#
 # CMake >= 2.8.1 changed the output directory algorithm (See doc).
 # Here we also set per-configuration directories (CMAKE_*_OUTPUT_DIRECTORY_<CONFIG>), or else binaries are generated in /bin/Debug and /bin/Release, etc. with MSVC and Xcode.
 # (Doc reads "multi-configuration generators (VS, Xcode) do NOT append a per-configuration subdirectory to the specified directory").
 # The workaround for 2.6.x (adding "../" as an output prefix for each target) seem to have no effect in >=2.8.1, so there is no need to change this.
-SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_LIBDIR})
+IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 5)
-SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_BINDIR})
+    # If CMake < 2.6.0
-IF(WIN32)
+    SET(EXECUTABLE_OUTPUT_PATH ${OUTPUT_BINDIR})
-    SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_BINDIR})
+    SET(LIBRARY_OUTPUT_PATH    ${OUTPUT_LIBDIR})
-ELSE(WIN32)
+ELSE()
-    SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_LIBDIR})
+    # If CMake >= 2.6.0
-ENDIF(WIN32)
+    SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_LIBDIR})
+    SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_BINDIR})
+    IF(WIN32)
+        SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_BINDIR})
+    ELSE(WIN32)
+        SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_LIBDIR})
+    ENDIF(WIN32)
 
-# Testing CMAKE_VERSION is possible in >= 2.6.4 only
+    # Testing CMAKE_VERSION is possible in >= 2.6.4 only
-BUILDER_VERSION_GREATER(2 8 0)
+    BUILDER_VERSION_GREATER(2 8 0)
-IF(VALID_BUILDER_VERSION)  # If CMake >= 2.8.1
+    IF(VALID_BUILDER_VERSION)  # If CMake >= 2.8.1
-    FOREACH(CONF ${CMAKE_CONFIGURATION_TYPES})        # For each configuration (Debug, Release, MinSizeRel... and/or anything the user chooses)
+        FOREACH(CONF ${CMAKE_CONFIGURATION_TYPES})        # For each configuration (Debug, Release, MinSizeRel... and/or anything the user chooses)
-        STRING(TOUPPER "${CONF}" CONF)                # Go uppercase (DEBUG, RELEASE...)
+            STRING(TOUPPER "${CONF}" CONF)                # Go uppercase (DEBUG, RELEASE...)
-        SET("CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CONF}" "${OUTPUT_LIBDIR}")
+            SET("CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CONF}" "${OUTPUT_LIBDIR}")
-        SET("CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CONF}" "${OUTPUT_BINDIR}")
+            SET("CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CONF}" "${OUTPUT_BINDIR}")
-        IF(WIN32)
+            IF(WIN32)
-            SET("CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CONF}" "${OUTPUT_BINDIR}")
+                SET("CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CONF}" "${OUTPUT_BINDIR}")
-        ELSE()
+            ELSE()
-            SET("CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CONF}" "${OUTPUT_LIBDIR}")
+                SET("CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CONF}" "${OUTPUT_LIBDIR}")
-        ENDIF()
+            ENDIF()
-    ENDFOREACH()
+        ENDFOREACH()
-ENDIF(VALID_BUILDER_VERSION)
+    ENDIF(VALID_BUILDER_VERSION)
+ENDIF()
 
 #SET(INSTALL_BINDIR OpenSceneGraph/bin)
 #SET(INSTALL_INCDIR OpenSceneGraph/include)
@@ -985,7 +944,6 @@ SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} CACHE STRING "You may add additiona
 # This is unofficial so this may be removed or changed at anytime.
 SET(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} CACHE STRING "(EXPERIMENTAL) You may add additional search paths here. Use ; to separate multiple paths.")
 
-
 # This is for an advanced option to give aggressive warnings
 # under different compilers. If yours is not implemented, this option
 # will not be made available.
@@ -1002,19 +960,6 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
     # to be the workaround.
     SET(OSG_AGGRESSIVE_WARNING_FLAGS -Wall -Wparentheses -Wno-long-long -Wno-import -pedantic -Wreturn-type -Wmissing-braces -Wunknown-pragmas -Wunused)
 
-    MESSAGE( STATUS "g++ version ${CMAKE_CXX_COMPILER_VERSION} ")
-    IF(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.6)
-        SET(OSG_AGGRESSIVE_WARNING_FLAGS ${OSG_AGGRESSIVE_WARNING_FLAGS} -Wmaybe-uninitialized -Wextra)
-        IF(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.9)
-            SET(OSG_AGGRESSIVE_WARNING_FLAGS ${OSG_AGGRESSIVE_WARNING_FLAGS} -Wshadow)
-            IF(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0)
-                # -Wmisleading-indentation (in -Wall) generates less warnings when interpreting tab as 4 spaces instead of the default of 8
-                # SET(OSG_AGGRESSIVE_WARNING_FLAGS ${OSG_AGGRESSIVE_WARNING_FLAGS} -ftabstop=4)
-                SET(OSG_AGGRESSIVE_WARNING_FLAGS ${OSG_AGGRESSIVE_WARNING_FLAGS} -Wno-misleading-indentation)
-            ENDIF()
-        ENDIF()
-    ENDIF()
-
     # Previous included -Wformat=2 in OSG_AGGRESSIVE_WARNING_FLAGS but had to remove it due to standard library errors
 
 
@@ -1023,8 +968,7 @@ ELSEIF(MSVC)
         #C4100 'identifier' : unreferenced formal parameter
         #C4127 Error Message conditional expression is constant
         #C4706 assignment within conditional expression
-        #C4589: Constructor of abstract class 'osgGA::CameraManipulator' ignores initializer for virtual base class 'osg::Object'
+        SET(OSG_AGGRESSIVE_WARNING_FLAGS /W4 /wd4706 /wd4127 /wd4100)
-        SET(OSG_AGGRESSIVE_WARNING_FLAGS /W4 /wd4589 /wd4706 /wd4127 /wd4100)
 ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
         SET(OSG_AGGRESSIVE_WARNING_FLAGS  -Wall -Wparentheses -Wno-long-long -Wno-import -pedantic -Wreturn-type -Wmissing-braces -Wunknown-pragmas -Wunused -Wno-overloaded-virtual)
 
@@ -1067,17 +1011,16 @@ ENDIF()
 # This will only be made available if we set values for OSG_AGGRESSIVE_WARNING_FLAGS.
 IF(OSG_AGGRESSIVE_WARNING_FLAGS)
 
-    SET(OSG_AGGRESSIVE_WARNING_FLAGS ${OSG_AGGRESSIVE_WARNING_FLAGS} CACHE STRING "Compiler flags to use when OSG_AGGRESSIVE_WARNINGS is enabled." FORCE)
-
     IF (APPLE)
         SET(DEFAULT_USE_AGGRESSIVE_WARNINGS OFF)
     ELSE()
         SET(DEFAULT_USE_AGGRESSIVE_WARNINGS ON)
     ENDIF()
 
-    OPTION(OSG_AGGRESSIVE_WARNINGS "Enable to activate aggressive warnings" ${DEFAULT_USE_AGGRESSIVE_WARNINGS})
+    OPTION(OSG_USE_AGGRESSIVE_WARNINGS "Enable to activate aggressive warnings" ${DEFAULT_USE_AGGRESSIVE_WARNINGS})
+    MARK_AS_ADVANCED(OSG_USE_AGGRESSIVE_WARNINGS)
 
-    IF(OSG_AGGRESSIVE_WARNINGS)
+    IF(OSG_USE_AGGRESSIVE_WARNINGS)
         # Add flags defined by OSG_AGGRESSIVE_WARNING_FLAGS if they aren't already there
         FOREACH(flag ${OSG_AGGRESSIVE_WARNING_FLAGS})
             IF(NOT CMAKE_CXX_FLAGS MATCHES "${flag}")
@@ -1085,7 +1028,7 @@ IF(OSG_AGGRESSIVE_WARNING_FLAGS)
             ENDIF()
         ENDFOREACH()
     ELSE()
-        # Remove all flags considered aggressive
+        # Remove all flags considered aggresive
         FOREACH(flag ${OSG_AGGRESSIVE_WARNING_FLAGS})
             STRING(REGEX REPLACE "${flag}" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
         ENDFOREACH()
@@ -1132,15 +1075,15 @@ IF(APPLE AND NOT ANDROID)
             SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -miphoneos-version-min=${IPHONE_VERSION_MIN}" FORCE)
 
         ELSE()
-            #simulator uses i386 and x86_64 architectures
+            #simulator uses i386 architectures
-            SET(CMAKE_OSX_ARCHITECTURES "i386;x86_64" CACHE STRING "Build architectures for iOS Simulator" FORCE)
+            SET(CMAKE_OSX_ARCHITECTURES "i386" CACHE STRING "Build architectures for iOS Simulator" FORCE)
-            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mno-thumb -pipe -no-cpp-precomp" CACHE STRING "Flags used by the compiler during all build types." FORCE)
+            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mno-thumb -arch i386 -pipe -no-cpp-precomp" CACHE STRING "Flags used by the compiler during all build types." FORCE)
 
             SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mios-simulator-version-min=${IPHONE_VERSION_MIN}" FORCE)
 
         ENDIF()
 
-        #here we set the specific iphone sdk version. We can only set either device or simulator sdk. So if you want both you currently have to have two separate projects
+        #here we set the specific iphone sdk version. We can only set either device or simulator sdk. So if you want both you currently have to have two seperate projects
         SET(CMAKE_OSX_SYSROOT "${IPHONE_SDKROOT}" CACHE STRING "System root for iOS" FORCE)
 
         #hack, force link to opengles
@@ -1165,19 +1108,30 @@ 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_VERSION VERSION_GREATER 10.7)
+            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)
+                SET(OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX "imageio" CACHE STRING "Forced imageio default image plugin for OSX" FORCE)
-            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE)
+                # 64 Bit Works, i386,ppc is not supported any more
-          ELSEIF(OSG_OSX_VERSION VERSION_EQUAL 10.7)
+                SET(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "Build architectures for OSX" FORCE)
-            SET(OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX "imageio" CACHE STRING "Forced imageio default image plugin for OSX" FORCE)
+                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.8 -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE)
-            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE)
+            ELSEIF(${OSG_OSX_SDK_NAME} STREQUAL "macosx10.7")
-          ELSEIF(OSG_OSX_VERSION VERSION_GREATER 10.4)
+                SET(OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX "imageio" CACHE STRING "Forced imageio default image plugin for OSX" FORCE)
-            SET(OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX "imageio" CACHE STRING "Forced imageio default image plugin for OSX" FORCE)
+                # 64 Bit Works, PPC is not supported any more
-            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftree-vectorize -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE)
+                SET(CMAKE_OSX_ARCHITECTURES "i386;x86_64" CACHE STRING "Build architectures for OSX" FORCE)
-          ELSEIF(OSG_OSX_VERSION VERSION_EQUAL 10.4)
+                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.7 -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE)
-            SET(OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX "quicktime" CACHE STRING "Forced imageio default image plugin for OSX" FORCE)
+            ELSEIF(${OSG_OSX_SDK_NAME} STREQUAL "macosx10.6" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.5")
-            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftree-vectorize -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE)
+                SET(OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX "imageio" CACHE STRING "Forced imageio default image plugin for OSX" FORCE)
-          ENDIF()
+                # 64-bit compiles are not supported with Carbon.
+                SET(CMAKE_OSX_ARCHITECTURES "ppc;i386" CACHE STRING "Build architectures for OSX" FORCE)
+                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.5 -ftree-vectorize -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE)
+            ELSEIF(${OSG_OSX_SDK_NAME} STREQUAL "macosx10.4")
+                SET(OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX "quicktime" CACHE STRING "Forced imageio default image plugin for OSX" FORCE)
+                SET(CMAKE_OSX_ARCHITECTURES "ppc;i386" CACHE STRING "Build architectures for OSX" FORCE)
+                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.4 -ftree-vectorize -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE)
+            ELSE()
+                # No Universal Binary support
+                # Should break down further to set the -mmacosx-version-min,
+                # but the SDK detection is too unreliable here.
+            ENDIF()
         ENDIF()
 
         OPTION(OSG_BUILD_APPLICATION_BUNDLES "Enable the building of applications and examples as OSX Bundles" OFF)
@@ -1316,6 +1270,10 @@ SET(PKGCONFIG_FILES
   openscenegraph-osgVolume
 )
 
+IF(QT4_FOUND OR Qt5Widgets_FOUND )
+  SET(PKGCONFIG_FILES ${PKGCONFIG_FILES} openscenegraph-osgQt)
+ENDIF()
+
 FOREACH(PKGCONFIG_FILE ${PKGCONFIG_FILES})
   CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc.in
     ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc

CMakeModules/Find3rdPartyDependencies.cmake

@@ -9,19 +9,19 @@ MACRO(FIND_DEPENDENCY DEPNAME INCLUDEFILE LIBRARY_NAMES_BASE SEARCHPATHLIST DEBU
 
     SET(MY_PATH_INCLUDE )
     SET(MY_PATH_LIB )
-
+    
     FOREACH( MYPATH ${SEARCHPATHLIST} )
         SET(MY_PATH_INCLUDE ${MY_PATH_INCLUDE} ${MYPATH}/include)
         SET(MY_PATH_LIB ${MY_PATH_LIB} ${MYPATH}/lib)
     ENDFOREACH( MYPATH ${SEARCHPATHLIST} )
-
+    
     FIND_PATH("${DEPNAME}_INCLUDE_DIR" ${INCLUDEFILE}
       ${MY_PATH_INCLUDE}
       NO_DEFAULT_PATH
     )
     MARK_AS_ADVANCED("${DEPNAME}_INCLUDE_DIR")
     #MESSAGE( " ${DEPNAME}_INCLUDE_DIR --> ${${DEPNAME}_INCLUDE_DIR}<--")
-
+    
     SET(LIBRARY_NAMES "")
     FOREACH(LIBNAME ${LIBRARY_NAMES_BASE})
         LIST(APPEND LIBRARY_NAMES "${LIBNAME}${EXSUFFIX}")
@@ -35,7 +35,7 @@ MACRO(FIND_DEPENDENCY DEPNAME INCLUDEFILE LIBRARY_NAMES_BASE SEARCHPATHLIST DEBU
     FOREACH(LIBNAME ${LIBRARY_NAMES_BASE})
         LIST(APPEND LIBRARY_NAMES_DEBUG "${LIBNAME}${DEBUGSUFFIX}${EXSUFFIX}")
     ENDFOREACH(LIBNAME)
-    FIND_LIBRARY("${DEPNAME}_LIBRARY_DEBUG"
+    FIND_LIBRARY("${DEPNAME}_LIBRARY_DEBUG" 
         NAMES ${LIBRARY_NAMES_DEBUG}
       PATHS ${MY_PATH_LIB}
       NO_DEFAULT_PATH
@@ -49,13 +49,7 @@ MACRO(FIND_DEPENDENCY DEPNAME INCLUDEFILE LIBRARY_NAMES_BASE SEARCHPATHLIST DEBU
           MESSAGE("-- Warning Debug ${DEPNAME} not found, using: ${${DEPNAME}_LIBRARY}")
           SET(${DEPNAME}_LIBRARY_DEBUG "${${DEPNAME}_LIBRARY}")
       ENDIF(NOT ${DEPNAME}_LIBRARY_DEBUG)
-
-      SET(${DEPNAME}_LIBRARIES debug ${${DEPNAME}_LIBRARY_DEBUG} optimized ${${DEPNAME}_LIBRARY} )
-
     ENDIF(${DEPNAME}_INCLUDE_DIR AND ${DEPNAME}_LIBRARY)
-
-
-
 ENDMACRO(FIND_DEPENDENCY DEPNAME INCLUDEFILE LIBRARY_NAMES_BASE SEARCHPATHLIST DEBUGSUFFIX)
 
 
@@ -64,21 +58,21 @@ ENDMACRO(FIND_DEPENDENCY DEPNAME INCLUDEFILE LIBRARY_NAMES_BASE SEARCHPATHLIST D
 ################################################################################################
 
 MACRO(SEARCH_3RDPARTY OSG_3RDPARTY_BIN)
-        FIND_DEPENDENCY(TIFF tiff.h "libtiff;tiff" ${OSG_3RDPARTY_BIN} "D" "")
+        FIND_DEPENDENCY(TIFF tiff.h libtiff ${OSG_3RDPARTY_BIN} "D" "_i")
-        FIND_DEPENDENCY(FREETYPE ft2build.h "freetype;freetype2311MT;freetype234;freetype234MT;freetype235;freetype237;freetype238;freetype244;freetype250;freetype27;freetype271;" ${OSG_3RDPARTY_BIN} "d" "")
+        FIND_DEPENDENCY(FREETYPE ft2build.h "freetype;freetype2311MT;freetype234;freetype234MT;freetype235;freetype237;freetype238;freetype244;freetype250;" ${OSG_3RDPARTY_BIN} "d" "")
         IF(FREETYPE_FOUND)
-            #forcing subsequent FindFreeType stuff to not search for other variables.... kind of a hack
+            #forcing subsequent FindFreeType stuff to not search for other variables.... kind of a hack 
             SET(FREETYPE_INCLUDE_DIR_ft2build ${FREETYPE_INCLUDE_DIR} CACHE PATH "" FORCE)
             SET(FREETYPE_INCLUDE_DIR_freetype2 ${FREETYPE_INCLUDE_DIR} CACHE PATH "" FORCE)
             MARK_AS_ADVANCED(FREETYPE_INCLUDE_DIR_ft2build FREETYPE_INCLUDE_DIR_freetype2)
             SET(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR_ft2build};${FREETYPE_INCLUDE_DIR_freetype2}")
         ENDIF(FREETYPE_FOUND)
-        FIND_DEPENDENCY(CURL curl/curl.h "libcurl;curllib;libcurl_imp" ${OSG_3RDPARTY_BIN} "D" "")
+        FIND_DEPENDENCY(CURL curl/curl.h "libcurl;curllib" ${OSG_3RDPARTY_BIN} "D" "")
         FIND_DEPENDENCY(JPEG jpeglib.h "libjpeg;jpeg" ${OSG_3RDPARTY_BIN} "D" "")
         FIND_DEPENDENCY(GDAL gdal.h "gdal;gdal16" ${OSG_3RDPARTY_BIN} "d" "_i")
         FIND_DEPENDENCY(GLUT GL/glut.h glut32 ${OSG_3RDPARTY_BIN} "D" "")
         IF(GLUT_FOUND)
-            #forcing subsequent FindGlut stuff to not search for other variables.... kind of a hack
+            #forcing subsequent FindGlut stuff to not search for other variables.... kind of a hack 
             SET(GLUT_glut_LIBRARY ${GLUT_LIBRARY} CACHE FILEPATH "")
             MARK_AS_ADVANCED(GLUT_glut_LIBRARY)
         ENDIF(GLUT_FOUND)
@@ -87,18 +81,16 @@ MACRO(SEARCH_3RDPARTY OSG_3RDPARTY_BIN)
         IF(ZLIB_FOUND)
             FIND_DEPENDENCY(PNG png.h "libpng;libpng13;libpng15;libpng16" ${OSG_3RDPARTY_BIN} "D" "")
             IF(PNG_FOUND)
-                #forcing subsequent FindPNG stuff to not search for other variables.... kind of a hack
+                #forcing subsequent FindPNG stuff to not search for other variables.... kind of a hack 
                 SET(PNG_PNG_INCLUDE_DIR ${PNG_INCLUDE_DIR} CACHE FILEPATH "")
                 MARK_AS_ADVANCED(PNG_PNG_INCLUDE_DIR)
             ENDIF(PNG_FOUND)
         ENDIF(ZLIB_FOUND)
-        
+        FIND_DEPENDENCY(LIBXML2 libxml2 "libxml2" ${OSG_3RDPARTY_BIN} "D" "")   
-        # CMakes default module to find libxml2 will not find the in
-        FIND_DEPENDENCY(LIBXML2 libxml/xpath.h "libxml2" ${OSG_3RDPARTY_BIN} "D" "")
         IF(LIBXML2_FOUND)
-            # The CMAKE find libxml module uses LIBXML2_LIBRARIES -> fill it.... kind of a hack
+            # The CMAKE find libxml module uses LIBXML2_LIBRARIES -> fill it.... kind of a hack 
-            SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARY} CACHE FILEPATH "LibXML2 library for collada" FORCE)
+            SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARY} CACHE FILEPATH "" FORCE)
-        #    SET(LIBXML2_XMLLINT_EXECUTABLE ${OSG_3RDPARTY_BIN}/bin/xmllint.exe CACHE FILEPATH "Path to xmllint executable" FORCE)
+            SET(LIBXML2_XMLLINT_EXECUTABLE ${OSG_3RDPARTY_BIN}/bin/xmllint.exe CACHE FILEPATH "Path to xmllint executable" FORCE)
         ENDIF(LIBXML2_FOUND)
         #FIND_DEPENDENCY(DEPNAME INCLUDEFILE LIBRARY_NAMES_BASE SEARCHPATHLIST DEBUGSUFFIX EXSUFFIX)
         FIND_Package(NVTT)
@@ -112,7 +104,7 @@ ENDMACRO(SEARCH_3RDPARTY OSG_3RDPARTY_BIN)
 # this is code for handling optional 3RDPARTY usage
 ################################################################################################
 
-OPTION(USE_3RDPARTY_BIN "Set to ON to use Mike or Torbens prebuilt dependencies situated side of OpenSceneGraph source.  Use OFF for avoiding." ON)
+OPTION(USE_3RDPARTY_BIN "Set to ON to use Mike prebuilt dependencies situated side of OpenSceneGraph source.  Use OFF for avoiding." ON)
 IF(USE_3RDPARTY_BIN)
 
     # Check Architecture
@@ -140,7 +132,7 @@ IF(USE_3RDPARTY_BIN)
             SET(TEST_3RDPARTY_DIR "${PARENT_DIR}/3rdParty_win32binaries_vs90sp1")
         ENDIF()
     ENDIF(NOT EXISTS ${TEST_3RDPARTY_DIR})
-
+    
     SET(ACTUAL_3RDPARTY_DIR "${TEST_3RDPARTY_DIR}" CACHE PATH "Location of 3rdparty dependencies")
     SET(ACTUAL_3DPARTY_DIR "${ACTUAL_3RDPARTY_DIR}")  # kept for backcompatibility
     IF(EXISTS ${ACTUAL_3RDPARTY_DIR})

CMakeModules/FindAVFoundation.cmake

@@ -30,9 +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_VERSION VERSION_LESS 10.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")
-        MESSAGE("AVFoundation disabled for SDK < 10.8")
+          # nothing special here ;-)
-        SET(AV_FOUNDATION_FOUND "NO")
+      ELSE()
+          MESSAGE("AVFoundation disabled for SDK < 10.8")
+          SET(AV_FOUNDATION_FOUND "NO")
       ENDIF()
   ENDIF()
 ENDIF()

CMakeModules/FindCOLLADA.cmake

@@ -23,38 +23,24 @@ ELSE ()
 ENDIF()
 
 
+
 IF(APPLE)
     SET(COLLADA_BUILDNAME "mac")
-  SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BUILDNAME})
 ELSEIF(MINGW)
     SET(COLLADA_BUILDNAME "mingw")
-  SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BUILDNAME})
+ELSEIF(MSVC12)
-ELSEIF(MSVC_VERSION EQUAL 1900 OR MSVC_VERSION EQUAL 1910 )
-    SET(COLLADA_BUILDNAME "vc14")
-    SET(COLLADA_BOOST_BUILDNAME "vc140")
-ELSEIF(MSVC_VERSION EQUAL 1800)
     SET(COLLADA_BUILDNAME "vc12")
-    SET(COLLADA_BOOST_BUILDNAME "vc120")
+ELSEIF(MSVC11)
-ELSEIF(MSVC_VERSION EQUAL 1700)
     SET(COLLADA_BUILDNAME "vc11")
-    SET(COLLADA_BOOST_BUILDNAME "vc110")
+ELSEIF(MSVC10)
-ELSEIF(MSVC_VERSION EQUAL 1600)
     SET(COLLADA_BUILDNAME "vc10")
-    SET(COLLADA_BOOST_BUILDNAME "vc100")
+ELSEIF(MSVC90)
-ELSEIF(MSVC_VERSION EQUAL 1500)
     SET(COLLADA_BUILDNAME "vc9")
-    SET(COLLADA_BOOST_BUILDNAME "vc90")
+ELSEIF(MSVC80)
-ELSEIF(MSVC_VERSION EQUAL 1400)
     SET(COLLADA_BUILDNAME "vc8")
-    SET(COLLADA_BOOST_BUILDNAME "vc80")
+ELSE(APPLE)
-ELSE()
   SET(COLLADA_BUILDNAME "linux")
-  SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BUILDNAME})
+ENDIF(APPLE)
-ENDIF()
-
-IF(${CMAKE_VS_PLATFORM_TOOLSET})
-    string(REPLACE "v" "vc" COLLADA_BOOST_BUILDNAME ${CMAKE_VS_PLATFORM_TOOLSET})
-ENDIF()
 
 
 FIND_PATH(COLLADA_INCLUDE_DIR dae.h
@@ -67,19 +53,10 @@ FIND_PATH(COLLADA_INCLUDE_DIR dae.h
     /usr/local/include
     /usr/local/include/colladadom
     /usr/local/include/collada-dom
-    /usr/local/include/collada-dom2.5
-    /usr/local/include/collada-dom2.4
-    /usr/local/include/collada-dom2.2
     /opt/local/include/collada-dom
-    /opt/local/include/collada-dom2.5
-    /opt/local/include/collada-dom2.4
-    /opt/local/include/collada-dom2.2
     /usr/include/
     /usr/include/colladadom
     /usr/include/collada-dom
-    /usr/include/collada-dom2.5
-    /usr/include/collada-dom2.4
-    /usr/include/collada-dom2.2
     /sw/include # Fink
     /opt/local/include # DarwinPorts
     /opt/csw/include # Blastwave
@@ -89,7 +66,7 @@ FIND_PATH(COLLADA_INCLUDE_DIR dae.h
 )
 
 FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY
-    NAMES collada_dom collada14dom Collada14Dom libcollada14dom21 libcollada14dom22 collada-dom2.5-dp collada-dom2.5-dp-${COLLADA_BOOST_BUILDNAME}-mt collada-dom2.4-dp collada-dom2.4-dp-${COLLADA_BOOST_BUILDNAME}-mt
+    NAMES collada_dom collada14dom Collada14Dom libcollada14dom21 libcollada14dom22 collada-dom2.4-dp
     PATHS
     ${COLLADA_DOM_ROOT}/build/${COLLADA_BUILDNAME}-1.4
     ${COLLADA_DOM_ROOT}
@@ -113,7 +90,7 @@ FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY
 )
 
 FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY_DEBUG
-    NAMES collada_dom-d collada14dom-d Collada14Dom-d libcollada14dom21-d libcollada14dom22-d  collada-dom2.5-dp-d collada-dom2.5-dp-${COLLADA_BOOST_BUILDNAME}-mt-d collada-dom2.4-dp-d collada-dom2.4-dp-${COLLADA_BOOST_BUILDNAME}-mt-d
+    NAMES collada_dom-d collada14dom-d Collada14Dom-d libcollada14dom21-d libcollada14dom22-d  collada-dom2.4-dp-d
     PATHS
     ${COLLADA_DOM_ROOT}/build/${COLLADA_BUILDNAME}-1.4-d
     ${COLLADA_DOM_ROOT}
@@ -201,16 +178,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
 
     FIND_PACKAGE(ZLIB)
     IF (ZLIB_FOUND)
-        IF (ZLIB_LIBRARY_RELEASE)
+        SET(COLLADA_ZLIB_LIBRARY "${ZLIB_LIBRARY}" CACHE FILEPATH "" FORCE)
-            SET(COLLADA_ZLIB_LIBRARY "${ZLIB_LIBRARY_RELEASE}" CACHE FILEPATH "" FORCE)
-        ELSE(ZLIB_LIBRARY_RELEASE)
-            SET(COLLADA_ZLIB_LIBRARY "${ZLIB_LIBRARY}" CACHE FILEPATH "" FORCE)
-        ENDIF(ZLIB_LIBRARY_RELEASE)
-        IF (ZLIB_LIBRARY_DEBUG)
-            SET(COLLADA_ZLIB_LIBRARY_DEBUG "${ZLIB_LIBRARY_DEBUG}" CACHE FILEPATH "" FORCE)
-        ELSE(ZLIB_LIBRARY_DEBUG)
-            SET(COLLADA_ZLIB_LIBRARY_DEBUG "${COLLADA_ZLIB_LIBRARY}" CACHE FILEPATH "" FORCE)
-        ENDIF(ZLIB_LIBRARY_DEBUG)
     ELSE(ZLIB_FOUND)
         IF(WIN32)
             FIND_LIBRARY(COLLADA_ZLIB_LIBRARY
@@ -276,7 +244,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
     )
 
     FIND_LIBRARY(COLLADA_BOOST_FILESYSTEM_LIBRARY
-        NAMES libboost_filesystem boost_filesystem boost_filesystem-mt libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_54 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_55 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_58 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_62 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_63
+        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
@@ -284,7 +252,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_BOOST_BUILDNAME}-mt-gd libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_54 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_55 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_58 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_62 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_63
+        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
@@ -292,7 +260,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
     )
 
     FIND_LIBRARY(COLLADA_BOOST_SYSTEM_LIBRARY
-        NAMES libboost_system boost_system boost_system-mt libboost_system-${COLLADA_BOOST_BUILDNAME}-mt libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_54 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_55  libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_58 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_62 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_63
+        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
@@ -300,7 +268,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_BOOST_BUILDNAME}-mt-gd libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_54 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_55 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_58 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_62 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_63
+        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/FindEGL.cmake

@@ -1,33 +0,0 @@
-# Finds EGL header and library
-#
-# This script defines the following:
-#  EGL_FOUND // Set to TRUE if EGL is found
-#  EGL_INCLUDE_DIR // Parent directory of directory EGL/egl.h header.
-#
-# EGL_DIR can be set as an environment variable or a CMake variable,
-# to the parent directory of the EGL header.
-#
-
-
-FIND_PATH( EGL_INCLUDE_DIR
-    NAMES EGL/egl.h
-    HINTS ENV EGL_DIR
-)
-
-FIND_LIBRARY(EGL_LIBRARY
-    NAMES EGL
-    HINTS ENV EGL_DIR
-    PATH_SUFFIXES lib
-)
-
-# handle the QUIETLY and REQUIRED arguments and set
-# EGL_FOUND to TRUE as appropriate
-INCLUDE( FindPackageHandleStandardArgs )
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(EGL
-                                  REQUIRED_VARS EGL_LIBRARY EGL_INCLUDE_DIR)
-
-MARK_AS_ADVANCED(
-    EGL_INCLUDE_DIR
-    EGL_LIBRARY
-)

CMakeModules/FindFBX.cmake

@@ -9,12 +9,7 @@
 # correspond to the ./configure --prefix=$FBX_DIR
 
 IF(APPLE)
-  if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    # using regular Clang or AppleClang
-    SET(FBX_LIBDIR "clang")
-  else()
     SET(FBX_LIBDIR "gcc4/ub")
-  endif()
 ELSEIF(CMAKE_COMPILER_IS_GNUCXX)
     SET(FBX_LIBDIR "gcc4")
 ELSEIF(MSVC80)
@@ -25,10 +20,8 @@ ELSEIF(MSVC10)
     SET(FBX_LIBDIR "vs2010")
 ELSEIF(MSVC11)
     SET(FBX_LIBDIR "vs2012")
-ELSEIF(MSVC12 OR MSVC_VERSION==1800)
+ELSEIF(MSVC12 OR MSVC_VERSION>1800)
     SET(FBX_LIBDIR "vs2013")
-ELSEIF(MSVC14 OR MSVC_VERSION>1900)
-    SET(FBX_LIBDIR "vs2015")
 ENDIF()
 
 IF(APPLE)
@@ -44,41 +37,26 @@ ENDIF()
 #try to use 2015.1 or 2014.2 version
 
 IF(APPLE)
-    SET(FBX_LIBNAME "fbxsdk")
+    SET(FBX_LIBNAME "libfbxsdk")
 ELSEIF(CMAKE_COMPILER_IS_GNUCXX)
     SET(FBX_LIBNAME "fbxsdk")
 ELSE()
-    OPTION(FBX_SHARED OFF)
+    SET(FBX_LIBNAME "libfbxsdk-md")
-    IF(FBX_SHARED)
-        SET(FBX_LIBNAME "libfbxsdk")
-    ELSE()
-        SET(FBX_LIBNAME "libfbxsdk-md")
-    ENDIF()
 ENDIF()
 
 SET(FBX_LIBNAME_DEBUG ${FBX_LIBNAME}d)
 
 SET( FBX_SEARCH_PATHS
     $ENV{FBX_DIR}
-    "$ENV{ProgramW6432}/Autodesk/FBX/FBX SDK/2018.1.1"
-    "$ENV{PROGRAMFILES}/Autodesk/FBX/FBX SDK/2018.1.1"
-    "/Applications/Autodesk/FBX\ SDK/2018.0"
-    "$ENV{ProgramW6432}/Autodesk/FBX/FBX SDK/2017.1"
-    "$ENV{PROGRAMFILES}/Autodesk/FBX/FBX SDK/2017.1"
-    "/Applications/Autodesk/FBX SDK/2017.1"
-    "$ENV{ProgramW6432}/Autodesk/FBX/FBX SDK/2016.1.2"
-    "$ENV{PROGRAMFILES}/Autodesk/FBX/FBX SDK/2016.1.2"
-    "$ENV{ProgramW6432}/Autodesk/FBX/FBX SDK/2016.1.1"
-    "$ENV{PROGRAMFILES}/Autodesk/FBX/FBX SDK/2016.1.1"
     "$ENV{ProgramW6432}/Autodesk/FBX/FBX SDK/2015.1"
     "$ENV{PROGRAMFILES}/Autodesk/FBX/FBX SDK/2015.1"
-    "/Applications/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/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"
@@ -118,9 +96,8 @@ IF(NOT FBX_FOUND)
 
     SET( FBX_SEARCH_PATHS
         $ENV{FBX_DIR}
-        "$ENV{ProgramW6432}/Autodesk/FBX/FBX SDK/2014.1"
+        $ENV{ProgramW6432}/Autodesk/FBX/FBX SDK/2014.1
-        "$ENV{PROGRAMFILES}/Autodesk/FBX/FBX SDK/2014.1"
+        $ENV{PROGRAMFILES}/Autodesk/FBX/FBX SDK/2014.1
-        "/Applications/Autodesk/FBX/FBX SDK/2014.1"
         /Applications/Autodesk/FBXSDK20141
     )
 
@@ -157,9 +134,8 @@ IF(NOT FBX_FOUND)
 
     SET( FBX_SEARCH_PATHS
         $ENV{FBX_DIR}
-        "$ENV{ProgramW6432}/Autodesk/FBX/FBX SDK/2013.3"
+        $ENV{ProgramW6432}/Autodesk/FBX/FBX SDK/2013.3
-        "$ENV{PROGRAMFILES}/Autodesk/FBX/FBX SDK/2013.3"
+        $ENV{PROGRAMFILES}/Autodesk/FBX/FBX SDK/2013.3
-        "/Applications/Autodesk/FBX/FBX SDK/2013.3"
         /Applications/Autodesk/FBXSDK20133
     )
 

CMakeModules/FindFFmpeg.cmake

@@ -12,7 +12,7 @@
 
 #In ffmpeg code, old version use "#include <header.h>" and newer use "#include <libname/header.h>"
 #In OSG ffmpeg plugin, we used "#include <header.h>" for compatibility with old version of ffmpeg
-#With the new version of FFmpeg, a file named "time.h" was added that breaks compatibility with the old version of ffmpeg.
+#With the new version of FFmpeg, a file named "time.h" was added that breaks compatability with the old version of ffmpeg.
 
 #We have to search the path which contain the header.h (useful for old version)
 #and search the path which contain the libname/header.h (useful for new version)
@@ -96,7 +96,7 @@ ENDMACRO(FFMPEG_FIND)
 SET(FFMPEG_ROOT "$ENV{FFMPEG_DIR}" CACHE PATH "Location of FFMPEG")
 
 # find stdint.h
-IF(MSVC)
+IF(WIN32)
 
     FIND_PATH(FFMPEG_STDINT_INCLUDE_DIR stdint.h
         PATHS

CMakeModules/FindFreetype.cmake

@@ -1,188 +1,141 @@
-#.rst:
+# - Locate FreeType library
-# FindFreetype
-# ------------
-#
-# Locate FreeType library
-#
 # This module defines
-#
+#  FREETYPE_LIBRARY, the library to link against
-# ::
+#  FREETYPE_FOUND, if false, do not try to link to FREETYPE
-#
+#  FREETYPE_INCLUDE_DIRS, where to find headers.
-#   FREETYPE_LIBRARIES, the library to link against
+#  This is the concatenation of the paths:
-#   FREETYPE_FOUND, if false, do not try to link to FREETYPE
+#  FREETYPE_INCLUDE_DIR_ft2build
-#   FREETYPE_INCLUDE_DIRS, where to find headers.
+#  FREETYPE_INCLUDE_DIR_freetype2
-#   FREETYPE_VERSION_STRING, the version of freetype found (since CMake 2.8.8)
+#   
-#   This is the concatenation of the paths:
+# $FREETYPE_DIR is an environment variable that would
-#   FREETYPE_INCLUDE_DIR_ft2build
+# correspond to the ./configure --prefix=$FREETYPE_DIR
-#   FREETYPE_INCLUDE_DIR_freetype2
+# used in building FREETYPE.
-#
+# Created by Eric Wing. 
-#
-#
-# $FREETYPE_DIR is an environment variable that would correspond to the
-# ./configure --prefix=$FREETYPE_DIR used in building FREETYPE.
 
-#=============================================================================
+# prefer FindFreetype from cmake distribution
-# Copyright 2000-2016 Kitware, Inc.
+if(EXISTS ${CMAKE_ROOT}/Modules/FindFreetype.cmake)
-# Copyright 2000-2011 Insight Software Consortium
+  include(${CMAKE_ROOT}/Modules/FindFreetype.cmake)
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-#   notice, this list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright
-#   notice, this list of conditions and the following disclaimer in the
-#   documentation and/or other materials provided with the distribution.
-#
-# * Neither the names of Kitware, Inc., the Insight Software Consortium,
-#   nor the names of their contributors may be used to endorse or promote
-#   products derived from this software without specific prior written
-#   permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#=============================================================================
 
-# Created by Eric Wing.
+  if(FREETYPE_FOUND)
-# Modifications by Alexander Neundorf.
+    return()
-# This file has been renamed to "FindFreetype.cmake" instead of the correct
+  endif()
-# "FindFreeType.cmake" in order to be compatible with the one from KDE4, Alex.
+endif()
 
-# Ugh, FreeType seems to use some #include trickery which
+# Ugh, FreeType seems to use some #include trickery which 
 # makes this harder than it should be. It looks like they
 # put ft2build.h in a common/easier-to-find location which
-# then contains a #include to a more specific header in a
+# then contains a #include to a more specific header in a 
 # more specific location (#include <freetype/config/ftheader.h>).
-# Then from there, they need to set a bunch of #define's
+# Then from there, they need to set a bunch of #define's 
 # so you can do something like:
 # #include FT_FREETYPE_H
-# Unfortunately, using CMake's mechanisms like include_directories()
+# Unfortunately, using CMake's mechanisms like INCLUDE_DIRECTORIES()
 # wants explicit full paths and this trickery doesn't work too well.
-# I'm going to attempt to cut out the middleman and hope
+# I'm going to attempt to cut out the middleman and hope 
 # everything still works.
 
-# Adapted for OpenSceneGraph until the updates here for finding the debug Windows library freetyped are released with CMake
+FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h 
-
-set(FREETYPE_FIND_ARGS
-  HINTS
-    ENV FREETYPE_DIR
   PATHS
-    /usr/X11R6
+  $ENV{FREETYPE_DIR}
-    /usr/local/X11R6
+  NO_DEFAULT_PATH
-    /usr/local/X11
+  PATH_SUFFIXES include    
-    /usr/freeware
+)
-    ENV GTKMM_BASEPATH
+FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h 
-    [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
+  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
+  NO_DEFAULT_PATH
+  PATH_SUFFIXES include
+)
+FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h 
+  PATHS
+  /usr/local
+  /usr
+  /usr/local/X11R6
+  /usr/local/X11
+  /usr/X11R6
+  /usr/X11
+  /sw
+  /opt/local
+  /opt/csw
+  /opt
+  /usr/freeware
+  PATH_SUFFIXES include include/freetype2
 )
 
-find_path(
+FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h 
-  FREETYPE_INCLUDE_DIR_ft2build
+  $ENV{FREETYPE_DIR}/include/freetype2
-  ft2build.h
+  NO_DEFAULT_PATH
-  ${FREETYPE_FIND_ARGS}
+)
-  PATH_SUFFIXES
+FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h 
-    include/freetype2
+  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    include
+  NO_DEFAULT_PATH
-    freetype2
+  PATH_SUFFIXES include/freetype2
+)
+FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/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_path(
+FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h 
-  FREETYPE_INCLUDE_DIR_freetype2
+  /usr/local/include/freetype2
-  NAMES
+  /usr/include/freetype2
-    freetype/config/ftheader.h
+  /usr/local/X11R6/include/freetype2
-    config/ftheader.h
+  /usr/local/X11/include/freetype2
-  ${FREETYPE_FIND_ARGS}
+  /usr/X11R6/include/freetype2
-  PATH_SUFFIXES
+  /usr/X11/include/freetype2
-    include/freetype2
+  /sw/include/freetype2
-    include
+  /opt/local/include/freetype2
-    freetype2
+  /opt/csw/include/freetype2
+  /opt/include/freetype2
+  /usr/freeware/include/freetype2
 )
 
-if(NOT FREETYPE_LIBRARY)
+FIND_LIBRARY(FREETYPE_LIBRARY 
-  find_library(FREETYPE_LIBRARY_RELEASE
+  NAMES freetype libfreetype freetype219
-    NAMES
+  PATHS
-      freetype
+  $ENV{FREETYPE_DIR}
-      libfreetype
+  NO_DEFAULT_PATH
-      freetype219
+  PATH_SUFFIXES lib64 lib 
-    ${FREETYPE_FIND_ARGS}
+)
-    PATH_SUFFIXES
+FIND_LIBRARY(FREETYPE_LIBRARY 
-      lib
+  NAMES freetype libfreetype freetype219
-  )
+  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  find_library(FREETYPE_LIBRARY_DEBUG
+  NO_DEFAULT_PATH
-    NAMES
+  PATH_SUFFIXES lib64 lib 
-      freetyped
+)
-      libfreetyped
+FIND_LIBRARY(FREETYPE_LIBRARY 
-      freetype219d
+  NAMES freetype libfreetype freetype219
-    ${FREETYPE_FIND_ARGS}
+  PATHS
-    PATH_SUFFIXES
+  /usr/local
-      lib
+  /usr
-  )
+  /usr/local/X11R6
-  include(SelectLibraryConfigurations) #OSG Look in CMake Modules dir
+  /usr/local/X11
-  select_library_configurations(FREETYPE)
+  /usr/X11R6
-endif()
+  /usr/X11
-
+  /sw
-unset(FREETYPE_FIND_ARGS)
+  /opt/local
-
+  /opt/csw
-# set the user variables
+  /opt
-if(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
+  /usr/freeware
-  set(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR_ft2build};${FREETYPE_INCLUDE_DIR_freetype2}")
+  PATH_SUFFIXES lib64 lib
-  list(REMOVE_DUPLICATES FREETYPE_INCLUDE_DIRS)
-endif()
-set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}")
-
-if(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
-  set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
-elseif(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
-  set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
-endif()
-
-if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H)
-  file(STRINGS "${FREETYPE_H}" freetype_version_str
-       REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$")
-
-  unset(FREETYPE_VERSION_STRING)
-  foreach(VPART MAJOR MINOR PATCH)
-    foreach(VLINE ${freetype_version_str})
-      if(VLINE MATCHES "^#[\t ]*define[\t ]+FREETYPE_${VPART}[\t ]+([0-9]+)$")
-        set(FREETYPE_VERSION_PART "${CMAKE_MATCH_1}")
-        if(FREETYPE_VERSION_STRING)
-          set(FREETYPE_VERSION_STRING "${FREETYPE_VERSION_STRING}.${FREETYPE_VERSION_PART}")
-        else()
-          set(FREETYPE_VERSION_STRING "${FREETYPE_VERSION_PART}")
-        endif()
-        unset(FREETYPE_VERSION_PART)
-      endif()
-    endforeach()
-  endforeach()
-endif()
-
-
-# handle the QUIETLY and REQUIRED arguments and set FREETYPE_FOUND to TRUE if
-# all listed variables are TRUE
-include(FindPackageHandleStandardArgs) #OSG Look in CMake Modules dir
-
-find_package_handle_standard_args(
-  Freetype
-  REQUIRED_VARS
-    FREETYPE_LIBRARY
-    FREETYPE_INCLUDE_DIRS
-  VERSION_VAR
-    FREETYPE_VERSION_STRING
 )
 
-mark_as_advanced(
+IF(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
-  FREETYPE_INCLUDE_DIR_freetype2
+  SET(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR_ft2build};${FREETYPE_INCLUDE_DIR_freetype2}")
-  FREETYPE_INCLUDE_DIR_ft2build
+ENDIF(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
-)
+
+
+SET(FREETYPE_FOUND "NO")
+IF(FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIRS)
+  SET(FREETYPE_FOUND "YES")
+ENDIF(FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIRS)
+
+

CMakeModules/FindGStreamer.cmake

@@ -65,7 +65,7 @@
 #    )
 #endmacro()
 
-if (MSVC)
+if (WIN32)
     macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _library)
         find_path(${_component_prefix}_INCLUDE_DIRS
             NAMES ${_header}

CMakeModules/FindGTA.cmake

@@ -16,42 +16,41 @@ IF(PKG_CONFIG_FOUND)
 
     PKG_CHECK_MODULES(GTA gta)
 
+ELSE(PKG_CONFIG_FOUND)
+
+FIND_PATH(GTA_INCLUDE_DIRS gta/gta.hpp
+    $ENV{GTA_DIR}/include
+    $ENV{GTA_DIR}
+    ~/Library/Frameworks
+    /Library/Frameworks
+    /usr/local/include
+    /usr/include
+    /sw/include # Fink
+    /opt/local/include # DarwinPorts
+    /opt/csw/include # Blastwave
+    /opt/include
+    /usr/freeware/include
+)
+
+FIND_LIBRARY(GTA_LIBRARIES 
+    NAMES gta libgta
+    PATHS
+    $ENV{GTA_DIR}/lib
+    $ENV{GTA_DIR}
+    ~/Library/Frameworks
+    /Library/Frameworks
+    /usr/local/lib
+    /usr/lib
+    /sw/lib
+    /opt/local/lib
+    /opt/csw/lib
+    /opt/lib
+    /usr/freeware/lib64
+)
+
+SET(GTA_FOUND "NO")
+IF(GTA_LIBRARIES AND GTA_INCLUDE_DIRS)
+    SET(GTA_FOUND "YES")
+ENDIF(GTA_LIBRARIES AND GTA_INCLUDE_DIRS)
+
 ENDIF(PKG_CONFIG_FOUND)
-
-IF(NOT GTA_FOUND)
-    FIND_PATH(GTA_INCLUDE_DIRS gta/gta.hpp
-        $ENV{GTA_DIR}/include
-        $ENV{GTA_DIR}
-        ~/Library/Frameworks
-        /Library/Frameworks
-        /usr/local/include
-        /usr/include
-        /sw/include # Fink
-        /opt/local/include # DarwinPorts
-        /opt/csw/include # Blastwave
-        /opt/include
-        /usr/freeware/include
-    )
-    
-    FIND_LIBRARY(GTA_LIBRARY
-        NAMES gta libgta
-        PATHS
-        $ENV{GTA_DIR}/lib
-        $ENV{GTA_DIR}
-        ~/Library/Frameworks
-        /Library/Frameworks
-        /usr/local/lib
-        /usr/lib
-        /sw/lib
-        /opt/local/lib
-        /opt/csw/lib
-        /opt/lib
-        /usr/freeware/lib64
-    )
-    
-    SET(GTA_FOUND "NO")
-    IF(GTA_LIBRARY AND GTA_INCLUDE_DIRS)
-        SET(GTA_FOUND "YES")
-    ENDIF(GTA_LIBRARY AND GTA_INCLUDE_DIRS)
-
-ENDIF(NOT GTA_FOUND)

CMakeModules/FindLIBLAS.cmake

@@ -17,7 +17,7 @@ macro(FIND_LIBLAS_LIBRARY MYLIBRARY MYLIBRARYNAME)
 
    find_library(
      "${MYLIBRARY}_DEBUG"
-     NAMES "${MYLIBRARYNAME}${CMAKE_DEBUG_POSTFIX}" "lib${MYLIBRARYNAME}${CMAKE_DEBUG_POSTFIX}"
+     NAMES "${MYLIBRARYNAME}${CMAKE_DEBUG_POSTFIX}"
      PATHS
      ${LIBLAS_DIR}/lib/Debug
      ${LIBLAS_DIR}/lib64/Debug
@@ -30,7 +30,7 @@ macro(FIND_LIBLAS_LIBRARY MYLIBRARY MYLIBRARYNAME)
 
    find_library(
      "${MYLIBRARY}_DEBUG"
-     NAMES "${MYLIBRARYNAME}${CMAKE_DEBUG_POSTFIX}" "lib${MYLIBRARYNAME}${CMAKE_DEBUG_POSTFIX}"
+     NAMES "${MYLIBRARYNAME}${CMAKE_DEBUG_POSTFIX}"
      PATHS
      ~/Library/Frameworks
      /Library/Frameworks
@@ -48,7 +48,7 @@ macro(FIND_LIBLAS_LIBRARY MYLIBRARY MYLIBRARYNAME)
 
    find_library(
      ${MYLIBRARY}
-     NAMES "${MYLIBRARYNAME}${CMAKE_RELEASE_POSTFIX}" "lib${MYLIBRARYNAME}${CMAKE_RELEASE_POSTFIX}"
+     NAMES "${MYLIBRARYNAME}${CMAKE_RELEASE_POSTFIX}"
      PATHS
      ${LIBLAS_DIR}/lib/Release
      ${LIBLAS_DIR}/lib64/Release
@@ -69,7 +69,7 @@ macro(FIND_LIBLAS_LIBRARY MYLIBRARY MYLIBRARYNAME)
 
    find_library(
      ${MYLIBRARY}
-     NAMES "${MYLIBRARYNAME}${CMAKE_RELEASE_POSTFIX}" "lib${MYLIBRARYNAME}${CMAKE_RELEASE_POSTFIX}"
+     NAMES "${MYLIBRARYNAME}${CMAKE_RELEASE_POSTFIX}"
      PATHS
      ~/Library/Frameworks
      /Library/Frameworks
@@ -94,12 +94,14 @@ macro(FIND_LIBLAS_LIBRARY MYLIBRARY MYLIBRARYNAME)
 endmacro(FIND_LIBLAS_LIBRARY LIBRARY LIBRARYNAME)
 
 FIND_LIBLAS_LIBRARY(LIBLAS_LIBRARY las)
+FIND_LIBLAS_LIBRARY(LIBLASC_LIBRARY las_c)
 
 set(LIBLAS_FOUND "NO")
-if(LIBLAS_LIBRARY AND LIBLAS_INCLUDE_DIR)
+if(LIBLAS_LIBRARY AND LIBLASC_LIBRARY AND LIBLAS_INCLUDE_DIR)
+
     FIND_PACKAGE(Boost) # used by LIBLAS
     if(Boost_FOUND)
-        set(LIBLAS_LIBRARIES ${LIBLAS_LIBRARY} )
+        set(LIBLAS_LIBRARIES ${LIBLAS_LIBRARY} ${LIBLASC_LIBRARY} )
         set(LIBLAS_FOUND "YES")
     endif()
 endif()

CMakeModules/FindNVTT.cmake

@@ -16,7 +16,7 @@ FIND_PATH(NVTT_INCLUDE_DIR nvtt/nvtt.h
 )
 
 # NVTT
-FIND_LIBRARY(NVTT_LIBRARY_RELEASE
+FIND_LIBRARY(NVTT_LIBRARY
   NAMES nvtt
   PATHS
   /usr/local
@@ -37,7 +37,7 @@ FIND_LIBRARY(NVTT_LIBRARY_DEBUG
 )
 
 # NVIMAGE
-FIND_LIBRARY(NVIMAGE_LIBRARY_RELEASE
+FIND_LIBRARY(NVIMAGE_LIBRARY
   NAMES nvimage
   PATHS
   /usr/local
@@ -58,7 +58,7 @@ FIND_LIBRARY(NVIMAGE_LIBRARY_DEBUG
 )
 
 # NVMATH
-FIND_LIBRARY(NVMATH_LIBRARY_RELEASE
+FIND_LIBRARY(NVMATH_LIBRARY
   NAMES nvmath
   PATHS
   /usr/local
@@ -79,7 +79,7 @@ FIND_LIBRARY(NVMATH_LIBRARY_DEBUG
 )
 
 # NVCORE
-FIND_LIBRARY(NVCORE_LIBRARY_RELEASE
+FIND_LIBRARY(NVCORE_LIBRARY
   NAMES nvcore
   PATHS
   /usr/local
@@ -98,114 +98,10 @@ FIND_LIBRARY(NVCORE_LIBRARY_DEBUG
   PATH_SUFFIXES lib64 lib lib/shared lib/static lib64/static
 )
 
-# NVTHREAD
-FIND_LIBRARY(NVTHREAD_LIBRARY_RELEASE
-  NAMES nvthread
-  PATHS
-  /usr/local
-  /usr
-  $ENV{NVTT_DIR}
-  ${3rdPartyRoot}
-  PATH_SUFFIXES lib64 lib lib/shared lib/static lib64/static
-)
-FIND_LIBRARY(NVTHREAD_LIBRARY_DEBUG
-  NAMES nvthread_d
-  PATHS
-  /usr/local
-  /usr
-  $ENV{NVTT_DIR}
-  ${3rdPartyRoot}
-  PATH_SUFFIXES lib64 lib lib/shared lib/static lib64/static
-)
-
-# SQUISH
-FIND_LIBRARY(NVSQUISH_LIBRARY_RELEASE
-  NAMES squish
-  PATHS
-  /usr/local
-  /usr
-  $ENV{NVTT_DIR}
-  ${3rdPartyRoot}
-  PATH_SUFFIXES lib64 lib lib/shared lib/static lib64/static
-)
-FIND_LIBRARY(NVSQUISH_LIBRARY_DEBUG
-  NAMES squish_d
-  PATHS
-  /usr/local
-  /usr
-  $ENV{NVTT_DIR}
-  ${3rdPartyRoot}
-  PATH_SUFFIXES lib64 lib lib/shared lib/static lib64/static
-)
-
-# BC6H
-FIND_LIBRARY(NVBC6H_LIBRARY_RELEASE
-  NAMES bc6h
-  PATHS
-  /usr/local
-  /usr
-  $ENV{NVTT_DIR}
-  ${3rdPartyRoot}
-  PATH_SUFFIXES lib64 lib lib/shared lib/static lib64/static
-)
-FIND_LIBRARY(NVBC6H_LIBRARY_DEBUG
-  NAMES bc6h_d
-  PATHS
-  /usr/local
-  /usr
-  $ENV{NVTT_DIR}
-  ${3rdPartyRoot}
-  PATH_SUFFIXES lib64 lib lib/shared lib/static lib64/static
-)
-
-# BC7
-FIND_LIBRARY(NVBC7_LIBRARY_RELEASE
-  NAMES bc7
-  PATHS
-  /usr/local
-  /usr
-  $ENV{NVTT_DIR}
-  ${3rdPartyRoot}
-  PATH_SUFFIXES lib64 lib lib/shared lib/static lib64/static
-)
-FIND_LIBRARY(NVBC7_LIBRARY_DEBUG
-  NAMES bc7_d
-  PATHS
-  /usr/local
-  /usr
-  $ENV{NVTT_DIR}
-  ${3rdPartyRoot}
-  PATH_SUFFIXES lib64 lib lib/shared lib/static lib64/static
-)
-
-IF (WIN32)
-    SET(LIBS_TO_SETUP "NVTT" "NVCORE" "NVMATH" "NVIMAGE" "NVTHREAD" "NVBC7" "NVBC6H" "NVSQUISH")
-ELSE()
-    SET(LIBS_TO_SETUP "NVTT" "NVCORE" "NVMATH" "NVIMAGE")
-ENDIF()
 
 
-FOREACH(LIB ${LIBS_TO_SETUP})
-	IF(${LIB}_LIBRARY_DEBUG)
-	   SET(${LIB}_LIBRARIES  optimized ${${LIB}_LIBRARY_RELEASE} debug ${${LIB}_LIBRARY_DEBUG})
-	ELSE(${LIB}_LIBRARY_DEBUG)
-	   SET(${LIB}_LIBRARY_DEBUG ${${LIB}_LIBRARY_RELEASE})
-	   SET(${LIB}_LIBRARIES  optimized  ${${LIB}_LIBRARY_RELEASE} debug ${${LIB}_LIBRARY_DEBUG}) 
-	ENDIF(${LIB}_LIBRARY_DEBUG)
-ENDFOREACH(LIB ${LIBS_TO_SETUP})
-
-SET(NVTT_LIBRARIES
-	${NVTT_LIBRARIES}  
-	${NVCORE_LIBRARIES} 
-	${NVMATH_LIBRARIES} 
-	${NVIMAGE_LIBRARIES} 
-	${NVTHREAD_LIBRARIES} 
-	${NVBC7_LIBRARIES} 
-	${NVBC6H_LIBRARIES} 
-	${NVSQUISH_LIBRARIES}
-) 
 
 SET(NVTT_FOUND "NO")
-IF(NVTT_LIBRARY_RELEASE AND NVTT_INCLUDE_DIR)
+IF(NVTT_LIBRARY AND NVTT_INCLUDE_DIR)
-   SET(NVTT_FOUND "YES" )
+  SET(NVTT_FOUND "YES")
-ENDIF(NVTT_LIBRARY_RELEASE AND NVTT_INCLUDE_DIR)
+ENDIF(NVTT_LIBRARY AND NVTT_INCLUDE_DIR)

CMakeModules/FindOSG.cmake

@@ -116,6 +116,7 @@ FIND_OSG_LIBRARY(OSGUTIL_LIBRARY osgUtil)
 FIND_OSG_LIBRARY(OSGDB_LIBRARY osgDB)
 FIND_OSG_LIBRARY(OSGTEXT_LIBRARY osgText)
 FIND_OSG_LIBRARY(OSGWIDGET_LIBRARY osgWidget)
+FIND_OSG_LIBRARY(OSGQT_LIBRARY osgQt)
 FIND_OSG_LIBRARY(OSGTERRAIN_LIBRARY osgTerrain)
 FIND_OSG_LIBRARY(OSGFX_LIBRARY osgFX)
 FIND_OSG_LIBRARY(OSGVIEWER_LIBRARY osgViewer)

CMakeModules/FindOpenCascade.cmake

@@ -1,173 +0,0 @@
-# LocateOPENCASCADE
-# This module defines
-# OPENCASCADE_LIBRARY
-# OPENCASCADE_FOUND, if false, do not try to link to OPENCASCADE
-# OPENCASCADE_INCLUDE_DIR, where to find the headers
-#
-# $OPENCASCADE_DIR is an environment variable that would
-# correspond to the ./configure --prefix=$OPENCASCADE_DIR
-# used in building OPENCASCADE.
-
-FIND_PATH(OPENCASCADE_INCLUDE_DIR BRepMesh.hxx
-  PATHS
-    ${OPENCASCADE_DIR}
-    $ENV{OPENCASCADE_DIR}
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local
-    /usr
-    /sw # Fink
-    /opt/local # DarwinPorts
-    /opt/csw # Blastwave
-    /opt
-    /usr/freeware
-  PATH_SUFFIXES
-    opencascade
-    inc
-    include
-    inc/cascade
-    include/cascade
-)
-
-MACRO(FIND_OPENCASCADE_LIBRARY MYLIBRARY MYLIBRARYNAME)
-
-    FIND_LIBRARY("${MYLIBRARY}"
-        NAMES "${MYLIBRARYNAME}"
-        PATHS
-        $ENV{OPENCASCADE_DIR}/lib}
-        $ENV{OPENCASCADE_LIB}
-        ${OPENCASCADE_DIR}/lib
-        $ENV{OPENCASCADE_DIR}/lib
-        ${OPENCASCADE_DIR}/lib/
-        ~/Library/Frameworks
-        /Library/Frameworks
-        /usr/local/lib
-        /usr/lib
-        /sw/lib
-        /opt/local/lib
-        /opt/csw/lib
-        /opt/lib
-        /usr/freeware/lib64
-        )
-
-ENDMACRO()
-
-
-
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKBinL TKBinL)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKBin TKBin)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKBinTObj TKBinTObj)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKBinXCAF TKBinXCAF)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKBool TKBool)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKBO TKBO)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKBRep TKBRep)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKCAF TKCAF)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKCDF TKCDF)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKernel TKernel)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKFeat TKFeat)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKFillet TKFillet)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKG2d TKG2d)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKG3d TKG3d)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKGeomAlgo TKGeomAlgo)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKGeomBase TKGeomBase)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKHLR TKHLR)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKIGES TKIGES)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKLCAF TKLCAF)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKMath TKMath)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKMesh TKMesh)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKMeshVS TKMeshVS)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKOffset TKOffset)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKOpenGl TKOpenGl)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKPrim TKPrim)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKService TKService)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKShHealing TKShHealing)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKSTEP209 TKSTEP209)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKSTEPAttr TKSTEPAttr)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKSTEPBase TKSTEPBase)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKSTEP TKSTEP)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKSTL TKSTL)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKTObj TKTObj)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKTopAlgo TKTopAlgo)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKV3d TKV3d)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKVRML TKVRML)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXDEIGES TKXDEIGES)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXDESTEP TKXDESTEP)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXMesh TKXMesh)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXmlL TKXmlL)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXml TKXml)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXmlTObj TKXmlTObj)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXmlXCAF TKXmlXCAF)
-FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXSBase TKXSBase)
-
-set (OPENCASCADE_LIBRARY_TYPE_DESCR 
-"Specifies the type of library to be used. 'Shared' libraries
-are linked dynamically and loaded at runtime. 'Static' libraries
-are archives of object files for use when linking other targets")
-
-# set type of OCCT libraries
-if (NOT OPENCASCADE_LIBRARY_TYPE)
-  set (OPENCASCADE_LIBRARY_TYPE "Static" CACHE STRING "${OPENCASCADE_LIBRARY_TYPE_DESCR}" FORCE)
-  SET_PROPERTY(CACHE OPENCASCADE_LIBRARY_TYPE PROPERTY STRINGS Shared Static)
-endif()
-
-if ("${OPENCASCADE_LIBRARY_TYPE}" STREQUAL "Shared")
-
-SET(OPENCASCADE_LIBRARY ${OPENCASCADE_LIBRARY}
-    ${OPENCASCADE_TKernel}
-    ${OPENCASCADE_TKMath}
-    ${OPENCASCADE_TKXCAF}
-    ${OPENCASCADE_TKXSBase}
-    ${OPENCASCADE_TKSTEPAttr}
-    ${OPENCASCADE_TKSTEPBase}
-    ${OPENCASCADE_TKSTEP209}
-    ${OPENCASCADE_TKSTEP}
-    ${OPENCASCADE_TKXDESTEP}
-    ${OPENCASCADE_TKIGES}
-    ${OPENCASCADE_TKXDEIGES}
-    ${OPENCASCADE_TKLCAF}
-    ${OPENCASCADE_TKBRep}
-    ${OPENCASCADE_TKMesh}
-    ${OPENCASCADE_TKTopAlgo}
-    ${OPENCASCADE_TKShHealing}
-)
-else ("${OPENCASCADE_LIBRARY_TYPE}" STREQUAL "Shared")
-SET(OPENCASCADE_LIBRARY ${OPENCASCADE_LIBRARY}
-    ${OPENCASCADE_TKBO}
-    ${OPENCASCADE_TKBool}
-    ${OPENCASCADE_TKBRep}
-    ${OPENCASCADE_TKCAF}
-    ${OPENCASCADE_TKCDF}
-    ${OPENCASCADE_TKernel}
-    ${OPENCASCADE_TKG2d}
-    ${OPENCASCADE_TKG3d}
-    ${OPENCASCADE_TKGeomAlgo}
-    ${OPENCASCADE_TKGeomBase}
-    ${OPENCASCADE_TKHLR}
-    ${OPENCASCADE_TKIGES}
-    ${OPENCASCADE_TKLCAF}
-    ${OPENCASCADE_TKMath}
-    ${OPENCASCADE_TKMesh}
-    ${OPENCASCADE_TKPrim}
-    ${OPENCASCADE_TKService}
-    ${OPENCASCADE_TKShHealing}
-    ${OPENCASCADE_TKSTEP}
-    ${OPENCASCADE_TKSTEP209}
-    ${OPENCASCADE_TKSTEPAttr}
-    ${OPENCASCADE_TKSTEPBase}
-    ${OPENCASCADE_TKTopAlgo}
-    ${OPENCASCADE_TKV3d}
-    ${OPENCASCADE_TKXCAF}
-    ${OPENCASCADE_TKXDEIGES}
-    ${OPENCASCADE_TKXDESTEP}
-    ${OPENCASCADE_TKXSBase}
-)
-endif ("${OPENCASCADE_LIBRARY_TYPE}" STREQUAL "Shared")
-
-SET(OPENCASCADE_FOUND "NO")
-IF(OPENCASCADE_LIBRARY AND OPENCASCADE_INCLUDE_DIR)
-    SET(OPENCASCADE_FOUND "YES")
-ENDIF(OPENCASCADE_LIBRARY AND OPENCASCADE_INCLUDE_DIR)
-
-IF(OPENCASCADE_INCLUDE_DIR)
-    SET(OPENCASCADE_FOUND "YES")
-ENDIF(OPENCASCADE_INCLUDE_DIR)

CMakeModules/FindOpenEXR.cmake

@@ -28,7 +28,7 @@ FIND_PATH(OPENEXR_INCLUDE_DIR OpenEXR/ImfIO.h
 # example: OPENEXR_FIND_VAR(OPENEXR_IlmImf_LIBRARY IlmImf)
 MACRO(OPENEXR_FIND_VAR varname libname)
     FIND_LIBRARY( ${varname}
-        NAMES ${libname} ${libname}-2_1 ${libname}-2_2
+        NAMES ${libname}
         PATHS
         $ENV{OPENEXR_DIR}/lib
         $ENV{OPENEXR_DIR}
@@ -52,10 +52,13 @@ MACRO(OPENEXR_FIND libname)
 ENDMACRO(OPENEXR_FIND)
 
 OPENEXR_FIND(IlmImf)
+OPENEXR_FIND(IlmThread)
+OPENEXR_FIND(Iex)
+OPENEXR_FIND(Half)
 
 SET(OPENEXR_FOUND "NO")
-IF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmImf_LIBRARY)
+IF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmImf_LIBRARY AND OPENEXR_IlmThread_LIBRARY AND OPENEXR_Iex_LIBRARY AND OPENEXR_Half_LIBRARY)
-    SET(OPENEXR_LIBRARIES ${OPENEXR_IlmImf_LIBRARY} )
+    SET(OPENEXR_LIBRARIES ${OPENEXR_IlmImf_LIBRARY} ${OPENEXR_IlmThread_LIBRARY} ${OPENEXR_Half_LIBRARY} ${OPENEXR_Iex_LIBRARY} )
-    SET(OPENEXR_LIBRARIES_VARS OPENEXR_IlmImf_LIBRARY )
+    SET(OPENEXR_LIBRARIES_VARS OPENEXR_IlmImf_LIBRARY OPENEXR_IlmThread_LIBRARY OPENEXR_Half_LIBRARY OPENEXR_Iex_LIBRARY )
     SET(OPENEXR_FOUND "YES")
-ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmImf_LIBRARY)
+ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmImf_LIBRARY AND OPENEXR_IlmThread_LIBRARY AND OPENEXR_Iex_LIBRARY AND OPENEXR_Half_LIBRARY)

CMakeModules/FindOurDCMTK.cmake

@@ -0,0 +1,270 @@
+# - find DCMTK libraries
+#
+
+#  DCMTK_INCLUDE_DIRS  - Directories to include to use DCMTK
+#  DCMTK_LIBRARIES     - Files to link against to use DCMTK
+#  DCMTK_FOUND         - If false, don't try to use DCMTK
+#  DCMTK_DIR           - (optional) Source directory for DCMTK
+#
+# DCMTK_DIR can be used to make it simpler to find the various include
+# directories and compiled libraries if you've just compiled it in the
+# source tree. Just set it to the root of the tree where you extracted
+# the source.
+#
+# Written for VXL by Amitha Perera.
+# Modified by Robert Osfied to enable support for install placements of DCMTK 3.5.4 versions onwards
+
+FIND_PATH( DCMTK_ROOT_INCLUDE_DIR dcmtk/config/osconfig.h
+    ${DCMTK_DIR}/config/include
+    ${DCMTK_DIR}/include
+    /usr/local/dicom/include
+    /usr/local/include/
+    /usr/include/
+    /usr/local/dicom/include/
+)
+
+FIND_PATH( DCMTK_config_INCLUDE_DIR osconfig.h
+    ${DCMTK_ROOT_INCLUDE_DIR}/dcmtk/config
+    ${DCMTK_DIR}/config/include
+    ${DCMTK_DIR}/include
+    /usr/local/dicom/include
+    /usr/local/include/dcmtk/config
+    /usr/include/dcmtk/config
+    /usr/local/dicom/include/dcmtk/config
+)
+
+FIND_PATH( DCMTK_ofstd_INCLUDE_DIR ofstdinc.h
+    ${DCMTK_ROOT_INCLUDE_DIR}/dcmtk/ofstd
+    ${DCMTK_DIR}/ofstd/include
+    ${DCMTK_DIR}/include/ofstd
+    /usr/local/dicom/include/dcmtk/ofstd
+    /usr/local/include/dcmtk/ofstd
+    /usr/include/dcmtk/ofstd
+    /usr/local/dicom/include/dcmtk/ofstd
+)
+
+FIND_LIBRARY( DCMTK_ofstd_LIBRARY ofstd
+    PATHS
+        ${DCMTK_DIR}/ofstd/libsrc
+        ${DCMTK_DIR}/ofstd/libsrc/Release
+        ${DCMTK_DIR}/ofstd/libsrc/Debug
+        ${DCMTK_DIR}/ofstd/Release
+        ${DCMTK_DIR}/ofstd/Debug
+        ${DCMTK_DIR}/lib
+        /usr/local/dicom/lib
+        /usr/local/lib64
+        /usr/lib64
+        /usr/local/lib
+        /usr/lib
+        /usr/local/dicom/lib
+    PATH_SUFFIXES dcmtk
+)
+
+
+FIND_PATH( DCMTK_dcmdata_INCLUDE_DIR dctypes.h
+    ${DCMTK_ROOT_INCLUDE_DIR}/dcmtk/dcmdata
+    ${DCMTK_DIR}/dcmdata/include
+    ${DCMTK_DIR}/include/dcmdata
+    /usr/local/dicom/include/dcmtk/dcmdata
+    /usr/local/include/dcmtk/dcmdata
+    /usr/include/dcmtk/dcmdata
+    /usr/local/dicom/include/dcmtk/dcmdata
+)
+
+FIND_LIBRARY( DCMTK_dcmdata_LIBRARY dcmdata
+    PATHS
+        ${DCMTK_DIR}/dcmdata/libsrc
+        ${DCMTK_DIR}/dcmdata/libsrc/Release
+        ${DCMTK_DIR}/dcmdata/libsrc/Debug
+        ${DCMTK_DIR}/dcmdata/Release
+        ${DCMTK_DIR}/dcmdata/Debug
+        ${DCMTK_DIR}/lib
+        /usr/local/dicom/lib
+        /usr/local/lib64
+        /usr/lib64
+        /usr/local/lib
+        /usr/lib
+        /usr/local/dicom/lib
+    PATH_SUFFIXES dcmtk
+)
+
+
+FIND_PATH( DCMTK_dcmimgle_INCLUDE_DIR dcmimage.h
+    ${DCMTK_ROOT_INCLUDE_DIR}/dcmtk/dcmimgle
+    ${DCMTK_DIR}/dcmimgle/include
+    ${DCMTK_DIR}/include/dcmimgle
+    /usr/local/dicom/include/dcmtk/dcmimgle
+    /usr/local/include/dcmtk/dcmimgle
+    /usr/include/dcmtk/dcmimgle
+    /usr/local/dicom/include/dcmtk/dcmimgle
+)
+
+FIND_LIBRARY( DCMTK_dcmimgle_LIBRARY dcmimgle
+    PATHS
+        ${DCMTK_DIR}/dcmimgle/libsrc
+        ${DCMTK_DIR}/dcmimgle/libsrc/Release
+        ${DCMTK_DIR}/dcmimgle/libsrc/Debug
+        ${DCMTK_DIR}/dcmimgle/Release
+        ${DCMTK_DIR}/dcmimgle/Debug
+        ${DCMTK_DIR}/lib
+        /usr/local/dicom/lib
+        /usr/local/lib64
+        /usr/lib64
+        /usr/local/lib
+        /usr/lib
+        /usr/local/dicom/lib
+    PATH_SUFFIXES dcmtk
+)
+
+FIND_PATH( DCMTK_dcmimage_INCLUDE_DIR diregist.h
+    ${DCMTK_ROOT_INCLUDE_DIR}/dcmtk/dcmimage
+    ${DCMTK_DIR}/dcmimage/include
+    ${DCMTK_DIR}/include/dcmimage
+    /usr/local/dicom/include/dcmtk/dcmimage
+    /usr/local/include/dcmtk/dcmimage
+    /usr/include/dcmtk/dcmimage
+    /usr/local/dicom/include/dcmtk/dcmimage
+)
+
+FIND_LIBRARY( DCMTK_dcmimage_LIBRARY dcmimage
+    PATHS
+        ${DCMTK_DIR}/dcmimage/libsrc
+        ${DCMTK_DIR}/dcmimage/libsrc/Release
+        ${DCMTK_DIR}/dcmimage/libsrc/Debug
+        ${DCMTK_DIR}/dcmimage/Release
+        ${DCMTK_DIR}/dcmimage/Debug
+        ${DCMTK_DIR}/lib
+        /usr/local/dicom/lib
+        /usr/local/lib64
+        /usr/lib64
+        /usr/local/lib
+        /usr/lib
+        /usr/local/dicom/lib
+    PATH_SUFFIXES dcmtk
+)
+
+FIND_LIBRARY(DCMTK_imagedb_LIBRARY imagedb
+    PATHS
+        ${DCMTK_DIR}/imagectn/libsrc/Release
+        ${DCMTK_DIR}/imagectn/libsrc/
+        ${DCMTK_DIR}/imagectn/libsrc/Debug
+        ${DCMTK_DIR}/lib
+        /usr/local/dicom/lib
+        /usr/local/lib64
+        /usr/lib64
+        /usr/local/lib
+        /usr/lib
+        /usr/local/dicom/lib
+    PATH_SUFFIXES dcmtk
+)
+
+FIND_LIBRARY(DCMTK_dcmnet_LIBRARY dcmnet
+    PATHS
+        ${DCMTK_DIR}/dcmnet/libsrc/Release
+        ${DCMTK_DIR}/dcmnet/libsrc/Debug
+        ${DCMTK_DIR}/dcmnet/libsrc/
+        ${DCMTK_DIR}/lib
+        /usr/local/dicom/lib
+        /usr/local/lib64
+        /usr/lib64
+        /usr/local/lib
+        /usr/lib
+        /usr/local/dicom/lib
+    PATH_SUFFIXES dcmtk
+)
+
+FIND_LIBRARY(DCMTK_oflog_LIBRARY oflog
+    PATHS
+        ${DCMTK_DIR}/dcmnet/libsrc/Release
+        ${DCMTK_DIR}/dcmnet/libsrc/Debug
+        ${DCMTK_DIR}/dcmnet/libsrc/
+        ${DCMTK_DIR}/lib
+        /usr/local/dicom/lib
+        /usr/local/lib64
+        /usr/lib64
+        /usr/local/lib
+        /usr/lib
+        /usr/local/dicom/lib
+    PATH_SUFFIXES dcmtk
+)
+
+FIND_LIBRARY(DCMTK_ofstd_LIBRARY ofstd
+    PATHS
+        ${DCMTK_DIR}/dcmnet/libsrc/Release
+        ${DCMTK_DIR}/dcmnet/libsrc/Debug
+        ${DCMTK_DIR}/dcmnet/libsrc/
+        ${DCMTK_DIR}/lib
+        /usr/local/dicom/lib
+        /usr/local/lib64
+        /usr/lib64
+        /usr/local/lib
+        /usr/lib
+        /usr/local/dicom/lib
+    PATH_SUFFIXES dcmtk
+)
+
+IF( DCMTK_config_INCLUDE_DIR
+    AND DCMTK_ofstd_INCLUDE_DIR
+    AND DCMTK_ofstd_LIBRARY
+    AND DCMTK_dcmdata_INCLUDE_DIR
+    AND DCMTK_dcmdata_LIBRARY
+    AND DCMTK_dcmimgle_INCLUDE_DIR
+    AND DCMTK_dcmimgle_LIBRARY
+    AND DCMTK_dcmimage_INCLUDE_DIR
+    AND DCMTK_dcmimage_LIBRARY )
+
+  SET( DCMTK_FOUND "YES" )
+  SET( DCMTK_INCLUDE_DIRS
+    ${DCMTK_config_INCLUDE_DIR}
+    ${DCMTK_ofstd_INCLUDE_DIR}
+    ${DCMTK_dcmdata_INCLUDE_DIR}
+    ${DCMTK_dcmimgle_INCLUDE_DIR}
+    ${DCMTK_dcmimage_INCLUDE_DIR}
+  )
+
+  SET( DCMTK_LIBRARIES
+    ${DCMTK_dcmimgle_LIBRARY}
+    ${DCMTK_dcmimage_LIBRARY}
+    ${DCMTK_dcmdata_LIBRARY}
+    ${DCMTK_ofstd_LIBRARY}
+    ${DCMTK_config_LIBRARY}
+  )
+
+  IF(DCMTK_imagedb_LIBRARY)
+   SET( DCMTK_LIBRARIES
+   ${DCMTK_LIBRARIES}
+   ${DCMTK_imagedb_LIBRARY}
+   )
+  ENDIF()
+
+  IF(DCMTK_dcmnet_LIBRARY)
+   SET( DCMTK_LIBRARIES
+   ${DCMTK_LIBRARIES}
+   ${DCMTK_dcmnet_LIBRARY}
+   )
+  ENDIF()
+
+  IF(DCMTK_oflog_LIBRARY)
+   SET( DCMTK_LIBRARIES
+   ${DCMTK_LIBRARIES}
+   ${DCMTK_oflog_LIBRARY}
+   )
+  ENDIF()
+
+  IF(DCMTK_ofstd_LIBRARY)
+   SET( DCMTK_LIBRARIES
+   ${DCMTK_LIBRARIES}
+   ${DCMTK_ofstd_LIBRARY}
+   )
+  ENDIF()
+
+  IF( WIN32 )
+    SET( DCMTK_LIBRARIES ${DCMTK_LIBRARIES} netapi32 )
+  ENDIF()
+
+ENDIF()
+
+IF( NOT DCMTK_FOUND )
+  SET( DCMTK_DIR "" CACHE PATH "Root of DCMTK source tree (optional)." )
+  MARK_AS_ADVANCED( DCMTK_DIR )
+ENDIF()

CMakeModules/FindQuickTime.cmake

@@ -55,20 +55,19 @@ ELSE()
       #Quicktime is not supported under 64bit OSX build so we need to detect it and disable it.
       #First check to see if we are running with a native 64-bit compiler (10.6 default) and implicit arch
       IF(NOT CMAKE_OSX_ARCHITECTURES AND CMAKE_SIZEOF_VOID_P EQUAL 8)
-        MESSAGE("Disabling QuickTime on 64-bit architectures")
-        SET(QUICKTIME_FOUND "NO")
-      ELSEIF(OSG_OSX_VERSION VERSION_GREATER 10.6)
-        # Quicktime officially deprecated starting 10.7
-        MESSAGE("Disabling QuickTime because it's not supported by the selected SDK ${OSG_OSX_VERSION}")
-        SET(QUICKTIME_FOUND "NO")
-      ELSE()
-        #Otherwise check to see if 64-bit is explicitly called for.
-        LIST(FIND CMAKE_OSX_ARCHITECTURES "x86_64" has64Compile)
-        IF(NOT has64Compile EQUAL -1)
-          MESSAGE("Disabling QuickTime on 64-bit architectures")
           SET(QUICKTIME_FOUND "NO")
-        ENDIF()
+      ELSE()
+          #Otherwise check to see if 64-bit is explicitly called for.
+          LIST(FIND CMAKE_OSX_ARCHITECTURES "x86_64" has64Compile)
+          IF(NOT has64Compile EQUAL -1)
+              SET(QUICKTIME_FOUND "NO")
+          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" 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()
   ENDIF()
 ENDIF()

CMakeModules/FindZLIB.cmake

@@ -0,0 +1,58 @@
+# Locate zlib
+# This module defines
+# ZLIB_LIBRARY
+# ZLIB_FOUND, if false, do not try to link to zlib 
+# ZLIB_INCLUDE_DIR, where to find the headers
+#
+# $ZLIB_DIR is an environment variable that would
+# correspond to the ./configure --prefix=$ZLIB_DIR
+# used in building zlib.
+#
+# Created by Ulrich Hertlein. 
+
+# prefer FindZLIB from cmake distribution
+if(EXISTS ${CMAKE_ROOT}/Modules/FindZLIB.cmake)
+  include(${CMAKE_ROOT}/Modules/FindZLIB.cmake)
+
+  if(ZLIB_FOUND)
+    return()
+  endif()
+endif()
+
+
+FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
+    $ENV{ZLIB_DIR}/include
+    $ENV{ZLIB_DIR}
+    ~/Library/Frameworks
+    /Library/Frameworks
+    /usr/local/include
+    /usr/include
+    /sw/include # Fink
+    /opt/local/include # DarwinPorts
+    /opt/csw/include # Blastwave
+    /opt/include
+    /usr/freeware/include
+)
+
+FIND_LIBRARY(ZLIB_LIBRARY 
+    NAMES z libz zlib
+    PATHS
+    $ENV{ZLIB_DIR}/lib
+    $ENV{ZLIB_DIR}
+    ~/Library/Frameworks
+    /Library/Frameworks
+    /usr/local/lib
+    /usr/lib
+    /sw/lib
+    /opt/local/lib
+    /opt/csw/lib
+    /opt/lib
+    /usr/freeware/lib64
+)
+
+SET(ZLIB_FOUND "NO")
+IF(ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR)
+    SET(ZLIB_FOUND "YES")
+ENDIF(ZLIB_LIBRARY AND ZLIB_INCLUDE_DIR)
+
+

CMakeModules/Findilmbase.cmake

@@ -1,63 +0,0 @@
-# Locate ILMBASE
-# This module defines
-# ILMBASE_LIBRARY
-# ILMBASE_FOUND, if false, do not try to link to ILMBASE 
-# ILMBASE_INCLUDE_DIR, where to find the headers
-#
-# $ILMBASE_DIR is an environment variable that would
-# correspond to the ./configure --prefix=$ILMBASE_DIR
-#
-# Created by Robert Osfield. 
-
-
-FIND_PATH(ILMBASE_INCLUDE_DIR OpenEXR/ImathVec.h
-    $ENV{ILMBASE_DIR}/include
-    $ENV{ILMBASE_DIR}
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local/include
-    /usr/include
-    /sw/include # Fink
-    /opt/local/include # DarwinPorts
-    /opt/csw/include # Blastwave
-    /opt/include
-    /usr/freeware/include
-)
-
-# Macro to find ilmbase libraries
-# example: ILMBASE_FIND_VAR(OPENEXR_IlmThread_LIBRARY IlmThread)
-MACRO(ILMBASE_FIND_VAR varname libname)
-    FIND_LIBRARY( ${varname}
-        NAMES ${libname} ${libname}-2_1 ${libname}-2_2
-        PATHS
-        $ENV{ILMBASE_DIR}/lib
-        $ENV{ILMBASE_DIR}
-        ~/Library/Frameworks
-        /Library/Frameworks
-        /usr/local/lib
-        /usr/lib
-        /sw/lib
-        /opt/local/lib
-        /opt/csw/lib
-        /opt/lib
-        /usr/freeware/lib64
-    )
-ENDMACRO(ILMBASE_FIND_VAR)
-
-# Macro to find exr libraries (and debug versions)
-# example: ILMBASE_FIND(OPENEXR_IlmThread_LIBRARY IlmThread)
-MACRO(ILMBASE_FIND libname)
-    ILMBASE_FIND_VAR(ILMBASE_${libname}_LIBRARY ${libname})
-    ILMBASE_FIND_VAR(ILMBASE_${libname}_LIBRARY_DEBUG ${libname}d)
-ENDMACRO(ILMBASE_FIND)
-
-ILMBASE_FIND(IlmThread)
-ILMBASE_FIND(Iex)
-ILMBASE_FIND(Half)
-
-SET(ILMBASE_FOUND "NO")
-IF(ILMBASE_INCLUDE_DIR AND ILMBASE_IlmThread_LIBRARY AND ILMBASE_Iex_LIBRARY AND ILMBASE_Half_LIBRARY)
-    SET(ILMBASE_LIBRARIES ${ILMBASE_IlmThread_LIBRARY} ${ILMBASE_Half_LIBRARY} ${ILMBASE_Iex_LIBRARY} )
-    SET(ILMBASE_LIBRARIES_VARS ILMBASE_IlmThread_LIBRARY ILMBASE_Half_LIBRARY ILMBASE_Iex_LIBRARY )
-    SET(ILMBASE_FOUND "YES")
-ENDIF(ILMBASE_INCLUDE_DIR AND ILMBASE_IlmThread_LIBRARY AND ILMBASE_Iex_LIBRARY AND ILMBASE_Half_LIBRARY)

CMakeModules/ModuleInstall.cmake

@@ -32,12 +32,6 @@ INSTALL(
     ARCHIVE DESTINATION ${INSTALL_ARCHIVEDIR} COMPONENT libopenscenegraph-dev    
 )
 
-IF(MSVC AND DYNAMIC_OPENSCENEGRAPH)
-    GET_TARGET_PROPERTY(PREFIX ${LIB_NAME} PREFIX)
-    INSTALL(FILES ${OUTPUT_BINDIR}/${PREFIX}${LIB_NAME}${CMAKE_RELWITHDEBINFO_POSTFIX}.pdb DESTINATION ${INSTALL_BINDIR} COMPONENT libopenscenegraph CONFIGURATIONS RelWithDebInfo)
-    INSTALL(FILES ${OUTPUT_BINDIR}/${PREFIX}${LIB_NAME}${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION ${INSTALL_BINDIR} COMPONENT libopenscenegraph CONFIGURATIONS Debug)
-ENDIF(MSVC AND DYNAMIC_OPENSCENEGRAPH)
-
 IF(NOT OSG_COMPILE_FRAMEWORKS)
     INSTALL (
         FILES        ${TARGET_H}

CMakeModules/OsgCPack.cmake

@@ -57,7 +57,7 @@ ENDIF()
 SET(CPACK_SOURCE_GENERATOR "TGZ")
 
 
-# for ms visual studio we use it's internally defined variable to get the configuration (debug,release, ...)
+# for ms visual studio we use it's internally defined variable to get the configuration (debug,release, ...) 
 IF(MSVC_IDE)
     SET(OSG_CPACK_CONFIGURATION "$(OutDir)")
     SET(PACKAGE_TARGET_PREFIX "Package ")
@@ -84,87 +84,9 @@ ENDIF()
 SET(PACKAGE_ALL_TARGETNAME "${PACKAGE_TARGET_PREFIX}ALL")
 ADD_CUSTOM_TARGET(${PACKAGE_ALL_TARGETNAME})
 
- # cpack configuration for debian packages
-IF(${CPACK_GENERATOR} STREQUAL "DEB")
-    SET(OPENSCENEGRAPH_PACKAGE_MAINTAINER
-        ""
-        CACHE STRING
-        "Name and email address of the package maintainer, e.g., 'Jon Doe <jon.doe@superawesomemail.com>'"
-    )
-    SET(CPACK_LIBOPENSCENEGRAPH_DEPENDENCIES
-        "libopenthreads"
-        CACHE STRING
-        "Dependend packages for the openscenegraph library package (uses deb dependecy format), e.g., 'libc6, libcurl3-gnutls, libgif4, libjpeg8, libpng12-0'"
-    )
-    SET(CPACK_LIBOPENSCENEGRAPH-DEV_DEPENDENCIES
-        "libopenscenegraph"
-        CACHE STRING
-        "Dependend packages for the openscenegraph development package (uses deb dependecy format), e.g., 'libc6, libcurl3-gnutls, libgif4, libjpeg8, libpng12-0'"
-    )
-    SET(CPACK_LIBOPENTHREADS_DEPENDENCIES
-        ""
-        CACHE STRING
-        "Dependend packages for the openthreads library package (uses deb dependecy format), e.g., 'libc6, libcurl3-gnutls, libgif4, libjpeg8, libpng12-0'"
-    )
-    SET(CPACK_LIBOPENTHREADS-DEV_DEPENDENCIES
-        "libopenthreads"
-        CACHE STRING
-        "Dependend packages for the openthreads development package (uses deb dependecy format), e.g., 'libc6, libcurl3-gnutls, libgif4, libjpeg8, libpng12-0'"
-    )
-    SET(CPACK_OPENSCENEGRAPH_DEPENDENCIES
-        "libopenscenegraph"
-        CACHE STRING
-        "Dependend packages for the openscenegraph main package (uses deb dependecy format), e.g., 'libc6, libcurl3-gnutls, libgif4, libjpeg8, libpng12-0'"
-    )
-    SET(CPACK_OPENSCENEGRAPH-ALL_DEPENDENCIES
-        ""
-        CACHE STRING
-        "Dependend packages for the openscenegraph package with all components (uses deb dependecy format), e.g., 'libc6, libcurl3-gnutls, libgif4, libjpeg8, libpng12-0'"
-    )
-
-    SET(CPACK_LIBOPENSCENEGRAPH_CONFLICTS
-        ""
-        CACHE STRING
-        "Conflicting packages for the openscenegraph library package (uses deb dependecy format), e.g., 'libc6, libcurl3-gnutls, libgif4, libjpeg8, libpng12-0'"
-    )
-    SET(CPACK_LIBOPENSCENEGRAPH-DEV_CONFLICTS
-        ""
-        CACHE STRING
-        "Conflicting packages for the openscenegraph development package (uses deb dependecy format), e.g., 'libc6, libcurl3-gnutls, libgif4, libjpeg8, libpng12-0'"
-    )
-    SET(CPACK_LIBOPENTHREADS_CONFLICTS
-        ""
-        CACHE STRING
-        "Conflicting packages for the openthreads library package (uses deb dependecy format), e.g., 'libc6, libcurl3-gnutls, libgif4, libjpeg8, libpng12-0'"
-    )
-    SET(CPACK_LIBOPENTHREADS-DEV_CONFLICTS
-        ""
-        CACHE STRING
-        "Conflicting packages for the openthreads development package (uses deb dependecy format), e.g., 'libc6, libcurl3-gnutls, libgif4, libjpeg8, libpng12-0'"
-    )
-    SET(CPACK_OPENSCENEGRAPH_CONFLICTS
-        ""
-        CACHE STRING
-        "Conflicting packages for the openscenegraph main package (uses deb dependecy format), e.g., 'libc6, libcurl3-gnutls, libgif4, libjpeg8, libpng12-0'"
-    )
-    SET(CPACK_OPENSCENEGRAPH-ALL_CONFLICTS
-        ""
-        CACHE STRING
-        "Conflicting packages for the openscenegraph package with all components (uses deb dependecy format), e.g., 'libc6, libcurl3-gnutls, libgif4, libjpeg8, libpng12-0'"
-    )
-ENDIF()
-
 MACRO(GENERATE_PACKAGING_TARGET package_name)
     SET(CPACK_PACKAGE_NAME ${package_name})
 
-    # set debian dependencies AND conflicts
-    IF(${CPACK_GENERATOR} STREQUAL "DEB")
-        STRING(TOUPPER CPACK_${package_name}_DEPENDENCIES DEPENDENCIES_VAR)
-        STRING(TOUPPER CPACK_${package_name}_CONFLICTS CONFLICTS_VAR)
-        SET(OSG_PACKAGE_DEPENDS "${${DEPENDENCIES_VAR}}")
-        SET(OSG_PACKAGE_CONFLICTS "${${CONFLICTS_VAR}}")
-    ENDIF()
-
     # the doc packages don't need a system-arch specification
     IF(${package} MATCHES -doc)
         SET(OSG_PACKAGE_FILE_NAME ${package_name}-${OPENSCENEGRAPH_VERSION})
@@ -192,7 +114,7 @@ MACRO(GENERATE_PACKAGING_TARGET package_name)
     ELSE()
         SET(ARCHIVE_EXT "tar.gz")
     ENDIF()
-
+    
     # Create a target that creates the current package
     # and rename the package to give it proper filename
     ADD_CUSTOM_TARGET(${PACKAGE_TARGETNAME})
@@ -202,8 +124,8 @@ MACRO(GENERATE_PACKAGING_TARGET package_name)
         COMMAND ${CMAKE_CPACK_COMMAND} -C ${OSG_CPACK_CONFIGURATION} --config ${OpenSceneGraph_BINARY_DIR}/CPackConfig-${package_name}.cmake
         COMMENT "Run CPack packaging for ${package_name}..."
     )
-    # Add the exact same custom command to the all package generating target.
+    # Add the exact same custom command to the all package generating target. 
-    # I can't use add_dependencies to do this because it would allow parallel building of packages so am going brute here
+    # I can't use add_dependencies to do this because it would allow parallell building of packages so am going brute here
     ADD_CUSTOM_COMMAND(TARGET ${PACKAGE_ALL_TARGETNAME}
         COMMAND ${CMAKE_CPACK_COMMAND} -C ${OSG_CPACK_CONFIGURATION} --config ${OpenSceneGraph_BINARY_DIR}/CPackConfig-${package_name}.cmake
     )

CMakeModules/OsgCPackConfig.cmake.in

@@ -53,7 +53,7 @@ SET(CPACK_NSIS_INSTALLER_ICON_CODE "")
 SET(CPACK_NSIS_INSTALLER_MUI_ICON_CODE "")
 SET(CPACK_OUTPUT_CONFIG_FILE "${PROJECT_BINARY_DIR}/CPackConfig-${OSG_CPACK_COMPONENT}.cmake")
 SET(CPACK_PACKAGE_DEFAULT_LOCATION "/")
-SET(CPACK_PACKAGE_DESCRIPTION_FILE "${OpenSceneGraph_SOURCE_DIR}/README.md")
+SET(CPACK_PACKAGE_DESCRIPTION_FILE "${OpenSceneGraph_SOURCE_DIR}/README.txt")
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The OpenSceneGraph is an open source high performance 3d graphics toolkit")
 SET(CPACK_PACKAGE_FILE_NAME "${OSG_PACKAGE_FILE_NAME}")
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
@@ -66,16 +66,6 @@ SET(CPACK_PACKAGE_VERSION_MAJOR "${OPENSCENEGRAPH_MAJOR_VERSION}")
 SET(CPACK_PACKAGE_VERSION_MINOR "${OPENSCENEGRAPH_MINOR_VERSION}")
 SET(CPACK_PACKAGE_VERSION_PATCH "${OPENSCENEGRAPH_PATCH_VERSION}")
 SET(CPACK_RESOURCE_FILE_LICENSE "${OpenSceneGraph_SOURCE_DIR}/LICENSE.txt")
-SET(CPACK_RESOURCE_FILE_README "${OpenSceneGraph_SOURCE_DIR}/README.md")
+SET(CPACK_RESOURCE_FILE_README "${OpenSceneGraph_SOURCE_DIR}/README.txt")
 SET(CPACK_RESOURCE_FILE_WELCOME "${OpenSceneGraph_SOURCE_DIR}/NEWS.txt")
 SET(CPACK_STRIP_FILES "ON")
-
-# DEBIAN OPTIONS
-IF(${CPACK_GENERATOR} STREQUAL "DEB")
-    SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "${OPENSCENEGRAPH_PACKAGE_MAINTAINER}")
-    SET(CPACK_DEBIAN_PACKAGE_HOMEPAGE    "http://www.openscenegraph.org")
-    SET(CPACK_DEBIAN_PACKAGE_SECTION     "Development")
-    SET(CPACK_DEBIAN_PACKAGE_DEPENDS     "${OSG_PACKAGE_DEPENDS}")
-    SET(CPACK_DEBIAN_PACKAGE_CONFLICTS   "${OSG_PACKAGE_CONFLICTS}")
-    SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${OpenSceneGraph_SOURCE_DIR}/debian_scripts/postinst;")
-ENDIF()

CMakeModules/OsgDetermineWinVersion.cmake

@@ -1,22 +0,0 @@
-# - If Windows is used, this script sets the variable WIN32_WINNT to the corresponding windows version
-
-if (WIN32)
-  message(STATUS "Checking windows version...")
-    macro(get_WIN32_WINNT version)
-        if (CMAKE_SYSTEM_VERSION)
-            set(ver ${CMAKE_SYSTEM_VERSION})
-            string(REGEX MATCH "^([0-9]+).([0-9])" ver ${ver})
-            string(REGEX MATCH "^([0-9]+)" verMajor ${ver})
-            # Check for Windows 10, b/c we'll need to convert to hex 'A'.
-            if ("${verMajor}" MATCHES "10")
-                set(verMajor "A")
-                string(REGEX REPLACE "^([0-9]+)" ${verMajor} ver ${ver})
-            endif ("${verMajor}" MATCHES "10")
-            # Remove all remaining '.' characters.
-            string(REPLACE "." "" ver ${ver})
-            # Prepend each digit with a zero.
-            string(REGEX REPLACE "([0-9A-Z])" "0\\1" ver ${ver})
-            set(${version} "0x${ver}")
-        endif(CMAKE_SYSTEM_VERSION)
-    endmacro(get_WIN32_WINNT)
-endif(WIN32)

CMakeModules/OsgMacroUtils.cmake

@@ -27,10 +27,15 @@ MACRO(BUILDER_VERSION_GREATER MAJOR_VER MINOR_VER PATCH_VER)
     ENDIF()
 ENDMACRO(BUILDER_VERSION_GREATER MAJOR_VER MINOR_VER PATCH_VER)
 
+# CMAKE24: if CMake version is <2.6.0.
+SET(CMAKE24 OFF)
+IF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} LESS 5)
+    SET(CMAKE24 ON)
+ENDIF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} LESS 5)
 
 # CMAKE_VERSION_TEST: Define whether "IF(${CMAKE_VERSION} VERSION_LESS "x.y.z")" can be used or not.
-BUILDER_VERSION_GREATER(2 8 0)
+BUILDER_VERSION_GREATER(2 6 3)
-SET(CMAKE_VERSION_TEST ${VALID_BUILDER_VERSION})        # >= 2.8.0
+SET(CMAKE_VERSION_TEST ${VALID_BUILDER_VERSION})        # >= 2.6.4
 
 SET(VALID_BUILDER_VERSION OFF)
 
@@ -38,13 +43,9 @@ SET(VALID_BUILDER_VERSION OFF)
 MACRO(LINK_WITH_VARIABLES TRGTNAME)
     FOREACH(varname ${ARGN})
         IF(${varname}_DEBUG)
-            IF(${varname}_RELEASE)
+            TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${${varname}}" debug "${${varname}_DEBUG}")
-                TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${${varname}_RELEASE}" debug "${${varname}_DEBUG}")
-            ELSE(${varname}_RELEASE)
-                TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${${varname}}" debug "${${varname}_DEBUG}")
-            ENDIF(${varname}_RELEASE)
         ELSE(${varname}_DEBUG)
-            TARGET_LINK_LIBRARIES(${TRGTNAME} ${${varname}} )
+            TARGET_LINK_LIBRARIES(${TRGTNAME} "${${varname}}" )
         ENDIF(${varname}_DEBUG)
     ENDFOREACH(varname)
 ENDMACRO(LINK_WITH_VARIABLES TRGTNAME)
@@ -82,8 +83,8 @@ ENDMACRO(LINK_EXTERNAL TRGTNAME)
 MACRO(LINK_CORELIB_DEFAULT CORELIB_NAME)
     #SET(ALL_GL_LIBRARIES ${OPENGL_LIBRARIES})
     SET(ALL_GL_LIBRARIES ${OPENGL_gl_LIBRARY})
-    IF (OSG_GLES1_AVAILABLE OR OSG_GLES2_AVAILABLE OR OSG_GLES3_AVAILABLE)
+    IF (OSG_GLES1_AVAILABLE OR OSG_GLES2_AVAILABLE)
-        SET(ALL_GL_LIBRARIES ${ALL_GL_LIBRARIES} ${EGL_LIBRARY})
+        SET(ALL_GL_LIBRARIES ${ALL_GL_LIBRARIES} ${OPENGL_egl_LIBRARY})
     ENDIF()
 
     LINK_EXTERNAL(${CORELIB_NAME} ${ALL_GL_LIBRARIES})
@@ -122,9 +123,9 @@ MACRO(SETUP_LINK_LIBRARIES)
     FOREACH(LINKLIB ${TARGET_ADDED_LIBRARIES})
       SET(TO_INSERT TRUE)
       FOREACH (value ${TARGET_COMMON_LIBRARIES})
-            IF ("${value}" STREQUAL "${LINKLIB}")
+            IF (${value} STREQUAL ${LINKLIB})
                   SET(TO_INSERT FALSE)
-            ENDIF ("${value}" STREQUAL "${LINKLIB}")
+            ENDIF (${value} STREQUAL ${LINKLIB})
         ENDFOREACH (value ${TARGET_COMMON_LIBRARIES})
       IF(TO_INSERT)
           LIST(APPEND TARGET_LIBRARIES ${LINKLIB})
@@ -133,8 +134,8 @@ MACRO(SETUP_LINK_LIBRARIES)
 
     #SET(ALL_GL_LIBRARIES ${OPENGL_LIBRARIES})
     SET(ALL_GL_LIBRARIES ${OPENGL_gl_LIBRARY})
-    IF (OSG_GLES1_AVAILABLE OR OSG_GLES2_AVAILABLE OR OSG_GLES3_AVAILABLE)
+    IF (OSG_GLES1_AVAILABLE OR OSG_GLES2_AVAILABLE)
-        SET(ALL_GL_LIBRARIES ${ALL_GL_LIBRARIES} ${EGL_LIBRARY})
+        SET(ALL_GL_LIBRARIES ${ALL_GL_LIBRARIES} ${OPENGL_egl_LIBRARY})
     ENDIF()
 
 #    FOREACH(LINKLIB ${TARGET_LIBRARIES})
@@ -225,9 +226,6 @@ MACRO(SETUP_LIBRARY LIB_NAME)
         )
         SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES FOLDER "OSG Core")
         IF(APPLE)
-            IF(OSG_BUILD_PLATFORM_IPHONE OR OSG_BUILD_PLATFORM_IPHONE_SIMULATOR)
-                SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES XCODE_ATTRIBUTE_ENABLE_BITCODE ${IPHONE_ENABLE_BITCODE})
-            ENDIF()
             SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES XCODE_ATTRIBUTE_WARNING_CFLAGS "")
         ENDIF()
         IF(TARGET_LABEL)
@@ -269,23 +267,6 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME)
     ## plugins gets put in libopenscenegraph by default
     IF(${ARGC} GREATER 1)
       SET(PACKAGE_COMPONENT libopenscenegraph-${ARGV1})
-
-      # add cpack config variables for plugin with own package
-      IF(BUILD_OSG_PACKAGES)
-        IF("${CPACK_GENERATOR}" STREQUAL "DEB")
-            STRING(TOUPPER ${PACKAGE_COMPONENT} UPPER_PACKAGE_COMPONENT)
-            SET(CPACK_${UPPER_PACKAGE_COMPONENT}_DEPENDENCIES
-                "libopenscenegraph"
-                CACHE STRING
-                "Dependend packages for the ${PACKAGE_COMPONENT} package with all components (uses deb dependecy format), e.g., 'libc6, libcurl3-gnutls, libgif4, libjpeg8, libpng12-0'"
-            )
-            SET(CPACK_${UPPER_PACKAGE_COMPONENT}_CONFLICTS
-                ""
-                CACHE STRING
-                "Conflicting packages for the ${PACKAGE_COMPONENT} package (uses deb dependecy format), e.g., 'libc6, libcurl3-gnutls, libgif4, libjpeg8, libpng12-0'"
-            )
-        ENDIF()
-      ENDIF()
     ELSE(${ARGC} GREATER 1)
       SET(PACKAGE_COMPONENT libopenscenegraph)
     ENDIF(${ARGC} GREATER 1)
@@ -336,9 +317,6 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME)
     SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES FOLDER "Plugins")
     IF(APPLE)
         SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES XCODE_ATTRIBUTE_WARNING_CFLAGS "")
-        IF(OSG_BUILD_PLATFORM_IPHONE OR OSG_BUILD_PLATFORM_IPHONE_SIMULATOR)
-            SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES XCODE_ATTRIBUTE_ENABLE_BITCODE ${IPHONE_ENABLE_BITCODE})
-        ENDIF()
     ENDIF()
     SETUP_LINK_LIBRARIES()
 
@@ -348,10 +326,6 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME)
             RUNTIME DESTINATION bin COMPONENT ${PACKAGE_COMPONENT}
             ARCHIVE DESTINATION lib/${OSG_PLUGINS} COMPONENT libopenscenegraph-dev
             LIBRARY DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT})
-        IF(MSVC AND DYNAMIC_OPENSCENEGRAPH)
-            INSTALL(FILES ${OUTPUT_BINDIR}/${OSG_PLUGINS}/${TARGET_TARGETNAME}${CMAKE_RELWITHDEBINFO_POSTFIX}.pdb DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT} CONFIGURATIONS RelWithDebInfo)
-            INSTALL(FILES ${OUTPUT_BINDIR}/${OSG_PLUGINS}/${TARGET_TARGETNAME}${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT} CONFIGURATIONS Debug)
-        ENDIF(MSVC AND DYNAMIC_OPENSCENEGRAPH)
     ELSE(WIN32)
         INSTALL(TARGETS ${TARGET_TARGETNAME}
             RUNTIME DESTINATION bin COMPONENT ${PACKAGE_COMPONENT}
@@ -367,7 +341,7 @@ ENDMACRO(SETUP_PLUGIN)
 
 MACRO(SETUP_EXE IS_COMMANDLINE_APP)
     #MESSAGE("in -->SETUP_EXE<-- ${TARGET_NAME}-->${TARGET_SRC} <--> ${TARGET_H}<--")
-    IF(GLCORE_FOUND)
+    IF(GL3_FOUND)
         INCLUDE_DIRECTORIES( ${GLCORE_INCLUDE_DIR} )
     ENDIF()
 
@@ -429,9 +403,6 @@ MACRO(SETUP_EXE IS_COMMANDLINE_APP)
 
     IF(APPLE)
         SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES XCODE_ATTRIBUTE_WARNING_CFLAGS "")
-        IF(OSG_BUILD_PLATFORM_IPHONE OR OSG_BUILD_PLATFORM_IPHONE_SIMULATOR)
-            SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES XCODE_ATTRIBUTE_ENABLE_BITCODE ${IPHONE_ENABLE_BITCODE})
-        ENDIF()
     ENDIF()
 
     SETUP_LINK_LIBRARIES()
@@ -457,10 +428,6 @@ MACRO(SETUP_APPLICATION APPLICATION_NAME)
             INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin BUNDLE DESTINATION bin)
         ELSE(APPLE)
             INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph  )
-            IF(MSVC)
-                INSTALL(FILES ${CMAKE_BINARY_DIR}/bin/${TARGET_NAME}${CMAKE_RELWITHDEBINFO_POSTFIX}.pdb DESTINATION bin COMPONENT openscenegraph CONFIGURATIONS RelWithDebInfo)
-                INSTALL(FILES ${CMAKE_BINARY_DIR}/bin/${TARGET_NAME}${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION bin COMPONENT openscenegraph CONFIGURATIONS Debug)
-            ENDIF(MSVC)
         ENDIF(APPLE)
 
 ENDMACRO(SETUP_APPLICATION)
@@ -490,10 +457,6 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME)
             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 )
-            IF(MSVC)
-                INSTALL(FILES ${CMAKE_BINARY_DIR}/bin/${TARGET_NAME}${CMAKE_RELWITHDEBINFO_POSTFIX}.pdb DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples CONFIGURATIONS RelWithDebInfo)
-                INSTALL(FILES ${CMAKE_BINARY_DIR}/bin/${TARGET_NAME}${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples CONFIGURATIONS Debug)
-            ENDIF(MSVC)
         ENDIF(APPLE)
 
 ENDMACRO(SETUP_EXAMPLE)

LICENSE.txt

@@ -50,7 +50,7 @@
 
   1. As a special exception, the copyright holders of this library give
   permission for additional uses of the text contained in this release of
-  the library as licensed under the wxWindows Library Licence, applying
+  the library as licenced under the wxWindows Library Licence, applying
   either version 3 of the Licence, or (at your option) any later version of
   the Licence as published by the copyright holders of version 3 of the
   Licence document.

NEWS.txt

@@ -1,98 +1,9 @@
 OSG News
 ========
 
-OpenSceneGraph 3.6 release
-PERTHSHIRE, Scotland - 7th April 2018 - OpenSceneGraph Professional Services announces the release of OpenSceneGraph 3.6.0, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. The OpenSceneGraph is written entirely in Standard C++ and built upon OpenGL (1.2 to 4.6) and OpenGL ES (1.0 to 3.0), and offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modelling markets. OpenSceneGraph 3.6 runs on all Microsoft Windows platforms, Apple OS/X, iOS, GNU/Linux, Android, Solaris, HP-UX, AIX and FreeBSD operating systems.
-
-Updates include:
-
-  * OpenThreads::Affinity introduced to enable setting of processor affinity on viewer and database threads
-  * osgText rewritten to improve visual quality, add signed distance field support and full GLES2/3 and GL3/4 support
-  * Added VertexArrayObject support, enable full OpenGL Core Profile support under OSX.
-  * Added OpenCASCADE plugin
-  * Added STEP (.stp) plugin
-  * Improvements to FBX and COLLADA loaders
-  * Improvements to gles plugin to provide better Sketchfab support
-  * Added osgemscripten example
-  * Improvements to osgAnimation
-  * NodeVisitor ValueMap for storing values that can be stored and accessed across frames, such as update, event and cull traversals
-  * ShapeDrawable rewritten as an osg::Geometry to improve performance and flexibility
-  * Added osg::MultiDrawArrays support
-  * Added osgdeferred example that illustrates how to implement deferred rendering
-  * Added MultiDrawIndirect support
-  * Moved glDispatchCompute control out of osg::Program into a dedicated osg::DispatchCompute class to improve control of compute shaders
-  * KdTree support added for PolytopeIntersector, and ability to work with points, lines and polygons
-  * osgQt has been moved out to it's own dedicated osgQt github repository
-  * CMake build support for iOS bitcode builds
-  * CoverityScan testing introduced, fixes bring defect density to 0.0 per 1,0000 lines of code!
-  * Support for Codedoc automated documentation
-  * Support for Travis automated build system
-
-
-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 at http://www.openscenegraph.org/index.php/download-section/stable-releases and at our github repository https://github.com/openscenegraph/OpenSceneGraph/.
-
-OpenSceneGraph is released under the 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. Further details http://www.openscenegraph.org/index.php/about/licensing
-
-
-Professional support and services:
-
-OpenSceneGraph project is backed up with professional services by OpenSceneGraph Professional Services, based in Scotland, and a range of Contractors from around the world http://www.openscenegraph.org/index.php/support/professional-support. For enquires email robert@openscenegraph.com. 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 568 individuals from around the world that have directly contributed to the development and refinement of the OpenSceneGraph code base.
-
-
-
-OpenSceneGraph 3.4 release introduces shader composition, new osgUI library, displacement mapping, volume rendering, lua scripting support and much more
-PERTHSHIRE, Scotland - 12th August 2015 - OpenSceneGraph Professional Services announces the release of OpenSceneGraph 3.4, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. OpenSceneGraph 3.4 written entirely in Standard C++ and built upon OpenGL, offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modelling markets - a real-time visualization tool which eclipses commercial scene graph toolkits in functionality, stability and performance. OpenSceneGraph 3.4 runs on all Microsoft Windows platforms, Apple OS/X, iOS, GNU/Linux, Android, IRIX, Solaris, HP-UX, AIX and FreeBSD operating systems.
-Updates include:
-
-  * New #pragma(tic) composition shader functionality built into the core OSG that provides a easy to use yet flexible scheme for controlling and composing shaders at runtime levering GLSL support for #define and #pragma.
-  * New osgTerrain::DisplacementMappingTechnique to uses vertex, geometry and fragment shader based displacement mapping technique that dramatically lowers the CPU and GPU memory footprint and bandwidth needs for the same visual quality.  The new scheme enables paged terrain that work robustly on smaller hardware, or with far higher loads without framedrops.  This new technique levels #pragma(tic) shader composition to enable one to toggle on/off features in the shaders at runtime in a way that is as convenient to use as toggle modes in a fixed function pipeline scene graph.
-  * New osgVolume::MultipassTechique that uses multipass rendering and shaders to enable seamless mixing of traditional 3D geometry and volumes, support for geometry hulls that constrain where the volume should be rendered as well as improving the ray tracing shaders so that they are both faster and have higher visual quality than the previous generation of ray traced shaders supported by OSG-3.2 releases and before.
-  * New osgDB::Classiterface  class that provides an easy to use mechanism for introspection of scene graph classes, allowing one to get, set properties and invoke methods in a generic way, making the task of integrating 3rd prarty tools such as scripting languages straight forward.
-  * New Lua scripting support via a plugin that integrates Lua 5.2.3 and the OSG via the OSG's native serialization codes.
-  * New osgUI NodeKit, that enables User Interface elements to be placed directly into 3D scene graph. The classes are fully scriptable so you create create UI and behaviours all within lua scripts.
-  * Improvements to OpenGL ES 1.1, ES 2.0 and ES3.0 support, including platform specific extensions
-  * Improvements to OpenGL 4.x support with a range of new extensions support
-  * Updates to osgQt to support Qt5 and provide better support for Qt4
-
-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 Downloads section of the openscenegraph.org website.
-
-OpenSceneGraph is released under the 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 OpenSceneGraph Professional Services, based in Scotland, and a range of 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 550 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 modelling 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.
+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.
 
 === Open-source development delivers industry-leading features and performance ===
 The !OpenSceneGraph 3.2 release is the culmination of 14 years of work by the open-source community that has grown up around the project. The real-time graphics industry and academia embraced it from the very beginning, deploying it in real-world applications, and actively participating in its development, testing and refinement. The end result is a high-quality library with a feature set relevant to application developers' needs in both the desktop and mobile space.
@@ -106,7 +17,7 @@ The !OpenSceneGraph 3.2 release is the culmination of 14 years of work by the op
   * New OpenGL extensions support including compute shaders, tessellation shaders, integer array formats and associated Vec* classes, primitive restart
   * Improvements to osgManipulator NodeKit that introduce new manipulators and improve flexibility and customizability
   * Updates to osgQt to support Qt5 and provide better support for Qt4
-  * New osgGA::Device base class for receiving from and sending events to both real and virtual devices in a generic, extensible way
+  * New osgGA::Device base class for recieving from and sending events to both real and virtual devices in a generic, extensible way
   * New ZeroConf, RestHTTP and OSC plugins to enable remote control of applications such as controlling desktop systems from tablets and phones
   * Improvements to osgVolume NodeKit and DICOM plugin for better medical visualization
   * New TrackVis .trk track files plugin for the visualization of brain scans.
@@ -143,7 +54,7 @@ The !OpenSceneGraph project owes a great deal to the community for its developme
 
 = !OpenSceneGraph 3.0 release adds support OpenGL ES 1.1, OpenGL ES 2.0, OpenGL 3.x to 4.0, support for Andoid and IOS platforms and much more.
 
-PERTHSHIRE, Scotland - 28th June 2011 - !OpenSceneGraph Professional Services announces the release of !OpenSceneGraph 3.0, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. !OpenSceneGraph 3.0 written entirely in Standard C++ and built upon OpenGL, offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modelling markets - a real-time visualization tool which eclipses commercial scene graph toolkits in functionality, stability and performance. !OpenSceneGraph 3.0 runs on all Microsoft Windows platforms, Apple OS/X, iOS, GNU/Linux, Android, IRIX, Solaris, HP-UX, AIX and FreeBSD operating systems.
+PERTHSHIRE, Scotland - 28th June 2011 - !OpenSceneGraph Professional Services announces the release of !OpenSceneGraph 3.0, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. !OpenSceneGraph 3.0 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.0 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.0 release is the culmination of 12 years of work by the lead developers and the open-source community that has grown up around the project. The real-time graphics industry and academia embraced it from the very beginning, deploying it in real-world applications, and actively participating in its development, testing and refinement. The end result is a high-quality library with a feature set relevant to application developers' needs.
@@ -198,7 +109,7 @@ The !OpenSceneGraph project owes a great deal to the community for its developme
 
 = !OpenSceneGraph 2.8 release adds osgAnimation and osgVolume libraries, DICOM support, LispSM shadowing and much more. =
 
-PERTHSHIRE, Scotland - 12th February 2009 - !OpenSceneGraph Professional Services announces the release of !OpenSceneGraph 2.8, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. !OpenSceneGraph 2.8 written entirely in Standard C++ and built upon OpenGL, offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modelling markets - a real-time visualization tool which eclipses commercial scene graph toolkits in functionality, stability and performance. !OpenSceneGraph 2.8 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris, HP-UX, AIX and FreeBSD operating systems.
+PERTHSHIRE, Scotland - 12th February 2009 - !OpenSceneGraph Professional Services announces the release of !OpenSceneGraph 2.8, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. !OpenSceneGraph 2.8 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 2.8 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris, HP-UX, AIX and FreeBSD operating systems.
 
 === Open-source development delivers industry-leading features and performance ===
 The !OpenSceneGraph 2.8 release is the culmination of 10 years of work by the lead developers and the open-source community that has grown up around the project. The real-time graphics industry and academia embraced it from the very beginning, deploying it in real-world applications, and actively participating in its development, testing and refinement. The end result is a high-quality library with a feature set relevant to application developers' needs.
@@ -269,7 +180,7 @@ About !OpenSceneGraph Professional Services:[[BR]]
 
 = !OpenSceneGraph 2.6 release adds osgWidget library, KdTree intersections, Anti-aliased FBOsand much more. =
 
-PERTHSHIRE, Scotland - 5th August 2008 - !OpenSceneGraph Professional Services announces the release of !OpenSceneGraph 2.6, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. !OpenSceneGraph 2.6 written entirely in Standard C++ and built upon OpenGL, offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modelling markets - a real-time visualization tool which eclipses commercial scene graph toolkits in functionality, stability and performance. !OpenSceneGraph 2.6 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris, HP-UX, AIX and FreeBSD operating systems.
+PERTHSHIRE, Scotland - 5th August 2008 - !OpenSceneGraph Professional Services announces the release of !OpenSceneGraph 2.6, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. !OpenSceneGraph 2.6 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 2.6 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris, HP-UX, AIX and FreeBSD operating systems.
 
 === Open-source development delivers industry-leading features and performance ===
 The !OpenSceneGraph 2.6 release is the culmination of 9 years of work by the lead developers and the open-source community that has grown up around the project. The real-time graphics industry and academia embraced it from the very beginning, deploying it in real-world applications, and actively participating in its development, testing and refinement. The end result is a high-quality library with a feature set relevant to application developers' needs.
@@ -338,7 +249,7 @@ About !OpenSceneGraph Professional Services:[[BR]]
 
 = !OpenSceneGraph 2.4 release adds geometry shaders, multiple render targets, support for terrabyte scale terrain databases, writing to !OpenFlight and much more. =
 
-PERTHSHIRE, Scotland - 25th April 2008 - !OpenSceneGraph Professional Services announces the release of !OpenSceneGraph 2.4, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. !OpenSceneGraph 2.4 written entirely in Standard C++ and built upon OpenGL, offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modelling markets - a real-time visualization tool which eclipses commercial scene graph toolkits in functionality, stability and performance. !OpenSceneGraph 2.4 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris, HP-UX, AIX and FreeBSD operating systems.
+PERTHSHIRE, Scotland - 25th April 2008 - !OpenSceneGraph Professional Services announces the release of !OpenSceneGraph 2.4, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. !OpenSceneGraph 2.4 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 2.4 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris, HP-UX, AIX and FreeBSD operating systems.
 
 === Open-source development delivers industry-leading features and performance ===
 The !OpenSceneGraph 2.4 release is the culmination of 9 years of work by the lead developers and the open-source community that has grown up around the project. The real-time graphics industry and academia embraced it from the very beginning, deploying it in real-world applications, and actively participating in its development, testing and refinement. The end result is a high-quality library with a feature set relevant to application developers' needs.
@@ -394,7 +305,7 @@ About !OpenSceneGraph Professional Services:[[BR]]
 
 = OpenSceneGraph 2.2 release adds support for advanced displays, soft and parallel split shadow maps and easier builds =
 
-PERTHSHIRE, Scotland - 4th October 2007  - !OpenSceneGraph Professional Services announces the release of !OpenSceneGraph 2.2, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. !OpenSceneGraph 2.2 written entirely in Standard C++ and built upon OpenGL, offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modelling markets - a real-time visualization tool which eclipses commercial scene graph toolkits in functionality, stability and performance. !OpenSceneGraph 2.2 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris, HP-UX, AIX and !FreeBSD operating systems.
+PERTHSHIRE, Scotland - 4th October 2007  - !OpenSceneGraph Professional Services announces the release of !OpenSceneGraph 2.2, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. !OpenSceneGraph 2.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 2.2 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris, HP-UX, AIX and !FreeBSD operating systems.
 
 === Open-source development delivers industry-leading features and performance ===
 The !OpenSceneGraph 2.2 release is the culmination of 8 years of work by the lead developers and the open-source community that has grown up around the project. The real-time graphics industry and academia embraced it from the very beginning, deploying it in real-world applications, and actively participating in its development, testing and refinement. The end result is a high-quality library with a feature set relevant to application developers' needs.
@@ -451,7 +362,7 @@ About !OpenSceneGraph Professional Services:[[BR]]
 
 !!![=OpenSceneGraph=] 2.0 release improves ease-of-use and scalability, introducing new osgViewer, osgShadow and osgManipulator libraries, new build system, improved multi-core, multi-GPU support.
 
-PERTHSHIRE, Scotland - 15th June 2007  - [=OpenSceneGraph=] Professional Services announces the release of [=OpenSceneGraph=] 2.0, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. [=OpenSceneGraph=] 2.0, written entirely in Standard C++ and built upon [=OpenGL=], offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modelling markets a real-time visualization tool which rivals established commercial scene graph toolkits in functionality and performance. [=OpenSceneGraph=] 2.0 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris, HP-UX, AIX and [=FreeBSD=] operating systems.
+PERTHSHIRE, Scotland - 15th June 2007  - [=OpenSceneGraph=] Professional Services announces the release of [=OpenSceneGraph=] 2.0, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. [=OpenSceneGraph=] 2.0, 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 rivals established commercial scene graph toolkits in functionality and performance. [=OpenSceneGraph=] 2.0 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris, HP-UX, AIX and [=FreeBSD=] operating systems.
 
 !!!Open-source development delivers industry-leading features and performance
 The [=OpenSceneGraph=] 2.0 release is the culmination of 8 years of work by the lead developers and the open-source community that has grown up around the project. The real-time graphics industry and academia embraced it from the very beginning, deploying it in real-world applications, and actively participating in its development, testing and refinement. The end result is a high-quality library with a feature set relevant to application developers' needs.
@@ -509,7 +420,7 @@ Project Lead and Proprietor [=OpenSceneGraph=] Professional Services
 
 !!![=OpenSceneGraph=] 1.2 release introduces Windows 64bit and AIX support, COLLADA support, processor affinity and texture atlas builder.
 
-PERTHSHIRE, Scotland - 12th September 2006  - [=OpenSceneGraph=] Professional Services announces the release of [=OpenSceneGraph=] 1.2, the industry's leading open source scene graph technology, designed to accelerate application development and improve 3D graphics performance. [=OpenSceneGraph=] 1.2, written entirely in Standard C++ and built upon [=OpenGL=], offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modelling markets a real time visualization tool which rivals established commercial scene graph toolkits in functionality and performance. [=OpenSceneGraph=] 1.2 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris, HP-UX, AIX and [=FreeBSD=] operating systems.
+PERTHSHIRE, Scotland - 12th September 2006  - [=OpenSceneGraph=] Professional Services announces the release of [=OpenSceneGraph=] 1.2, the industry's leading open source scene graph technology, designed to accelerate application development and improve 3D graphics performance. [=OpenSceneGraph=] 1.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 rivals established commercial scene graph toolkits in functionality and performance. [=OpenSceneGraph=] 1.2 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris, HP-UX, AIX and [=FreeBSD=] operating systems.
 
 The [=OpenSceneGraph=]-1.2 release introduces:
 
@@ -534,7 +445,7 @@ Project Lead and Proprietor [=OpenSceneGraph=] Professional Services
 !!!OpenSceneGraph 1.1 release introduces peformance and scalability improvements, full OpenGL Shading Language support and new OpenFlight 16.1, TerrPagea2.2 and Quake3 loaders.
 
 AYRSHIRE, Scotland - July 19th 2006  - [=OpenSceneGraph=] Professional Services announces the release of [=OpenSceneGraph=] 1.1,
-the industry's leading open-source graphics library with [=OpenGL=] 2.0 and [=OpenGL=] Shading Language support. [=OpenSceneGraph=] is designed to accelerate application development and improve 3D graphics performance. [=OpenSceneGraph=] 1.1, written entirely in Standard C++ and built upon [=OpenGL=], offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modelling markets a real time visualization tool which rivals established commercial scene graph toolkits in functionality and performance. [=OpenSceneGraph=] 1.1 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris and [=FreeBSD=] operating systems.
+the industry's leading open-source graphics library with [=OpenGL=] 2.0 and [=OpenGL=] Shading Language support. [=OpenSceneGraph=] is designed to accelerate application development and improve 3D graphics performance. [=OpenSceneGraph=] 1.1, 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 rivals established commercial scene graph toolkits in functionality and performance. [=OpenSceneGraph=] 1.1 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris and [=FreeBSD=] operating systems.
 
 The OpenSceneGraph-1.1 release introduces:
 
@@ -561,7 +472,7 @@ Project Lead and Proprietor [=OpenSceneGraph=] Professional Services
 
 !!!High performance open-source graphics toolkit [=OpenSceneGraph=] hits 1.0!
 
-AYRSHIRE, Scotland - December 9th, 2005 - [=OpenSceneGraph=] Professional Services announces the release of [=OpenSceneGraph=] 1.0, the industry's leading open-source graphics library with [=OpenGL=] 2.0 and [=OpenGL=] Shading Language support. [=OpenSceneGraph=] is designed to accelerate application development and improve 3D graphics performance. [=OpenSceneGraph=] 1.0, written entirely in Standard C++ and built upon [=OpenGL=], offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modelling markets a real time visualization tool which rivals established commercial scene graph toolkits in functionality and performance. [=OpenSceneGraph=] 1.0 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris and [=FreeBSD=] operating systems.
+AYRSHIRE, Scotland - December 9th, 2005 - [=OpenSceneGraph=] Professional Services announces the release of [=OpenSceneGraph=] 1.0, the industry's leading open-source graphics library with [=OpenGL=] 2.0 and [=OpenGL=] Shading Language support. [=OpenSceneGraph=] is designed to accelerate application development and improve 3D graphics performance. [=OpenSceneGraph=] 1.0, 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 rivals established commercial scene graph toolkits in functionality and performance. [=OpenSceneGraph=] 1.0 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris and [=FreeBSD=] operating systems.
 
 ->''"3Dlabs congratulates the [=OpenSceneGraph=] development community on the release of [=OpenSceneGraph=] 1.0. [=OpenSceneGraph=] is a shining example of how open-source projects can deliver commercial-quality products with outstanding performance and a ton of cutting-edge features. 3Dlabs committed engineering resources to [=OpenSceneGraph=] to help implement full support of programmable shader technology through [=OpenGL=] Shading Language. It is gratifying to see the excitement that developers have for this important cross-platform, real-time visualization library."'''\\
 Randi Rost, director of developer relations at 3Dlabs, http://developer.3Dlabs.com/
@@ -688,7 +599,7 @@ osgpbuffer also example now uses Producer's pbuffer support making it portable a
 
 API refinements, bug fixes and performance improvements:
 
-There have been many bug fixes, a number of performance improvements and API cleanups that have occurred throughout the 0.9.8 - 0.9.9, too many separate items to enumerate here.  Together with the above new features they all go to making the OpenSceneGraph-0.9.9 the most robust, high performance and feature rich version so far, and sets the stage for the upcoming 1.0.
+There have been many bug fixes, a number of performance improvements and API cleanups that have occured throughout the 0.9.8 - 0.9.9, too many separate items to enumerate here.  Together with the above new features they all go to making the OpenSceneGraph-0.9.9 the most robust, high performance and feature rich version so far, and sets the stage for the upcoming 1.0.
 
 We would like to thank the following engineers for their contributions in the 0.9.8 - 0.9.9.9 time frame (in alphabetic order):
 Alberto Farre, Bob Kuehne, Brede Johansen, Carlo Camporesi, Chris Hanson, Don Burns, Donn Mielcarek,  Don Tidrow, Farshid Lashkari, Frederic Marmond, Garrett Potts, Igor Kravtchenko, James French, Jan Ciger, John Grant, Joakim Simonsson, Joran Jessurun, Jason Daly, Kevin Moiule, Leandro Motta Barros, Marco Jez, Mason Menninger, Mike Weiblen, Nathan Monteleone, Norman Vine, Olaf Flebbe, Paul Melis, Per Fahlberg, Rainer Oder, Randall Hopper, Reinhard Sainitzer, Robert Osfield, Ruben, Sebastien Grignard, Stephan Huber, Terry Welsh, Thom DeCarlo, Tony Horrobin, Tree, Tugkan Calapoglu, Vivek Rajan, Waltice and Yuzhong Shen
@@ -707,7 +618,7 @@ OpenProducer - http://www.andesengineering.com/Producer/index.html
 OpenThreads - http://openthreads.sf.net
 xine-lib - http://xinehq.de/
 
-OpenSceneGraph Commercial Support, Training and Consultancy links:
+OpenSceneGraph Commericial Support, Training and Consultancy links:
 
 OpenSceneGraph Professional Services - http://www.openscenegraph.com
 Andes Engineering - http://www.andesengineering.com
@@ -721,7 +632,7 @@ Andes Engineering - http://www.andesengineering.com
 
     >>> Support for database archives, improved pager, 3d compressed textures
 
-    Release 0.9.8 reflects a continuation of the prior commitment to release
+    Release 0.9.8 reflects a continuation of the prior committment to release
     often, arriving only two short months after 0.9.7.  This contrasts sharply
     to the long period between 0.9.6-2 and 0.9.7.  The following set of
     improvements and features are part of the 0.9.8 release.
@@ -1136,7 +1047,7 @@ Andes Engineering - http://www.andesengineering.com
     has now been moved to a freetype plug-in which is dynamically loaded on demand,
     with the core osgText library providing a default font when the plug-in is
     unavailable.  Moving the freetype dependency out of the osgText library makes
-    it just dependent on OpenGL and Standard C++ like the rest of the core libraries,
+    it just dependant on OpenGL and Standard C++ like the rest of the core libraries,
     allowing osgText to compile by default on all platforms.
 
     Improved thread safety has also been achieved in the core osg and osgUtil libraries
@@ -1561,9 +1472,9 @@ Andes Engineering - http://www.andesengineering.com
 
     Scene graph optimization has been added which can boost performance
     on some database by as much as an order of magnititude, this is
-    particularly noticeable in .flt based databases.  Display list performance
+    particularily noticable in .flt based databases.  Display list performance
     has also been boosted on NVidia based machines thanks to changing the
-    compilation and execution of display list into two separate operations.
+    compilation and execution of display list into two seperate operations.
 
     App callbacks are now supported on all Nodes, and there now a proper
     app traversal which can be used to animate the scene.
@@ -1613,7 +1524,7 @@ Andes Engineering - http://www.andesengineering.com
     the core scene graph  library making extremely easy to take advantage of
     this advanced rendering techinque - normally only seen in research papers.
     Check out osgimpostor demo to see how easy it is to add osg::Impostor
-    nodes to your own models. Impostors are particularly effective are
+    nodes to your own models. Impostors are particularily effective are
     reducing scene complexity whilest minimizing the visual impact, making it
     ideal for scenes with large numbers of complex objects such as a city
     scene, or a dense forest.
@@ -1624,7 +1535,7 @@ Andes Engineering - http://www.andesengineering.com
 
     The cool thing about both the osgreflect and osgimpostor demos is that
     there is no hardwiring to achieve the results, the scene graph stores
-    all the information necessary to specify the number and type of rendering
+    all the information neccessary to specify the number and type of rendering
     passes, and the framework handles the rest behind the scenes.  This also
     makes it very easy to add these advanced rendering techinques to your
     own applications as everything is cleanly encapsulated with
@@ -1636,7 +1547,7 @@ Andes Engineering - http://www.andesengineering.com
     web or your own.
 
     osg::Camera has been totally revamped and now supports asymetric
-    and othographics projections in addition to the symmetrical perspective
+    and othographics projections in addition to the symetrical perspective
     projections.
 
     And finally, support for texture subloading has been added to osg::Texture

README.md

@@ -1,119 +0,0 @@
-[![Build Status](https://travis-ci.org/openscenegraph/OpenSceneGraph.svg?branch=master)](https://travis-ci.org/openscenegraph/OpenSceneGraph)
-[![Coverity Status](https://scan.coverity.com/projects/9159/badge.svg)](https://scan.coverity.com/projects/openscenegraph-openscenegraph)
-[![Documentation](https://codedocs.xyz/openscenegraph/OpenSceneGraph.svg)](https://codedocs.xyz/openscenegraph/OpenSceneGraph/)
-[ABI Tracker](https://abi-laboratory.pro/tracker/timeline/openscenegraph/ "ABI Tracker")
-
-# Introduction
-
-Welcome to the OpenSceneGraph (OSG).
-
-For up-to-date information on the project, in-depth details on how to compile and run libraries and examples, see the documentation on the OpenSceneGraph website:
-
-    http://www.openscenegraph.org/index.php/documentation
-
-For support subscribe to our public mailing list or forum, details at:
-
-    http://www.openscenegraph.org/index.php/support
-
-For the impatient, we've included quick build instructions below, these are are broken down is three parts:
-
-  1) General notes on building the OpenSceneGraph
-  2) macOS release notes
-  3) iOS release notes
-
-If details below are not sufficient then head over to the openscenegraph.org to the Documentation/GettingStarted and Documentation/PlatformSpecifics sections for more indepth instructions.
-
-Robert Osfield.
-Project Lead.
-7th April 2018.
-
----
-
-## Section 1. How to build OpenSceneGraph
-
-The OpenSceneGraph uses the CMake build system to generate a platform-specific build environment.  CMake reads the `CMakeLists.txt` files that you'll find throughout the OpenSceneGraph directories, checks for installed dependencies and then generates files for the selected build system.
-
-If you don't already have CMake installed on your system you can grab it from http://www.cmake.org, use version 2.8.0 or later.  Details on the OpenSceneGraph's CMake build can be found at:
-
-    http://www.openscenegraph.org/projects/osg/wiki/Build/CMake
-
-Under Unix-like systems (i.e. Linux, IRIX, Solaris, Free-BSD, HP-UX, AIX, macOS) use the `cmake` or `ccmake` command-line utils. Note that `cmake .` defaults to building Release to ensure that you get the best performance from your final libraries/applications.
-
-    cd OpenSceneGraph
-    cmake .
-    make
-    sudo make install
-
-Alternatively, you can create an out-of-source build directory and run cmake or ccmake from there. The advantage to this approach is that the temporary files created by CMake won't clutter the OpenSceneGraph source directory, and also makes it possible to have multiple independent build targets by creating multiple build directories. In a directory alongside the OpenSceneGraph use:
-
-    mkdir build
-    cd build
-    cmake ../OpenSceneGraph
-    make
-    sudo make install
-
-Under Windows use the GUI tool CMakeSetup to build your VisualStudio files. The following page on our wiki dedicated to the CMake build system should help guide you through the process:
-
-    http://www.openscenegraph.org/index.php/documentation/platform-specifics/windows
-
-Under macOS you can either use the CMake build system above, or use the Xcode projects that you will find in the OpenSceneGraph/Xcode directory. See release notes on macOS CMake build below.
-
-For further details on compilation, installation and platform-specific information read "Getting Started" guide:
-
-    http://www.openscenegraph.org/index.php/documentation/10-getting-started
-
-
-## Section 2. Release notes on macOS build, by Eric Sokolowski et al.
-
-There are two ways to compile OpenSceneGraph under macOS.  The recommended way is to use CMake to generate Xcode project files and then use Xcode to build the library. The default project will be able to build Debug or Release libraries, examples, and sample applications.
-
-The alternative is to build OpenSceneGraph from the command line using `make` or `ninja` using the instructions for Unix-like systems above.
-
-Here are some key settings to consider when using CMake:
-
-- BUILD_OSG_EXAMPLES - By default this is turned off. Turn this setting on to compile many great example programs.
-- CMAKE_OSX_ARCHITECTURES - Xcode can create applications, executables, libraries, and frameworks that can be run on more than one architecture. Use this setting to indicate the architectures on which to build OSG. x86_64 is the only supported value for OS versions > 10.7.
-- OSG_BUILD_APPLICATION_BUNDLES - Normally only executable binaries are created for the examples and sample applications. Turn this option on if you want to create real macOS .app bundles. There are caveats to creating `.app` bundles, see below.
-- OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX - By default macOS uses the `imageio` plugin instead of the plugins for the individual file types (e.g. `jpg`, `gif`, etc.) to load image file types. The `imageio` plugin can handle all popular file formats through the ImageIO framework.
-- OSG_WINDOWING_SYSTEM - You have the choice to use Cocoa, Carbon, or X11 when building applications on macOS. Cocoa is the default for OS versions >= 10.5. Carbon and X11 are no longer actively supported, either by Apple or the OSG community.
-
-
-### APPLICATION BUNDLES (.app bundles)
-
-The example programs when built as application bundles only contain the executable file. They do not contain the dependent libraries as would a normal bundle, so they are not generally portable to other machines.
-They also do not know where to find plugins. An environmental variable OSG_LIBRARY_PATH may be set to point to the location where the plugin .so files are located. OSG_FILE_PATH may be set to point to the location where data files are located. Setting OSG_FILE_PATH to the OpenSceneGraph-Data directory is very useful when testing OSG by running the example programs.
-
-Many of the example programs use command-line arguments. When double-clicking on an application (or using the equivalent "open" command on the command line) only those examples and applications that do not require command-line arguments will successfully run. The executable file within the .app bundle can be run from the command-line if command-line arguments are needed.
-
-
-## Section 3. Release notes on iOS build, by Thomas Hogarth
-
-With CMake, XCode and the iOS sdk installed you can generate an iOS XCode project using the following command line:
-
-    export THIRDPARTY_PATH=/path/to/my/3rdParty
-    cmake ./ -G Xcode -DOSG_BUILD_PLATFORM_IPHONE:BOOL=ON \
-    -DIPHONE_SDKVER="10.2" \
-    -DIPHONE_VERSION_MIN="8.0" \
-    -DOPENGL_PROFILE:STRING=GLES2 \
-    -DBUILD_OSG_APPLICATIONS:BOOL=OFF \
-    -DBUILD_OSG_EXAMPLES:BOOL=ON \
-    -DOSG_WINDOWING_SYSTEM:STRING=IOS \
-    -DOSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX="imageio" \
-    -DDYNAMIC_OPENSCENEGRAPH:BOOL=OFF \
-    -DDYNAMIC_OPENTHREADS:BOOL=OFF \
-    -DCURL_INCLUDE_DIR:PATH="$THIRDPARTY_PATH/curl-ios-device/include" \
-    -DCURL_LIBRARY:PATH="$THIRDPARTY_PATH/curl-ios-device/lib/libcurl.a" \
-    -DFREETYPE_INCLUDE_DIR_freetype2:PATH="$THIRDPARTY_PATH/freetype-ios-universal/include/freetype" \
-    -DFREETYPE_INCLUDE_DIR_ft2build:PATH="$THIRDPARTY_PATH/freetype-ios-universal/include" \
-    -DFREETYPE_LIBRARY:PATH="$THIRDPARTY_PATH/freetype-ios-universal/lib/libFreeType_iphone_universal.a" \
-    -DTIFF_INCLUDE_DIR:PATH="$THIRDPARTY_PATH/tiff-ios-device/include" \
-    -DTIFF_LIBRARY:PATH="$THIRDPARTY_PATH/tiff-ios-device/lib/libtiff.a" \
-    -DGDAL_INCLUDE_DIR:PATH="$THIRDPARTY_PATH/gdal-ios-device/include" \
-    -DGDAL_LIBRARY:PATH="$THIRDPARTY_PATH/gdal-ios-device/lib/libgdal.a"
-
-
-Be sure to set the THIRDPARTY_PATH to the path containing your thirdparty dependencies. Set IPHONE_SDKVER to the version of the iOS sdk you have installed, in this instance 10.2. IPHONE_VERSION_MIN controls the base sdk used by xcode, and lastly set OPENGL_PROFILE to the version of GLES you want to use.
-
-Once this completes an XCode project will have been generated in the osg root folder. Open the generated Xcode project, select the example_osgViewerIPhone target. In 'General' tab set a development team. In the 'Build Settings' tab search for 'Other Linker Flags', then for each target type (debug, release etc) that you want to use open the list of arguments and delete the 'OpenGL' line and the '-framework' line above it. This is because cmake has tried to add the desktop OpenGL library which we don't want.
-
-Once this is done you should be able to build and deploy the `example_osgViewerIPhone` target on your device.

README.txt

@@ -0,0 +1,209 @@
+Welcome to the OpenSceneGraph (OSG).
+
+For up-to-date information on the project, in-depth details on how to
+compile and run libraries and examples, see the documentation on the
+OpenSceneGraph website:
+
+    http://www.openscenegraph.org/index.php/documentation
+
+For support subscribe to our public mailing list or forum, details at:
+
+    http://www.openscenegraph.org/index.php/support
+
+For the impatient, we've included quick build instructions below, these
+are are broken down is three parts:
+
+  1) General notes on building the OpenSceneGraph
+  2) OSX release notes
+  3) iOS release notes
+
+If details below are not sufficient then head over to the openscenegraph.org
+to the Documentation/GettingStarted and Documentation/PlatformSpecifics sections for
+more indepth instructions.
+
+Robert Osfield.
+Project Lead.
+12th August 2015.
+
+--
+
+Section 1. How to build the OpenSceneGraph
+==========================================
+
+The OpenSceneGraph uses the CMake build system to generate a
+platform-specific build environment.  CMake reads the CMakeLists.txt
+files that you'll find throughout the OpenSceneGraph directories,
+checks for installed dependenciesand then generates the appropriate
+build system.
+
+If you don't already have CMake installed on your system you can grab
+it from http://www.cmake.org, use version 2.4.6 or later.  Details on the
+OpenSceneGraph's CMake build can be found at:
+
+    http://www.openscenegraph.org/projects/osg/wiki/Build/CMake
+
+Under unices (i.e. Linux, IRIX, Solaris, Free-BSD, HP-Ux, AIX, OSX)
+use the cmake or ccmake command-line utils. Note that cmake . defaults
+to building Release to ensure that you get the best performance from
+your final libraries/applications.
+
+    cd OpenSceneGraph
+    cmake .
+    make
+    sudo make install
+
+Alternatively, you can create an out-of-source build directory and run
+cmake or ccmake from there. The advantage to this approach is that the
+temporary files created by CMake won't clutter the OpenSceneGraph
+source directory, and also makes it possible to have multiple
+independent build targets by creating multiple build directories. In a
+directory alongside the OpenSceneGraph use:
+
+    mkdir build
+    cd build
+    cmake ../OpenSceneGraph
+    make
+    sudo make install
+
+Under Windows use the GUI tool CMakeSetup to build your VisualStudio
+files. The following page on our wiki dedicated to the CMake build
+system should help guide you through the process:
+
+    http://www.openscenegraph.org/index.php/documentation/platform-specifics/windows
+
+Under OSX you can either use the CMake build system above, or use the
+Xcode projects that you will find in the OpenSceneGraph/Xcode
+directory. See release notes on OSX CMake build below.
+
+For further details on compilation, installation and platform-specific
+information read "Getting Started" guide:
+
+    http://www.openscenegraph.org/index.php/documentation/10-getting-started
+
+
+Section 2. Release notes on OSX build, by Eric Sokolowsky, August 5, 2008
+=========================================================================
+
+There are several ways to compile OpenSceneGraph under OSX.  The
+recommended way is to use CMake 2.6 to generate Xcode projects, then use
+Xcode to build the library. The default project will be able to build
+Debug or Release libraries, examples, and sample applications. Here are
+some key settings to consider when using CMake:
+
+BUILD_OSG_EXAMPLES - By default this is turned off. Turn this setting on
+to compile many great example programs.
+
+CMAKE_OSX_ARCHITECTURES - Xcode can create applications, executables,
+libraries, and frameworks that can be run on more than one architecture.
+Use this setting to indicate the architectures on which to build OSG.
+Possibilities include ppc, ppc64, i386, and x86_64. Building OSG using
+either of the 64-bit options (ppc64 and x86_64) has its own caveats
+below.
+
+OSG_BUILD_APPLICATION_BUNDLES - Normally only executable binaries are
+created for the examples and sample applications. Turn this option on if
+you want to create real OSX .app bundles. There are caveats to creating
+.app bundles, see below.
+
+OSG_WINDOWING_SYSTEM - You have the choice to use Carbon or X11 when
+building applications on OSX. Under Leopard and later, X11 applications,
+when started, will automatically launch X11 when needed. However,
+full-screen X11 applications will still show the menu bar at the top of
+the screen. Since many parts of the Carbon user interface are not
+64-bit, X11 is the only supported option for OSX applications compiled
+for ppc64 or x86_64.
+
+There is an Xcode directory in the base of the OSG software
+distribution, but its future is limited, and will be discontinued once
+the CMake project generator completely implements its functionality.
+
+
+APPLICATION BUNDLES (.app bundles)
+
+The example programs when built as application bundles only contain the
+executable file. They do not contain the dependent libraries as would a
+normal bundle, so they are not generally portable to other machines.
+They also do not know where to find plugins. An environmental variable
+OSG_LIBRARY_PATH may be set to point to the location where the plugin
+.so files are located. OSG_FILE_PATH may be set to point to the location
+where data files are located. Setting OSG_FILE_PATH to the
+OpenSceneGraph-Data directory is very useful when testing OSG by running
+the example programs.
+
+Many of the example programs use command-line arguments. When
+double-clicking on an application (or using the equivalent "open"
+command on the command line) only those examples and applications that
+do not require command-line arguments will successfully run. The
+executable file within the .app bundle can be run from the command-line
+if command-line arguments are needed.
+
+
+64-BIT APPLICATION SUPPORT
+
+OpenSceneGraph will not compile successfully when OSG_WINDOWING_SYSTEM is
+Carbon and either x86_64 or ppc64 is selected under CMAKE_OSX_ARCHITECTURES,
+as Carbon is a 32bit only API. A version of the osgviewer library written in
+Cocoa is needed. However, OSG may be compiled under 64-bits if the X11
+windowing system is selected. However, Two parts of the OSG default
+distribution will not work with 64-bit X11: the osgviewerWX example
+program and the osgdb_qt (Quicktime) plugin. These must be removed from
+the Xcode project after Cmake generates it in order to compile with
+64-bit architectures. The lack of the latter means that images such as
+jpeg, tiff, png, and gif will not work, nor will animations dependent on
+Quicktime. A new ImageIO-based plugin is being developed to handle the
+still images, and a QTKit plugin will need to be developed to handle
+animations.
+
+
+Section 3. Release notes on iOS build, by Thomas Hoghart
+=========================================================
+
+* Run CMake with either OSG_BUILD_PLATFORM_IPHONE or OSG_BUILD_PLATFORM_IPHONE_SIMULATOR set:
+  $ mkdir build-iOS ; cd build-iOS
+  $ ccmake -DOSG_BUILD_PLATFORM_IPHONE_SIMULATOR=YES -G Xcode ..
+* Check that CMAKE_OSX_ARCHITECTURE is i386 for the simulator or armv6;armv7 for the device
+* Disable DYNAMIC_OPENSCENEGRAPH, DYNAMIC_OPENTHREADS
+  This will give us the static build we need for iPhone.
+* Disable OSG_GL1_AVAILABLE, OSG_GL2_AVAILABLE, OSG_GL3_AVAILABLE,
+  OSG_GL_DISPLAYLISTS_AVAILABLE, OSG_GL_VERTEX_FUNCS_AVAILABLE
+* Enable OSG_GLES1_AVAILABLE *OR* OSG_GLES2_AVAILABLE *OR* OSG_GLES3_AVAILABLE (GLES3 will enable GLES2 features)
+* Ensure OSG_WINDOWING_SYSTEM is set to IOS
+* Change FREETYPE include and library paths to an iPhone version
+  (OpenFrameworks has one bundled with its distribution)
+* Ensure that CMake_OSX_SYSROOT points to your iOS SDK.
+* Generate the Xcode project
+* Open the Xcode project
+  $ open OpenSceneGraph.xcodeproj
+* Under Sources -> osgDB, select FileUtils.cpp and open the 'Get Info' panel, change File Type
+  to source.cpp.objcpp
+
+Here's an example for the command-line:
+$ cmake -G Xcode \
+-D OSG_BUILD_PLATFORM_IPHONE:BOOL=ON \
+-D CMAKE_CXX_FLAGS:STRING="-ftree-vectorize -fvisibility-inlines-hidden -mno-thumb -arch armv6 -pipe -no-cpp-precomp -miphoneos-version-min=3.1 -mno-thumb" \
+-D BUILD_OSG_APPLICATIONS:BOOL=OFF \
+-D OSG_BUILD_FRAMEWORKS:BOOL=OFF \
+-D OSG_WINDOWING_SYSTEM:STRING=IOS \
+-D OSG_BUILD_PLATFORM_IPHONE:BOOL=ON \
+-D CMAKE_OSX_ARCHITECTURES:STRING="armv6;armv7" \
+-D CMAKE_OSX_SYSROOT:STRING=/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.2.sdk \
+-D OSG_GL1_AVAILABLE:BOOL=OFF \
+-D OSG_GL2_AVAILABLE:BOOL=OFF \
+-D OSG_GLES1_AVAILABLE:BOOL=ON \
+-D OSG_GL_DISPLAYLISTS_AVAILABLE:BOOL=OFF \
+-D OSG_GL_FIXED_FUNCTION_AVAILABLE:BOOL=ON \
+-D OSG_GL_LIBRARY_STATIC:BOOL=OFF \
+-D OSG_GL_MATRICES_AVAILABLE:BOOL=ON \
+-D OSG_GL_VERTEX_ARRAY_FUNCS_AVAILABLE:BOOL=ON \
+-D OSG_GL_VERTEX_FUNCS_AVAILABLE:BOOL=OFF \
+-D DYNAMIC_OPENSCENEGRAPH:BOOL=OFF \
+-D DYNAMIC_OPENTHREADS:BOOL=OFF .
+
+
+Known issues:
+* When Linking final app against ive plugin, you need to add -lz to
+  the 'Other linker flags' list.
+* Apps and exes don't get created
+* You can only select Simulator, or Device projects. In the XCode
+  project you will see both types but the sdk they link will
+  be the same.

applications/osgarchive/osgarchive.cpp

@@ -1,9 +1,9 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
  *
- * This application is open source and may be redistributed and/or modified
+ * This application is open source and may be redistributed and/or modified   
  * freely and without restriction, both in commercial and non commercial applications,
  * as long as this copyright notice is maintained.
- *
+ * 
  * This application 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.
@@ -26,12 +26,12 @@ 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 an application for collecting a set of separate files into a single archive file that can be later read in OSG applications..");
     arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] filename ...");
-
+        
     // if user request help write it out to cout.
     if (arguments.read("-h") || arguments.read("--help"))
     {
@@ -49,14 +49,14 @@ int main( int argc, char **argv )
     {
         insert = true;
     }
-
+    
     bool extract = false;
     while (arguments.read("-e") || arguments.read("--extract"))
     {
         extract = true;
     }
-
+    
-    bool list = false;
+    bool list = false;    
     while (arguments.read("-l") || arguments.read("--list"))
     {
         list = true;
@@ -93,7 +93,7 @@ int main( int argc, char **argv )
             }
         }
     }
-
+    
     // any option left unread are converted into errors to write out later.
     arguments.reportRemainingOptionsAsUnrecognized();
 
@@ -103,7 +103,7 @@ int main( int argc, char **argv )
         arguments.writeErrorMessages(std::cout);
         return 1;
     }
-
+    
     if (archiveFilename.empty())
     {
         std::cout<<"Please specify an archive name using --archive filename"<<std::endl;
@@ -115,7 +115,7 @@ int main( int argc, char **argv )
         std::cout<<"Please specify an operation on the archive, either --insert, --extract or --list"<<std::endl;
         return 1;
     }
-
+    
     if (insert && extract)
     {
         std::cout<<"Cannot insert and extract files from the archive at one time, please use either --insert or --extract."<<std::endl;
@@ -127,7 +127,7 @@ int main( int argc, char **argv )
     if (insert)
     {
         archive = osgDB::openArchive(archiveFilename, osgDB::Archive::WRITE);
-
+        
         if (archive.valid())
         {
             for (FileNameList::iterator itr=files.begin();
@@ -135,7 +135,7 @@ int main( int argc, char **argv )
                 ++itr)
             {
                 std::cout<<"reading "<<*itr<<std::endl;
-                osg::ref_ptr<osg::Object> obj = osgDB::readRefObjectFile(*itr);
+                osg::ref_ptr<osg::Object> obj = osgDB::readObjectFile(*itr);
                 if (obj.valid())
                 {
                     std::cout<<"  write to archive "<<*itr<<std::endl;
@@ -152,10 +152,10 @@ int main( int argc, char **argv )
             }
         }
     }
-    else
+    else 
     {
         archive = osgDB::openArchive(archiveFilename, osgDB::Archive::READ);
-
+        
         if (extract && archive.valid())
         {
             for (FileNameList::iterator itr=files.begin();
@@ -175,7 +175,7 @@ int main( int argc, char **argv )
     }
 
     if (list && archive.valid())
-    {
+    {        
         std::cout<<"List of files in archive:"<<std::endl;
         osgDB::Archive::FileNameList fileNames;
         if (archive->getFileNames(fileNames))
@@ -187,11 +187,11 @@ int main( int argc, char **argv )
                 std::cout<<"    "<<*itr<<std::endl;
             }
         }
-
+        
         std::cout<<std::endl;
         std::cout<<"Master file "<<archive->getMasterFileName()<<std::endl;
     }
-
+    
     return 0;
 }
 

applications/osgconv/osgconv.cpp

@@ -157,7 +157,6 @@ public:
         }
 
         osg::ref_ptr<osg::State> state = new osg::State;
-        state->initializeExtensionProcs();
 
         for(TextureSet::iterator itr=_textureSet.begin();
             itr!=_textureSet.end();
@@ -625,19 +624,13 @@ int main( int argc, char **argv )
     while (arguments.read("-e",ext))
     {
         std::string libName = osgDB::Registry::instance()->createLibraryNameForExtension(ext);
-        if (osgDB::Registry::instance()->loadLibrary(libName)==osgDB::Registry::NOT_LOADED)
+        osgDB::Registry::instance()->loadLibrary(libName);
-        {
-            OSG_NOTICE<<"Unable to load library : "<<libName<<std::endl;
-        }
     }
 
     std::string libName;
     while (arguments.read("-l",libName))
     {
-        if (osgDB::Registry::instance()->loadLibrary(libName)==osgDB::Registry::NOT_LOADED)
+        osgDB::Registry::instance()->loadLibrary(libName);
-        {
-            OSG_NOTICE<<"Unable to load library : "<<libName<<std::endl;
-        }
     }
 
     while (arguments.read("-o",str))
@@ -740,7 +733,7 @@ int main( int argc, char **argv )
     while(arguments.read("--addMissingColours") || arguments.read("--addMissingColors")) { addMissingColours = true; }
 
     bool do_overallNormal = false;
-    while(arguments.read("--overallNormal")) { do_overallNormal = true; }
+    while(arguments.read("--overallNormal") || arguments.read("--overallNormal")) { do_overallNormal = true; }
 
     bool enableObjectCache = false;
     while(arguments.read("--enable-object-cache")) { enableObjectCache = true; }
@@ -778,7 +771,7 @@ int main( int argc, char **argv )
 
     osg::Timer_t startTick = osg::Timer::instance()->tick();
 
-    osg::ref_ptr<osg::Node> root = osgDB::readRefNodeFiles(fileNames);
+    osg::ref_ptr<osg::Node> root = osgDB::readNodeFiles(fileNames);
 
     if (root.valid())
     {
@@ -823,7 +816,7 @@ int main( int argc, char **argv )
 
         if (internalFormatMode != osg::Texture::USE_IMAGE_DATA_FORMAT)
         {
-            ext = osgDB::getFileExtension(fileNameOut);
+            std::string ext = osgDB::getFileExtension(fileNameOut);
             CompressTexturesVisitor ctv(internalFormatMode);
             root->accept(ctv);
             ctv.compress();

applications/osgfilecache/osgfilecache.cpp

@@ -1,9 +1,9 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
  *
- * This application is open source and may be redistributed and/or modified
+ * This application is open source and may be redistributed and/or modified   
  * freely and without restriction, both in commercial and non commercial applications,
  * as long as this copyright notice is maintained.
- *
+ * 
  * This application 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.
@@ -32,10 +32,7 @@
 #include <signal.h>
 #include <stdlib.h>
 
-#include <OpenThreads/Atomic>
+static bool s_ExitApplication = false;
-
-static OpenThreads::Atomic s_ExitApplication;
-static OpenThreads::Atomic s_SigValue;
 
 struct Extents
 {
@@ -49,20 +46,20 @@ struct Extents
         _maxLevel(maxLevel),
         _min(minX, minY),
         _max(maxX, maxY) {}
-
+    
     Extents(const Extents& extents):
         _maxLevel(extents._maxLevel),
         _min(extents._min),
         _max(extents._max) {}
-
+        
     Extents& operator = (const Extents& rhs)
     {
         if (&rhs == this) return *this;
-
+        
         _maxLevel = rhs._maxLevel;
         _min = rhs._min;
         _max = rhs._max;
-
+                
         return *this;
     }
 
@@ -72,10 +69,10 @@ struct Extents
         osg::notify(osg::INFO)<<"  _maxLevel="<<_maxLevel<<", _min="<<_min<<" _max="<<_max<<std::endl;
 
         if (level>_maxLevel) return false;
-
+        
         osg::Vec2d union_min, union_max;
 
-        // handle mins
+        // handle mins        
         if (_min.x()!=DBL_MAX && in_min.x()!=DBL_MAX)
         {
             // both _min.x() and in_min.x() are defined so use max of two
@@ -98,7 +95,7 @@ struct Extents
             union_min.y() = _min.y()<in_min.y() ? _min.y() : in_min.y();
         }
 
-        // handle maxs
+        // handle maxs        
         if (_max.x()!=-DBL_MAX && in_max.x()!=-DBL_MAX)
         {
             // both _max.x() and in_max.x() are defined so use max of two
@@ -124,7 +121,7 @@ struct Extents
         bool result = union_min.x()<union_max.x() && union_min.y()<union_max.y() ;
 
         osg::notify(osg::INFO)<<"  union_min="<<union_min<<" union_max="<<union_max<<" result = "<<result<<std::endl;
-
+        
         return result;
     }
 
@@ -143,7 +140,7 @@ public:
         _currentLevel(0) {}
 
     void setFileCache(osgDB::FileCache* fileCache) { _fileCache = fileCache; }
-
+        
     void addExtents(unsigned int maxLevel, double minX, double minY, double maxX, double maxY)
     {
         _extentsList.push_back(Extents(maxLevel, minX, minY, maxX, maxY));
@@ -157,16 +154,16 @@ public:
     void apply(osg::CoordinateSystemNode& cs)
     {
         _csnStack.push_back(&cs);
-
+        
         if (!s_ExitApplication) traverse(cs);
 
         _csnStack.pop_back();
     }
-
+    
     void apply(osg::Group& group)
     {
         if (s_ExitApplication) return;
-
+    
         osgTerrain::TerrainTile* terrainTile = dynamic_cast<osgTerrain::TerrainTile*>(&group);
         osgTerrain::Locator* locator = terrainTile ? terrainTile->getLocator() : 0;
         if (locator)
@@ -199,7 +196,7 @@ public:
 
             return;
         }
-
+        
         traverse(group);
     }
 
@@ -220,11 +217,11 @@ public:
     void apply(osg::PagedLOD& plod)
     {
         if (s_ExitApplication) return;
-
+    
         ++_currentLevel;
-
+        
         initBound();
-
+        
         // first compute the bounds of this subgraph
         for(unsigned int i=0; i<plod.getNumFileNames(); ++i)
         {
@@ -233,7 +230,7 @@ public:
                 traverse(plod);
             }
         }
-
+        
         if (intersects())
         {
             for(unsigned int i=0; i<plod.getNumFileNames(); ++i)
@@ -242,7 +239,7 @@ public:
                 if (!plod.getFileName(i).empty())
                 {
                     std::string filename;
-                    if (!plod.getDatabasePath().empty())
+                    if (!plod.getDatabasePath().empty()) 
                     {
                         filename = plod.getDatabasePath() + plod.getFileName(i);
                     }
@@ -258,10 +255,10 @@ public:
                 }
             }
         }
-
+        
         --_currentLevel;
     }
-
+    
     void apply(osg::Geode& geode)
     {
         for(unsigned int i=0; i<geode.getNumDrawables(); ++i)
@@ -274,10 +271,10 @@ public:
             }
         }
     }
-
+    
-    osg::ref_ptr<osg::Node> readNodeFileAndWriteToCache(const std::string& filename)
+    osg::Node* readNodeFileAndWriteToCache(const std::string& filename)
     {
-        osg::ref_ptr<osg::Node> node = 0;
+        osg::Node* node = 0;
         if (_fileCache.valid() )
         {
             if (_fileCache->existsInCache(filename))
@@ -289,7 +286,7 @@ public:
             {
                 osg::notify(osg::NOTICE)<<"reading : "<<filename<<std::endl;
 
-                node = osgDB::readRefNodeFile(filename);
+                node = osgDB::readNodeFile(filename);
                 if (node)
                 {
                     osg::notify(osg::NOTICE)<<"write to FileCache : "<<filename<<std::endl;
@@ -301,7 +298,7 @@ public:
         else
         {
             osg::notify(osg::NOTICE)<<"reading : "<<filename<<std::endl;
-            node = osgDB::readRefNodeFile(filename);
+            node = osgDB::readNodeFile(filename);
         }
         return node;
     }
@@ -310,18 +307,18 @@ public:
 protected:
 
     inline void pushMatrix(osg::Matrix& matrix) { _matrixStack.push_back(matrix); }
-
+    
     inline void popMatrix() { _matrixStack.pop_back(); }
 
     void convertXYZToLatLongHeight(osg::EllipsoidModel* em, osg::Vec3d& v)
     {
         em->convertXYZToLatLongHeight(v.x(), v.y(), v.z(),
                                       v.y(), v.x(), v.z());
-
+                                      
         v.x() = osg::RadiansToDegrees(v.x());
         v.y() = osg::RadiansToDegrees(v.y());
     }
-
+    
     void initBound()
     {
         _min.set(DBL_MAX, DBL_MAX);
@@ -335,16 +332,16 @@ protected:
         if (v.x() > _max.x()) _max.x() = v.x();
         if (v.y() > _max.y()) _max.y() = v.y();
     }
-
+    
     void updateBound(osg::Vec3Array& vertices)
     {
         // set up matrix
         osg::Matrix matrix;
         if (!_matrixStack.empty()) matrix = _matrixStack.back();
-
+        
         // set up ellipsoid model
         osg::EllipsoidModel* em = !_csnStack.empty() ?  _csnStack.back()->getEllipsoidModel() : 0;
-
+        
         for(osg::Vec3Array::iterator itr = vertices.begin();
             itr != vertices.end();
             ++itr)
@@ -355,7 +352,7 @@ protected:
             updateBound(v);
         }
     }
-
+    
     bool intersects()
     {
         osg::notify(osg::INFO)<<"intersects() _min = "<<_min<<" _max = "<<_max<<std::endl;
@@ -365,7 +362,7 @@ protected:
         {
             if (itr->intersects(_currentLevel, _min, _max)) return true;
         }
-
+        
         return false;
     }
 
@@ -379,15 +376,15 @@ protected:
     unsigned int    _currentLevel;
     MatrixStack     _matrixStack;
     CSNStack        _csnStack;
-
+    
     osg::Vec2d      _min;
     osg::Vec2d      _max;
 };
 
 static void signalHandler(int sig)
 {
-    s_SigValue.exchange(sig);
+    printf("\nCaught signal %d, requesting exit...\n\n",sig);
-    s_ExitApplication.exchange(1);
+    s_ExitApplication = true;
 }
 
 int main( int argc, char **argv )
@@ -406,7 +403,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 an application for collecting a set of separate files into a single archive file that can be later read in OSG applications..");
@@ -415,21 +412,21 @@ int main( int argc, char **argv )
     arguments.getApplicationUsage()->addCommandLineOption("-e level minX minY maxX maxY","Read down to <level> across the extents minX, minY to maxY, maxY.  Note, for geocentric datase X and Y are longitude and latitude respectively.");
     arguments.getApplicationUsage()->addCommandLineOption("-c directory","Shorthand for --file-cache directory.");
     arguments.getApplicationUsage()->addCommandLineOption("--file-cache directory","Set directory as to place cache download files.");
-
+        
     // if user request help write it out to cout.
     if (arguments.read("-h") || arguments.read("--help"))
     {
         arguments.getApplicationUsage()->write(std::cout);
         return 1;
     }
-
+    
     LoadDataVisitor ldv;
 
     std::string fileCachePath;
     while(arguments.read("--file-cache",fileCachePath) || arguments.read("-c",fileCachePath)) {}
-
+    
     if (fileCachePath.empty())
-    {
+    {   
         const char* env_fileCachePath = getenv("OSG_FILE_CACHE");
         if (env_fileCachePath)
         {
@@ -442,7 +439,7 @@ int main( int argc, char **argv )
         std::cout<<"No path to the file cache defined, please set OSG_FILE_PATH env var, or use --file-cache <directory> to set a suitable directory for the file cache."<<std::endl;
         return 1;
     }
-
+    
     ldv.setFileCache(new osgDB::FileCache(fileCachePath));
 
     unsigned int maxLevels = 0;
@@ -450,14 +447,14 @@ int main( int argc, char **argv )
     {
         ldv.addExtents(maxLevels);
     }
-
+    
     double minX, maxX, minY, maxY;
     while(arguments.read("-e",maxLevels, minX, minY, maxX, maxY))
     {
         ldv.addExtents(maxLevels, minX, minY, maxX, maxY);
     }
 
-
+    
     std::string filename;
     for(int i=1; i<arguments.argc(); ++i)
     {
@@ -467,26 +464,26 @@ int main( int argc, char **argv )
             break;
         }
     }
-
+    
-    if (filename.empty())
+    if (filename.empty()) 
     {
         std::cout<<"No file to load specified."<<std::endl;
         return 1;
     }
-
+    
     osg::ref_ptr<osg::Node> loadedModel = ldv.readNodeFileAndWriteToCache(filename);
     if (!loadedModel)
     {
         std::cout<<"No data loaded, please specify a database to load"<<std::endl;
         return 1;
     }
-
+    
-
+    
     loadedModel->accept(ldv);
 
     if (s_ExitApplication)
     {
-        std::cout<<"osgfilecache exited in response to signal : "<<s_SigValue<<std::endl;
+        std::cout<<"osgfilecache cleanly exited in response to signal."<<std::endl;
     }
 
     return 0;

applications/osgversion/Contributors.cpp

@@ -261,30 +261,7 @@ const char* invalidNames[] =
     "RayIntersector",
     "OpenSceneGraph-Data",
     "Node",
-    "AlphaFunc",
+    "AlphaFunc"
-    "CompositeViewer",
-    "OpenSceneGraph-3",
-    "DisplaySettings::SHADER_NONE",
-    "CodeDocs",
-    "Mon",
-    "Tue",
-    "Wed",
-    "Fri",
-    "Sat",
-    "Sun",
-    "I",
-    "TriangleFunctor",
-    "PrimitiveFunctor",
-    "OpenMW",
-    "StreamOperator",
-    "SceneLoader",
-    "OpenGL",
-    "FindLIBLAS",
-    "PissedCapslock",
-    "MinGW",
-    "Haojia521",
-    "Github",
-    "It"
 };
 
 
@@ -507,9 +484,7 @@ TypoCorrection typoCorrections[] =
     {"Janik", "Jannik"},
     {"Viganò", "Vigan<EFBFBD>"},
     {"Vigano", "Vigan<EFBFBD>"},
-    {"Frashud", "Farshid"},
+    {"Frashud", "Farshid"}
-    {"Dannahauer","Dannahauer"},
-    {"Sando","Sandro"}
 };
 
 
@@ -523,18 +498,6 @@ struct NameCorrection
 
 NameCorrection nameCorrections[] =
 {
-    {"LaurensVoerman","GetScalarValue",
-     "Laurens", "Voerman"},
-    {"LaurensVoerman","Meta_Shape",
-     "Laurens", "Voerman"},
-    {"LaurensVoerman","OpenCascade",
-     "Laurens", "Voerman"},
-    {"LaurensVoerman","Fri",
-     "Laurens", "Voerman"},
-    {"LaurensVoerman","",
-     "Laurens", "Voerman"},
-    {"Laurens","Loerman",
-     "Laurens", "Voerman"},
     {"FrancoisTigeot","",
      "Francois", "Tigeot"},
     {"Juan","Manuel",
@@ -710,9 +673,7 @@ NameCorrection nameCorrections[] =
      {"WeSee", "",
        "Alois", "Wismer"},
      {"We", "See",
-       "Alois", "Wismer"},
+       "Alois", "Wismer"}
-     {"AnyOldName3", "",
-       "Chris", "Djali"}
 };
 
 

applications/osgviewer/osgviewer.cpp

@@ -74,19 +74,23 @@ int main(int argc, char** argv)
     std::string url, username, password;
     while(arguments.read("--login",url, username, password))
     {
-        osgDB::Registry::instance()->getOrCreateAuthenticationMap()->addAuthenticationDetails(
+        if (!osgDB::Registry::instance()->getAuthenticationMap())
-            url,
+        {
-            new osgDB::AuthenticationDetails(username, password)
+            osgDB::Registry::instance()->setAuthenticationMap(new osgDB::AuthenticationMap);
-        );
+            osgDB::Registry::instance()->getAuthenticationMap()->addAuthenticationDetails(
+                url,
+                new osgDB::AuthenticationDetails(username, password)
+            );
+        }
     }
 
     std::string device;
     while(arguments.read("--device", device))
     {
-        osg::ref_ptr<osgGA::Device> dev = osgDB::readRefFile<osgGA::Device>(device);
+        osg::ref_ptr<osgGA::Device> dev = osgDB::readFile<osgGA::Device>(device);
         if (dev.valid())
         {
-            viewer.addDevice(dev);
+            viewer.addDevice(dev.get());
         }
     }
 
@@ -148,7 +152,7 @@ int main(int argc, char** argv)
     viewer.addEventHandler(new osgViewer::ScreenCaptureHandler);
 
     // load the data
-    osg::ref_ptr<osg::Node> loadedModel = osgDB::readRefNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFiles(arguments);
     if (!loadedModel)
     {
         std::cout << arguments.getApplicationName() <<": No data loaded" << std::endl;
@@ -168,9 +172,9 @@ int main(int argc, char** argv)
 
     // optimize the scene graph, remove redundant nodes and state etc.
     osgUtil::Optimizer optimizer;
-    optimizer.optimize(loadedModel);
+    optimizer.optimize(loadedModel.get());
 
-    viewer.setSceneData(loadedModel);
+    viewer.setSceneData( loadedModel.get() );
 
     viewer.realize();
 

applications/present3D/Cluster.cpp

@@ -15,7 +15,6 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/types.h>
-#include <errno.h>
 
 #if !defined (WIN32) || defined(__CYGWIN__)
 #include <sys/ioctl.h>
@@ -34,7 +33,7 @@
 #if defined(__linux)
     #include <unistd.h>
     #include <linux/sockios.h>
-#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
     #include <unistd.h>
     #include <sys/sockio.h>
 #elif defined(__sgi)
@@ -42,8 +41,6 @@
     #include <net/soioctl.h>
 #elif defined(__CYGWIN__)
     #include <unistd.h>
-#elif defined (__GNU__)
-    #include <unistd.h>
 #elif defined(__sun)
     #include <unistd.h>
     #include <sys/sockio.h>
@@ -291,23 +288,14 @@ bool Receiver::init( void )
         perror( "Socket" );
     return false;
     }
-
-    int result = 0;
-
 #if defined (WIN32) && !defined(__CYGWIN__)
 //    const BOOL on = TRUE;
 //    setsockopt( _so, SOL_SOCKET, SO_REUSEADDR, (const char*) &on, sizeof(int));
 #else
     int on = 1;
-    result = setsockopt( _so, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
+    setsockopt( _so, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
 #endif
 
-    if (result)
-    {
-        OSG_NOTICE<<"Warning: Reciever::init() setsockopt(..) failed, errno="<<errno<<std::endl;
-        return false;
-    }
-
 //    struct sockaddr_in saddr;
     saddr.sin_family = AF_INET;
     saddr.sin_port   = htons( _port );
@@ -350,7 +338,7 @@ void Receiver::sync( void )
     }
 
 #if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ ) || \
-    defined(__DragonFly__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
+    defined(__DragonFly__)
     socklen_t
 #else
     int
@@ -367,17 +355,11 @@ void Receiver::sync( void )
 
 #if defined (WIN32) && !defined(__CYGWIN__)
 //    saddr.sin_port   = htons( _port );
-    int result = recvfrom( _so, (char *)_buffer, _buffer_size, 0, (sockaddr*)&saddr, &size );
+    recvfrom( _so, (char *)_buffer, _buffer_size, 0, (sockaddr*)&saddr, &size );
 //    recvfrom(sock_Receive, szMessage, 256, 0, (sockaddr*)&addr_Cli, &clilen)
     //int err = WSAGetLastError ();
     //int *dum = (int*) _buffer;
 
-    if (result<0)
-    {
-        OSG_NOTICE<<"Warning: Receiver::sync() recvfrom(..) failed, errno="<<errno<<std::endl;
-        return;
-    }
-
     while( select( _so+1, &fdset, 0L, 0L, &tv ) )
     {
         if( FD_ISSET( _so, &fdset ) )
@@ -386,13 +368,7 @@ void Receiver::sync( void )
         }
     }
 #else
-    int result = recvfrom( _so, (caddr_t)_buffer, _buffer_size, 0, 0, &size );
+    recvfrom( _so, (caddr_t)_buffer, _buffer_size, 0, 0, &size );
-    if (result<0)
-    {
-        OSG_NOTICE<<"Warning: Receiver::sync() recvfrom(..) failed, errno="<<errno<<std::endl;
-        return;
-    }
-
     while( select( _so+1, &fdset, 0L, 0L, &tv ) )
     {
         if( FD_ISSET( _so, &fdset ) )
@@ -451,26 +427,21 @@ bool Broadcaster::init( void )
     int on = 1;
 #endif
 
-    int result = 0;
-
 #if defined (WIN32) && !defined(__CYGWIN__)
-    result = setsockopt( _so, SOL_SOCKET, SO_REUSEADDR, (const char *) &on, sizeof(int));
+    setsockopt( _so, SOL_SOCKET, SO_REUSEADDR, (const char *) &on, sizeof(int));
 #else
-    result = setsockopt( _so, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
+    setsockopt( _so, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
 #endif
 
-    if (result) return false;
-
     saddr.sin_family = AF_INET;
     saddr.sin_port   = htons( _port );
     if( _address == 0 )
     {
 #if defined (WIN32) && !defined(__CYGWIN__)
-        result = setsockopt( _so, SOL_SOCKET, SO_BROADCAST, (const char *) &on, sizeof(int));
+        setsockopt( _so, SOL_SOCKET, SO_BROADCAST, (const char *) &on, sizeof(int));
 #else
-        result = setsockopt( _so, SOL_SOCKET, SO_BROADCAST, &on, sizeof(on));
+        setsockopt( _so, SOL_SOCKET, SO_BROADCAST, &on, sizeof(on));
 #endif
-        if (result) return false;
 
 #if !defined (WIN32) || defined(__CYGWIN__)
         struct ifreq ifr;
@@ -541,19 +512,14 @@ void Broadcaster::sync( void )
         return;
     }
 
-    int result = 0;
 #if defined (WIN32) && !defined(__CYGWIN__)
     unsigned int size = sizeof( SOCKADDR_IN );
-    result = sendto( _so, (const char *)_buffer, _buffer_size, 0, (struct sockaddr *)&saddr, size );
+    sendto( _so, (const char *)_buffer, _buffer_size, 0, (struct sockaddr *)&saddr, size );
     // int err = WSAGetLastError ();
     // int *dum = (int*) _buffer;
 #else
     unsigned int size = sizeof( struct sockaddr_in );
-    result = sendto( _so, (const void *)_buffer, _buffer_size, 0, (struct sockaddr *)&saddr, size );
+    sendto( _so, (const void *)_buffer, _buffer_size, 0, (struct sockaddr *)&saddr, size );
 #endif
 
-    if (result)
-    {
-        OSG_NOTICE<<"Warning: sentTo(...) failed : errno="<<errno<<std::endl;
-    }
 }

applications/present3D/Cluster.h

@@ -43,7 +43,7 @@ class Receiver
      // Define what port to listen and bind to
     void setPort( const short port );
 
-    // Sync does a blocking wait to receive next message
+    // Sync does a blocking wait to recieve next message
     void sync( void );
 
     private :
@@ -141,7 +141,7 @@ class CameraPacket {
         void writeEventQueue(osgViewer::Viewer& viewer);
 
         void setMasterKilled(const bool flag) { _masterKilled = flag; }
-        bool getMasterKilled() const { return _masterKilled; }
+        const bool getMasterKilled() const { return _masterKilled; }
 
         unsigned int    _byte_order;
         bool            _masterKilled;

applications/present3D/ReadShowFile.cpp

@@ -215,24 +215,24 @@ osg::ref_ptr<osg::Node> p3d::readShowFiles(osg::ArgumentParser& arguments,const
     std::string filename;
     while (arguments.read("--image",filename))
     {
-        osg::ref_ptr<osg::Image> image = readRefImageFile(filename.c_str(), local_options.get());
+        osg::ref_ptr<osg::Image> image = readImageFile(filename.c_str(), local_options.get());
-        if (image.valid()) nodeList.push_back(osg::createGeodeForImage(image));
+        if (image.valid()) nodeList.push_back(osg::createGeodeForImage(image.get()));
     }
 
     while (arguments.read("--movie",filename))
     {
-        osg::ref_ptr<osg::Image> image = readRefImageFile(filename.c_str(), local_options.get());
+        osg::ref_ptr<osg::Image> image = readImageFile(filename.c_str(), local_options.get());
-        osg::ImageStream* imageStream = dynamic_cast<osg::ImageStream*>(image.get());
+        osg::ref_ptr<osg::ImageStream> imageStream = dynamic_cast<osg::ImageStream*>(image.get());
-        if (imageStream)
+        if (image.valid())
         {
             imageStream->play();
-            nodeList.push_back(osg::createGeodeForImage(imageStream));
+            nodeList.push_back(osg::createGeodeForImage(imageStream.get()));
         }
     }
 
     while (arguments.read("--dem",filename))
     {
-        osg::ref_ptr<osg::HeightField> hf = readRefHeightFieldFile(filename.c_str(), local_options.get());
+        osg::HeightField* hf = readHeightFieldFile(filename.c_str(), local_options.get());
         if (hf)
         {
             osg::Geode* geode = new osg::Geode;
@@ -247,7 +247,7 @@ osg::ref_ptr<osg::Node> p3d::readShowFiles(osg::ArgumentParser& arguments,const
         if (!arguments.isOption(pos))
         {
             // not an option so assume string is a filename.
-            osg::ref_ptr<osg::Node> node = osgDB::readRefNodeFile( arguments[pos], local_options.get());
+            osg::Node *node = osgDB::readNodeFile( arguments[pos], local_options.get());
 
             if(node)
             {
@@ -256,7 +256,7 @@ osg::ref_ptr<osg::Node> p3d::readShowFiles(osg::ArgumentParser& arguments,const
                 nodeList.push_back(node);
 
                 // make sure that this presentation isn't cached
-                osgDB::Registry::instance()->removeFromObjectCache( arguments[pos], local_options.get());
+                osgDB::Registry::instance()->removeFromObjectCache( arguments[pos] );
             }
         }
     }

applications/present3D/SpellChecker.cpp

@@ -86,7 +86,7 @@ bool SpellChecker::isCorrect(const std::string& word) const
     return true;
 }
 
-SpellChecker::WordList SpellChecker::suggest(const std::string& /*word*/) const
+SpellChecker::WordList SpellChecker::suggest(const std::string& word) const
 {
     return WordList();
 }

applications/present3D/present3D.cpp

@@ -137,7 +137,7 @@ class ForwardToDeviceEventHandler : public osgGA::GUIEventHandler {
 public:
     ForwardToDeviceEventHandler(osgGA::Device* device, bool format_mouse_events) : osgGA::GUIEventHandler(), _device(device), _forwardMouseEvents(format_mouse_events) {}
 
-    virtual bool handle (const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& /*aa*/, osg::Object *, osg::NodeVisitor *)
+    virtual bool handle (const osgGA::GUIEventAdapter &ea, osgGA::GUIActionAdapter &aa, osg::Object *, osg::NodeVisitor *)
     {
         switch (ea.getEventType())
         {
@@ -180,7 +180,7 @@ class DumpEventHandler : public osgGA::GUIEventHandler {
 public:
     DumpEventHandler() : osgGA::GUIEventHandler() {}
 
-    virtual bool handle (const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& /*aa*/, osg::Object *, osg::NodeVisitor *)
+    virtual bool handle (const osgGA::GUIEventAdapter &ea, osgGA::GUIActionAdapter &aa, osg::Object *, osg::NodeVisitor *)
     {
         switch (ea.getEventType())
         {
@@ -266,7 +266,7 @@ void processLoadedModel(osg::ref_ptr<osg::Node>& loadedModel, int optimizer_opti
 
 void addDeviceTo(osgViewer::Viewer& viewer, const std::string& device_name, bool forward_mouse_events)
 {
-    osg::ref_ptr<osgGA::Device> dev = osgDB::readRefFile<osgGA::Device>(device_name);
+    osg::ref_ptr<osgGA::Device> dev = osgDB::readFile<osgGA::Device>(device_name);
     if (dev.valid())
     {
         OSG_INFO << "Adding Device : " << device_name << std::endl;
@@ -317,7 +317,7 @@ int main( int argc, char **argv )
     if (arguments.read("-devices") || arguments.read("--devices"))
     {
         // Force load QuickTime plugin, probe video capability, exit
-        osgDB::readRefImageFile("devices.live");
+        osgDB::readImageFile("devices.live");
         return 1;
     }
 
@@ -336,10 +336,14 @@ int main( int argc, char **argv )
     std::string url, username, password;
     while(arguments.read("--login",url, username, password))
     {
-        osgDB::Registry::instance()->getOrCreateAuthenticationMap()->addAuthenticationDetails(
+        if (!osgDB::Registry::instance()->getAuthenticationMap())
-            url,
+        {
-            new osgDB::AuthenticationDetails(username, password)
+            osgDB::Registry::instance()->setAuthenticationMap(new osgDB::AuthenticationMap);
-        );
+            osgDB::Registry::instance()->getAuthenticationMap()->addAuthenticationDetails(
+                url,
+                new osgDB::AuthenticationDetails(username, password)
+            );
+        }
     }
 
 
@@ -447,7 +451,7 @@ int main( int argc, char **argv )
 
         osg::ref_ptr<osgDB::Options> device_options = new osgDB::Options("documentRegisteredHandlers");
 
-        osg::ref_ptr<osgGA::Device> rest_http_device = osgDB::readRefFile<osgGA::Device>(server_address+":"+server_port+"/"+document_root+".resthttp", device_options.get());
+        osg::ref_ptr<osgGA::Device> rest_http_device = osgDB::readFile<osgGA::Device>(server_address+":"+server_port+"/"+document_root+".resthttp", device_options.get());
         if (rest_http_device.valid())
         {
             viewer.addDevice(rest_http_device.get());
@@ -843,11 +847,12 @@ 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 receiving of camera packets.
+        // objects for managing the broadcasting and recieving of camera packets.
         CameraPacket cp;
         Broadcaster  bc;
         Receiver     rc;
@@ -859,117 +864,116 @@ int main( int argc, char **argv )
 
         while( !viewer.done() && !masterKilled)
         {
-            osg::Timer_t startFrameTick = osg::Timer::instance()->tick();
+            // wait for all cull and draw threads to complete.
+            viewer.advance();
 
-            if (viewer.getRunFrameScheme()!=osgViewer::ViewerBase::ON_DEMAND || seh->checkNeedToDoFrame())
+            osg::Timer_t currentTick = osg::Timer::instance()->tick();
+            double deltaTime = osg::Timer::instance()->delta_s(startOfFrameTick, currentTick);
+
+
+            if (deltaTime<targetFrameTime)
             {
-                // do the normal frame.
+                OpenThreads::Thread::microSleep(static_cast<unsigned int>((targetFrameTime-deltaTime)*1000000.0));
-
-                // wait for all cull and draw threads to complete.
-                viewer.advance();
-
-    #if 0
-                if (kmcb)
-                {
-                    double time = kmcb->getTime();
-                    viewer.getFrameStamp()->setReferenceTime(time);
-                }
-    #endif
-
-    #ifdef USE_SDL
-                sdlIntegration.update(viewer);
-    #endif
-
-                if (P3DApplicationType==MASTER)
-                {
-                    // take camera zero as the guide.
-                    osg::Matrix modelview(viewer.getCamera()->getViewMatrix());
-
-                    cp.setPacket(modelview,viewer.getFrameStamp());
-
-                    // cp.readEventQueue(viewer);
-
-                    scratchPad.reset();
-                    scratchPad.write(cp);
-
-                    scratchPad.reset();
-                    scratchPad.read(cp);
-
-                    bc.setBuffer(scratchPad.startPtr(), scratchPad.numBytes());
-
-                    std::cout << "bc.sync()"<<scratchPad.numBytes()<<std::endl;
-
-                    bc.sync();
-                }
-                else if (P3DApplicationType==SLAVE)
-                {
-                    rc.setBuffer(scratchPad.startPtr(), scratchPad.numBytes());
-
-                    rc.sync();
-
-                    scratchPad.reset();
-                    scratchPad.read(cp);
-
-                    // cp.writeEventQueue(viewer);
-
-                    if (cp.getMasterKilled())
-                    {
-                        std::cout << "Received master killed."<<std::endl;
-                        // break out of while (!done) loop since we've now want to shut down.
-                        masterKilled = true;
-                    }
-                }
-
-                // update the scene by traversing it with the update visitor which will
-                // call all node update callbacks and animations.
-                viewer.eventTraversal();
-
-                if (seh->getRequestReload())
-                {
-                    OSG_INFO<<"Reload requested"<<std::endl;
-                    seh->setRequestReload(false);
-                    int previous_ActiveSlide = seh->getActiveSlide();
-                    int previous_ActiveLayer = seh->getActiveLayer();
-
-                    // reset time so any event key generate
-
-                    loadedModel = p3d::readShowFiles(arguments,cacheAllOption.get());
-                    processLoadedModel(loadedModel, optimizer_options, cursorFileName);
-
-                    if (!loadedModel)
-                    {
-                        return 0;
-                    }
-
-                    viewer.setSceneData(loadedModel.get());
-                    seh->set(loadedModel.get());
-                    seh->selectSlide(previous_ActiveSlide, previous_ActiveLayer);
-
-                    continue;
-
-                }
-
-                // update the scene by traversing it with the update visitor which will
-                // call all node update callbacks and animations.
-                viewer.updateTraversal();
-
-                if (P3DApplicationType==SLAVE)
-                {
-                    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();
             }
 
-            // work out if we need to force a sleep to hold back the frame rate
+            startOfFrameTick =  osg::Timer::instance()->tick();
-            osg::Timer_t endFrameTick = osg::Timer::instance()->tick();
+
-            double frameTime = osg::Timer::instance()->delta_s(startFrameTick, endFrameTick);
+#if 0
-            if (frameTime < targetFrameTime) OpenThreads::Thread::microSleep(static_cast<unsigned int>(1000000.0*(targetFrameTime-frameTime)));
+            if (kmcb)
+            {
+                double time = kmcb->getTime();
+                viewer.getFrameStamp()->setReferenceTime(time);
+            }
+#endif
+
+#ifdef USE_SDL
+            sdlIntegration.update(viewer);
+#endif
+
+            if (P3DApplicationType==MASTER)
+            {
+                // take camera zero as the guide.
+                osg::Matrix modelview(viewer.getCamera()->getViewMatrix());
+
+                cp.setPacket(modelview,viewer.getFrameStamp());
+
+                // cp.readEventQueue(viewer);
+
+                scratchPad.reset();
+                scratchPad.write(cp);
+
+                scratchPad.reset();
+                scratchPad.read(cp);
+
+                bc.setBuffer(scratchPad.startPtr(), scratchPad.numBytes());
+
+                std::cout << "bc.sync()"<<scratchPad.numBytes()<<std::endl;
+
+                bc.sync();
+            }
+            else if (P3DApplicationType==SLAVE)
+            {
+                rc.setBuffer(scratchPad.startPtr(), scratchPad.numBytes());
+
+                rc.sync();
+
+                scratchPad.reset();
+                scratchPad.read(cp);
+
+                // cp.writeEventQueue(viewer);
+
+                if (cp.getMasterKilled())
+                {
+                    std::cout << "Received master killed."<<std::endl;
+                    // break out of while (!done) loop since we've now want to shut down.
+                    masterKilled = true;
+                }
+            }
+
+            // update the scene by traversing it with the update visitor which will
+            // call all node update callbacks and animations.
+            viewer.eventTraversal();
+
+            if (seh->getRequestReload())
+            {
+                OSG_INFO<<"Reload requested"<<std::endl;
+                seh->setRequestReload(false);
+                int previous_ActiveSlide = seh->getActiveSlide();
+                int previous_ActiveLayer = seh->getActiveLayer();
+
+                // reset time so any event key generate
+
+                loadedModel = p3d::readShowFiles(arguments,cacheAllOption.get());
+                processLoadedModel(loadedModel, optimizer_options, cursorFileName);
+
+                if (!loadedModel)
+                {
+                    return 0;
+                }
+
+                viewer.setSceneData(loadedModel.get());
+                seh->set(loadedModel.get());
+                seh->selectSlide(previous_ActiveSlide, previous_ActiveLayer);
+
+                continue;
+
+            }
+
+            // update the scene by traversing it with the update visitor which will
+            // call all node update callbacks and animations.
+            viewer.updateTraversal();
+
+            if (P3DApplicationType==SLAVE)
+            {
+                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();
         }
     }
     else

debian_scripts/postinst

@@ -1 +0,0 @@
-ldconfig 

doc/Doxyfiles/all_Doxyfile

@@ -39,7 +39,6 @@ OPTIMIZE_OUTPUT_FOR_C  = NO
 OPTIMIZE_OUTPUT_JAVA   = NO
 OPTIMIZE_FOR_FORTRAN   = NO
 OPTIMIZE_OUTPUT_VHDL   = NO
-EXTENSION_MAPPING      = no_extension=C++
 BUILTIN_STL_SUPPORT    = NO
 CPP_CLI_SUPPORT        = NO
 SIP_SUPPORT            = NO

doc/Doxyfiles/auto_Doxyfile

@@ -39,7 +39,6 @@ OPTIMIZE_OUTPUT_FOR_C  = NO
 OPTIMIZE_OUTPUT_JAVA   = NO
 OPTIMIZE_FOR_FORTRAN   = NO
 OPTIMIZE_OUTPUT_VHDL   = NO
-EXTENSION_MAPPING      = no_extension=C++
 BUILTIN_STL_SUPPORT    = NO
 CPP_CLI_SUPPORT        = NO
 SIP_SUPPORT            = NO

doc/Doxyfiles/auto_Mainpage

@@ -169,25 +169,6 @@ OPTIMIZE_OUTPUT_FOR_C  = NO
 
 OPTIMIZE_OUTPUT_JAVA   = NO
 
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given
-# extension. Doxygen has a built-in mapping, but you can override or extend it
-# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
-# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
-# Fortran. In the later case the parser tries to guess whether the code is fixed
-# or free formatted code, this is the default for Fortran type files), VHDL. For
-# instance to make doxygen treat .inc files as Fortran files (default is PHP),
-# and .f files as C (default is Fortran), use: inc=Fortran f=C.
-#
-# Note: For files without extension you can use no_extension as a placeholder.
-#
-# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen.
-
-EXTENSION_MAPPING      = no_extension=C++
-
 # Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
 # the same type (for instance a group of public functions) to be put as a 
 # subgroup of that type (e.g. under the Public Functions section). Set it to 

doc/Doxyfiles/core_Doxyfile

@@ -29,7 +29,6 @@ OPTIMIZE_OUTPUT_FOR_C  = NO
 OPTIMIZE_OUTPUT_JAVA   = NO
 OPTIMIZE_FOR_FORTRAN   = NO
 OPTIMIZE_OUTPUT_VHDL   = NO
-EXTENSION_MAPPING      = no_extension=C++
 BUILTIN_STL_SUPPORT    = NO
 CPP_CLI_SUPPORT        = NO
 SIP_SUPPORT            = NO

doc/Doxyfiles/doxyfile.cmake

@@ -11,12 +11,12 @@ CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
 BRIEF_MEMBER_DESC      = YES
 REPEAT_BRIEF           = YES
-ABBREVIATE_BRIEF       =
+ABBREVIATE_BRIEF       = 
 ALWAYS_DETAILED_SEC    = NO
 INLINE_INHERITED_MEMB  = NO
 FULL_PATH_NAMES        = YES
 STRIP_FROM_PATH        = "${OpenSceneGraph_SOURCE_DIR}/include/"
-STRIP_FROM_INC_PATH    =
+STRIP_FROM_INC_PATH    = 
 SHORT_NAMES            = YES
 JAVADOC_AUTOBRIEF      = YES
 QT_AUTOBRIEF           = NO
@@ -24,12 +24,11 @@ MULTILINE_CPP_IS_BRIEF = NO
 INHERIT_DOCS           = YES
 SEPARATE_MEMBER_PAGES  = NO
 TAB_SIZE               = 8
-ALIASES                =
+ALIASES                = 
 OPTIMIZE_OUTPUT_FOR_C  = NO
 OPTIMIZE_OUTPUT_JAVA   = NO
 OPTIMIZE_FOR_FORTRAN   = NO
 OPTIMIZE_OUTPUT_VHDL   = NO
-EXTENSION_MAPPING      = no_extension=C++
 BUILTIN_STL_SUPPORT    = NO
 CPP_CLI_SUPPORT        = NO
 SIP_SUPPORT            = NO
@@ -37,6 +36,7 @@ IDL_PROPERTY_SUPPORT   = YES
 DISTRIBUTE_GROUP_DOC   = NO
 SUBGROUPING            = YES
 TYPEDEF_HIDES_STRUCT   = NO
+SYMBOL_CACHE_SIZE      = 0
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -63,13 +63,13 @@ GENERATE_TODOLIST      = YES
 GENERATE_TESTLIST      = YES
 GENERATE_BUGLIST       = YES
 GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS       =
+ENABLED_SECTIONS       = 
 MAX_INITIALIZER_LINES  = 30
 SHOW_USED_FILES        = YES
 SHOW_FILES             = YES
 SHOW_NAMESPACES        = YES
-FILE_VERSION_FILTER    =
+FILE_VERSION_FILTER    = 
-LAYOUT_FILE            =
+LAYOUT_FILE            = 
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
@@ -79,27 +79,26 @@ WARN_IF_UNDOCUMENTED   = YES
 WARN_IF_DOC_ERROR      = YES
 WARN_NO_PARAMDOC       = NO
 WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           =
+WARN_LOGFILE           = 
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
 INPUT                  = "${OpenSceneGraph_SOURCE_DIR}/include/osg" \
-                         "${OpenSceneGraph_SOURCE_DIR}/include/osgAnimation" \
                          "${OpenSceneGraph_SOURCE_DIR}/include/osgDB" \
                          "${OpenSceneGraph_SOURCE_DIR}/include/osgFX" \
                          "${OpenSceneGraph_SOURCE_DIR}/include/osgGA" \
                          "${OpenSceneGraph_SOURCE_DIR}/include/osgManipulator" \
                          "${OpenSceneGraph_SOURCE_DIR}/include/osgParticle" \
-                         "${OpenSceneGraph_SOURCE_DIR}/include/osgQt" \
                          "${OpenSceneGraph_SOURCE_DIR}/include/osgShadow" \
                          "${OpenSceneGraph_SOURCE_DIR}/include/osgSim" \
                          "${OpenSceneGraph_SOURCE_DIR}/include/osgTerrain" \
                          "${OpenSceneGraph_SOURCE_DIR}/include/osgText" \
-                         "${OpenSceneGraph_SOURCE_DIR}/include/osgUI" \
                          "${OpenSceneGraph_SOURCE_DIR}/include/osgUtil" \
                          "${OpenSceneGraph_SOURCE_DIR}/include/osgViewer" \
                          "${OpenSceneGraph_SOURCE_DIR}/include/osgVolume" \
-                         "${OpenSceneGraph_SOURCE_DIR}/include/osgWidget"
+                         "${OpenSceneGraph_SOURCE_DIR}/include/osgWidget" \
+                         "${OpenSceneGraph_SOURCE_DIR}/include/osgQt" \
+                         "${OpenSceneGraph_SOURCE_DIR}/include/osgAnimation"
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          = *include* \
                          *.cpp
@@ -107,13 +106,13 @@ RECURSIVE              = YES
 EXCLUDE                = .svn
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       = */.svn/*
-EXCLUDE_SYMBOLS        =
+EXCLUDE_SYMBOLS        = 
-EXAMPLE_PATH           =
+EXAMPLE_PATH           = 
-EXAMPLE_PATTERNS       =
+EXAMPLE_PATTERNS       = 
 EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             =
+IMAGE_PATH             = 
-INPUT_FILTER           =
+INPUT_FILTER           = 
-FILTER_PATTERNS        =
+FILTER_PATTERNS        = 
 FILTER_SOURCE_FILES    = NO
 #---------------------------------------------------------------------------
 # configuration options related to source browsing
@@ -131,16 +130,16 @@ VERBATIM_HEADERS       = YES
 #---------------------------------------------------------------------------
 ALPHABETICAL_INDEX     = YES
 COLS_IN_ALPHA_INDEX    = 2
-IGNORE_PREFIX          =
+IGNORE_PREFIX          = 
 #---------------------------------------------------------------------------
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
 GENERATE_HTML          = YES
 HTML_OUTPUT            = OpenSceneGraphReferenceDocs
 HTML_FILE_EXTENSION    = .html
-HTML_HEADER            =
+HTML_HEADER            = 
 HTML_FOOTER            = "${OpenSceneGraph_SOURCE_DIR}/doc/Doxyfiles/custom_Footer.html"
-HTML_STYLESHEET        =
+HTML_STYLESHEET        = 
 HTML_DYNAMIC_SECTIONS  = NO
 GENERATE_DOCSET        = NO
 DOCSET_FEEDNAME        = "Doxygen generated docs"
@@ -149,14 +148,14 @@ GENERATE_HTMLHELP      = ${GENERATE_HTMLHELP}
 CHM_FILE               = "../${CMAKE_PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm"
 HHC_LOCATION           = "${HTML_HELP_COMPILER}"
 GENERATE_CHI           = NO
-CHM_INDEX_ENCODING     =
+CHM_INDEX_ENCODING     = 
 BINARY_TOC             = NO
 TOC_EXPAND             = NO
 GENERATE_QHP           = NO
-QCH_FILE               =
+QCH_FILE               = 
 QHP_NAMESPACE          = org.doxygen.Project
 QHP_VIRTUAL_FOLDER     = doc
-QHG_LOCATION           =
+QHG_LOCATION           = 
 DISABLE_INDEX          = NO
 ENUM_VALUES_PER_LINE   = 4
 GENERATE_TREEVIEW      = NO
@@ -171,8 +170,8 @@ LATEX_CMD_NAME         = latex
 MAKEINDEX_CMD_NAME     = makeindex
 COMPACT_LATEX          = NO
 PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         =
+EXTRA_PACKAGES         = 
-LATEX_HEADER           =
+LATEX_HEADER           = 
 PDF_HYPERLINKS         = NO
 USE_PDFLATEX           = NO
 LATEX_BATCHMODE        = NO
@@ -184,8 +183,8 @@ GENERATE_RTF           = NO
 RTF_OUTPUT             = rtf
 COMPACT_RTF            = NO
 RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    =
+RTF_STYLESHEET_FILE    = 
-RTF_EXTENSIONS_FILE    =
+RTF_EXTENSIONS_FILE    = 
 #---------------------------------------------------------------------------
 # configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -198,6 +197,8 @@ MAN_LINKS              = NO
 #---------------------------------------------------------------------------
 GENERATE_XML           = NO
 XML_OUTPUT             = xml
+XML_SCHEMA             = 
+XML_DTD                = 
 XML_PROGRAMLISTING     = YES
 #---------------------------------------------------------------------------
 # configuration options for the AutoGen Definitions output
@@ -209,36 +210,37 @@ GENERATE_AUTOGEN_DEF   = NO
 GENERATE_PERLMOD       = NO
 PERLMOD_LATEX          = NO
 PERLMOD_PRETTY         = YES
-PERLMOD_MAKEVAR_PREFIX =
+PERLMOD_MAKEVAR_PREFIX = 
 #---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
+# Configuration options related to the preprocessor   
 #---------------------------------------------------------------------------
 ENABLE_PREPROCESSING   = YES
 MACRO_EXPANSION        = NO
 EXPAND_ONLY_PREDEF     = NO
 SEARCH_INCLUDES        = YES
-INCLUDE_PATH           =
+INCLUDE_PATH           = 
-INCLUDE_FILE_PATTERNS  =
+INCLUDE_FILE_PATTERNS  = 
 PREDEFINED             = DOXYGEN_SHOULD_SKIP_THIS
-EXPAND_AS_DEFINED      =
+EXPAND_AS_DEFINED      = 
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
-# Configuration::additions related to external references
+# Configuration::additions related to external references   
 #---------------------------------------------------------------------------
-TAGFILES               =
+TAGFILES               = 
 GENERATE_TAGFILE       = ${GENERATE_TAGFILE}
 ALLEXTERNALS           = NO
 EXTERNAL_GROUPS        = YES
 PERL_PATH              = /usr/bin/perl
 #---------------------------------------------------------------------------
-# Configuration options related to the dot tool
+# Configuration options related to the dot tool   
 #---------------------------------------------------------------------------
 CLASS_DIAGRAMS         = YES
-MSCGEN_PATH            =
+MSCGEN_PATH            = 
 HIDE_UNDOC_RELATIONS   = YES
 HAVE_DOT               = YES
+DOT_FONTNAME           = FreeSans
 DOT_FONTSIZE           = 10
-DOT_FONTPATH           =
+DOT_FONTPATH           = 
 CLASS_GRAPH            = YES
 COLLABORATION_GRAPH    = NO
 GROUP_GRAPHS           = YES
@@ -252,7 +254,7 @@ GRAPHICAL_HIERARCHY    = YES
 DIRECTORY_GRAPH        = YES
 DOT_IMAGE_FORMAT       = png
 DOT_PATH               = "${DOXYGEN_DOT_PATH}"
-DOTFILE_DIRS           =
+DOTFILE_DIRS           = 
 DOT_GRAPH_MAX_NODES    = 50
 MAX_DOT_GRAPH_DEPTH    = 0
 DOT_TRANSPARENT        = YES
@@ -260,6 +262,6 @@ DOT_MULTI_TARGETS      = NO
 GENERATE_LEGEND        = YES
 DOT_CLEANUP            = YES
 #---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
+# Configuration::additions related to the search engine   
 #---------------------------------------------------------------------------
 SEARCHENGINE           = ${SEARCHENGINE}

doc/Doxyfiles/openthreads.doxyfile.cmake

@@ -11,12 +11,12 @@ CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
 BRIEF_MEMBER_DESC      = YES
 REPEAT_BRIEF           = YES
-ABBREVIATE_BRIEF       =
+ABBREVIATE_BRIEF       = 
 ALWAYS_DETAILED_SEC    = NO
 INLINE_INHERITED_MEMB  = NO
 FULL_PATH_NAMES        = YES
 STRIP_FROM_PATH        = "${OpenSceneGraph_SOURCE_DIR}/include/"
-STRIP_FROM_INC_PATH    =
+STRIP_FROM_INC_PATH    = 
 SHORT_NAMES            = YES
 JAVADOC_AUTOBRIEF      = YES
 QT_AUTOBRIEF           = NO
@@ -24,12 +24,11 @@ MULTILINE_CPP_IS_BRIEF = NO
 INHERIT_DOCS           = YES
 SEPARATE_MEMBER_PAGES  = NO
 TAB_SIZE               = 8
-ALIASES                =
+ALIASES                = 
 OPTIMIZE_OUTPUT_FOR_C  = NO
 OPTIMIZE_OUTPUT_JAVA   = NO
 OPTIMIZE_FOR_FORTRAN   = NO
 OPTIMIZE_OUTPUT_VHDL   = NO
-EXTENSION_MAPPING      = no_extension=C++
 BUILTIN_STL_SUPPORT    = NO
 CPP_CLI_SUPPORT        = NO
 SIP_SUPPORT            = NO
@@ -37,6 +36,7 @@ IDL_PROPERTY_SUPPORT   = YES
 DISTRIBUTE_GROUP_DOC   = NO
 SUBGROUPING            = YES
 TYPEDEF_HIDES_STRUCT   = NO
+SYMBOL_CACHE_SIZE      = 0
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -63,13 +63,13 @@ GENERATE_TODOLIST      = YES
 GENERATE_TESTLIST      = YES
 GENERATE_BUGLIST       = YES
 GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS       =
+ENABLED_SECTIONS       = 
 MAX_INITIALIZER_LINES  = 30
 SHOW_USED_FILES        = YES
 SHOW_FILES             = YES
 SHOW_NAMESPACES        = YES
-FILE_VERSION_FILTER    =
+FILE_VERSION_FILTER    = 
-LAYOUT_FILE            =
+LAYOUT_FILE            = 
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
@@ -79,7 +79,7 @@ WARN_IF_UNDOCUMENTED   = YES
 WARN_IF_DOC_ERROR      = YES
 WARN_NO_PARAMDOC       = NO
 WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           =
+WARN_LOGFILE           = 
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
@@ -91,13 +91,13 @@ RECURSIVE              = YES
 EXCLUDE                = .svn
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       = */.svn/*
-EXCLUDE_SYMBOLS        =
+EXCLUDE_SYMBOLS        = 
-EXAMPLE_PATH           =
+EXAMPLE_PATH           = 
-EXAMPLE_PATTERNS       =
+EXAMPLE_PATTERNS       = 
 EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             =
+IMAGE_PATH             = 
-INPUT_FILTER           =
+INPUT_FILTER           = 
-FILTER_PATTERNS        =
+FILTER_PATTERNS        = 
 FILTER_SOURCE_FILES    = NO
 #---------------------------------------------------------------------------
 # configuration options related to source browsing
@@ -115,16 +115,16 @@ VERBATIM_HEADERS       = YES
 #---------------------------------------------------------------------------
 ALPHABETICAL_INDEX     = YES
 COLS_IN_ALPHA_INDEX    = 2
-IGNORE_PREFIX          =
+IGNORE_PREFIX          = 
 #---------------------------------------------------------------------------
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
 GENERATE_HTML          = YES
 HTML_OUTPUT            = OpenThreadsReferenceDocs
 HTML_FILE_EXTENSION    = .html
-HTML_HEADER            =
+HTML_HEADER            = 
 HTML_FOOTER            = "${OpenSceneGraph_SOURCE_DIR}/doc/Doxyfiles/custom_Footer.html"
-HTML_STYLESHEET        =
+HTML_STYLESHEET        = 
 HTML_DYNAMIC_SECTIONS  = NO
 GENERATE_DOCSET        = NO
 DOCSET_FEEDNAME        = "Doxygen generated docs"
@@ -133,14 +133,14 @@ GENERATE_HTMLHELP      = ${GENERATE_HTMLHELP}
 CHM_FILE               = "../OpenThreadsReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm"
 HHC_LOCATION           = "${HTML_HELP_COMPILER}"
 GENERATE_CHI           = NO
-CHM_INDEX_ENCODING     =
+CHM_INDEX_ENCODING     = 
 BINARY_TOC             = NO
 TOC_EXPAND             = NO
 GENERATE_QHP           = NO
-QCH_FILE               =
+QCH_FILE               = 
 QHP_NAMESPACE          = org.doxygen.Project
 QHP_VIRTUAL_FOLDER     = doc
-QHG_LOCATION           =
+QHG_LOCATION           = 
 DISABLE_INDEX          = NO
 ENUM_VALUES_PER_LINE   = 4
 GENERATE_TREEVIEW      = NO
@@ -155,8 +155,8 @@ LATEX_CMD_NAME         = latex
 MAKEINDEX_CMD_NAME     = makeindex
 COMPACT_LATEX          = NO
 PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         =
+EXTRA_PACKAGES         = 
-LATEX_HEADER           =
+LATEX_HEADER           = 
 PDF_HYPERLINKS         = NO
 USE_PDFLATEX           = NO
 LATEX_BATCHMODE        = NO
@@ -168,8 +168,8 @@ GENERATE_RTF           = NO
 RTF_OUTPUT             = rtf
 COMPACT_RTF            = NO
 RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    =
+RTF_STYLESHEET_FILE    = 
-RTF_EXTENSIONS_FILE    =
+RTF_EXTENSIONS_FILE    = 
 #---------------------------------------------------------------------------
 # configuration options related to the man page output
 #---------------------------------------------------------------------------
@@ -182,6 +182,8 @@ MAN_LINKS              = NO
 #---------------------------------------------------------------------------
 GENERATE_XML           = NO
 XML_OUTPUT             = xml
+XML_SCHEMA             = 
+XML_DTD                = 
 XML_PROGRAMLISTING     = YES
 #---------------------------------------------------------------------------
 # configuration options for the AutoGen Definitions output
@@ -193,36 +195,37 @@ GENERATE_AUTOGEN_DEF   = NO
 GENERATE_PERLMOD       = NO
 PERLMOD_LATEX          = NO
 PERLMOD_PRETTY         = YES
-PERLMOD_MAKEVAR_PREFIX =
+PERLMOD_MAKEVAR_PREFIX = 
 #---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
+# Configuration options related to the preprocessor   
 #---------------------------------------------------------------------------
 ENABLE_PREPROCESSING   = YES
 MACRO_EXPANSION        = NO
 EXPAND_ONLY_PREDEF     = NO
 SEARCH_INCLUDES        = YES
-INCLUDE_PATH           =
+INCLUDE_PATH           = 
-INCLUDE_FILE_PATTERNS  =
+INCLUDE_FILE_PATTERNS  = 
 PREDEFINED             = DOXYGEN_SHOULD_SKIP_THIS
-EXPAND_AS_DEFINED      =
+EXPAND_AS_DEFINED      = 
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
-# Configuration::additions related to external references
+# Configuration::additions related to external references   
 #---------------------------------------------------------------------------
-TAGFILES               =
+TAGFILES               = 
 GENERATE_TAGFILE       = ${GENERATE_TAGFILE}
 ALLEXTERNALS           = NO
 EXTERNAL_GROUPS        = YES
 PERL_PATH              = /usr/bin/perl
 #---------------------------------------------------------------------------
-# Configuration options related to the dot tool
+# Configuration options related to the dot tool   
 #---------------------------------------------------------------------------
 CLASS_DIAGRAMS         = YES
-MSCGEN_PATH            =
+MSCGEN_PATH            = 
 HIDE_UNDOC_RELATIONS   = YES
 HAVE_DOT               = YES
+DOT_FONTNAME           = FreeSans
 DOT_FONTSIZE           = 10
-DOT_FONTPATH           =
+DOT_FONTPATH           = 
 CLASS_GRAPH            = YES
 COLLABORATION_GRAPH    = NO
 GROUP_GRAPHS           = YES
@@ -235,8 +238,8 @@ CALLER_GRAPH           = NO
 GRAPHICAL_HIERARCHY    = YES
 DIRECTORY_GRAPH        = YES
 DOT_IMAGE_FORMAT       = png
-DOT_PATH               =
+DOT_PATH               = 
-DOTFILE_DIRS           =
+DOTFILE_DIRS           = 
 DOT_GRAPH_MAX_NODES    = 50
 MAX_DOT_GRAPH_DEPTH    = 0
 DOT_TRANSPARENT        = YES
@@ -244,6 +247,6 @@ DOT_MULTI_TARGETS      = NO
 GENERATE_LEGEND        = YES
 DOT_CLEANUP            = YES
 #---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
+# Configuration::additions related to the search engine   
 #---------------------------------------------------------------------------
 SEARCHENGINE           = ${SEARCHENGINE}

examples/CMakeLists.txt

@@ -20,7 +20,6 @@ ELSE(ANDROID)
 
 IF(DYNAMIC_OPENSCENEGRAPH)
 
-    ADD_SUBDIRECTORY(osgsimpleMDI)
     ADD_SUBDIRECTORY(osg2cpp)
     ADD_SUBDIRECTORY(osganalysis)
     ADD_SUBDIRECTORY(osganimate)
@@ -37,7 +36,7 @@ IF(DYNAMIC_OPENSCENEGRAPH)
     ADD_SUBDIRECTORY(osgcompositeviewer)
     ADD_SUBDIRECTORY(osgcopy)
     ADD_SUBDIRECTORY(osgcubemap)
-    ADD_SUBDIRECTORY(osgdeferred)
+    ADD_SUBDIRECTORY(osgdelaunay)
     ADD_SUBDIRECTORY(osgcluster)
     ADD_SUBDIRECTORY(osgdatabaserevisions)
     ADD_SUBDIRECTORY(osgdepthpartition)
@@ -55,6 +54,7 @@ IF(DYNAMIC_OPENSCENEGRAPH)
     ADD_SUBDIRECTORY(osghangglide)
     ADD_SUBDIRECTORY(osghud)
     ADD_SUBDIRECTORY(osgimagesequence)
+    ADD_SUBDIRECTORY(osgimpostor)
     ADD_SUBDIRECTORY(osgintersection)
     ADD_SUBDIRECTORY(osgkdtree)
     ADD_SUBDIRECTORY(osgkeyboard)
@@ -69,7 +69,6 @@ IF(DYNAMIC_OPENSCENEGRAPH)
     ADD_SUBDIRECTORY(osggpx)
     ADD_SUBDIRECTORY(osggraphicscost)
     ADD_SUBDIRECTORY(osgmanipulator)
-    ADD_SUBDIRECTORY(osgimpostor)
     ADD_SUBDIRECTORY(osgmovie)
     ADD_SUBDIRECTORY(osgmultiplemovies)
     ADD_SUBDIRECTORY(osgmultiplerendertargets)
@@ -77,7 +76,6 @@ IF(DYNAMIC_OPENSCENEGRAPH)
     ADD_SUBDIRECTORY(osgmultitexturecontrol)
     ADD_SUBDIRECTORY(osgmultitouch)
     ADD_SUBDIRECTORY(osgmultiviewpaging)
-    ADD_SUBDIRECTORY(osgobjectcache)
     ADD_SUBDIRECTORY(osgoccluder)
     ADD_SUBDIRECTORY(osgocclusionquery)
     ADD_SUBDIRECTORY(osgoit)
@@ -99,15 +97,12 @@ IF(DYNAMIC_OPENSCENEGRAPH)
     ADD_SUBDIRECTORY(osgreflect)
     ADD_SUBDIRECTORY(osgrobot)
     ADD_SUBDIRECTORY(osgSSBO)
-    ADD_SUBDIRECTORY(osgsampler)
     ADD_SUBDIRECTORY(osgscalarbar)
     ADD_SUBDIRECTORY(osgscribe)
     ADD_SUBDIRECTORY(osgsequence)
     ADD_SUBDIRECTORY(osgshaders)
-    ADD_SUBDIRECTORY(osgshaderpipeline)
     ADD_SUBDIRECTORY(osgshadercomposition)
     ADD_SUBDIRECTORY(osgshadergen)
-    ADD_SUBDIRECTORY(osgshadermultiviewport)
     ADD_SUBDIRECTORY(osgshaderterrain)
     # ADD_SUBDIRECTORY(osgshadercompositor)
     ADD_SUBDIRECTORY(osgshadow)
@@ -168,9 +163,10 @@ IF(DYNAMIC_OPENSCENEGRAPH)
     ADD_SUBDIRECTORY(osgwidgettable)
     ADD_SUBDIRECTORY(osgwidgetwindow)
     ADD_SUBDIRECTORY(osguserdata)
+
     # GL3/GL4 example
     ADD_SUBDIRECTORY(osgsimplegl3)
-    ADD_SUBDIRECTORY(osgbindlesstext)
+
     IF(OSG_CPP_EXCEPTIONS_AVAILABLE)
         ADD_SUBDIRECTORY(osgunittests)
         ADD_SUBDIRECTORY(osgmemorytest)
@@ -193,6 +189,10 @@ IF(DYNAMIC_OPENSCENEGRAPH)
 
     ADD_SUBDIRECTORY(osgpdf)
 
+    IF   (GLUT_FOUND)
+        ADD_SUBDIRECTORY(osgviewerGLUT)
+    ENDIF(GLUT_FOUND)
+
     IF   (SDL_FOUND)
         ADD_SUBDIRECTORY(osgviewerSDL)
     ENDIF(SDL_FOUND)
@@ -211,6 +211,20 @@ IF(DYNAMIC_OPENSCENEGRAPH)
         ENDIF()
     ENDIF()
 
+    IF   ( (QT4_FOUND OR Qt5Widgets_FOUND) AND NOT OSG_GLES1_AVAILABLE AND NOT OSG_GLES2_AVAILABLE AND NOT OSG_GL3_AVAILABLE)
+
+        IF ( QT4_FOUND OR Qt5Widgets_FOUND)
+            ADD_SUBDIRECTORY(osgviewerQt)
+            ADD_SUBDIRECTORY(osgqfont)
+        ENDIF()
+
+        IF ( (QT4_FOUND AND QT_QTWEBKIT_FOUND) OR Qt5WebKitWidgets_FOUND )
+            ADD_SUBDIRECTORY(osgQtWidgets)
+            ADD_SUBDIRECTORY(osgQtBrowser)
+        ENDIF()
+
+    ENDIF()
+
     IF   (FLTK_FOUND AND FLTK_GL_LIBRARY)
         ADD_SUBDIRECTORY(osgviewerFLTK)
     ENDIF()
@@ -254,3 +268,4 @@ ELSE(DYNAMIC_OPENSCENEGRAPH)
 ENDIF(DYNAMIC_OPENSCENEGRAPH)
 
 ENDIF(ANDROID)
+

examples/osg2cpp/osg2cpp.cpp

@@ -85,7 +85,7 @@ int main( int argc, char **argv )
     std::string filename;
     if (arguments.read("--shader",filename))
     {
-        osg::ref_ptr<osg::Shader> shader = osgDB::readRefShaderFile(filename);
+        osg::ref_ptr<osg::Shader> shader = osgDB::readShaderFile(filename);
         if (shader.valid())
         {
             std::string name = osgDB::getStrippedName(filename);

examples/osgAndroidExampleGLES1/jni/OsgMainApp.cpp

@@ -23,7 +23,7 @@ void OsgMainApp::loadModels(){
         newModel = _vModelsToLoad[i];
         osg::notify(osg::ALWAYS)<<"Loading: "<<newModel.filename<<std::endl;
 
-        osg::ref_ptr<osg::Node> loadedModel = osgDB::readRefNodeFile(newModel.filename);
+        osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFile(newModel.filename);
         if (loadedModel == 0) {
             osg::notify(osg::ALWAYS)<<"Model not loaded"<<std::endl;
         } else {

examples/osgAndroidExampleGLES2/jni/OsgMainApp.cpp

@@ -23,7 +23,7 @@ void OsgMainApp::loadModels(){
         newModel = _vModelsToLoad[i];
         osg::notify(osg::ALWAYS)<<"Loading: "<<newModel.filename<<std::endl;
 
-        osg::ref_ptr<osg::Node> loadedModel = osgDB::readRefNodeFile(newModel.filename);
+        osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFile(newModel.filename);
         if (loadedModel == 0) {
             osg::notify(osg::ALWAYS)<<"Model not loaded"<<std::endl;
         } else {

examples/osgCMakeExample/CMakeLists.txt

@@ -1,24 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-
-SET(PROJECT_NAME osgCMakeExample)
-
-PROJECT(${PROJECT_NAME})
-
-FIND_PACKAGE(OpenThreads)
-FIND_PACKAGE(osg)
-FIND_PACKAGE(osgDB)
-FIND_PACKAGE(osgUtil)
-FIND_PACKAGE(osgGA)
-FIND_PACKAGE(osgViewer)
-
-SET(SOURCES
-    main.cpp
-)
-
-INCLUDE_DIRECTORIES(${OPENTHREADS_INCLUDE_DIR} ${OSG_INCLUDE_DIR})
-
-LINK_DIRECTORIES(${OSG_LIB_DIR})
-
-ADD_EXECUTABLE(${PROJECT_NAME} ${SOURCES})
-
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${OSG_LIBRARIES} ${OSGVIEWER_LIBRARIES} ${OSGUTIL_LIBRARIES} ${OSGDB_LIBRARIES} ${OSGGA_LIBRARIES} ${OPENTHREADS_LIBRARIES})

examples/osgCMakeExample/main.cpp

@@ -1,183 +0,0 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2010 Robert Osfield
- *
- * This application is open source and may be redistributed and/or modified
- * freely and without restriction, both in commercial and non commercial applications,
- * as long as this copyright notice is maintained.
- *
- * This application 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.
-*/
-
-#include <osgDB/ReadFile>
-#include <osgUtil/Optimizer>
-#include <osg/CoordinateSystemNode>
-
-#include <osg/Switch>
-#include <osg/Types>
-#include <osgText/Text>
-
-#include <osgViewer/Viewer>
-#include <osgViewer/ViewerEventHandlers>
-
-#include <osgGA/TrackballManipulator>
-#include <osgGA/FlightManipulator>
-#include <osgGA/DriveManipulator>
-#include <osgGA/KeySwitchMatrixManipulator>
-#include <osgGA/StateSetManipulator>
-#include <osgGA/AnimationPathManipulator>
-#include <osgGA/TerrainManipulator>
-#include <osgGA/SphericalManipulator>
-
-#include <osgGA/Device>
-
-#include <iostream>
-
-
-int main(int argc, char** argv)
-{
-    // use an ArgumentParser object to manage the program arguments.
-    osg::ArgumentParser arguments(&argc,argv);
-
-    arguments.getApplicationUsage()->setApplicationName(arguments.getApplicationName());
-    arguments.getApplicationUsage()->setDescription(arguments.getApplicationName()+" is the standard OpenSceneGraph example which loads and visualises 3d models.");
-    arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] filename ...");
-    arguments.getApplicationUsage()->addCommandLineOption("--image <filename>","Load an image and render it on a quad");
-    arguments.getApplicationUsage()->addCommandLineOption("--dem <filename>","Load an image/DEM and render it on a HeightField");
-    arguments.getApplicationUsage()->addCommandLineOption("--login <url> <username> <password>","Provide authentication information for http file access.");
-    arguments.getApplicationUsage()->addCommandLineOption("-p <filename>","Play specified camera path animation file, previously saved with 'z' key.");
-    arguments.getApplicationUsage()->addCommandLineOption("--speed <factor>","Speed factor for animation playing (1 == normal speed).");
-    arguments.getApplicationUsage()->addCommandLineOption("--device <device-name>","add named device to the viewer");
-
-    osgViewer::Viewer viewer(arguments);
-
-    unsigned int helpType = 0;
-    if ((helpType = arguments.readHelpType()))
-    {
-        arguments.getApplicationUsage()->write(std::cout, helpType);
-        return 1;
-    }
-
-    // report any errors if they have occurred when parsing the program arguments.
-    if (arguments.errors())
-    {
-        arguments.writeErrorMessages(std::cout);
-        return 1;
-    }
-
-    if (arguments.argc()<=1)
-    {
-        arguments.getApplicationUsage()->write(std::cout,osg::ApplicationUsage::COMMAND_LINE_OPTION);
-        return 1;
-    }
-
-    std::string url, username, password;
-    while(arguments.read("--login",url, username, password))
-    {
-        if (!osgDB::Registry::instance()->getAuthenticationMap())
-        {
-            osgDB::Registry::instance()->setAuthenticationMap(new osgDB::AuthenticationMap);
-            osgDB::Registry::instance()->getAuthenticationMap()->addAuthenticationDetails(
-                url,
-                new osgDB::AuthenticationDetails(username, password)
-            );
-        }
-    }
-
-    std::string device;
-    while(arguments.read("--device", device))
-    {
-        osg::ref_ptr<osgGA::Device> dev = osgDB::readRefFile<osgGA::Device>(device);
-        if (dev.valid())
-        {
-            viewer.addDevice(dev);
-        }
-    }
-
-    // set up the camera manipulators.
-    {
-        osg::ref_ptr<osgGA::KeySwitchMatrixManipulator> keyswitchManipulator = new osgGA::KeySwitchMatrixManipulator;
-
-        keyswitchManipulator->addMatrixManipulator( '1', "Trackball", new osgGA::TrackballManipulator() );
-        keyswitchManipulator->addMatrixManipulator( '2', "Flight", new osgGA::FlightManipulator() );
-        keyswitchManipulator->addMatrixManipulator( '3', "Drive", new osgGA::DriveManipulator() );
-        keyswitchManipulator->addMatrixManipulator( '4', "Terrain", new osgGA::TerrainManipulator() );
-        keyswitchManipulator->addMatrixManipulator( '5', "Orbit", new osgGA::OrbitManipulator() );
-        keyswitchManipulator->addMatrixManipulator( '6', "FirstPerson", new osgGA::FirstPersonManipulator() );
-        keyswitchManipulator->addMatrixManipulator( '7', "Spherical", new osgGA::SphericalManipulator() );
-
-        std::string pathfile;
-        double animationSpeed = 1.0;
-        while(arguments.read("--speed",animationSpeed) ) {}
-        char keyForAnimationPath = '8';
-        while (arguments.read("-p",pathfile))
-        {
-            osgGA::AnimationPathManipulator* apm = new osgGA::AnimationPathManipulator(pathfile);
-            if (apm || !apm->valid())
-            {
-                apm->setTimeScale(animationSpeed);
-
-                unsigned int num = keyswitchManipulator->getNumMatrixManipulators();
-                keyswitchManipulator->addMatrixManipulator( keyForAnimationPath, "Path", apm );
-                keyswitchManipulator->selectMatrixManipulator(num);
-                ++keyForAnimationPath;
-            }
-        }
-
-        viewer.setCameraManipulator( keyswitchManipulator.get() );
-    }
-
-    // add the state manipulator
-    viewer.addEventHandler( new osgGA::StateSetManipulator(viewer.getCamera()->getOrCreateStateSet()) );
-
-    // add the thread model handler
-    viewer.addEventHandler(new osgViewer::ThreadingHandler);
-
-    // add the window size toggle handler
-    viewer.addEventHandler(new osgViewer::WindowSizeHandler);
-
-    // add the stats handler
-    viewer.addEventHandler(new osgViewer::StatsHandler);
-
-    // add the help handler
-    viewer.addEventHandler(new osgViewer::HelpHandler(arguments.getApplicationUsage()));
-
-    // add the record camera path handler
-    viewer.addEventHandler(new osgViewer::RecordCameraPathHandler);
-
-    // add the LOD Scale handler
-    viewer.addEventHandler(new osgViewer::LODScaleHandler);
-
-    // add the screen capture handler
-    viewer.addEventHandler(new osgViewer::ScreenCaptureHandler);
-
-    // load the data
-    osg::ref_ptr<osg::Node> loadedModel = osgDB::readRefNodeFiles(arguments);
-    if (!loadedModel)
-    {
-        std::cout << arguments.getApplicationName() <<": No data loaded" << std::endl;
-        return 1;
-    }
-
-    // any option left unread are converted into errors to write out later.
-    arguments.reportRemainingOptionsAsUnrecognized();
-
-    // report any errors if they have occurred when parsing the program arguments.
-    if (arguments.errors())
-    {
-        arguments.writeErrorMessages(std::cout);
-        return 1;
-    }
-
-
-    // optimize the scene graph, remove redundant nodes and state etc.
-    osgUtil::Optimizer optimizer;
-    optimizer.optimize(loadedModel);
-
-    viewer.setSceneData(loadedModel);
-
-    viewer.realize();
-
-    return viewer.run();
-
-}

examples/osgQtBrowser/CMakeLists.txt

@@ -0,0 +1,25 @@
+SET(TARGET_SRC
+    osgQtBrowser.cpp
+)
+
+IF(CMAKE_COMPILER_IS_GNUCXX)
+    # Remove -pedantic flag as it barfs on Qt headers
+   STRING(REGEX REPLACE "-pedantic" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ENDIF()
+
+if ( QT4_FOUND )
+    SET(TARGET_EXTERNAL_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${QT_QTWEBKIT_LIBRARY})
+    INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTOPENGL_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTWEBKIT_INCLUDE_DIR} )
+endif( QT4_FOUND )
+
+SET(TARGET_ADDED_LIBRARIES osgWidget osgQt)
+
+#### end var setup  ###
+SET ( EXAMPLE_NAME osgQtBrowser )
+SETUP_EXAMPLE(${EXAMPLE_NAME})
+
+IF ( Qt5Widgets_FOUND )
+    qt5_use_modules( example_${EXAMPLE_NAME} Widgets OpenGL WebKitWidgets )
+ENDIF( Qt5Widgets_FOUND )
+
+

examples/osgQtBrowser/osgQtBrowser.cpp

@@ -0,0 +1,145 @@
+/* OpenSceneGraph example, osgcompositeviewer.
+*
+*  Permission is hereby granted, free of charge, to any person obtaining a copy
+*  of this software and associated documentation files (the "Software"), to deal
+*  in the Software without restriction, including without limitation the rights
+*  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+*  copies of the Software, and to permit persons to whom the Software is
+*  furnished to do so, subject to the following conditions:
+*
+*  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+*  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+*  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+*  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+*  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+*  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+*  THE SOFTWARE.
+*/
+
+#include <iostream>
+
+#include <osg/Notify>
+#include <osg/io_utils>
+
+#include <osg/ArgumentParser>
+#include <osgDB/WriteFile>
+#include <osgGA/TrackballManipulator>
+#include <osgGA/StateSetManipulator>
+#include <osgViewer/Viewer>
+#include <osgViewer/ViewerEventHandlers>
+#include <osgWidget/Browser>
+
+#include <QtGlobal>
+#if QT_VERSION >= 0x050000
+# include <QtWebKitWidgets>
+#else
+# include <QtWebKit>
+#endif
+
+#include <QWebSettings>
+
+#include <QGraphicsScene>
+#include <QGraphicsView>
+#include <QApplication>
+#include <QPainter>
+#include <QtEvents>
+
+#include <osgQt/QGraphicsViewAdapter>
+#include <osgQt/QWebViewImage>
+
+
+// Thread that runs the viewer's frame loop as we can't run Qt in the background...
+class ViewerFrameThread : public OpenThreads::Thread
+{
+    public:
+
+        ViewerFrameThread(osgViewer::ViewerBase* viewerBase, bool doQApplicationExit):
+            _viewerBase(viewerBase),
+            _doQApplicationExit(doQApplicationExit) {}
+
+        ~ViewerFrameThread()
+        {
+            if (isRunning())
+            {
+                cancel();
+                join();
+            }
+        }
+
+        int cancel()
+        {
+            _viewerBase->setDone(true);
+            return 0;
+        }
+
+        void run()
+        {
+            int result = _viewerBase->run();
+
+            if (_doQApplicationExit) QApplication::exit(result);
+        }
+
+        osg::ref_ptr<osgViewer::ViewerBase> _viewerBase;
+        bool _doQApplicationExit;
+};
+
+
+int main(int argc, char **argv)
+{
+    // Qt requires that we construct the global QApplication before creating any widgets.
+    QApplication app(argc, argv);
+
+    // use an ArgumentParser object to manage the program arguments.
+    osg::ArgumentParser arguments(&argc,argv);
+
+    bool useFrameLoopThread = false;
+    if (arguments.read("--no-frame-thread")) useFrameLoopThread = false;
+    if (arguments.read("--frame-thread")) useFrameLoopThread = true;
+
+    osg::ref_ptr<osgQt::QWebViewImage> image = new osgQt::QWebViewImage;
+
+    if (arguments.argc()>1) image->navigateTo((arguments[1]));
+    else image->navigateTo("http://www.youtube.com/");
+
+    osgWidget::GeometryHints hints(osg::Vec3(0.0f,0.0f,0.0f),
+                                   osg::Vec3(1.0f,0.0f,0.0f),
+                                   osg::Vec3(0.0f,0.0f,1.0f),
+                                   osg::Vec4(1.0f,1.0f,1.0f,1.0f),
+                                   osgWidget::GeometryHints::RESIZE_HEIGHT_TO_MAINTAINCE_ASPECT_RATIO);
+
+
+    osg::ref_ptr<osgWidget::Browser> browser = new osgWidget::Browser;
+    browser->assign(image.get(), hints);
+
+    // image->focusBrowser(true);
+
+    osg::ref_ptr<osgViewer::Viewer> viewer = new osgViewer::Viewer(arguments);
+    viewer->setSceneData(browser.get());
+    viewer->setCameraManipulator(new osgGA::TrackballManipulator());
+    viewer->addEventHandler(new osgViewer::StatsHandler);
+    viewer->addEventHandler(new osgViewer::WindowSizeHandler);
+
+    if (useFrameLoopThread)
+    {
+        // create a thread to run the viewer's frame loop
+        ViewerFrameThread viewerThread(viewer.get(), true);
+        viewerThread.startThread();
+
+        // now start the standard Qt event loop, then exists when the viewerThead sends the QApplication::exit() signal.
+        return QApplication::exec();
+
+    }
+    else
+    {
+        // run the frame loop, interleaving Qt and the main OSG frame loop
+        while(!viewer->done())
+        {
+            // process Qt events - this handles both events and paints the browser image
+            QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
+
+            viewer->frame();
+        }
+
+        return 0;
+    }
+}

examples/osgQtWidgets/CMakeLists.txt

@@ -0,0 +1,23 @@
+SET(TARGET_SRC
+    osgQtWidgets.cpp
+)
+
+IF(CMAKE_COMPILER_IS_GNUCXX)
+    # Remove -pedantic flag as it barfs on Qt headers
+   STRING(REGEX REPLACE "-pedantic" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ENDIF()
+
+if ( QT4_FOUND )
+    SET(TARGET_EXTERNAL_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${QT_QTWEBKIT_LIBRARY})
+    INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTOPENGL_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTWEBKIT_INCLUDE_DIR} )
+endif( QT4_FOUND )
+
+SET(TARGET_ADDED_LIBRARIES osgWidget osgQt)
+
+#### end var setup  ###
+SET ( EXAMPLE_NAME osgQtWidgets )
+SETUP_EXAMPLE(${EXAMPLE_NAME})
+
+IF ( Qt5Widgets_FOUND )
+    qt5_use_modules( example_${EXAMPLE_NAME} OpenGL WebKitWidgets )
+ENDIF( Qt5Widgets_FOUND )

examples/osgSSBO/osgSSBO.cpp

@@ -10,7 +10,7 @@
 #include <osg/StateAttributeCallback>
 #include <osg/Texture2D>
 #include <osg/Geometry>
-#include <osg/DispatchCompute>
+#include <osg/Geode>
 #include <osgDB/ReadFile>
 #include <osgGA/StateSetManipulator>
 #include <osgViewer/Viewer>
@@ -142,7 +142,7 @@ enum Channel
 class ShaderStorageBufferCallback : public osg::StateAttributeCallback
 {
 public:
-    void operator() (osg::StateAttribute* /*attr*/, osg::NodeVisitor* /*nv*/)
+    void operator() (osg::StateAttribute* attr, osg::NodeVisitor* nv)
     {
         //if you need to process the data in your app-code , better leaving it on GPU and processing there, uploading per frame will make it slow
 #if 0
@@ -167,7 +167,6 @@ class ComputeNode : public osg::PositionAttitudeTransform
 
 public:
 
-    osg::ref_ptr<osg::DispatchCompute>                _DispatchCompute;
     osg::ref_ptr<osg::Program>                        _computeProgram;
     osg::ref_ptr<osg::Shader>                        _computeShader;        //compute and write position data in SSBO
 
@@ -201,12 +200,15 @@ public:
 
     ComputeNode()
     {
-        _computeShaderSourcePath = "shaders/osgssboComputeShader.cs";
+        const char* envOsgFilePath = getenv("OSG_FILE_PATH");
-        _vertexShaderSourcePath = "shaders/osgssboVertexShader.vs";
+        std::stringstream computeshaderpath; computeshaderpath << envOsgFilePath << "/shaders/osgssboComputeShader.cs";
-        _geometryShaderSourcePath = "shaders/osgssboGeometryShader.gs";
+        _computeShaderSourcePath = computeshaderpath.str();
-        _fragmentShaderSourcePath = "shaders/osgssboFragmentShader.fs";
+        std::stringstream vertexshaderpath; vertexshaderpath << envOsgFilePath << "/shaders/osgssboVertexShader.vs";
-	_DispatchCompute=new osg::DispatchCompute();
+        _vertexShaderSourcePath = vertexshaderpath.str();
-        addChild(_DispatchCompute);
+        std::stringstream geometryshaderpath; geometryshaderpath << envOsgFilePath << "/shaders/osgssboGeometryShader.gs";
+        _geometryShaderSourcePath = geometryshaderpath.str();
+        std::stringstream fragmentshaderpath; fragmentshaderpath << envOsgFilePath << "/shaders/osgssboFragmentShader.fs";
+        _fragmentShaderSourcePath = fragmentshaderpath.str();
     }
 
 };
@@ -241,7 +243,7 @@ public:
             if (_computeNode->_computeShader.valid())
             {
                 runningSource = _computeNode->_computeShader->getShaderSource();
-                reloadedshader = osgDB::readRefShaderFile(osg::Shader::COMPUTE, _computeNode->_computeShaderSourcePath);
+                reloadedshader = osg::Shader::readShaderFile(osg::Shader::COMPUTE, _computeNode->_computeShaderSourcePath);
 
                 reloadedstring = reloadedshader->getShaderSource();
                 if (!osgDB::equalCaseInsensitive(runningSource.c_str(), reloadedstring.c_str()))
@@ -256,7 +258,7 @@ public:
             {
 
                 runningSource = _computeNode->_vertexShader->getShaderSource();
-                reloadedshader = osgDB::readRefShaderFile(osg::Shader::VERTEX, _computeNode->_vertexShaderSourcePath);
+                reloadedshader = osg::Shader::readShaderFile(osg::Shader::VERTEX, _computeNode->_vertexShaderSourcePath);
 
                 reloadedstring = reloadedshader->getShaderSource();
                 if (!osgDB::equalCaseInsensitive(runningSource.c_str(), reloadedstring.c_str()))
@@ -272,7 +274,7 @@ public:
             if (_computeNode->_geometryShader.valid())
             {
                 runningSource = _computeNode->_geometryShader->getShaderSource();
-                reloadedshader = osgDB::readRefShaderFile(osg::Shader::GEOMETRY, _computeNode->_geometryShaderSourcePath);
+                reloadedshader = osg::Shader::readShaderFile(osg::Shader::GEOMETRY, _computeNode->_geometryShaderSourcePath);
 
                 reloadedstring = reloadedshader->getShaderSource();
                 if (!osgDB::equalCaseInsensitive(runningSource.c_str(), reloadedstring.c_str()))
@@ -286,7 +288,7 @@ public:
             if (_computeNode->_fragmentShader.valid())
             {
                 runningSource = _computeNode->_fragmentShader->getShaderSource();
-                reloadedshader = osgDB::readRefShaderFile(osg::Shader::FRAGMENT, _computeNode->_fragmentShaderSourcePath);
+                reloadedshader = osg::Shader::readShaderFile(osg::Shader::FRAGMENT, _computeNode->_fragmentShaderSourcePath);
 
                 reloadedstring = reloadedshader->getShaderSource();
                 if (!osgDB::equalCaseInsensitive(runningSource.c_str(), reloadedstring.c_str()))
@@ -309,7 +311,7 @@ public:
 //set  OSG_FILE_PATH for loading axes.osgt
 void ComputeNode::addHelperGeometry()
 {
-    _helperNode = osgDB::readRefNodeFile("axes.osgt");
+    _helperNode = osgDB::readNodeFile("axes.osgt");
 
     if (_helperNode.valid())
     {
@@ -462,8 +464,8 @@ void ComputeNode::addDataMonitor(osg::Vec3 placement, osg::Vec3 relativePlacemen
     ss->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
 
     //add a label
-    osg::ref_ptr<osgText::Text> text = new osgText::Text;
+    osgText::Text* text = new osgText::Text;
-    osg::ref_ptr<osgText::Font> font = osgText::readRefFontFile("fonts/arial.ttf");
+    osgText::Font* font = osgText::readFontFile("fonts/arial.ttf");
     text->setFont(font);
     text->setColor(osg::Vec4(1, 1, 1, 1));
     text->setCharacterSize(0.1*scale);
@@ -471,6 +473,7 @@ void ComputeNode::addDataMonitor(osg::Vec3 placement, osg::Vec3 relativePlacemen
     pat->setName(labelCaption);
     text->setText(pat->getName());
     text->setBackdropType(osgText::Text::OUTLINE);
+    text->setBackdropImplementation(osgText::Text::POLYGON_OFFSET);
     text->setBackdropOffset(0.05f);
     text->setBackdropColor(osg::Vec4(0.0f, 0.0f, 0.0f, 1.0f));
 
@@ -497,9 +500,9 @@ osg::Image* createSpotLightImage(const osg::Vec4& centerColour, const osg::Vec4&
         {
             float dx = (float(c) - mid)*div;
             float dy = (float(r) - mid)*div;
-            float pr = powf(1.0f - sqrtf(dx*dx + dy*dy), power);
+            float r = powf(1.0f - sqrtf(dx*dx + dy*dy), power);
-            if (pr < 0.0f) pr = 0.0f;
+            if (r < 0.0f) r = 0.0f;
-            osg::Vec4 color = centerColour*pr + backgroudColour*(1.0f - pr);
+            osg::Vec4 color = centerColour*r + backgroudColour*(1.0f - r);
             *ptr++ = (unsigned char)((color[0])*255.0f);
             *ptr++ = (unsigned char)((color[1])*255.0f);
             *ptr++ = (unsigned char)((color[2])*255.0f);
@@ -515,13 +518,13 @@ void ComputeNode::addComputationResultsRenderTree()
 
     _computationResultsRenderProgram = new osg::Program;
 
-    _vertexShader = osgDB::readRefShaderFile(osg::Shader::VERTEX, _vertexShaderSourcePath);
+    _vertexShader = osg::Shader::readShaderFile(osg::Shader::VERTEX, _vertexShaderSourcePath);
     _computationResultsRenderProgram->addShader(_vertexShader.get());
 
-    _geometryShader = osgDB::readRefShaderFile(osg::Shader::GEOMETRY, _geometryShaderSourcePath);
+    _geometryShader = osg::Shader::readShaderFile(osg::Shader::GEOMETRY, _geometryShaderSourcePath);
     _computationResultsRenderProgram->addShader(_geometryShader.get());
 
-    _fragmentShader = osgDB::readRefShaderFile(osg::Shader::FRAGMENT, _fragmentShaderSourcePath);
+    _fragmentShader = osg::Shader::readShaderFile(osg::Shader::FRAGMENT, _fragmentShaderSourcePath);
     _computationResultsRenderProgram->addShader(_fragmentShader.get());
 
 
@@ -625,8 +628,8 @@ void ComputeNode::initComputingSetup()
 {
 
     _computeProgram = new osg::Program;
-    _DispatchCompute->setComputeGroups((NUM_ELEMENTS_X / WORK_GROUP_SIZE) <= 1 ? 1 : (NUM_ELEMENTS_X / WORK_GROUP_SIZE), (NUM_ELEMENTS_Y / WORK_GROUP_SIZE) <= 1 ? 1 : (NUM_ELEMENTS_Y / WORK_GROUP_SIZE), 1);
+    _computeProgram->setComputeGroups((NUM_ELEMENTS_X / WORK_GROUP_SIZE) <= 1 ? 1 : (NUM_ELEMENTS_X / WORK_GROUP_SIZE), (NUM_ELEMENTS_Y / WORK_GROUP_SIZE) <= 1 ? 1 : (NUM_ELEMENTS_Y / WORK_GROUP_SIZE), 1);
-    _computeShader = osgDB::readRefShaderFile(osg::Shader::COMPUTE, _computeShaderSourcePath);
+    _computeShader = osg::Shader::readShaderFile(osg::Shader::COMPUTE, _computeShaderSourcePath);
     _computeProgram->addShader(_computeShader.get());
 
     setDataVariance(osg::Object::DYNAMIC);
@@ -770,7 +773,7 @@ void ComputeNode::initComputingSetup()
     _dataArray->setBufferObject(_ssbo.get());
 
 
-    _ssbb = new osg::ShaderStorageBufferBinding(0, _dataArray.get(), 0, blockSize);
+    _ssbb = new osg::ShaderStorageBufferBinding(0, _ssbo.get(), 0, blockSize);
     statesetComputation->setAttributeAndModes(_ssbb.get(), osg::StateAttribute::ON);
 
 

examples/osganalysis/osganalysis.cpp

@@ -20,8 +20,6 @@
 #include <osgViewer/Viewer>
 #include <osgViewer/ViewerEventHandlers>
 
-#include <osg/ContextData>
-
 #include <osgDB/ReadFile>
 #include <osgDB/WriteFile>
 #include <osgDB/FileNameUtils>
@@ -104,9 +102,9 @@ public:
     {
         if (!stateset) return;
 
-        for(unsigned int ti=0; ti<stateset->getNumTextureAttributeLists(); ++ti)
+        for(unsigned int i=0; i<stateset->getNumTextureAttributeLists(); ++i)
         {
-            osg::StateAttribute* sa = stateset->getTextureAttribute(ti, osg::StateAttribute::TEXTURE);
+            osg::StateAttribute* sa = stateset->getTextureAttribute(i, osg::StateAttribute::TEXTURE);
             osg::Texture* texture = dynamic_cast<osg::Texture*>(sa);
             if (texture)
             {
@@ -256,7 +254,9 @@ public:
     {
         OSG_NOTICE<<"Reallocating Arrays"<<std::endl;
 
+        typedef std::vector< osg::ref_ptr<osg::Array> > ArrayVector;
         typedef std::vector< osg::ref_ptr<osg::Geometry> > GeometryVector;
+        ArrayVector newArrays;
         GeometryVector newGeometries;
         for(GeometryMap::iterator itr = _geometryMap.begin();
             itr != _geometryMap.end();
@@ -504,7 +504,7 @@ protected:
         optimizeVertexOrder = false;
 
         reallocateMemory = false;
-
+        
         modifyTextureSettings = false;
         buildImageMipmaps = false;
         compressImages = false;
@@ -524,21 +524,21 @@ protected:
     bool optimizeVertexOrder;
 
     bool reallocateMemory;
-
+    
     bool modifyTextureSettings;
     bool buildImageMipmaps;
     bool compressImages;
     bool disableMipmaps;
 
 };
-//
+// 
 class DatabasePagingOperation : public osg::Operation, public osgUtil::IncrementalCompileOperation::CompileCompletedCallback
 {
 public:
 
     DatabasePagingOperation(const std::string& filename,
                             const std::string& outputFilename,
-                             SceneGraphProcessor* sceneGraphProcessor,
+                             SceneGraphProcessor* sceneGraphProcessor, 
                              osgUtil::IncrementalCompileOperation* ico):
         osg::Referenced(true),
         Operation("DatabasePaging Operation", false),
@@ -550,12 +550,12 @@ public:
         {
         }
 
-    virtual void operator () (osg::Object* /*object*/)
+    virtual void operator () (osg::Object* object)
     {
         osg::notify(osg::NOTICE)<<"LoadAndCompileOperation "<<_filename<<std::endl;
 
         _modelReadyToMerge = false;
-        _loadedModel = osgDB::readRefNodeFile(_filename);
+        _loadedModel = osgDB::readNodeFile(_filename);
 
         if (_loadedModel.valid())
         {
@@ -570,7 +570,7 @@ public:
             if (!_outputFilename.empty())
             {
                 OSG_NOTICE<<"Writing out file "<<_outputFilename<<std::endl;
-
+                
                 osgDB::writeNodeFile(*_loadedModel, _outputFilename);
             }
 
@@ -594,7 +594,7 @@ public:
         osg::notify(osg::NOTICE)<<"done LoadAndCompileOperation "<<_filename<<std::endl;
     }
 
-    virtual bool compileCompleted(osgUtil::IncrementalCompileOperation::CompileSet* /*compileSet*/)
+    virtual bool compileCompleted(osgUtil::IncrementalCompileOperation::CompileSet* compileSet)
     {
         OSG_NOTICE<<"compileCompleted"<<std::endl;
         _modelReadyToMerge = true;
@@ -612,13 +612,14 @@ public:
 class TexturePoolHandler : public osgGA::GUIEventHandler
 {
 public:
-    virtual bool handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter& /*aa*/)
+    virtual bool handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter& aa)
     {
         if (ea.getEventType() == osgGA::GUIEventAdapter::KEYUP)
         {
             if (ea.getKey()=='r')
             {
-                osg::getOrCreateContextData(0)->reportStats(osg::notify(osg::NOTICE));
+                osg::Texture::getTextureObjectManager(0)->reportStats(osg::notify(osg::NOTICE));
+                osg::GLBufferObjectManager::getGLBufferObjectManager(0)->reportStats(osg::notify(osg::NOTICE));
             }
         }
         return false;
@@ -630,7 +631,8 @@ struct ReportStatsAnimationCompletedCallback : public osgGA::AnimationPathManipu
     virtual void completed(const osgGA::AnimationPathManipulator*)
     {
         OSG_NOTICE<<"Animation completed"<<std::endl;
-        osg::getOrCreateContextData(0)->reportStats(osg::notify(osg::NOTICE));
+        osg::Texture::getTextureObjectManager(0)->reportStats(osg::notify(osg::NOTICE));
+        osg::GLBufferObjectManager::getGLBufferObjectManager(0)->reportStats(osg::notify(osg::NOTICE));
     }
 };
 
@@ -662,7 +664,7 @@ int main(int argc, char** argv)
             {
                 apm->setTimeScale(animationSpeed);
                 apm->setAnimationCompletedCallback(new ReportStatsAnimationCompletedCallback());
-
+                
                 unsigned int num = keyswitchManipulator->getNumMatrixManipulators();
                 keyswitchManipulator->addMatrixManipulator( keyForAnimationPath, "Path", apm );
                 keyswitchManipulator->selectMatrixManipulator(num);
@@ -673,7 +675,7 @@ int main(int argc, char** argv)
         viewer.setCameraManipulator( keyswitchManipulator.get() );
     }
 
-    // set up event handlers
+    // set up event handlers 
     {
         viewer.addEventHandler( new osgViewer::StatsHandler());
         viewer.addEventHandler( new osgViewer::WindowSizeHandler() );
@@ -780,8 +782,8 @@ int main(int argc, char** argv)
             modelIndex<fileNames.size() &&
             (currentTime-timeOfLastMerge)>timeBetweenMerges)
         {
-            filename = fileNames[modelIndex++];
+            std::string filename = fileNames[modelIndex++];
-            outputFilename = outputPostfix.empty() ? std::string() : osgDB::getStrippedName(filename)+outputPostfix;
+            std::string outputFilename = outputPostfix.empty() ? std::string() : osgDB::getStrippedName(filename)+outputPostfix;
 
             databasePagingOperation = new DatabasePagingOperation(
                 filename,
@@ -795,7 +797,7 @@ int main(int argc, char** argv)
         if (databasePagingOperation.get() && databasePagingOperation->_modelReadyToMerge)
         {
             OSG_NOTICE<<"Merging subgraph"<<std::endl;
-
+            
             timeOfLastMerge = currentTime;
 
             group->removeChildren(0,group->getNumChildren());

examples/osganimate/osganimate.cpp

@@ -26,7 +26,6 @@
 
 #include <osgDB/Registry>
 #include <osgDB/ReadFile>
-#include <osgDB/WriteFile>
 
 #include <osgGA/TrackballManipulator>
 #include <osgGA/FlightManipulator>
@@ -137,9 +136,9 @@ osg::Node* createMovingModel(const osg::Vec3& center, float radius)
 
     osg::AnimationPath* animationPath = createAnimationPath(center,radius,animationLength);
 
-    osg::ref_ptr<osg::Group> model = new osg::Group;
+    osg::Group* model = new osg::Group;
 
-    osg::ref_ptr<osg::Node> glider = osgDB::readRefNodeFile("glider.osgt");
+    osg::Node* glider = osgDB::readNodeFile("glider.osgt");
     if (glider)
     {
         const osg::BoundingSphere& bs = glider->getBound();
@@ -147,7 +146,7 @@ osg::Node* createMovingModel(const osg::Vec3& center, float radius)
         float size = radius/bs.radius()*0.3f;
         osg::MatrixTransform* positioned = new osg::MatrixTransform;
         positioned->setDataVariance(osg::Object::STATIC);
-        positioned  ->setMatrix(osg::Matrix::translate(-bs.center())*
+        positioned->setMatrix(osg::Matrix::translate(-bs.center())*
                                      osg::Matrix::scale(size,size,size)*
                                      osg::Matrix::rotate(osg::inDegrees(-90.0f),0.0f,0.0f,1.0f));
 
@@ -160,7 +159,7 @@ osg::Node* createMovingModel(const osg::Vec3& center, float radius)
         model->addChild(xform);
     }
 
-    osg::ref_ptr<osg::Node> cessna = osgDB::readRefNodeFile("cessna.osgt");
+    osg::Node* cessna = osgDB::readNodeFile("cessna.osgt");
     if (cessna)
     {
         const osg::BoundingSphere& bs = cessna->getBound();
@@ -174,30 +173,26 @@ osg::Node* createMovingModel(const osg::Vec3& center, float radius)
 
         positioned->addChild(cessna);
 
-        osg::ref_ptr<osg::MatrixTransform> xform = new osg::MatrixTransform;
+        osg::MatrixTransform* xform = new osg::MatrixTransform;
         xform->setUpdateCallback(new osg::AnimationPathCallback(animationPath,0.0f,2.0));
         xform->addChild(positioned);
 
         model->addChild(xform);
     }
 
-    #ifndef OSG_GLES2_AVAILABLE
+    return model;
-    model->getOrCreateStateSet()->setMode(GL_NORMALIZE, osg::StateAttribute::ON);
-    #endif
-
-    return model.release();
 }
 
-osg::ref_ptr<osg::Group> createModel(bool overlay, osgSim::OverlayNode::OverlayTechnique technique)
+osg::Node* createModel(bool overlay, osgSim::OverlayNode::OverlayTechnique technique)
 {
     osg::Vec3 center(0.0f,0.0f,0.0f);
     float radius = 100.0f;
 
-    osg::ref_ptr<osg::Group> root = new osg::Group;
+    osg::Group* root = new osg::Group;
 
     float baseHeight = center.z()-radius*0.5;
-    osg::ref_ptr<osg::Node> baseModel = createBase(osg::Vec3(center.x(), center.y(), baseHeight),radius);
+    osg::Node* baseModel = createBase(osg::Vec3(center.x(), center.y(), baseHeight),radius);
-    osg::ref_ptr<osg::Node> movingModel = createMovingModel(center,radius*0.8f);
+    osg::Node* movingModel = createMovingModel(center,radius*0.8f);
 
     if (overlay)
     {
@@ -237,14 +232,14 @@ int main( int argc, char **argv )
     osgViewer::Viewer viewer;
 
     // load the nodes from the commandline arguments.
-    osg::ref_ptr<osg::Group> model = createModel(overlay, technique);
+    osg::Node* model = createModel(overlay, technique);
     if (!model)
     {
         return 1;
     }
 
     // tilt the scene so the default eye position is looking down on the model.
-    osg::ref_ptr<osg::MatrixTransform> rootnode = new osg::MatrixTransform;
+    osg::MatrixTransform* rootnode = new osg::MatrixTransform;
     rootnode->setMatrix(osg::Matrix::rotate(osg::inDegrees(30.0f),1.0f,0.0f,0.0f));
     rootnode->addChild(model);
 
@@ -252,13 +247,6 @@ int main( int argc, char **argv )
     osgUtil::Optimizer optimzer;
     optimzer.optimize(rootnode);
 
-    std::string filename;
-    if (arguments.read("-o",filename))
-    {
-        osgDB::writeNodeFile(*rootnode, filename);
-        return 1;
-    }
-
     // set the scene to render
     viewer.setSceneData(rootnode);
 

examples/osganimationeasemotion/osganimationeasemotion.cpp

@@ -317,8 +317,7 @@ public:
     }
 };
 
-int main(int, char**)
+int main(int argc, char** argv) {
-{
     osgViewer::Viewer viewer;
 
     osgWidget::WindowManager* wm = new osgWidget::WindowManager(

examples/osganimationhardware/osganimationhardware.cpp

@@ -1,14 +1,14 @@
-/*  -*-c++-*-
+/*  -*-c++-*- 
  *  Copyright (C) 2009 Cedric Pinson <cedric.pinson@plopbyte.net>
  *
- * This library is open source and may be redistributed and/or modified under
+ * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
  * (at your option) any later version.  The full license is in LICENSE file
  * included with this distribution, and on the openscenegraph.org website.
- *
+ * 
  * This library 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 
  * OpenSceneGraph Public License for more details.
 */
 
@@ -28,8 +28,6 @@
 #include <osgAnimation/BasicAnimationManager>
 #include <osgAnimation/RigGeometry>
 #include <osgAnimation/RigTransformHardware>
-#include <osgAnimation/MorphGeometry>
-#include <osgAnimation/MorphTransformHardware>
 #include <osgAnimation/AnimationManagerBase>
 #include <osgAnimation/BoneMapVisitor>
 
@@ -42,100 +40,89 @@ static unsigned int getRandomValueinRange(unsigned int v)
 }
 
 
-osg::ref_ptr<osg::Program> CommonProgram;
+osg::ref_ptr<osg::Program> program;
 // show how to override the default RigTransformHardware for customized usage
 struct MyRigTransformHardware : public osgAnimation::RigTransformHardware
 {
-    int _maxmatrix;
+
-    MyRigTransformHardware() : _maxmatrix(99){}
+    void operator()(osgAnimation::RigGeometry& geom)
-    virtual bool init(osgAnimation::RigGeometry& rig)
     {
-        if(_perVertexInfluences.empty())
+        if (_needInit)
-        {
+            if (!init(geom))
-            prepareData(rig);
+                return;
+        computeMatrixPaletteUniform(geom.getMatrixFromSkeletonToGeometry(), geom.getInvMatrixFromSkeletonToGeometry());
+    }
+
+    bool init(osgAnimation::RigGeometry& geom)
+    {
+        osg::Vec3Array* pos = dynamic_cast<osg::Vec3Array*>(geom.getVertexArray());
+        if (!pos) {
+            osg::notify(osg::WARN) << "RigTransformHardware no vertex array in the geometry " << geom.getName() << std::endl;
             return false;
         }
-        if(!rig.getSkeleton())
+
+        if (!geom.getSkeleton()) {
+            osg::notify(osg::WARN) << "RigTransformHardware no skeleting set in geometry " << geom.getName() << std::endl;
             return false;
+        }
 
         osgAnimation::BoneMapVisitor mapVisitor;
-        rig.getSkeleton()->accept(mapVisitor);
+        geom.getSkeleton()->accept(mapVisitor);
-        osgAnimation::BoneMap boneMap = mapVisitor.getBoneMap();
+        osgAnimation::BoneMap bm = mapVisitor.getBoneMap();
 
-        if (!buildPalette(boneMap,rig) )
+        if (!createPalette(pos->size(),bm, geom.getVertexInfluenceSet().getVertexToBoneList()))
             return false;
 
-        osg::Geometry& source = *rig.getSourceGeometry();
+        int attribIndex = 11;
-        osg::Vec3Array* positionSrc = dynamic_cast<osg::Vec3Array*>(source.getVertexArray());
+        int nbAttribs = getNumVertexAttrib();
 
-        if (!positionSrc)
+        // use a global program for all avatar
-        {
+        if (!program.valid()) {
-            OSG_WARN << "RigTransformHardware no vertex array in the geometry " << rig.getName() << std::endl;
+            program = new osg::Program;
-            return false;
+            program->setName("HardwareSkinning");
-        }
+            if (!_shader.valid())
+                _shader = osg::Shader::readShaderFile(osg::Shader::VERTEX,"shaders/skinning.vert");
 
-        // copy shallow from source geometry to rig
+            if (!_shader.valid()) {
-        rig.copyFrom(source);
+                osg::notify(osg::WARN) << "RigTransformHardware can't load VertexShader" << std::endl;
-
-        osg::ref_ptr<osg::Shader> vertexshader;
-        osg::ref_ptr<osg::StateSet> stateset = rig.getOrCreateStateSet();
-        if(!CommonProgram.valid())
-        {
-            CommonProgram   = new osg::Program;
-            CommonProgram->setName("HardwareSkinning");
-
-            //set default source if _shader is not user setted
-            if (!vertexshader.valid())
-            {
-                    vertexshader = osgDB::readRefShaderFile(osg::Shader::VERTEX,"skinning.vert");
-            }
-
-            if (!vertexshader.valid())
-            {
-                OSG_WARN << "RigTransformHardware can't load VertexShader" << std::endl;
                 return false;
             }
 
             // replace max matrix by the value from uniform
             {
-                std::string str = vertexshader->getShaderSource();
+                std::string str = _shader->getShaderSource();
                 std::string toreplace = std::string("MAX_MATRIX");
                 std::size_t start = str.find(toreplace);
-                if (std::string::npos != start)
+                std::stringstream ss;
-                {
+                ss << getMatrixPaletteUniform()->getNumElements();
-                    std::stringstream ss;
+                str.replace(start, toreplace.size(), ss.str());
-                    ss << _maxmatrix;//getMatrixPaletteUniform()->getNumElements();
+                _shader->setShaderSource(str);
-                    str.replace(start, toreplace.size(), ss.str());
+                osg::notify(osg::INFO) << "Shader " << str << std::endl;
-                    vertexshader->setShaderSource(str);
-                }
-                else
-                {
-                    OSG_WARN<< "MAX_MATRIX not found in Shader! " << str << std::endl;
-                }
-                OSG_INFO << "Shader " << str << std::endl;
             }
-            CommonProgram->addShader(vertexshader.get());
+
-        }
+            program->addShader(_shader.get());
-        
+
-        unsigned int nbAttribs = getNumVertexAttrib();
+            for (int i = 0; i < nbAttribs; i++)
-        for (unsigned int i = 0; i < nbAttribs; i++)
+            {
+                std::stringstream ss;
+                ss << "boneWeight" << i;
+                program->addBindAttribLocation(ss.str(), attribIndex + i);
+
+                osg::notify(osg::INFO) << "set vertex attrib " << ss.str() << std::endl;
+            }
+        } 
+        for (int i = 0; i < nbAttribs; i++)
         {
             std::stringstream ss;
             ss << "boneWeight" << i;
-            CommonProgram->addBindAttribLocation(ss.str(), _minAttribIndex + i);
+            geom.setVertexAttribArray(attribIndex + i, getVertexAttrib(i));
-            rig.setVertexAttribArray(_minAttribIndex + i, getVertexAttrib(i));
-            OSG_INFO << "set vertex attrib " << ss.str() << std::endl;
         }
 
-
+        osg::ref_ptr<osg::StateSet> ss = new osg::StateSet;
-        stateset->removeUniform("nbBonesPerVertex");
+        ss->addUniform(getMatrixPaletteUniform());
-        stateset->addUniform(new osg::Uniform("nbBonesPerVertex",_bonesPerVertex));
+        ss->addUniform(new osg::Uniform("nbBonesPerVertex", getNumBonesPerVertex()));
-
+        ss->setAttributeAndModes(program.get());
-        stateset->removeUniform("matrixPalette");
+        geom.setStateSet(ss.get());
-        stateset->addUniform(_uniformMatrixPalette);
-
-        stateset->setAttribute(CommonProgram.get());
-
         _needInit = false;
         return true;
     }
@@ -146,9 +133,8 @@ struct MyRigTransformHardware : public osgAnimation::RigTransformHardware
 struct SetupRigGeometry : public osg::NodeVisitor
 {
     bool _hardware;
-    
     SetupRigGeometry( bool hardware = true) : osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN), _hardware(hardware) {}
-
+    
     void apply(osg::Geode& geode)
     {
         for (unsigned int i = 0; i < geode.getNumDrawables(); i++)
@@ -156,15 +142,10 @@ struct SetupRigGeometry : public osg::NodeVisitor
     }
     void apply(osg::Drawable& geom)
     {
-        if (_hardware)
+        if (_hardware) {
-        {
             osgAnimation::RigGeometry* rig = dynamic_cast<osgAnimation::RigGeometry*>(&geom);
             if (rig)
-            {
                 rig->setRigTransformImplementation(new MyRigTransformHardware);
-                osgAnimation::MorphGeometry *morph=dynamic_cast<osgAnimation::MorphGeometry*>(rig->getSourceGeometry());
-                if(morph)morph->setMorphTransformImplementation(new osgAnimation::MorphTransformHardware);
-            }
         }
 
 #if 0
@@ -188,12 +169,11 @@ osg::Group* createCharacterInstance(osg::Group* character, bool hardware)
     osgAnimation::BasicAnimationManager* anim = dynamic_cast<osgAnimation::BasicAnimationManager*>(animationManager);
     const osgAnimation::AnimationList& list = animationManager->getAnimationList();
     int v = getRandomValueinRange(list.size());
-    if (list[v]->getName() == std::string("MatIpo_ipo"))
+    if (list[v]->getName() == std::string("MatIpo_ipo")) {
-    {
         anim->playAnimation(list[v].get());
         v = (v + 1)%list.size();
     }
-
+        
     anim->playAnimation(list[v].get());
 
     SetupRigGeometry switcher(hardware);
@@ -213,15 +193,12 @@ int main (int argc, char* argv[])
 
     bool hardware = true;
     int maxChar = 10;
-    while (psr.read("--software"))
+    while (psr.read("--software")) { hardware = false; }
-    {
-        hardware = false;
-    }
     while (psr.read("--number", maxChar)) {}
 
-    osg::ref_ptr<osg::Node> node = osgDB::readRefNodeFiles(psr);
+
-    osg::ref_ptr<osg::Group> root = dynamic_cast<osg::Group*>(node.get());
+    osg::ref_ptr<osg::Group> root = dynamic_cast<osg::Group*>(osgDB::readNodeFiles(psr));
-    if (!root)
+    if (!root) 
     {
         std::cout << psr.getApplicationName() <<": No data loaded" << std::endl;
         return 1;
@@ -229,7 +206,7 @@ int main (int argc, char* argv[])
 
     {
         osgAnimation::AnimationManagerBase* animationManager = dynamic_cast<osgAnimation::AnimationManagerBase*>(root->getUpdateCallback());
-        if(!animationManager)
+        if(!animationManager) 
         {
             osg::notify(osg::FATAL) << "no AnimationManagerBase found, updateCallback need to animate elements" << std::endl;
             return 1;
@@ -241,13 +218,13 @@ int main (int argc, char* argv[])
 
     // add the state manipulator
     viewer.addEventHandler( new osgGA::StateSetManipulator(viewer.getCamera()->getOrCreateStateSet()) );
-
+    
     // add the thread model handler
     viewer.addEventHandler(new osgViewer::ThreadingHandler);
 
     // add the window size toggle handler
     viewer.addEventHandler(new osgViewer::WindowSizeHandler);
-
+        
     // add the stats handler
     viewer.addEventHandler(new osgViewer::StatsHandler);
 
@@ -266,10 +243,9 @@ int main (int argc, char* argv[])
 
     double xChar = maxChar;
     double yChar = xChar * 9.0/16;
-    for (double  i = 0.0; i < xChar; i++)
+    for (double  i = 0.0; i < xChar; i++) {
-    {
+        for (double  j = 0.0; j < yChar; j++) {
-        for (double  j = 0.0; j < yChar; j++)
+
-        {
             osg::ref_ptr<osg::Group> c = createCharacterInstance(root.get(), hardware);
             osg::MatrixTransform* tr = new osg::MatrixTransform;
             tr->setMatrix(osg::Matrix::translate( 2.0 * (i - xChar * .5),
@@ -281,6 +257,7 @@ int main (int argc, char* argv[])
     }
     std::cout << "created " << xChar * yChar << " instance"  << std::endl;
 
+
     return viewer.run();
 }
 

examples/osganimationmakepath/osganimationmakepath.cpp

@@ -1,14 +1,14 @@
-/*  -*-c++-*-
+/*  -*-c++-*- 
  *  Copyright (C) 2008 Cedric Pinson <mornifle@plopbyte.net>
  *
- * This library is open source and may be redistributed and/or modified under
+ * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
  * (at your option) any later version.  The full license is in LICENSE file
  * included with this distribution, and on the openscenegraph.org website.
- *
+ * 
  * This library 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 
  * OpenSceneGraph Public License for more details.
  *
  *  Authors:
@@ -33,7 +33,7 @@
   public:
       META_Object(osgAnimation, AnimtkUpdateCallback);
 
-      AnimtkUpdateCallback()
+      AnimtkUpdateCallback() 
       {
           _sampler = new osgAnimation::Vec3CubicBezierSampler;
           _playing = false;
@@ -41,7 +41,6 @@
       }
       AnimtkUpdateCallback(const AnimtkUpdateCallback& val, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY):
           osg::Object(val, copyop),
-          osg::Callback(val, copyop),
           osg::NodeCallback(val, copyop),
           _sampler(val._sampler),
           _startTime(val._startTime),
@@ -53,16 +52,16 @@
 
       /** Callback method called by the NodeVisitor when visiting a node.*/
       virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
-      {
+      { 
-          if (nv->getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR &&
+          if (nv->getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR && 
-              nv->getFrameStamp() &&
+              nv->getFrameStamp() && 
-              nv->getFrameStamp()->getFrameNumber() != _lastUpdate)
+              nv->getFrameStamp()->getFrameNumber() != _lastUpdate) 
           {
 
               _lastUpdate = nv->getFrameStamp()->getFrameNumber();
               _currentTime = osg::Timer::instance()->tick();
 
-              if (_playing && _sampler.get() && _sampler->getKeyframeContainer())
+              if (_playing && _sampler.get() && _sampler->getKeyframeContainer()) 
               {
                   osg::MatrixTransform* transform = dynamic_cast<osg::MatrixTransform*>(node);
                   if (transform) {
@@ -98,7 +97,7 @@ class AnimtkStateSetUpdateCallback : public osg::StateSet::Callback
 public:
     META_Object(osgAnimation, AnimtkStateSetUpdateCallback);
 
-    AnimtkStateSetUpdateCallback()
+    AnimtkStateSetUpdateCallback() 
     {
         _sampler = new osgAnimation::Vec4LinearSampler;
         _playing = false;
@@ -107,7 +106,6 @@ public:
 
     AnimtkStateSetUpdateCallback(const AnimtkStateSetUpdateCallback& val, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY):
         osg::Object(val, copyop),
-        osg::Callback(val, copyop),
         osg::StateSet::Callback(val, copyop),
         _sampler(val._sampler),
         _startTime(val._startTime),
@@ -119,19 +117,19 @@ public:
 
     /** Callback method called by the NodeVisitor when visiting a node.*/
     virtual void operator()(osg::StateSet* state, osg::NodeVisitor* nv)
-    {
+    { 
-        if (state &&
+        if (state && 
-            nv->getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR &&
+            nv->getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR && 
-            nv->getFrameStamp() &&
+            nv->getFrameStamp() && 
             nv->getFrameStamp()->getFrameNumber() != _lastUpdate) {
 
             _lastUpdate = nv->getFrameStamp()->getFrameNumber();
             _currentTime = osg::Timer::instance()->tick();
 
-            if (_playing && _sampler.get() && _sampler->getKeyframeContainer())
+            if (_playing && _sampler.get() && _sampler->getKeyframeContainer()) 
             {
                 osg::Material* material = dynamic_cast<osg::Material*>(state->getAttribute(osg::StateAttribute::MATERIAL));
-                if (material)
+                if (material) 
                 {
                     osg::Vec4 result;
                     float t = osg::Timer::instance()->delta_s(_startTime, _currentTime);
@@ -157,7 +155,7 @@ public:
 
 // This won't really give good results in any situation, but it does demonstrate
 // on possible "fast" usage...
-class MakePathTimeCallback: public AnimtkUpdateCallback
+class MakePathTimeCallback: public AnimtkUpdateCallback 
 {
     osg::ref_ptr<osg::Geode> _geode;
     float _lastAdd;
@@ -170,11 +168,11 @@ public:
         _addSeconds(0.08f) {
     }
 
-    virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
+    virtual void operator()(osg::Node* node, osg::NodeVisitor* nv) 
     {
         float t = osg::Timer::instance()->delta_s(_startTime, _currentTime);
 
-        if(_lastAdd + _addSeconds <= t && t <= 8.0f)
+        if(_lastAdd + _addSeconds <= t && t <= 8.0f) 
         {
             osg::Vec3 pos;
 
@@ -192,7 +190,7 @@ public:
 
 // This will give great results if you DO NOT have VSYNC enabled and can generate
 // decent FPS.
-class MakePathDistanceCallback: public AnimtkUpdateCallback
+class MakePathDistanceCallback: public AnimtkUpdateCallback 
 {
     osg::ref_ptr<osg::Geode> _geode;
     osg::Vec3 _lastAdd;
@@ -205,7 +203,7 @@ public:
         _threshold(0.5f),
         _count(0) {}
 
-    virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
+    virtual void operator()(osg::Node* node, osg::NodeVisitor* nv) 
     {
         static bool countReported = false;
 
@@ -217,13 +215,13 @@ public:
 
         osg::Vec3 distance = _lastAdd - pos;
 
-        if(t <= 8.0f && distance.length() >= _threshold)
+        if(t <= 8.0f && distance.length() >= _threshold) 
         {
             _geode->addDrawable(new osg::ShapeDrawable(new osg::Sphere(pos, 0.25f)));
             _lastAdd = pos;
             _count++;
         }
-        else if(t > 8.0f)
+        else if(t > 8.0f) 
         {
             if(!countReported) std::cout << "Created " << _count << " nodes." << std::endl;
             countReported = true;
@@ -233,13 +231,13 @@ public:
     }
 };
 
-osg::StateSet* setupStateSet()
+osg::StateSet* setupStateSet() 
 {
     osg::StateSet* st = new osg::StateSet();
-
+    
     st->setAttributeAndModes(new osg::Material(), true);
     st->setMode(GL_BLEND, true);
-
+    
     AnimtkStateSetUpdateCallback* callback = new AnimtkStateSetUpdateCallback();
     osgAnimation::Vec4KeyframeContainer* keys = callback->_sampler->getOrCreateKeyframeContainer();
     keys->push_back(osgAnimation::Vec4Keyframe(0, osg::Vec4(1,0,0,1)));
@@ -250,11 +248,11 @@ osg::StateSet* setupStateSet()
     keys->push_back(osgAnimation::Vec4Keyframe(10, osg::Vec4(1,0,0,1)));
     callback->start();
     st->setUpdateCallback(callback);
-
+    
     return st;
 }
 
-osg::MatrixTransform* setupAnimtkNode(osg::Geode* staticGeode)
+osg::MatrixTransform* setupAnimtkNode(osg::Geode* staticGeode) 
 {
     osg::Vec3 v[5];
 
@@ -302,20 +300,20 @@ osg::MatrixTransform* setupAnimtkNode(osg::Geode* staticGeode)
     node->setUpdateCallback(callback);
 
     osg::Geode* geode = new osg::Geode();
-
+    
     geode->setStateSet(setupStateSet());
     geode->addDrawable(new osg::ShapeDrawable(new osg::Sphere(osg::Vec3(0.0f, 0.0f, 0.0f), 2)));
-
+    
     node->addChild(geode);
 
     return node;
 }
 
-int main(int argc, char** argv)
+int main(int argc, char** argv) 
 {
     osg::ArgumentParser arguments(&argc, argv);
     osgViewer::Viewer viewer(arguments);
-
+    
     osgGA::TrackballManipulator* tbm = new osgGA::TrackballManipulator();
 
     viewer.setCameraManipulator(tbm);

examples/osganimationmorph/osganimationmorph.cpp

@@ -1,14 +1,14 @@
-/*  -*-c++-*-
+/*  -*-c++-*- 
  *  Copyright (C) 2008 Cedric Pinson <mornifle@plopbyte.net>
  *
- * This library is open source and may be redistributed and/or modified under
+ * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
  * (at your option) any later version.  The full license is in LICENSE file
  * included with this distribution, and on the openscenegraph.org website.
- *
+ * 
  * This library 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 
  * OpenSceneGraph Public License for more details.
 */
 
@@ -33,11 +33,11 @@ struct GeometryFinder : public osg::NodeVisitor
 {
     osg::ref_ptr<osg::Geometry> _geom;
     GeometryFinder() : osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN) {}
-    void apply(osg::Geode& geode)
+    void apply(osg::Geode& geode) 
     {
         if (_geom.valid())
             return;
-        for (unsigned int i = 0; i < geode.getNumDrawables(); i++)
+        for (unsigned int i = 0; i < geode.getNumDrawables(); i++) 
         {
             osg::Geometry* geom = dynamic_cast<osg::Geometry*>(geode.getDrawable(i));
             if (geom) {
@@ -50,7 +50,7 @@ struct GeometryFinder : public osg::NodeVisitor
 
 osg::ref_ptr<osg::Geometry> getShape(const std::string& name)
 {
-    osg::ref_ptr<osg::Node> shape0 = osgDB::readRefNodeFile(name);
+    osg::ref_ptr<osg::Node> shape0 = osgDB::readNodeFile(name);
     if (shape0)
     {
         GeometryFinder finder;
@@ -104,12 +104,10 @@ int main (int argc, char* argv[])
 
     osg::Group* scene = new osg::Group;
     scene->addUpdateCallback(bam);
-
+    
     osg::Geode* geode = new osg::Geode;
     geode->addDrawable(morph);
-    osgAnimation::UpdateMorph* morphupdate=new osgAnimation::UpdateMorph("MorphNodeCallback");
+    geode->addUpdateCallback(new osgAnimation::UpdateMorph("MorphNodeCallback"));
-    morphupdate->addTarget("MorphNodeCallback");
-    geode->addUpdateCallback(morphupdate);
     scene->addChild(geode);
 
     viewer.addEventHandler(new osgViewer::StatsHandler());

examples/osganimationnode/osganimationnode.cpp

@@ -35,7 +35,6 @@ public:
     }
     AnimtkUpdateCallback(const AnimtkUpdateCallback& val, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY):
         osg::Object(val, copyop),
-        osg::Callback(val, copyop),
         osg::NodeCallback(val, copyop),
         _sampler(val._sampler),
         _startTime(val._startTime),
@@ -99,7 +98,6 @@ public:
 
     AnimtkStateSetUpdateCallback(const AnimtkStateSetUpdateCallback& val, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY):
         osg::Object(val, copyop),
-        osg::Callback(val, copyop),
         osg::StateSet::Callback(val, copyop),
         _sampler(val._sampler),
         _startTime(val._startTime),

examples/osganimationskinning/osganimationskinning.cpp

@@ -134,10 +134,13 @@ void initVertexMap(osgAnimation::Bone* b0,
                    osgAnimation::RigGeometry* geom,
                    osg::Vec3Array* array)
 {
+    osgAnimation::VertexInfluenceSet vertexesInfluences;
     osgAnimation::VertexInfluenceMap* vim = new osgAnimation::VertexInfluenceMap;
+
     (*vim)[b0->getName()].setName(b0->getName());
     (*vim)[b1->getName()].setName(b1->getName());
     (*vim)[b2->getName()].setName(b2->getName());
+
     for (int i = 0; i < (int)array->size(); i++)
     {
         float val = (*array)[i][0];

examples/osganimationtimeline/osganimationtimeline.cpp

@@ -38,7 +38,7 @@
 
 struct NoseBegin : public osgAnimation::Action::Callback
 {
-    virtual void operator()(osgAnimation::Action* action, osgAnimation::ActionVisitor* /*nv*/)
+    virtual void operator()(osgAnimation::Action* action, osgAnimation::ActionVisitor* nv)
     {
         std::cout << "sacrebleu, it scratches my nose, let me scratch it" << std::endl;
         std::cout << "process NoseBegin call back " << action->getName() << std::endl << std::endl;
@@ -47,7 +47,7 @@ struct NoseBegin : public osgAnimation::Action::Callback
 
 struct NoseEnd : public osgAnimation::Action::Callback
 {
-    virtual void operator()(osgAnimation::Action* action, osgAnimation::ActionVisitor* /*nv*/)
+    virtual void operator()(osgAnimation::Action* action, osgAnimation::ActionVisitor* nv)
     {
         std::cout << "shhhrt shrrrrt shhhhhhrrrrt, haaa it's better"<< std::endl;
         std::cout << "process NoseEnd call back " << action->getName() << std::endl << std::endl;
@@ -129,7 +129,7 @@ struct ExampleTimelineUsage : public osgGA::GUIEventHandler
             if (_releaseKey) // we hit a key and release it execute an action
             {
                 osgAnimation::Timeline* tml = _manager->getTimeline();
-                // don't play if already playing
+                // dont play if already playing
                 if (!tml->isActive(_scratchNose.get()))
                 {
                     // add this animation on top of two other
@@ -163,8 +163,7 @@ int main (int argc, char* argv[])
         file = psr[1];
 
     // replace the manager
-    osg::ref_ptr<osg::Node> loadedmodel = osgDB::readRefNodeFile(file);
+    osg::Group* root = dynamic_cast<osg::Group*>(osgDB::readNodeFile(file));
-    osg::Group* root = dynamic_cast<osg::Group*>(loadedmodel.get());
     if (!root) {
         osg::notify(osg::FATAL) << "can't read file " << file << std::endl;
         return 1;

examples/osganimationviewer/AnimtkViewer

@@ -1,14 +1,14 @@
-/*  -*-c++-*-
+/*  -*-c++-*- 
  *  Copyright (C) 2008 Cedric Pinson <mornifle@plopbyte.net>
  *
- * This library is open source and may be redistributed and/or modified under
+ * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
  * (at your option) any later version.  The full license is in LICENSE file
  * included with this distribution, and on the openscenegraph.org website.
- *
+ * 
  * This library 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 
  * OpenSceneGraph Public License for more details.
  *
  * Authors:
@@ -24,18 +24,18 @@
 #include <osgDB/ReadFile>
 #include <osgAnimation/BasicAnimationManager>
 
-class AnimtkViewerModelController
+class AnimtkViewerModelController 
 {
 public:
     typedef std::vector<std::string> AnimationMapVector;
 
-    static AnimtkViewerModelController& instance()
+    static AnimtkViewerModelController& instance() 
     {
         static AnimtkViewerModelController avmc;
         return avmc;
     }
 
-    static bool setModel(osgAnimation::BasicAnimationManager* model)
+    static bool setModel(osgAnimation::BasicAnimationManager* model) 
     {
         AnimtkViewerModelController& self = instance();
         self._model = model;
@@ -48,7 +48,7 @@ public:
         return true;
     }
 
-    bool list()
+    bool list() 
     {
         std::cout << "Animation List:" << std::endl;
         for(osgAnimation::AnimationMap::iterator it = _map.begin(); it != _map.end(); it++)
@@ -56,9 +56,9 @@ public:
         return true;
     }
 
-    bool play()
+    bool play() 
     {
-        if(_focus < _amv.size())
+        if(_focus < _amv.size()) 
         {
             std::cout << "Play " << _amv[_focus] << std::endl;
             _model->playAnimation(_map[_amv[_focus]].get());
@@ -68,44 +68,44 @@ public:
         return false;
     }
 
-    bool stop()
+    bool stop() 
     {
-        if(_focus < _amv.size())
+        if(_focus < _amv.size()) 
         {
             std::cout << "Stop " << _amv[_focus] << std::endl;
             _model->stopAnimation(_map[_amv[_focus]].get());
             return true;
         }
         return false;
-    }
+    }    
 
-    bool next()
+    bool next() 
     {
         _focus = (_focus + 1) % _map.size();
         std::cout << "Current now is " << _amv[_focus] << std::endl;
         return true;
     }
 
-    bool previous()
+    bool previous() 
     {
         _focus = (_map.size() + _focus - 1) % _map.size();
         std::cout << "Current now is " << _amv[_focus] << std::endl;
         return true;
     }
 
-    bool playByName(const std::string& name)
+    bool playByName(const std::string& name) 
     {
         for(unsigned int i = 0; i < _amv.size(); i++) if(_amv[i] == name) _focus = i;
         _model->playAnimation(_map[name].get());
         return true;
     }
 
-    const std::string& getCurrentAnimationName() const
+    const std::string& getCurrentAnimationName() const 
     {
         return _amv[_focus];
     }
 
-    const AnimationMapVector& getAnimationMap() const
+    const AnimationMapVector& getAnimationMap() const 
     {
         return _amv;
     }

examples/osganimationviewer/AnimtkViewer.cpp

@@ -127,8 +127,7 @@ int main(int argc, char** argv)
     osgViewer::Viewer viewer(arguments);
     osg::ref_ptr<osg::Group> group = new osg::Group();
 
-    osg::ref_ptr<osg::Node> loadedmodel = osgDB::readRefNodeFiles(arguments);
+    osg::Group* node = dynamic_cast<osg::Group*>(osgDB::readNodeFiles(arguments)); //dynamic_cast<osgAnimation::AnimationManager*>(osgDB::readNodeFile(psr[1]));
-    osg::Group* node = dynamic_cast<osg::Group*>(loadedmodel.get());
     if(!node)
     {
         std::cout << arguments.getApplicationName() <<": No data loaded" << std::endl;

examples/osganimationviewer/AnimtkViewerGUI

@@ -1,4 +1,4 @@
-/* -*-c++-*-
+/* -*-c++-*- 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
@@ -31,7 +31,7 @@ class AnimtkViewerGUI: public osgWidget::WindowManager {
 
 protected:
     osgWidget::Widget* _createButton(const std::string&);
-
+    
     bool _buttonPush(osgWidget::Event&);
     bool _listMouseHover(osgWidget::Event&);
 

examples/osganimationviewer/AnimtkViewerGUI.cpp

@@ -1,14 +1,14 @@
-/*  -*-c++-*-
+/*  -*-c++-*- 
  *  Copyright (C) 2008 Cedric Pinson <mornifle@plopbyte.net>
  *
- * This library is open source and may be redistributed and/or modified under
+ * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
  * (at your option) any later version.  The full license is in LICENSE file
  * included with this distribution, and on the openscenegraph.org website.
- *
+ * 
  * This library 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 
  * OpenSceneGraph Public License for more details.
  *
  * Authors:
@@ -26,7 +26,7 @@
 const std::string IMAGE_PATH = "osgWidget/";
 
 template <class T>
-struct Sampler: public osg::DrawableUpdateCallback
+struct Sampler: public osg::Drawable::UpdateCallback 
 {
     T _motion;
     Sampler() {
@@ -35,28 +35,28 @@ struct Sampler: public osg::DrawableUpdateCallback
 
 typedef Sampler<osgAnimation::OutQuadMotion> WidgetSampler;
 
-struct ButtonFunctor: public WidgetSampler
+struct ButtonFunctor: public WidgetSampler 
 {
     float _direction;
     float _previous;
 
     const float _speed;
-
+    
     ButtonFunctor(): _speed(5) { _direction = -_speed; _previous = 0;}
 
     bool enter(osgWidget::Event&)
     {
-        _direction = _speed;
+        _direction = _speed; 
         return true;
     }
 
     bool leave(osgWidget::Event&)
     {
-        _direction = -_speed;
+        _direction = -_speed; 
         return true;
     }
 
-    void update(osg::NodeVisitor* nv , osg::Drawable* geom)
+    void update(osg::NodeVisitor* nv , osg::Drawable* geom) 
     {
         const osg::FrameStamp* f = nv->getFrameStamp();
         float dt = f->getSimulationTime() - _previous;
@@ -67,7 +67,7 @@ struct ButtonFunctor: public WidgetSampler
     void update(float t, osgWidget::Widget* w)
     {
         if (!w) return;
-        _motion.update(t*_direction);
+        _motion.update(t*_direction); 
         float val = _motion.getValue()*0.5;
         val += 0.5;
         if (val >= 1.0)
@@ -76,7 +76,7 @@ struct ButtonFunctor: public WidgetSampler
     }
 };
 
-struct LabelFunctor: public WidgetSampler
+struct LabelFunctor: public WidgetSampler 
 {
     float _previous;
     bool  _active;
@@ -86,7 +86,7 @@ struct LabelFunctor: public WidgetSampler
     osgAnimation::OutCubicMotion _scaleSampler;
 
     LabelFunctor():
-        _fadeOutTime(1.5f)
+        _fadeOutTime(1.5f) 
 {
         _previous = 0.0f;
         _active   = false;
@@ -94,7 +94,7 @@ struct LabelFunctor: public WidgetSampler
         _scaleSampler = osgAnimation::OutCubicMotion(0.5, 1.0, 1.0);
     }
 
-    void setActive(bool active)
+    void setActive(bool active) 
 {
         _active = active;
 
@@ -103,7 +103,7 @@ struct LabelFunctor: public WidgetSampler
         _scaleSampler.reset();
     }
 
-    void update(osg::NodeVisitor* nv , osg::Drawable* geom)
+    void update(osg::NodeVisitor* nv , osg::Drawable* geom) 
 {
         const osg::FrameStamp* f = nv->getFrameStamp();
 
@@ -118,7 +118,7 @@ struct LabelFunctor: public WidgetSampler
         updateScale(dt, dynamic_cast<osgWidget::Label*>(geom));
     }
 
-    void update(float t, osgWidget::Label* w)
+    void update(float t, osgWidget::Label* w) 
 {
         if(!w) return;
 
@@ -134,7 +134,7 @@ struct LabelFunctor: public WidgetSampler
         w->setFontColor(osg::Vec4(0.0f, 0.0f, 0.0f, (1.0f - val) * 0.7f));
     }
 
-    void updateScale(float t, osgWidget::Label* w)
+    void updateScale(float t, osgWidget::Label* w) 
 {
         _scaleSampler.update(t);
         float val = _scaleSampler.getValue();
@@ -146,14 +146,14 @@ struct LabelFunctor: public WidgetSampler
 };
 
 
-struct ListFunctor: public osg::NodeCallback
+struct ListFunctor: public osg::NodeCallback 
 {
     float _previous;
     int   _direction;
 
     osgAnimation::InQuadMotion _transformSampler;
 
-    ListFunctor()
+    ListFunctor() 
 {
         _direction = 1;
         _previous  = 0;
@@ -161,14 +161,14 @@ struct ListFunctor: public osg::NodeCallback
         _transformSampler.update(1.0f);
     }
 
-    void toggleShown()
+    void toggleShown() 
 {
         if(_direction == 1) _direction = -1;
 
         else _direction = 1;
     }
 
-    virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
+    virtual void operator()(osg::Node* node, osg::NodeVisitor* nv) 
 {
         const osg::FrameStamp* f = nv->getFrameStamp();
 
@@ -195,13 +195,13 @@ struct ListFunctor: public osg::NodeCallback
 };
 
 // This is a temporary hack to "prevent" dragging on Widgets and Windows.
-bool eatDrag(osgWidget::Event&)
+bool eatDrag(osgWidget::Event&) 
 {
     return true;
 }
 
 AnimtkViewerGUI::AnimtkViewerGUI(osgViewer::View* view, float w, float h, unsigned int mask):
-    osgWidget::WindowManager(view, w, h, mask, 0)
+    osgWidget::WindowManager(view, w, h, mask, 0) 
 {
     _createButtonBox();
     _createLabelBox();
@@ -226,10 +226,10 @@ AnimtkViewerGUI::AnimtkViewerGUI(osgViewer::View* view, float w, float h, unsign
     _buttonBox->resizeAdd(0.0f, 10.0f);
 }
 
-osgWidget::Widget* AnimtkViewerGUI::_createButton(const std::string& name)
+osgWidget::Widget* AnimtkViewerGUI::_createButton(const std::string& name) 
 {
     osgWidget::Widget* b = new osgWidget::Widget(name, 64.0f, 64.0f);
-
+    
     if(!b) return 0;
 
     b->setImage(IMAGE_PATH + name + ".png", true);
@@ -237,7 +237,7 @@ osgWidget::Widget* AnimtkViewerGUI::_createButton(const std::string& name)
 
     ButtonFunctor* bt = new ButtonFunctor();
     b->setUpdateCallback(bt);
-
+    
     b->addCallback(new osgWidget::Callback(&ButtonFunctor::enter, bt, osgWidget::EVENT_MOUSE_ENTER));
     b->addCallback(new osgWidget::Callback(&ButtonFunctor::leave, bt, osgWidget::EVENT_MOUSE_LEAVE));
     b->addCallback(new osgWidget::Callback(&AnimtkViewerGUI::_buttonPush, this, osgWidget::EVENT_MOUSE_PUSH));
@@ -246,7 +246,7 @@ osgWidget::Widget* AnimtkViewerGUI::_createButton(const std::string& name)
     return b;
 }
 
-bool AnimtkViewerGUI::_listMouseHover(osgWidget::Event& ev)
+bool AnimtkViewerGUI::_listMouseHover(osgWidget::Event& ev) 
 {
     osgWidget::Label* l = dynamic_cast<osgWidget::Label*>(ev.getWidget());
 
@@ -259,13 +259,13 @@ bool AnimtkViewerGUI::_listMouseHover(osgWidget::Event& ev)
     else if(ev.type == osgWidget::EVENT_MOUSE_PUSH) {
         AnimtkViewerModelController::instance().playByName(ev.getWidget()->getName());
     }
-
+    
     else return false;
 
     return true;
 }
 
-bool AnimtkViewerGUI::_buttonPush(osgWidget::Event& ev)
+bool AnimtkViewerGUI::_buttonPush(osgWidget::Event& ev) 
 {
     if(!ev.getWidget()) return false;
 
@@ -285,7 +285,7 @@ bool AnimtkViewerGUI::_buttonPush(osgWidget::Event& ev)
 
     else if(name == "stop") mc.stop();
 
-    else if(name == "next")
+    else if(name == "next") 
 {
         mc.next();
 
@@ -293,21 +293,21 @@ bool AnimtkViewerGUI::_buttonPush(osgWidget::Event& ev)
         l->setLabel(mc.getCurrentAnimationName());
         lf->setActive(true);
     }
-
+    
-    else if(name == "back")
+    else if(name == "back") 
 {
         mc.previous();
-
+        
         l->setFontColor(osg::Vec4(0.0f, 0.0f, 0.0f, 0.7f));
         l->setLabel(mc.getCurrentAnimationName());
         lf->setActive(true);
     }
 
-    else if(name == "pause")
+    else if(name == "pause") 
 {
     }
 
-    else if(name == "open")
+    else if(name == "open") 
 {
         ListFunctor* lsf = dynamic_cast<ListFunctor*>(_listBox->getUpdateCallback());
 
@@ -321,7 +321,7 @@ bool AnimtkViewerGUI::_buttonPush(osgWidget::Event& ev)
     return true;
 }
 
-void AnimtkViewerGUI::_createButtonBox()
+void AnimtkViewerGUI::_createButtonBox() 
 {
     _buttonBox = new osgWidget::Box("buttonBox", osgWidget::Box::HORIZONTAL);
 
@@ -345,12 +345,12 @@ void AnimtkViewerGUI::_createButtonBox()
     _buttonBox->addWidget(open);
     _buttonBox->addWidget(osg::clone(space, "space1", osg::CopyOp::DEEP_COPY_ALL));
     _buttonBox->getBackground()->setColor(0.0f, 0.0f, 0.0f, 0.7f);
-
+    
     _buttonBox->setEventMask(osgWidget::EVENT_MASK_MOUSE_DRAG);
     _buttonBox->addCallback(new osgWidget::Callback(&eatDrag, osgWidget::EVENT_MOUSE_DRAG));
 }
 
-void AnimtkViewerGUI::_createListBox()
+void AnimtkViewerGUI::_createListBox() 
 {
     _listBox = new osgWidget::Box("listBox", osgWidget::Box::VERTICAL);
 
@@ -362,7 +362,7 @@ void AnimtkViewerGUI::_createListBox()
         AnimtkViewerModelController::AnimationMapVector::const_iterator i = amv.begin();
         i != amv.end();
         i++
-        )
+        ) 
 {
         osgWidget::Label* label = new osgWidget::Label(*i);
 
@@ -387,12 +387,12 @@ void AnimtkViewerGUI::_createListBox()
     _listBox->getBackground()->setColor(0.0f, 0.0f, 0.0f, 0.7f);
 }
 
-void AnimtkViewerGUI::_createLabelBox()
+void AnimtkViewerGUI::_createLabelBox() 
 {
     _labelBox = new osgWidget::Box("labelBox", osgWidget::Box::VERTICAL);
 
     osgWidget::Label* label = new osgWidget::Label("label");
-
+    
     label->setFont("fonts/Vera.ttf");
     label->setFontSize(50);
     label->setFontColor(0.0f, 0.0f, 0.0f, 0.7f);

examples/osganimationviewer/AnimtkViewerKeyHandler.cpp

@@ -1,4 +1,4 @@
-/*  -*-c++-*-
+/*  -*-c++-*- 
  *  Copyright (C) 2008 Cedric Pinson <mornifle@plopbyte.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * Authors:
- *
+ * 
  * Cedric Pinson <mornifle@plopbyte.net>
  *
  */
@@ -32,7 +32,7 @@ AnimtkKeyEventHandler::AnimtkKeyEventHandler()
     _actionKeys[Prev] = '[';
 }
 
-void AnimtkKeyEventHandler::printUsage() const
+void AnimtkKeyEventHandler::printUsage() const 
 {
     std::cout << (char) _actionKeys.find(Help)->second << " for Help" << std::endl;
     std::cout << (char) _actionKeys.find(List)->second << " for List" << std::endl;
@@ -46,13 +46,13 @@ bool AnimtkKeyEventHandler::handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIA
                                    osg::Object*, osg::NodeVisitor*)
 {
     AnimtkViewerModelController& mc = AnimtkViewerModelController::instance();
-    if(ea.getEventType() == osgGA::GUIEventAdapter::KEYDOWN)
+    if(ea.getEventType() == osgGA::GUIEventAdapter::KEYDOWN) 
     {
         if (ea.getKey() == _actionKeys[List]) return mc.list();
         else if (ea.getKey() == _actionKeys[Play]) return mc.play();
         else if (ea.getKey() == _actionKeys[Next]) return mc.next();
         else if (ea.getKey() == _actionKeys[Prev]) return mc.previous();
-        else if (ea.getKey() == _actionKeys[Help])
+        else if (ea.getKey() == _actionKeys[Help]) 
         {
             printUsage();
             return true;

examples/osgatomiccounter/osgatomiccounter.cpp

@@ -108,10 +108,10 @@ class ResetAtomicCounter : public osg::StateAttributeCallback
             osg::AtomicCounterBufferBinding * acbb = dynamic_cast<osg::AtomicCounterBufferBinding *>(sa);
             if (acbb)
             {
-                osg::BufferData * acbd = acbb->getBufferData();
+                osg::AtomicCounterBufferObject * acbo = dynamic_cast<osg::AtomicCounterBufferObject*>(acbb->getBufferObject());
-                if (acbd)
+                if (acbo && acbo->getBufferData(0))
                 {
-                    acbd->dirty();
+                    acbo->getBufferData(0)->dirty();
                 }
             }
         }
@@ -165,7 +165,7 @@ int main(int argc, char** argv)
     viewer.addEventHandler(new osgViewer::ScreenCaptureHandler);
 
     // load the data
-    osg::ref_ptr<osg::Node> loadedModel = osgDB::readRefNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFiles(arguments);
     if (!loadedModel)
     {
         osg::Geometry * quad = osg::createTexturedQuadGeometry(osg::Vec3f(-2.0f, 0.0f, -2.0f),
@@ -207,10 +207,10 @@ int main(int argc, char** argv)
     acboBlue->setUsage(GL_STREAM_COPY);
     atomicCounterArrayBlue->setBufferObject(acboBlue.get());
 
-    osg::ref_ptr<osg::AtomicCounterBufferBinding> acbbRedAndGreen = new osg::AtomicCounterBufferBinding(0, atomicCounterArrayRedAndGreen.get(), 0, sizeof(GLuint)*3);
+    osg::ref_ptr<osg::AtomicCounterBufferBinding> acbbRedAndGreen = new osg::AtomicCounterBufferBinding(0, acboRedAndGreen.get(), 0, sizeof(GLuint)*3);
     ss->setAttributeAndModes(acbbRedAndGreen.get());
 
-    osg::ref_ptr<osg::AtomicCounterBufferBinding> acbbBlue = new osg::AtomicCounterBufferBinding(2, atomicCounterArrayBlue.get(), 0, sizeof(GLuint));
+    osg::ref_ptr<osg::AtomicCounterBufferBinding> acbbBlue = new osg::AtomicCounterBufferBinding(2, acboBlue.get(), 0, sizeof(GLuint));
     ss->setAttributeAndModes(acbbBlue.get());
 
     acbbRedAndGreen->setUpdateCallback(new ResetAtomicCounter);

examples/osgautocapture/osgautocapture.cpp

@@ -28,7 +28,7 @@
 #include <osgViewer/Viewer>
 #include <osgViewer/ViewerEventHandlers>
 #include <osgViewer/Renderer>
-
+    
 #include <iostream>
 #include <sstream>
 
@@ -41,7 +41,7 @@ public:
         osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN),
         _foundNode(0)
     {}
-
+    
     void apply(osg::Node& node)
     {
         T* result = dynamic_cast<T*>(&node);
@@ -50,7 +50,7 @@ public:
          else
              traverse(node);
      }
-
+    
     T* _foundNode;
 };
 
@@ -62,21 +62,21 @@ T* findTopMostNodeOfType(osg::Node* node)
 
     FindTopMostNodeOfTypeVisitor<T> fnotv;
     node->accept(fnotv);
-
+    
     return fnotv._foundNode;
 }
 
 /** Capture the frame buffer and write image to disk*/
 class WindowCaptureCallback : public osg::Camera::DrawCallback
 {
-public:
+public:    
     WindowCaptureCallback(GLenum readBuffer, const std::string& name):
         _readBuffer(readBuffer),
         _fileName(name)
         {
             _image = new osg::Image;
         }
-
+    
     virtual void operator () (osg::RenderInfo& renderInfo) const
         {
             #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE)
@@ -93,9 +93,9 @@ public:
 
                 if (gc->getTraits()->alpha)
                     pixelFormat = GL_RGBA;
-                else
+                else 
                     pixelFormat = GL_RGB;
-
+                
 #if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE)
                  if (pixelFormat == GL_RGB)
                  {
@@ -118,7 +118,7 @@ public:
 
                 _image->readPixels(0, 0, width, height, pixelFormat, GL_UNSIGNED_BYTE);
             }
-
+                
             if (!_fileName.empty())
             {
                 std::cout << "Writing to: " << _fileName << std::endl;
@@ -126,7 +126,7 @@ public:
             }
         }
 
-protected:
+protected:    
     GLenum                      _readBuffer;
     std::string                 _fileName;
     osg::ref_ptr<osg::Image>    _image;
@@ -138,7 +138,7 @@ protected:
 class CustomRenderer : public osgViewer::Renderer
 {
 public:
-    CustomRenderer(osg::Camera* camera)
+    CustomRenderer(osg::Camera* camera) 
         : osgViewer::Renderer(camera),
           _cullOnly(true)
         {
@@ -162,19 +162,19 @@ public:
         {
             osgUtil::SceneView* sceneView = _sceneView[0].get();
             if (!sceneView || _done ) return;
-
+            
             updateSceneView(sceneView);
-
+            
             osgViewer::View* view = dynamic_cast<osgViewer::View*>(_camera->getView());
             if (view) sceneView->setFusionDistance(view->getFusionDistanceMode(), view->getFusionDistanceValue());
 
             sceneView->inheritCullSettings(*(sceneView->getCamera()));
             sceneView->cull();
         }
-
+    
     bool _cullOnly;
 };
-
+    
 
 //===============================================================
 // MAIN
@@ -287,8 +287,8 @@ int main( int argc, char **argv )
     }
 
     // load the data
-    osg::ref_ptr<osg::Node> loadedModel = osgDB::readRefNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFiles(arguments);
-    if (!loadedModel)
+    if (!loadedModel) 
     {
         std::cout << arguments.getApplicationName() <<": No data loaded" << std::endl;
         return 1;
@@ -309,7 +309,7 @@ int main( int argc, char **argv )
     {
         osg::CoordinateSystemNode* csn = findTopMostNodeOfType<osg::CoordinateSystemNode>(loadedModel.get());
         if(!csn) return 1;
-
+        
         // Compute eye point in world coordiantes
         osg::Vec3d eye;
         csn->getEllipsoidModel()->convertLatLongHeightToXYZ(lat, lon, alt, eye.x(), eye.y(), eye.z());
@@ -331,11 +331,11 @@ int main( int argc, char **argv )
         osg::Vec3d up_cross_tangent = up ^ tangent;
         osg::Matrixd incline_matrix = osg::Matrixd::rotate(incline, up_cross_tangent);
         osg::Vec3d target = incline_matrix.preMult(tangent);
-
+        
         // Roll by rotating the up vector around the target vector ...
         osg::Matrixd roll_matrix = incline_matrix * osg::Matrixd::rotate(roll, target);
         up = roll_matrix.preMult(up);
-
+        
         viewer.getCamera()->setViewMatrixAsLookAt(eye, eye+target, up);
     }
     else
@@ -349,10 +349,10 @@ int main( int argc, char **argv )
         keyswitchManipulator->addMatrixManipulator( '3', "Drive", new osgGA::DriveManipulator() );
         keyswitchManipulator->addMatrixManipulator( '4', "Terrain", new osgGA::TerrainManipulator() );
 
-        viewer.setCameraManipulator( keyswitchManipulator.get() );
+        viewer.setCameraManipulator( keyswitchManipulator.get() ); 
     }
 
-
+            
     // Optimize DatabasePager for auto-capture
     osgDB::DatabasePager* pager = viewer.getDatabasePager();
     pager->setDoPreCompile(false);
@@ -374,9 +374,9 @@ int main( int argc, char **argv )
 
     // Initiate the first PagedLOD request
     viewer.frame();
-
+        
     osg::Timer_t beforeLoadTick = osg::Timer::instance()->tick();
-
+    
     // Keep updating and culling until full level of detail is reached
     while(!viewer.done() && pager->getRequestsInProgress())
     {
@@ -385,14 +385,14 @@ int main( int argc, char **argv )
         viewer.renderingTraversals();
     }
 //    std::cout<<std::endl;
-
+        
     osg::Timer_t afterLoadTick = osg::Timer::instance()->tick();
     std::cout<<"Load and Compile time = "<<osg::Timer::instance()->delta_s(beforeLoadTick, afterLoadTick)<<" seconds"<<std::endl;
 
     // Do cull and draw to render the scene correctly
     customRenderer->setCullOnly(false);
-
+    
-
+  
     //--- Capture the image!!! ---
     if (!activeMode)
     {

examples/osgautotransform/osgautotransform.cpp

@@ -18,9 +18,7 @@
 
 #include <osgUtil/Optimizer>
 #include <osgDB/ReadFile>
-#include <osgGA/TrackballManipulator>
+#include <osgViewer/Viewer>
-#include <osgViewer/ViewerEventHandlers>
-#include <osgViewer/CompositeViewer>
 
 #include <osg/Material>
 #include <osg/Geode>
@@ -195,125 +193,13 @@ osg::Node* createScene()
     return root;
 }
 
-osgViewer::View* createView(osg::ref_ptr<osg::Node> scenegraph, osg::ref_ptr<osg::GraphicsContext> gc, unsigned int x, unsigned int y, unsigned int width, unsigned int height)
+int main(int, char**)
 {
-    OSG_NOTICE<<"createView(....,x="<<x<<", y="<<y<<", width="<<width<<", height="<<height<<")"<<std::endl;
-
-    if (!gc)
-    {
-        osg::ref_ptr<osg::GraphicsContext::Traits> traits = new osg::GraphicsContext::Traits;
-        traits->x = x;
-        traits->y = y;
-        traits->width = width;
-        traits->height = height;
-        traits->windowDecoration = true;
-        traits->doubleBuffer = true;
-        traits->sharedContext = 0;
-
-        gc = osg::GraphicsContext::createGraphicsContext(traits.get());
-        if (!gc)
-        {
-            osg::notify(osg::NOTICE)<<"  GraphicsWindow has not been created successfully."<<std::endl;
-            return 0;
-        }
-
-        x = 0;
-        y = 0;
-    }
-
-
-    osgViewer::View* view = new osgViewer::View;
-    view->getCamera()->setGraphicsContext(gc.get());
-    view->getCamera()->setViewport(new osg::Viewport(x, y, width, height));
-    //view->getCamera()->setProjectionMatrixAsPerspective(30.0, double(width) / double(height), 1.0, 1000.0);
-    view->setCameraManipulator(new osgGA::TrackballManipulator);
-    view->setSceneData(scenegraph);
-    return view;
-}
-
-int main(int argc, char** argv)
-{
-    osg::ArgumentParser arguments(&argc, argv);
-
     // construct the viewer.
-    osgViewer::CompositeViewer viewer(arguments);
+    osgViewer::Viewer viewer;
 
-
+    // set the scene to render
-    // create the scene graph that contains osg::AutoTransform nodes, see about for implementation details
+    viewer.setSceneData(createScene());
-    osg::ref_ptr<osg::Node> scenegraph = createScene();
-
-    unsigned int numViews = 1;
-    while (arguments.read("-n",numViews)) {}
-
-    bool windows = false;
-    while (arguments.read("-w")) { windows = true; }
-
-    if (numViews<=1)
-    {
-        osgViewer::View* view = new osgViewer::View;
-        view->setUpViewAcrossAllScreens();
-        view->setSceneData(scenegraph.get());
-        view->setCameraManipulator(new osgGA::TrackballManipulator);
-        view->addEventHandler( new osgViewer::StatsHandler );
-        viewer.addView(view);
-    }
-    else
-    {
-        osg::GraphicsContext::WindowingSystemInterface* wsi = osg::GraphicsContext::getWindowingSystemInterface();
-        if (!wsi)
-        {
-            osg::notify(osg::NOTICE)<<"Error, no WindowSystemInterface available, cannot create windows."<<std::endl;
-            return 1;
-        }
-
-        unsigned int width, height;
-        wsi->getScreenResolution(osg::GraphicsContext::ScreenIdentifier(0), width, height);
-
-        unsigned int x=0, y=0;
-        while(arguments.read("--window", x, y, width, height)) {}
-
-        osg::ref_ptr<osg::GraphicsContext> gc;
-        if (!windows)
-        {
-            osg::ref_ptr<osg::GraphicsContext::Traits> traits = new osg::GraphicsContext::Traits;
-            traits->x = x;
-            traits->y = y;
-            traits->width = width;
-            traits->height = height;
-            traits->windowDecoration = true;
-            traits->doubleBuffer = true;
-            traits->sharedContext = 0;
-
-            gc = osg::GraphicsContext::createGraphicsContext(traits.get());
-            if (!gc)
-            {
-                osg::notify(osg::NOTICE)<<"  GraphicsWindow has not been created successfully."<<std::endl;
-                return 1;
-            }
-        }
-
-        if (numViews==2)
-        {
-            viewer.addView(createView(scenegraph, gc, 0, 0, width/2, height));
-            viewer.addView(createView(scenegraph, gc, width/2, 0, width/2, height));
-        }
-        else if (numViews==3)
-        {
-            viewer.addView(createView(scenegraph, gc, 0, 0, width/2, height/2));
-            viewer.addView(createView(scenegraph, gc, width/2, 0, width/2, height/2));
-            viewer.addView(createView(scenegraph, gc, 0, height/2, width, height/2));
-        }
-        else
-        {
-            viewer.addView(createView(scenegraph, gc, 0, 0, width/2, height/2));
-            viewer.addView(createView(scenegraph, gc, width/2, 0, width/2, height/2));
-            viewer.addView(createView(scenegraph, gc, 0, height/2, width/2, height/2));
-            viewer.addView(createView(scenegraph, gc, width/2, height/2, width/2, height/2));
-        }
-
-        viewer.getView(0)->addEventHandler( new osgViewer::StatsHandler );
-
-    }
 
     // run the viewers frame loop
     return viewer.run();

examples/osgbillboard/osgbillboard.cpp

@@ -42,10 +42,10 @@
 typedef std::vector< osg::ref_ptr<osg::Image> > ImageList;
 
 /** create quad at specified position. */
-osg::Drawable* createSquare(const osg::Vec3& corner,const osg::Vec3& width,const osg::Vec3& height, osg::ref_ptr<osg::Image> image)
+osg::Drawable* createSquare(const osg::Vec3& corner,const osg::Vec3& width,const osg::Vec3& height, osg::Image* image=NULL)
 {
     // set up the Geometry.
-    osg::ref_ptr<osg::Geometry> geom = new osg::Geometry;
+    osg::Geometry* geom = new osg::Geometry;
 
     osg::Vec3Array* coords = new osg::Vec3Array(4);
     (*coords)[0] = corner;
@@ -80,13 +80,13 @@ osg::Drawable* createSquare(const osg::Vec3& corner,const osg::Vec3& width,const
         geom->setStateSet(stateset);
     }
 
-    return geom.release();
+    return geom;
 }
 
 osg::Drawable* createAxis(const osg::Vec3& corner,const osg::Vec3& xdir,const osg::Vec3& ydir,const osg::Vec3& zdir)
 {
     // set up the Geometry.
-    osg::ref_ptr<osg::Geometry> geom = new osg::Geometry;
+    osg::Geometry* geom = new osg::Geometry;
 
     osg::Vec3Array* coords = new osg::Vec3Array(6);
     (*coords)[0] = corner;
@@ -121,20 +121,20 @@ osg::Drawable* createAxis(const osg::Vec3& corner,const osg::Vec3& xdir,const os
     stateset->setMode(GL_LIGHTING,osg::StateAttribute::OFF);
     geom->setStateSet(stateset);
 
-    return geom.release();
+    return geom;
 }
 
-osg::ref_ptr<osg::Node> createModel()
+osg::Node* createModel()
 {
 
     // create the root node which will hold the model.
-    osg::ref_ptr<osg::Group> root = new osg::Group();
+    osg::Group* root = new osg::Group();
 
     // add the drawable into a single geode to be shared...
     osg::Billboard* center = new osg::Billboard();
     center->setMode(osg::Billboard::POINT_ROT_EYE);
     center->addDrawable(
-        createSquare(osg::Vec3(-0.5f,0.0f,-0.5f),osg::Vec3(1.0f,0.0f,0.0f),osg::Vec3(0.0f,0.0f,1.0f),osgDB::readRefImageFile("Images/reflect.rgb")),
+        createSquare(osg::Vec3(-0.5f,0.0f,-0.5f),osg::Vec3(1.0f,0.0f,0.0f),osg::Vec3(0.0f,0.0f,1.0f),osgDB::readImageFile("Images/reflect.rgb")),
         osg::Vec3(0.0f,0.0f,0.0f));
 
     osg::Billboard* x_arrow = new osg::Billboard();
@@ -142,7 +142,7 @@ osg::ref_ptr<osg::Node> createModel()
     x_arrow->setAxis(osg::Vec3(1.0f,0.0f,0.0f));
     x_arrow->setNormal(osg::Vec3(0.0f,-1.0f,0.0f));
     x_arrow->addDrawable(
-       createSquare(osg::Vec3(-0.5f,0.0f,-0.5f),osg::Vec3(1.0f,0.0f,0.0f),osg::Vec3(0.0f,0.0f,1.0f),osgDB::readRefImageFile("Cubemap_axis/posx.png")),
+       createSquare(osg::Vec3(-0.5f,0.0f,-0.5f),osg::Vec3(1.0f,0.0f,0.0f),osg::Vec3(0.0f,0.0f,1.0f),osgDB::readImageFile("Cubemap_axis/posx.png")),
        osg::Vec3(5.0f,0.0f,0.0f));
 
     osg::Billboard* y_arrow = new osg::Billboard();
@@ -150,7 +150,7 @@ osg::ref_ptr<osg::Node> createModel()
     y_arrow->setAxis(osg::Vec3(0.0f,1.0f,0.0f));
     y_arrow->setNormal(osg::Vec3(1.0f,0.0f,0.0f));
     y_arrow->addDrawable(
-        createSquare(osg::Vec3(0.0f,-0.5f,-0.5f),osg::Vec3(0.0f,1.0f,0.0f),osg::Vec3(0.0f,0.0f,1.0f),osgDB::readRefImageFile("Cubemap_axis/posy.png")),
+        createSquare(osg::Vec3(0.0f,-0.5f,-0.5f),osg::Vec3(0.0f,1.0f,0.0f),osg::Vec3(0.0f,0.0f,1.0f),osgDB::readImageFile("Cubemap_axis/posy.png")),
         osg::Vec3(0.0f,5.0f,0.0f));
 
     osg::Billboard* z_arrow = new osg::Billboard();
@@ -158,7 +158,7 @@ osg::ref_ptr<osg::Node> createModel()
     z_arrow->setAxis(osg::Vec3(0.0f,0.0f,1.0f));
     z_arrow->setNormal(osg::Vec3(0.0f,-1.0f,0.0f));
     z_arrow->addDrawable(
-        createSquare(osg::Vec3(-0.5f,0.0f,-0.5f),osg::Vec3(1.0f,0.0f,0.0f),osg::Vec3(0.0f,0.0f,1.0f),osgDB::readRefImageFile("Cubemap_axis/posz.png")),
+        createSquare(osg::Vec3(-0.5f,0.0f,-0.5f),osg::Vec3(1.0f,0.0f,0.0f),osg::Vec3(0.0f,0.0f,1.0f),osgDB::readImageFile("Cubemap_axis/posz.png")),
         osg::Vec3(0.0f,0.0f,5.0f));
 
 

examples/osgbindlesstext/CMakeLists.txt

@@ -1,2 +0,0 @@
-SET(TARGET_SRC osgbindlesstext.cpp )
-SETUP_EXAMPLE(osgbindlesstext)

examples/osgbindlesstext/osgbindlesstext.cpp

@@ -1,599 +0,0 @@
-/* OpenSceneGraph example, osgbindlesstex.
-*
-*  Permission is hereby granted, free of charge, to any person obtaining a copy
-*  of this software and associated documentation files (the "Software"), to deal
-*  in the Software without restriction, including without limitation the rights
-*  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-*  copies of the Software, and to permit persons to whom the Software is
-*  furnished to do so, subject to the following conditions:
-*
-*  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-*  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-*  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-*  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-*  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-*  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-*  THE SOFTWARE.
-*/
-
-///\author David A Heitbrink
-/// This is an example implementation of the use of bindless textures.
-/// "bindless" textures are relatively simple concept, basically
-/// you get a texture handle, then ask the driver to keep said
-/// handle resident.
-///
-/// Once the texture has been made resident, we need to upload
-/// the handle (a 64 bit unsigned int) to the shader. This can
-/// be done in a number of ways, through attributes, uniform
-/// buffer objects, shader buffer objects or just plain uniforms.
-/// 
-/// The basic point of the bindless texture is to remove the need
-/// to bind a new texture every time we want to render something
-/// with a different texture. Generally speaking in broad terms
-/// driver overhead tends to be a huge bottle neck on modern
-/// hardware (as of late 2016). By using bindless textures
-/// we can remove a lot of calls to the driver to switch active 
-/// textures while rendering. What this also allows us to do
-/// is to consolidate more objects + draw states as we do
-/// not need to change textures, this save us a lot of calls to 
-/// the driver.
-///
-/// This example combines instancing with bindless textures 
-/// to draw 1000 cubes, each with a unique texture. This is
-/// a pretty simplified example, where each instance ID is 
-/// used as a index into the array of textures. 
-///
-/// One of the powerful things about bindless textures is it allows
-/// many more objects to be combined into a single drawable. 
-/// However to do this you may need to add an attribute to 
-/// use an index into the array of texture handles, and not
-/// just use the instance ID like in this example.
-
-#include <osg/Depth>
-#include <osg/Geode>
-#include <osg/Geometry>
-#include <osg/Material>
-#include <osg/Math>
-#include <osg/MatrixTransform>
-#include <osg/PolygonOffset>
-#include <osg/Projection>
-#include <osg/ShapeDrawable>
-#include <osg/StateSet>
-#include <osg/Switch>
-#include <osg/Texture2D>
-#include <osg/TextureBuffer>
-#include <osg/Image>
-#include <osg/TexEnv>
-#include <osg/VertexProgram>
-#include <osg/FragmentProgram>
-#include <osg/GLExtensions>
-#include <osg/ContextData>
-
-#include <osg/TextureBuffer>
-#include <osg/BufferIndexBinding>
-
-#include <osgDB/ReadFile>
-#include <osgDB/FileUtils>
-
-
-#include <osgText/Text>
-
-#include <osgViewer/Viewer>
-#include <osgViewer/ViewerEventHandlers>
-
-#include <osgGA/StateSetManipulator>
-
-#include <iostream>
-#include <sstream>
-//Hard coded constant for number unique textures 
-const int TextureCount = 1000;
-// To use bindless textures, we need to tell the GPU to 
-// enable the use of 64 bit integers and bindless textures
-//
-//
-// At this time (late 2016) NVidia drivers seem to dislike 
-// the ARB, GL_ARB_bindless_texture, if you do not have a 
-// NVidia driver, you will most likely have to change:  
-// GL_NV_gpu_shader5
-// to: 
-// GL_ARB_gpu_shader5
-
-//the XXX is so we can replace it with a string from TextureCount
-std::string vertShader= 
-"#version 450 compatibility                                 \n"
-"#extension GL_ARB_bindless_texture : require               \n"
-"#extension GL_NV_gpu_shader5 : require // uint64_t         \n"
-"//#extension GL_ARB_gpu_shader5 : require // uint64_t      \n"
-"//#extension GL_ARB_gpu_shader_int64: require // uint64_t  \n"
-"in float osg_FrameTime;                                    \n"
-"out vec2 TexCoord;                                         \n"
-"flat out int textureIndex;                                 \n"
-"void main() {                                              \n"
-"    mat4 scale =mat4(0.01, 0.00, 0.00, 0.00,               \n"
-"                     0.00, 0.01, 0.00, 0.00,               \n"
-"                     0.00, 0.00, 0.01, 0.00,               \n"
-"                     0.00, 0.00, 0.00, 1.00);              \n"
-"    vec4 pos = gl_Vertex*scale;                            \n"
-"    pos.x += ((gl_InstanceID%100)/10)*0.015-0.075;         \n"
-"    pos.y += (gl_InstanceID/100)*0.015 - 0.075;            \n"
-"    pos.z += (gl_InstanceID%10)*0.015 - 0.075;             \n"
-"    pos.w = 1;                                             \n"
-"    gl_Position = gl_ModelViewProjectionMatrix*pos;        \n"
-"    TexCoord = gl_MultiTexCoord0.xy;                       \n"
-"    textureIndex = gl_InstanceID%XXX;                      \n"
-"}                                                          \n"
-;
-//we could setup tex to be of type sampler2D, and not have to do
-//the type conversion, but I wanted to added code to test if tex
-//had a value set. 
-//If we get a red cube, we are not getting our handle from our UBO, 
-//if we get a black cube, then we are having an issue with the 
-//texture handle itself
-std::string fragShader = 
-"#version 450 compatibility                                    \n"
-"#extension GL_ARB_bindless_texture : require                  \n"
-"#extension GL_NV_gpu_shader5 : require // uint64_t            \n"
-"//#extension GL_ARB_gpu_shader5 : require // uint64_t         \n"
-"//#extension GL_ARB_gpu_shader_int64: require // uint64_t     \n"
-"uniform sampler2D TextureId;                                  \n"
-"in vec2 TexCoord;                                             \n"
-"flat in int textureIndex;                                     \n"
-"layout (binding = 0, std140) uniform TEXTURE_BLOCK            \n"
-"{                                                             \n"
-"    uint64_t      tex[XXX];                                   \n"
-"};                                                            \n"
-"void main() {                                                 \n"
-"    int tIndex = (int)(textureIndex);                         \n"
-"    sampler2D myText = sampler2D(tex[tIndex]);                \n"
-"    gl_FragColor = texture2D(myText,TexCoord);                \n"
-"    if (tex[tIndex] == 0) gl_FragColor.r = 1.0;               \n"
-"}                                                             \n"
-;
-
-///This class provides a basic wraper for a Uniform Buffer Object
-///or UBO, and provides the storage for the texture handles
-class BindlessBuffer: public osg::Referenced{
-public:
-    typedef osg::ref_ptr<osg::UniformBufferObject>  UniBufferObjRef;
-    typedef osg::ref_ptr<osg::UniformBufferBinding> UniBufferBindingRef;
-    typedef osg::ref_ptr<osg::UInt64Array> HandleArrayRef;
-    typedef osg::ref_ptr<BindlessBuffer>  BindlessBufferRef;
-    static BindlessBufferRef Make(size_t count){
-        BindlessBufferRef val = new BindlessBuffer();
-        val->_count   = count;
-        val->_sbbo    = new osg::UniformBufferObject;
-        val->_handles = new osg::UInt64Array();
-        val->_handles->resize(count*2,0);
-        val->_handles->setBufferObject(val->_sbbo.get());
-        val->_ssbb    = new osg::UniformBufferBinding(0, val->_handles.get(), 0, sizeof(GLuint64)*count);
-        return val;
-    }
-    BindlessBuffer& operator  = (const BindlessBuffer& rhs){
-        if (this != &rhs){
-            _count=rhs._count;
-            _sbbo =rhs._sbbo ;
-            _ssbb =rhs._ssbb ;
-            _handles = rhs._handles;
-        }
-        return *this;
-    }
-    BindlessBuffer(const BindlessBuffer& rhs):osg::Referenced(rhs){
-        if (this != &rhs){
-            _count=rhs._count;
-            _sbbo =rhs._sbbo ;
-            _ssbb =rhs._ssbb ;
-            _handles = rhs._handles;
-        }
-    }
-    UniBufferObjRef& Object(){return _sbbo;}
-    UniBufferBindingRef& Binding(){return _ssbb;}
-    HandleArrayRef& Handles(){return _handles;}
-    int count(){return _count;}
-private:
-    int _count;
-    UniBufferObjRef _sbbo;
-    UniBufferBindingRef _ssbb;
-    HandleArrayRef _handles;
-     
-    BindlessBuffer():osg::Referenced(),_count(0){
-    }
-};
-
-///This class extends a Texture, when this is texture is applied 
-///the first time, it will setup all our texture handles, after that
-///it will not make any more GL calls until it gets released
-class BindlessTexture: public osg::Texture2D
-{
-public:
-    typedef osg::ref_ptr<BindlessBuffer> BufferRef;
-    typedef std::vector<osg::ref_ptr<osg::Image> > TextureList;
-    typedef std::vector<GLuint64> HandleList;
-    typedef osg::ref_ptr< osg::Texture::TextureObject> TextureObjectRef;
-    typedef std::vector<TextureObjectRef> TextureObjectList;
-    typedef osg::buffered_object<TextureObjectList>  TextureObjectBuffer;
-
-    BindlessTexture(); 
-    BindlessTexture(BufferRef, TextureList);
-    BindlessTexture(const BindlessTexture& rhs, const osg::CopyOp& copy =osg::CopyOp::SHALLOW_COPY);
-    void releaseGLObjects(osg::State* state) const;
-    void resizeGLObjectBuffers(unsigned maxSize);
-    void setBidlessIndex(unsigned int index);
-    META_StateAttribute(osg, BindlessTexture, TEXTURE);
-
-    void apply(osg::State& state) const;
-protected:
-    void applyOnce(osg::State &state) const;
-    mutable osg::buffered_object<HandleList> _handles;
-    mutable TextureList _textureList;
-    mutable osg::ref_ptr<BindlessBuffer> _buffer;
-    mutable std::vector<bool> _isBound;
-    mutable TextureObjectBuffer _textureBufferList;
-    // array index = texture image unit.
-    unsigned int _bindlessIndex;
-};
-
-
-BindlessTexture::BindlessTexture():osg::Texture2D(),_bindlessIndex(0)
-{
-    _isBound.resize(5,false);
-}
-
-BindlessTexture::BindlessTexture(const BindlessTexture& rhs, const osg::CopyOp& copy) :
-    osg::Texture2D( rhs, copy )
-{
-    _isBound.resize(5,false);
-    _buffer = rhs._buffer;
-    _bindlessIndex = rhs._bindlessIndex;
-    for(unsigned i=0; i<rhs._handles.size(); ++i)
-        _handles[i] = rhs._handles[i];
-}
-
-BindlessTexture::BindlessTexture(BufferRef ref,TextureList textureList) :
-    osg::Texture2D( textureList[0] ),
-    _textureList(textureList),
-    _buffer(ref),
-    _bindlessIndex(0)
-{
-    _isBound.resize(5,false);
-}
-
-void BindlessTexture::setBidlessIndex(unsigned int index){
-    _bindlessIndex = index;
-}
-/// Just as the name suggest this should be called once per
-/// context, during its lifetime. This basically 
-/// just sets up our texture handles, and loads them
-/// into our UBO. A good portion of this was copied from
-/// Texture2D::apply, this is in no ways a general solution.
-void BindlessTexture::applyOnce(osg::State& state) const
-{
-    if (!_buffer)
-        return;
-    
-    TextureObject* textureObject;
-    unsigned contextID = state.getContextID();
-    osg::GLExtensions* extensions = osg::GLExtensions::Get( contextID, true );
-
-    osg::ref_ptr<osg::Image> image = _image;
-    if (_handles[contextID].size() <  _textureList.size())
-        _handles[contextID].resize( _textureList.size(),0);
-    if (_textureBufferList[contextID].size() < _textureList.size())
-        _textureBufferList[contextID].resize( _textureList.size());
-    int txtcount  = _textureList.size();
-    if (_buffer->count() < txtcount)
-        txtcount = _buffer->count();
-    //for each actual texture we have, bind it, get the texture hande, assign the value to our UBO
-    for (int i = 0; i <txtcount; i++){
-        image = _textureList[i];
-        if (_image.valid()) 
-            computeInternalFormatWithImage(*image);
-        else 
-            continue;
-        // compute the dimensions of the texture.
-        computeRequiredTextureDimensions(state,*image,_textureWidth, _textureHeight, _numMipmapLevels);
-        textureObject = generateAndAssignTextureObject(contextID,GL_TEXTURE_2D,_numMipmapLevels,_internalFormat,_textureWidth,_textureHeight,1,_borderWidth);
-        textureObject->bind();
-        applyTexParameters(GL_TEXTURE_2D,state);
-
-        applyTexImage2D_load(state,GL_TEXTURE_2D,image.get(),
-            _textureWidth, _textureHeight, _numMipmapLevels);
-        textureObject->setAllocated(true);
-        _textureBufferList[contextID][i] = textureObject;
-
-        //Here is where the "magic" happens, we get the texture handle for our texture, copy it to our UBO,
-        //and then tell OpenGL to keep the handle resident
-        _handles[contextID][i] = extensions->glGetTextureHandle( textureObject->id() );
-        std::vector<GLuint64> &vec = _buffer->Handles()->asVector();
-        vec[i*2]  = _handles[contextID][i];
-        _buffer->Object()->dirty();
-        _buffer->Handles()->dirty();
-     
-        if ( _handles[contextID][i] != 0L || extensions->glIsTextureHandleResident( _handles[contextID][i]) == GL_FALSE)
-        {
-            extensions->glMakeTextureHandleResident( _handles[contextID][i] );           
-        }
-    }
-    
-    // update the modified tag to show that it is up to date.
-    getModifiedCount(contextID) = image->getModifiedCount();
-}
-
-void BindlessTexture::apply(osg::State& state) const
-{
-   unsigned contextID = state.getContextID();
-   if ( _isBound[contextID] == false )
-   {
-       applyOnce(state);
-       _isBound[contextID] = true;
-   }else{
-       //we should mostly hit this during the lifetime of this object,
-       //note we basically do nothing......
-   }
-}
-/// cleanup, we just need to tell OpenGL to release our texture handle
-void BindlessTexture::releaseGLObjects(osg::State* state) const
-{
-    if (  state )
-    {
-        unsigned contextID = state->getContextID();
-        osg::Texture2D::releaseGLObjects( state );
-        osg::GLExtensions* ext = osg::GLExtensions::Get( contextID, true );
-       
-        for(unsigned i=0; i<_handles[contextID].size(); ++i)
-        {
-           ext->glMakeTextureHandleNonResident( _handles[contextID][i] );
-           _handles[contextID][i] = 0;
-        }
-        
-    }
-}
-
-void
-BindlessTexture::resizeGLObjectBuffers(unsigned int maxSize)
-{
-    osg::Texture2D::resizeGLObjectBuffers( maxSize );
-
-    unsigned int handleSize = _handles.size();
-    unsigned int txtSize = _textureList.size();
-    if ( handleSize < maxSize ) {
-        _isBound.resize(maxSize,false);
-    }
-    if ( handleSize < maxSize ) {
-        _handles.resize( maxSize );
-        for(unsigned i=handleSize; i<_handles.size(); ++i){
-            for(unsigned j=0; j<txtSize; ++j)
-                _handles[i][j] = 0;
-        }
-    }
-}
-
-typedef osg::ref_ptr<osg::Image> ImageRef;
-///////////////////////////////////////////////////////
-///Create an array of images, with checkerboard
-///pattern with random color and size
-///
-void createImageArray(osg::StateSet* attachPnt){
-    BindlessTexture::TextureList images;
-    images.resize(TextureCount);
-    BindlessBuffer::BindlessBufferRef buffer = BindlessBuffer::Make(TextureCount);
-    srand (time(NULL));
-    for (int i =0; i < TextureCount; i++){
-        ImageRef tImage = new osg::Image();
-        int powerOf2 = rand()%6+4;
-        const unsigned int imageSize = 1<<powerOf2;
-        tImage->allocateImage(imageSize,imageSize,1,GL_RGBA,GL_UNSIGNED_BYTE);
-        unsigned char* buff = tImage->data();
-        const int stride = 4;
-        unsigned char primaryColor[4];
-        
-        int boxWidth = rand()%15+2;
-        int boxLength = rand()%15+2;
-
-        //light squares
-        primaryColor[0] = rand()%128 + 128;
-        primaryColor[1] = rand()%128 + 128;
-        primaryColor[2] = rand()%128 + 128;
-        //dark squares
-        unsigned char secondaryColor[4];
-        secondaryColor[0] = rand()%128;
-        secondaryColor[1] = rand()%128;
-        secondaryColor[2] = rand()%128;
-        for (unsigned int x = 0; x < imageSize; x++){
-            for (unsigned int y =0; y<imageSize; y++){
-                unsigned char* pixel = &buff[(x*imageSize+y)*stride];
-                int xSide = x/boxWidth;
-                int ySide = y/boxLength;
-                bool isPrimaryColor =  (xSide+ySide)%2>0;
-                if (isPrimaryColor){
-                    pixel[0] = primaryColor[0];
-                    pixel[1] = primaryColor[1];
-                    pixel[2] = primaryColor[2];
-                }else{
-                    pixel[0] = secondaryColor[0];
-                    pixel[1] = secondaryColor[1];
-                    pixel[2] = secondaryColor[2];                
-                }
-                pixel[3] = 255;
-            }
-        }
-        images[i] = tImage;
-        
-        std::stringstream sstr;
-        sstr<<"Image"<<i;
-        tImage->setName(sstr.str());
-    }
-    BindlessTexture* tex = new BindlessTexture(buffer,images);
-    attachPnt->setTextureAttribute(0,tex,osg::StateAttribute::ON);
-    attachPnt->setAttributeAndModes(buffer->Binding(), osg::StateAttribute::ON);
-}
-///Create a cube centered at the origin, with given by size
-///
-osg::Geometry* createCube(float scale, osg::Vec3 origin = osg::Vec3(0.0f,0.0f,0.0f) )
-{
-    osg::Geometry* geometry = new osg::Geometry;
-    geometry->setName("TexturedCubeArray");
-
-    osg::Vec3Array* vertices = new osg::Vec3Array;
-    geometry->setVertexArray(vertices);
-
-    osg::Vec2Array* tcoords = new osg::Vec2Array();
-    geometry->setTexCoordArray(0,tcoords);
-
-    origin -= osg::Vec3(scale/2.0f,scale/2.0f,scale/2.0f);
-    osg::Vec3 dx(scale,0.0f,0.0f);
-    osg::Vec3 dy(0.0f,scale,0.0f);
-    osg::Vec3 dz(0.0f,0.0f,scale);
-
-    {
-        // front face
-        vertices->push_back(origin);
-        vertices->push_back(origin+dx);
-        vertices->push_back(origin+dx+dz);
-        vertices->push_back(origin+dz);
-
-        tcoords->push_back(osg::Vec2(0.0f,0.0f));
-        tcoords->push_back(osg::Vec2(1.0f,0.0f));
-        tcoords->push_back(osg::Vec2(1.0f,1.0f));
-        tcoords->push_back(osg::Vec2(0.0f,1.0f));
-    }
-
-    {
-        // back face
-        vertices->push_back(origin+dy);
-        vertices->push_back(origin+dy+dz);
-        vertices->push_back(origin+dy+dx+dz);
-        vertices->push_back(origin+dy+dx);
-
-        tcoords->push_back(osg::Vec2(0.0f,0.0f));
-        tcoords->push_back(osg::Vec2(1.0f,0.0f));
-        tcoords->push_back(osg::Vec2(1.0f,1.0f));
-        tcoords->push_back(osg::Vec2(0.0f,1.0f));
-    }
-
-    {
-        // left face
-        vertices->push_back(origin+dy);
-        vertices->push_back(origin);
-        vertices->push_back(origin+dz);
-        vertices->push_back(origin+dy+dz);
-
-        tcoords->push_back(osg::Vec2(0.0f,0.0f));
-        tcoords->push_back(osg::Vec2(1.0f,0.0f));
-        tcoords->push_back(osg::Vec2(1.0f,1.0f));
-        tcoords->push_back(osg::Vec2(0.0f,1.0f));
-    }
-
-    {
-        // right face
-        vertices->push_back(origin+dx+dy);
-        vertices->push_back(origin+dx+dy+dz);
-        vertices->push_back(origin+dx+dz);
-        vertices->push_back(origin+dx);
-
-        tcoords->push_back(osg::Vec2(0.0f,0.0f));
-        tcoords->push_back(osg::Vec2(1.0f,0.0f));
-        tcoords->push_back(osg::Vec2(1.0f,1.0f));
-        tcoords->push_back(osg::Vec2(0.0f,1.0f));
-    }
-
-    {
-        // top face
-        vertices->push_back(origin+dz);
-        vertices->push_back(origin+dz+dx);
-        vertices->push_back(origin+dz+dx+dy);
-        vertices->push_back(origin+dz+dy);
-
-        tcoords->push_back(osg::Vec2(0.0f,0.0f));
-        tcoords->push_back(osg::Vec2(1.0f,0.0f));
-        tcoords->push_back(osg::Vec2(1.0f,1.0f));
-        tcoords->push_back(osg::Vec2(0.0f,1.0f));
-    }
-
-    {
-        // bottom face
-        vertices->push_back(origin);
-        vertices->push_back(origin+dy);
-        vertices->push_back(origin+dx+dy);
-        vertices->push_back(origin+dx);
-
-        tcoords->push_back(osg::Vec2(0.0f,0.0f));
-        tcoords->push_back(osg::Vec2(1.0f,0.0f));
-        tcoords->push_back(osg::Vec2(1.0f,1.0f));
-        tcoords->push_back(osg::Vec2(0.0f,1.0f));
-    }
-    osg::DrawArrays* primSet = new osg::DrawArrays(GL_QUADS, 0, vertices->size());
-    geometry->addPrimitiveSet(primSet);
-
-    return geometry;
-}
-///
-///Here we are going to create our scene, basically we need to make sure our
-///Bindless texture gets applied before our shader programs. 
-///
-///
-osg::Group* CreateScene(){
-    osg::Group* sceneRoot= new osg::Group();
-    sceneRoot->setName("Root");
-    osg::Geode *geo = new osg::Geode();
-    geo->setName("Geo");
-    sceneRoot->addChild(geo);
-    osg::StateSet* scene_ss  = sceneRoot->getOrCreateStateSet();
-    createImageArray(scene_ss);
-    scene_ss->setMode(GL_DEPTH_TEST,osg::StateAttribute::ON);
-    
-    osg::ref_ptr<osg::Geometry> geom = createCube(0.9f);
-    osg::PrimitiveSet *prim = geom->getPrimitiveSet(0);
-    //instanced elements must use VBOs
-    geom->setUseDisplayList(false);
-    geom->setUseVertexBufferObjects(true);
-    geom->setCullingActive(false);
-    prim->setNumInstances(1000);
-    prim->dirty();
-    sceneRoot->addChild(geo);
-    geo->addDrawable(geom.get());
-        
-    osg::StateSet* ss = geo->getOrCreateStateSet();
-
-    std::string strTextureCount;
-    std::stringstream ssconv;
-    ssconv<<TextureCount;
-    ssconv>>strTextureCount;
-    std::string::size_type pos = vertShader.find("XXX");
-    vertShader.replace(pos,size_t(3),strTextureCount);
-
-    pos = fragShader.find("XXX");
-    fragShader.replace(pos,size_t(3),strTextureCount);
-
-    osg::Program* program = new osg::Program;
-    osg::Shader* vertex_shader = new osg::Shader(osg::Shader::VERTEX, vertShader);
-    program->addShader(vertex_shader);
-
-    osg::Shader* fragment_shader = new osg::Shader(osg::Shader::FRAGMENT, fragShader);
-    program->addShader(fragment_shader);
-
-    ss->setAttributeAndModes(program, osg::StateAttribute::ON);
-    
-    
-    return sceneRoot;
- }
-int main(int argc, char** argv)
-{
-    // set command line options
-    osg::ArgumentParser arguments(&argc,argv);
-
-    // construct the viewer.
-    osgViewer::Viewer viewer(arguments);
-
-    // add the stats handler
-    viewer.addEventHandler(new osgViewer::StatsHandler);
-    
-    // add model to viewer.
-    viewer.setSceneData( CreateScene() );
-
-    viewer.realize();
-    
-    viewer.getCamera()->getGraphicsContext()->getState()->setUseModelViewAndProjectionUniforms(true);
-
-    return viewer.run();
-}
-

examples/osgblenddrawbuffers/osgblenddrawbuffers.cpp

@@ -71,17 +71,9 @@ int main( int argc, char **argv )
     bool useGlobalBlending = false;
     if ( arguments.read("--no-draw-buffers") ) useGlobalBlending = true;
 
-
-    osg::ref_ptr<osg::Node> cessna = osgDB::readRefNodeFile("cessna.osgt");
-    if (!cessna)
-    {
-        OSG_NOTICE<<"Cannot not find model 'cessna.osg' to render"<<std::endl;
-        return 1;
-    }
-
     // Create a camera to output multi-rendering-targets (MRT)
-    osg::ref_ptr<osg::Camera> mrtCam = createMRTCamera( textures );
+    osg::Camera* mrtCam = createMRTCamera( textures );
-    mrtCam->addChild( cessna );
+    mrtCam->addChild( osgDB::readNodeFile("cessna.osgt") );
 
     // Create shader program to be used
     const char* mrtFragmentCode = {
@@ -95,8 +87,8 @@ int main( int argc, char **argv )
     osg::ref_ptr<osg::Program> program = new osg::Program;
     program->addShader( new osg::Shader(osg::Shader::FRAGMENT, mrtFragmentCode) );
 
-    osg::ref_ptr<osg::StateSet> ss = mrtCam->getOrCreateStateSet();
+    osg::StateSet* ss = mrtCam->getOrCreateStateSet();
-    ss->setAttributeAndModes( program );
+    ss->setAttributeAndModes( program.get() );
 
     // Apply blending to the original scene in MRT
     if ( !useGlobalBlending )
@@ -111,8 +103,8 @@ int main( int argc, char **argv )
         // Accept different blend/colormask attributes on multiple render targets
         osg::ref_ptr<osg::BlendFunci> blend0 = new osg::BlendFunci(0, GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
         osg::ref_ptr<osg::ColorMaski> colormask3 = new osg::ColorMaski(3, false, true, false, true);
-        ss->setAttribute( blend0 );
+        ss->setAttribute( blend0.get() );
-        ss->setAttributeAndModes( colormask3 );
+        ss->setAttributeAndModes( colormask3.get() );
     }
     else
     {

examples/osgblendequation/osgblendequation.cpp

@@ -139,10 +139,10 @@ int main( int argc, char **argv )
     osgViewer::Viewer viewer;
 
     // load the nodes from the commandline arguments.
-    osg::ref_ptr<osg::Node> loadedModel = osgDB::readRefNodeFiles(arguments);
+    osg::Node* loadedModel = osgDB::readNodeFiles(arguments);
 
     // if not loaded assume no arguments passed in, try use default mode instead.
-    if (!loadedModel) loadedModel = osgDB::readRefNodeFile("cessnafire.osgt");
+    if (!loadedModel) loadedModel = osgDB::readNodeFile("cessnafire.osgt");
 
     if (!loadedModel)
     {
@@ -150,11 +150,11 @@ int main( int argc, char **argv )
         return 1;
     }
 
-    osg::ref_ptr<osg::Group> root = new osg::Group;
+    osg::Group* root = new osg::Group;
     root->addChild(loadedModel);
 
 
-    osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet;
+    osg::StateSet* stateset = new osg::StateSet;
     stateset->setDataVariance(osg::Object::DYNAMIC);
 
     osg::BlendEquation* blendEquation = new osg::BlendEquation(osg::BlendEquation::FUNC_ADD);

examples/osgcallback/osgcallback.cpp

@@ -65,7 +65,7 @@ class DrawableDrawCallback : public osg::Drawable::DrawCallback
         }
 };
 
-struct DrawableUpdateCallback : public osg::DrawableUpdateCallback
+struct DrawableUpdateCallback : public osg::Drawable::UpdateCallback
 {
     virtual void update(osg::NodeVisitor*, osg::Drawable* drawable)
     {
@@ -73,7 +73,7 @@ struct DrawableUpdateCallback : public osg::DrawableUpdateCallback
     }
 };
 
-struct DrawableCullCallback : public osg::DrawableCullCallback
+struct DrawableCullCallback : public osg::Drawable::CullCallback
 {
     /** do customized cull code.*/
     virtual bool cull(osg::NodeVisitor*, osg::Drawable* drawable, osg::State* /*state*/) const
@@ -158,11 +158,11 @@ class CameraEventCallback : public osg::NodeCallback
 };
 
 
-struct TestDrawableUpdateCallback : public osg::DrawableUpdateCallback
+struct TestDrawableUpdateCallback : public osg::Drawable::UpdateCallback
 {
     TestDrawableUpdateCallback(const std::string &message): _message(message) {}
 
-    virtual void update(osg::NodeVisitor*, osg::Drawable* /*drw*/) {
+    virtual void update(osg::NodeVisitor*, osg::Drawable* drw) {
         printf("%s\n", _message.c_str());
     }
     std::string _message;
@@ -172,7 +172,7 @@ struct TestNodeUpdateCallback : public osg::NodeCallback
 {
     TestNodeUpdateCallback(const std::string &message): _message(message) {}
 
-    virtual void operator()(osg::Node* /*node*/, osg::NodeVisitor* /*nv*/) {
+    virtual void operator()(osg::Node* node, osg::NodeVisitor* nv) {
         printf("%s\n", _message.c_str());
     }
     std::string _message;
@@ -239,10 +239,10 @@ int main( int argc, char **argv )
     }
     else
     {
-        rootnode = osgDB::readRefNodeFiles(arguments);
+        rootnode = osgDB::readNodeFiles(arguments);
 
         // if not loaded assume no arguments passed in, try use default mode instead.
-        if (!rootnode) rootnode = osgDB::readRefNodeFile("cow.osgt");
+        if (!rootnode) rootnode = osgDB::readNodeFile("cow.osgt");
 
         if (!rootnode)
         {

examples/osgcamera/osgcamera.cpp

@@ -25,50 +25,50 @@
 #include <osgGA/AnimationPathManipulator>
 #include <iostream>
 
-class ModelHandler : public osgGA::GUIEventHandler
+class ModelHandler : public osgGA::GUIEventHandler 
 {
-public:
+public: 
 
     ModelHandler():
         _position(0) {}
-
+    
     typedef std::vector<std::string> Filenames;
     Filenames _filenames;
     unsigned int _position;
-
+    
     void add(const std::string& filename) { _filenames.push_back(filename); }
-
+        
     bool handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa)
     {
         osgViewer::Viewer* viewer = dynamic_cast<osgViewer::Viewer*>(&aa);
         if (!viewer) return false;
-
+    
         if (_filenames.empty()) return false;
-
+    
         switch(ea.getEventType())
         {
             case(osgGA::GUIEventAdapter::KEYUP):
             {
                 if (ea.getKey()=='l')
-                {
+                {                    
-                    osg::ref_ptr<osg::Node> model = osgDB::readRefNodeFile( _filenames[_position] );
+                    osg::ref_ptr<osg::Node> model = osgDB::readNodeFile( _filenames[_position] );
                     ++_position;
                     if (_position>=_filenames.size()) _position = 0;
-
+                    
                     if (model.valid())
                     {
                         viewer->setSceneData(model.get());
                     }
-
+                    
                     return true;
                 }
             }
             default: break;
         }
-
+        
         return false;
     }
-
+    
     bool _done;
 };
 
@@ -76,12 +76,12 @@ public:
 void singleWindowMultipleCameras(osgViewer::Viewer& viewer)
 {
     osg::GraphicsContext::WindowingSystemInterface* wsi = osg::GraphicsContext::getWindowingSystemInterface();
-    if (!wsi)
+    if (!wsi) 
     {
         osg::notify(osg::NOTICE)<<"Error, no WindowSystemInterface available, cannot create windows."<<std::endl;
         return;
     }
-
+    
     unsigned int width, height;
     wsi->getScreenResolution(osg::GraphicsContext::ScreenIdentifier(0), width, height);
 
@@ -127,12 +127,12 @@ void singleWindowMultipleCameras(osgViewer::Viewer& viewer)
 void multipleWindowMultipleCameras(osgViewer::Viewer& viewer, bool multipleScreens)
 {
     osg::GraphicsContext::WindowingSystemInterface* wsi = osg::GraphicsContext::getWindowingSystemInterface();
-    if (!wsi)
+    if (!wsi) 
     {
         osg::notify(osg::NOTICE)<<"Error, no WindowSystemInterface available, cannot create windows."<<std::endl;
         return;
     }
-
+    
     unsigned int width, height;
     wsi->getScreenResolution(osg::GraphicsContext::ScreenIdentifier(0), width, height);
 
@@ -198,7 +198,7 @@ int main( int argc, char **argv )
     // use an ArgumentParser object to manage the program arguments.
     osg::ArgumentParser arguments(&argc,argv);
 
-    if (argc<2)
+    if (argc<2) 
     {
         std::cout << argv[0] <<": requires filename argument." << std::endl;
         return 1;
@@ -214,7 +214,7 @@ int main( int argc, char **argv )
         osg::ref_ptr<osg::Node> model;
         if (sharedModel)
         {
-            model = osgDB::readRefNodeFiles(arguments);
+            model = osgDB::readNodeFiles(arguments);
             if (!model) return 0;
 
             if (enableVBO)
@@ -242,7 +242,7 @@ int main( int argc, char **argv )
                 if (sharedModel) viewer.setSceneData(model.get());
                 else
                 {
-                    osg::ref_ptr<osg::Node> node = osgDB::readRefNodeFiles(arguments);
+                    osg::ref_ptr<osg::Node> node = osgDB::readNodeFiles(arguments);
                     if (!node) return 0;
 
                     if (enableVBO)
@@ -268,19 +268,19 @@ int main( int argc, char **argv )
     while (arguments.read("-p",pathfile))
     {
         apm = new osgGA::AnimationPathManipulator(pathfile);
-        if (!apm.valid() || !(apm->valid()) )
+        if (!apm.valid() || !(apm->valid()) ) 
         {
             apm = 0;
         }
     }
 
     osgViewer::Viewer viewer(arguments);
-
+    
     while (arguments.read("-s")) { viewer.setThreadingModel(osgViewer::Viewer::SingleThreaded); }
     while (arguments.read("-g")) { viewer.setThreadingModel(osgViewer::Viewer::CullDrawThreadPerContext); }
     while (arguments.read("-d")) { viewer.setThreadingModel(osgViewer::Viewer::DrawThreadPerContext); }
     while (arguments.read("-c")) { viewer.setThreadingModel(osgViewer::Viewer::CullThreadPerCameraDrawThreadPerContext); }
-
+    
     bool limitNumberOfFrames = false;
     unsigned int maxFrames = 10;
     while (arguments.read("--run-till-frame-number",maxFrames)) { limitNumberOfFrames = true; }
@@ -292,7 +292,7 @@ int main( int argc, char **argv )
 
     if (apm.valid()) viewer.setCameraManipulator(apm.get());
     else viewer.setCameraManipulator( new osgGA::TrackballManipulator() );
-
+    
     viewer.addEventHandler(new osgViewer::StatsHandler);
     viewer.addEventHandler(new osgViewer::ThreadingHandler);
 
@@ -300,7 +300,7 @@ int main( int argc, char **argv )
     while (arguments.read("--config", configfile))
     {
         osg::notify(osg::NOTICE)<<"Trying to read config file "<<configfile<<std::endl;
-        osg::ref_ptr<osg::Object> object = osgDB::readRefObjectFile(configfile);
+        osg::ref_ptr<osg::Object> object = osgDB::readObjectFile(configfile);
         osgViewer::View* view = dynamic_cast<osgViewer::View*>(object.get());
         if (view)
         {
@@ -329,19 +329,19 @@ int main( int argc, char **argv )
     else
     {
         // load the scene.
-        osg::ref_ptr<osg::Node> loadedModel = osgDB::readRefNodeFiles(arguments);
+        osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFiles(arguments);
 
-        if (!loadedModel) loadedModel = osgDB::readRefNodeFile("cow.osgt");
+        if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osgt");
 
-        if (!loadedModel)
+        if (!loadedModel) 
         {
             std::cout << argv[0] <<": No data loaded." << std::endl;
             return 1;
         }
 
-        viewer.setSceneData(loadedModel);
+        viewer.setSceneData(loadedModel.get());
     }
-
+    
     viewer.realize();
 
     unsigned int numFrames = 0;

examples/osgcatch/osgcatch.cpp

@@ -55,11 +55,11 @@ class Character : public osg::Referenced
 {
 public:
     Character();
-
+    
     void setCharacter(const std::string& filename, const std::string& name, const osg::Vec3& orgin, const osg::Vec3& width, const osg::Vec3& catchPos, float positionRatio);
-
+    
     void setLives(const std::string& filename, const osg::Vec3& orgin, const osg::Vec3& delta, unsigned int numLives);
-
+    
     void setCatches(const std::string& filename, const osg::Vec3& orgin, const osg::Vec3& delta, unsigned int numLives);
 
     void moveLeft();
@@ -71,7 +71,7 @@ public:
     void resetCatches();
 
     bool addCatch();
-
+    
     bool looseLife();
 
     osg::Vec3 getCurrentCenterOfBasket() const { return _character->getPosition()+_centerBasket; }
@@ -91,12 +91,12 @@ public:
 
     unsigned int                                 _numCatches;
     osg::ref_ptr<osg::Switch>                    _catchSwitch;
-
+    
     osg::ref_ptr<osg::Group>                     _objectsGroup;
-
+    
     osg::Vec3                                    _centerBasket;
     float                                        _radiusBasket;
-
+    
 };
 
 Character::Character():
@@ -107,17 +107,17 @@ Character::Character():
 }
 
 
-void Character::setCharacter(const std::string& filename, const std::string& name, const osg::Vec3& origin, const osg::Vec3& cwidth, const osg::Vec3& catchPos, float positionRatio)
+void Character::setCharacter(const std::string& filename, const std::string& name, const osg::Vec3& origin, const osg::Vec3& width, const osg::Vec3& catchPos, float positionRatio)
 {
     _origin = origin;
-    _width = cwidth;
+    _width = width;
     _positionRatio = positionRatio;
     _numLives = 3;
     _numCatches = 0;
 
     float _characterSize = _width.length()*0.2f;
 
-    osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(filename);
+    osg::Image* image = osgDB::readImageFile(filename);
     if (image)
     {
         osg::Vec3 pos(-0.5f*_characterSize,0.0f,0.0f);
@@ -136,14 +136,14 @@ void Character::setCharacter(const std::string& filename, const std::string& nam
         _character = new osg::PositionAttitudeTransform;
         _character->setName(name);
         _character->addChild(geode);
-
+        
         moveTo(positionRatio);
 
         _centerBasket = width*catchPos.x() + height*catchPos.y() + pos;
         _radiusBasket = width.length()*catchPos.z();
 
     }
-
+    
 }
 
 void Character::setLives(const std::string& filename, const osg::Vec3& origin, const osg::Vec3& delta, unsigned int numLives)
@@ -153,7 +153,7 @@ void Character::setLives(const std::string& filename, const osg::Vec3& origin, c
     _numLives = numLives;
     _livesSwitch = new osg::Switch;
 
-    osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(filename);
+    osg::Image* image = osgDB::readImageFile(filename);
     if (image)
     {
         osg::StateSet* stateset = _livesSwitch->getOrCreateStateSet();
@@ -186,7 +186,7 @@ void Character::setCatches(const std::string& filename, const osg::Vec3& origin,
     _numCatches = 0;
     _catchSwitch = new osg::Switch;
 
-    osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(filename);
+    osg::Image* image = osgDB::readImageFile(filename);
     if (image)
     {
         osg::StateSet* stateset = _catchSwitch->getOrCreateStateSet();
@@ -249,20 +249,20 @@ void Character::resetCatches()
 bool Character::addCatch()
 {
     if (!_catchSwitch || _numCatches>=_catchSwitch->getNumChildren()) return false;
-
+    
     _catchSwitch->setValue(_numCatches,true);
     ++_numCatches;
-
+    
     return true;
 }
 
 bool Character::looseLife()
 {
     if (!_livesSwitch || _numLives==0) return false;
-
+    
     --_numLives;
     _livesSwitch->setValue(_numLives,false);
-
+    
     return (_numLives!=0);
 }
 
@@ -279,21 +279,21 @@ class CatchableObject  : public osg::Referenced
         bool anyInside(const osg::Vec3& lower_left, const osg::Vec3& top_right);
 
         bool centerInside(const osg::Vec3& center, float radius);
-
+        
         void explode();
-
+        
         bool dangerous() { return _dangerous; }
 
         void stop() { _stopped = true; }
-
+        
         bool stopped() { return _stopped; }
-
+        
         void setTimeToRemove(double time) { _timeToRemove=time; }
-
+        
         double getTimeToRemove() { return _timeToRemove; }
-
+        
         bool needToRemove(double time) { return  _timeToRemove>=0.0 && time>_timeToRemove; }
-
+        
         osg::ref_ptr<osg::PositionAttitudeTransform> _object;
         osg::Vec3                                    _velocity;
         float                                        _mass;
@@ -307,7 +307,7 @@ class CatchableObject  : public osg::Referenced
         static void setUpCatchablesMap(const FileList& fileList);
 
     public:
-
+    
         // update position and velocity
         void update(double dt);
 
@@ -317,7 +317,7 @@ class CatchableObject  : public osg::Referenced
             _viscosity = v;
             _viscosityCoefficient = 6 * osg::PI * _viscosity;
         }
-
+       
         /// Get the viscosity of the fluid.
         inline float getFluidViscosity() const { return _viscosity; }
 
@@ -330,17 +330,17 @@ class CatchableObject  : public osg::Referenced
 
         /// Get the density of the fluid.
         inline float getFluidDensity() const { return _density; }
-
+        
-
+        
         /// Set the wind vector.
         inline void setWind(const osg::Vec3& wind) { _wind = wind; }
-
+        
         /// Get the wind vector.
         inline const osg::Vec3& getWind() const { return _wind; }
-
+        
         /// Set the acceleration vector.
         inline void setAcceleration(const osg::Vec3& v) { _acceleration = v; }
-
+        
         /// Get the acceleration vector.
         inline const osg::Vec3& getAcceleration() const { return _acceleration; }
 
@@ -356,7 +356,7 @@ class CatchableObject  : public osg::Referenced
             setFluidDensity(1.2929f);
             setFluidViscosity(1.8e-5f);
         }
-
+        
         /// Set the fluid parameters as for pure water (20<32>C temperature).
         inline void setFluidToWater()
         {
@@ -364,7 +364,7 @@ class CatchableObject  : public osg::Referenced
             setFluidDensity(1.0f);
             setFluidViscosity(1.002e-3f);
         }
-
+            
 
     protected:
 
@@ -375,15 +375,15 @@ class CatchableObject  : public osg::Referenced
 
         float       _viscosityCoefficient;
         float       _densityCoefficeint;
-
+        
-
+ 
 };
 
 CatchableObject::CatchableObject()
 {
     _stopped = false;
     _dangerous = false;
-
+    
     _timeToRemove = -1.0; // do not remove.
     setFluidToAir();
 }
@@ -395,14 +395,14 @@ void CatchableObject::setUpCatchablesMap(const FileList& fileList)
         ++itr)
     {
         const std::string& filename = *itr;
-        osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(filename);
+        osg::Image* image = osgDB::readImageFile(filename);
         if (image)
         {
             osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet();
             stateset->setTextureAttributeAndModes(0,new osg::Texture2D(image),osg::StateAttribute::ON);
             stateset->setMode(GL_BLEND,osg::StateAttribute::ON);
             stateset->setRenderingHint(osg::StateSet::TRANSPARENT_BIN);
-
+            
             osg::Vec3 width((float)(image->s())/(float)(image->t()),0.0f,0.0);
             osg::Vec3 height(0.0f,0.0f,1.0f);
             osg::Vec3 pos = (width+height)*-0.5f;
@@ -455,8 +455,8 @@ void CatchableObject::update(double dt)
     osg::Vec3 force = _acceleration * (_mass - _density*Volume);
 
     // compute force due to friction
-    osg::Vec3 relative_wind = _velocity-_wind;
+    osg::Vec3 relative_wind = _velocity-_wind;            
-    force -= relative_wind * Area * (_viscosityCoefficient + _densityCoefficeint*relative_wind.length());
+    force -= relative_wind * Area * (_viscosityCoefficient + _densityCoefficeint*relative_wind.length());            
 
     // divide force by mass to get acceleration.
     _velocity += force*(dt/_mass);
@@ -466,7 +466,7 @@ void CatchableObject::update(double dt)
 bool CatchableObject::anyInside(const osg::Vec3& lower_left, const osg::Vec3& upper_right)
 {
     osg::Vec3 pos = _object->getPosition();
-
+    
     if (pos.x()+_radius < lower_left.x()) return false;
     if (pos.x()-_radius > upper_right.x()) return false;
     if (pos.z()+_radius < lower_left.z()) return false;
@@ -513,20 +513,20 @@ class GameEventHandler : public osgGA::GUIEventHandler
 public:
 
     GameEventHandler();
-
+    
     META_Object(osgStereImageApp,GameEventHandler);
 
     virtual bool handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter&);
-
+    
     virtual void getUsage(osg::ApplicationUsage& usage) const;
-
+    
     osg::Matrix getCameraPosition();
-
+    
     void compileGLObjects(osg::State& state)
     {
         osgUtil::GLObjectsVisitor compile;
         compile.setState(&state);
-
+    
         for(ObjectMap::iterator itr = s_objectMap.begin();
             itr != s_objectMap.end();
             ++itr)
@@ -534,14 +534,14 @@ public:
             itr->second->accept(compile);
         }
     }
-
+    
     osg::Node* createScene();
-
+    
     void setFOVY(float fovy) { _fovy = fovy; }
     float getFOVY() const { return _fovy; }
-
+    
     void createNewCatchable();
-
+    
     void clearCatchables()
     {
         for(CatchableObjectList::iterator itr=_catchableObjects.begin();
@@ -562,7 +562,7 @@ public:
 
         _catchableObjects.clear();
     }
-
+    
     void resetLevel()
     {
         _level = 0;
@@ -573,7 +573,7 @@ public:
 
         _levelStartTick = osg::Timer::instance()->tick();
     }
-
+    
     void nextLevel()
     {
         ++_level;
@@ -596,12 +596,12 @@ public:
     void resetGame()
     {
         _currentScore = 0;
-
+        
         updateTextWithScore();
 
         clearCatchables();
         resetLevel();
-
+        
         for(unsigned int i=0;i<_numberOfPlayers;++i)
         {
             _players[i].reset();
@@ -629,12 +629,12 @@ public:
             livesPosition = _originBaseLine+osg::Vec3(1000.0f,-0.5f,000.0f);
             catchesPosition = _originBaseLine+osg::Vec3(1100.0f,-0.5f,0.0f);
         }
-
+        
         switch(player)
         {
             case PLAYER_GIRL:
             {
-                std::string player_one = "Catch/girl.png";
+                std::string player_one = "Catch/girl.png"; 
                 osg::Vec3 catchPos(0.2, 0.57, 0.34);
 
                 _players[_numberOfPlayers].setCharacter(player_one,"girl", _originBaseLine + osg::Vec3(0.0f,-1.0f,0.0f), _widthBaseLine, catchPos, 0.5f);
@@ -646,7 +646,7 @@ public:
             }
             case PLAYER_BOY:
             {
-                std::string player_two = "Catch/boy.png";
+                std::string player_two = "Catch/boy.png"; 
                 osg::Vec3 catchPos(0.8, 0.57, 0.34);
 
                 _players[_numberOfPlayers].setCharacter(player_two,"boy", _originBaseLine + osg::Vec3(0.0f,-2.0f,0.0f), _widthBaseLine, catchPos, 0.5f);
@@ -656,10 +656,10 @@ public:
                  ++_numberOfPlayers;
                break;
             }
-        }
+        }                
     }
-
+    
-
+    
     typedef std::vector< osg::ref_ptr<osgText::Text> > TextList;
 
     void updateScoreWithCatch()
@@ -673,8 +673,8 @@ public:
         osg::Timer_t newTick = osg::Timer::instance()->tick();
         double timeForLevel = osg::Timer::instance()->delta_s(_levelStartTick, newTick);
 
-        // a ten second level gets you 10 points,
+        // a ten second level gets you 10 points, 
-        // a twenty second levels gets you 5 points.
+        // a twenty second levels gets you 5 points.        
         _currentScore += static_cast<unsigned int>(10000.0f/(timeForLevel*timeForLevel));
 
         updateTextWithScore();
@@ -685,24 +685,24 @@ public:
     {
         std::ostringstream os;
         os<<"Score: "<<_currentScore;
-
+        
         std::string textString = os.str();
-
+    
         for(TextList::iterator itr = _scoreTextList.begin();
             itr != _scoreTextList.end();
             ++itr)
         {
             (*itr)->setText(textString);
         }
-    }
+    }        
-
+    
     void updateLevelText()
     {
         std::ostringstream os;
         os<<"Level: "<<_level+1;
         _levelText->setText(os.str());
     }
-
+        
 
 protected:
 
@@ -715,45 +715,45 @@ protected:
     osg::Vec3 _originBaseLine;
     osg::Vec3 _widthBaseLine;
     float     _characterSize;
-
+    
     float _fovy;
 
     unsigned _level;
-
+    
     float _chanceOfExplodingAtStart;
     float _initialNumDropsPerSecond;
-
+    
     osg::ref_ptr<osg::Switch>   _gameSwitch;
     osg::ref_ptr<osg::Group>    _gameGroup;
     osg::ref_ptr<osg::Switch>   _levelSwitch;
-
+    
     unsigned int                _currentIndex;
     unsigned int                _welcomeIndex;
     unsigned int                _lostIndex;
     unsigned int                _wonIndex;
     unsigned int                _gameIndex;
-
+    
     osg::Timer_t                _levelStartTick;
     unsigned int                _currentScore;
-
+    
     osg::ref_ptr<osgText::Text> _levelText;
     TextList                    _scoreTextList;
-
+    
     unsigned int _numberOfPlayers;
     Character _players[2];
 
     typedef std::list< osg::ref_ptr<CatchableObject> > CatchableObjectList;
     CatchableObjectList _catchableObjects;
-
+    
     FileList _backgroundFiles;
     FileList _benignCatachables;
 
     bool _leftKeyPressed;
     bool _rightKeyPressed;
-
+    
     osg::ref_ptr<CatchableObject> _dummyCatchable;
-
+    
-
+        
 };
 
 
@@ -791,11 +791,11 @@ GameEventHandler::GameEventHandler()
     _benignCatachables.push_back("Catch/t.png");
     _benignCatachables.push_back("Catch/u.png");
     _benignCatachables.push_back("Catch/ball.png");
-
+    
     CatchableObject::setUpCatchablesMap(_benignCatachables);
-
+    
     _currentScore = 0;
-
+    
     setFOVY(osg::DegreesToRadians(60.0));
 
 }
@@ -817,7 +817,7 @@ bool GameEventHandler::handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionA
             default:
                 return false;
         }
-
+        
     }
     else if (_currentIndex==_lostIndex)
     {
@@ -834,7 +834,7 @@ bool GameEventHandler::handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionA
             default:
                 return false;
         }
-
+        
     }
     else if (_currentIndex==_wonIndex)
     {
@@ -851,7 +851,7 @@ bool GameEventHandler::handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionA
             default:
                 return false;
         }
-
+        
     }
     else if (_currentIndex==_gameIndex)
     {
@@ -888,7 +888,7 @@ bool GameEventHandler::handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionA
                     for(unsigned int i=0;i<_numberOfPlayers;++i)
                     {
                         bool inBasket = ((*itr)->centerInside(_players[i].getCurrentCenterOfBasket(),_players[i].getCurrentRadiusOfBasket()));
-
+                    
                         if ((*itr)->dangerous())
                         {
                             if ((*itr)->anyInside(_players[i].getLowerLeft(),_players[i].getUpperRight()) || inBasket)
@@ -912,7 +912,7 @@ bool GameEventHandler::handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionA
                         {
                             // player has caught a safe object.
                             updateScoreWithCatch();
-
+                            
                             if (!_players[i].addCatch())
                             {
                                 _players[i].resetCatches();
@@ -930,7 +930,7 @@ bool GameEventHandler::handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionA
                         }
                     }
 
-                    if (!(*itr)->anyInside(_origin, _origin+_width+_height) ||
+                    if (!(*itr)->anyInside(_origin, _origin+_width+_height) || 
                         (*itr)->needToRemove(ea.getTime()) ||
                         removeEntry)
                     {
@@ -968,7 +968,7 @@ bool GameEventHandler::handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionA
                 float numDropsPerSecond = _initialNumDropsPerSecond * (_level+1);
                 float r = (float)rand()/(float)RAND_MAX;
                 if (r < deltaTime*numDropsPerSecond)
-                {
+                { 
                     createNewCatchable();
                 }
 
@@ -1015,7 +1015,7 @@ bool GameEventHandler::handle(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionA
                 return false;
         }
     }
-    return false;
+    return false;    
 }
 
 void GameEventHandler::getUsage(osg::ApplicationUsage&) const
@@ -1026,9 +1026,9 @@ osg::Matrix GameEventHandler::getCameraPosition()
 {
     osg::Matrix cameraPosition;
     osg::Vec3 center = _origin+(_width+_height)*0.5f;
-
+    
     float distance = _height.length()/(2.0f*tanf(_fovy*0.5f));
-
+    
     cameraPosition.makeLookAt(center-osg::Vec3(0.0f,distance,0.0f),center,osg::Vec3(0.0f,0.0f,1.0f));
     return cameraPosition;
 }
@@ -1036,8 +1036,8 @@ osg::Matrix GameEventHandler::getCameraPosition()
 osg::Node* GameEventHandler::createScene()
 {
     _gameSwitch = new osg::Switch;
-
+    
-    // create a dummy catchable to load all the particule textures to reduce
+    // create a dummy catchable to load all the particule textures to reduce 
     // latency later on..
     _dummyCatchable = new CatchableObject;
     _dummyCatchable->setObject("Catch/a.png","a",osg::Vec3(0.0f,0.0,0.0f),1.0f,osg::Vec3(0.0f,0.0,0.0f));
@@ -1045,10 +1045,10 @@ osg::Node* GameEventHandler::createScene()
 
     // set up welcome subgraph
     {
-        osg::ref_ptr<osg::Geode> geode = new osg::Geode;
+        osg::Geode* geode = new osg::Geode;
 
         // set up the background
-        osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile("Catch/Welcome.jpg");
+        osg::Image* image = osgDB::readImageFile("Catch/Welcome.jpg");
         if (image)
         {
             osg::Geometry* geometry = osg::createTexturedQuadGeometry(_origin,_width,_height);
@@ -1057,7 +1057,7 @@ osg::Node* GameEventHandler::createScene()
 
             geode->addDrawable(geometry);
         }
-
+        
         // set up the text
         osg::Vec3 textPosition = _origin+_width*0.5f+_height*0.8f -osg::Vec3(0.0f,0.1f,0.0f);
         {
@@ -1072,7 +1072,7 @@ osg::Node* GameEventHandler::createScene()
 
             geode->addDrawable(text);
         }
-
+        
         {
             textPosition -= _height*0.25f;
             osgText::Text* text = new osgText::Text;
@@ -1121,9 +1121,9 @@ osg::Node* GameEventHandler::createScene()
 
     // set up you've lost subgraph
     {
-        osg::ref_ptr<osg::Geode> geode = new osg::Geode;
+        osg::Geode* geode = new osg::Geode;
 
-        osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile("Catch/YouLost.jpg");
+        osg::Image* image = osgDB::readImageFile("Catch/YouLost.jpg");
         if (image)
         {
             osg::Geometry* geometry = osg::createTexturedQuadGeometry(_origin,_width,_height);
@@ -1132,7 +1132,7 @@ osg::Node* GameEventHandler::createScene()
 
             geode->addDrawable(geometry);
         }
-
+        
         // set up the text
         osg::Vec3 textPosition = _origin+_width*0.5f+_height*0.75f -osg::Vec3(0.0f,0.1f,0.0f);
         {
@@ -1147,7 +1147,7 @@ osg::Node* GameEventHandler::createScene()
 
             geode->addDrawable(text);
         }
-
+        
         {
             textPosition -= _height*0.25f;
             osgText::Text* text = new osgText::Text;
@@ -1184,9 +1184,9 @@ osg::Node* GameEventHandler::createScene()
 
     // set up you've won subgraph
     {
-        osg::ref_ptr<osg::Geode> geode = new osg::Geode;
+        osg::Geode* geode = new osg::Geode;
 
-        osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile("Catch/YouWon.jpg");
+        osg::Image* image = osgDB::readImageFile("Catch/YouWon.jpg");
         if (image)
         {
             osg::Geometry* geometry = osg::createTexturedQuadGeometry(_origin,_width,_height);
@@ -1195,7 +1195,7 @@ osg::Node* GameEventHandler::createScene()
 
             geode->addDrawable(geometry);
         }
-
+        
         // set up the text
         osg::Vec3 textPosition = _origin+_width*0.5f+_height*0.75f -osg::Vec3(0.0f,0.1f,0.0f);
         {
@@ -1210,7 +1210,7 @@ osg::Node* GameEventHandler::createScene()
 
             geode->addDrawable(text);
         }
-
+        
         {
             textPosition -= _height*0.25f;
             osgText::Text* text = new osgText::Text;
@@ -1258,7 +1258,7 @@ osg::Node* GameEventHandler::createScene()
             _gameGroup->addChild(_players[i]._character.get());
             _gameGroup->addChild(_players[i]._livesSwitch.get());
             _gameGroup->addChild(_players[i]._catchSwitch.get());
-        }
+        }    
 
         // background
         {
@@ -1269,7 +1269,7 @@ osg::Node* GameEventHandler::createScene()
                 ++itr)
             {
 
-                osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(*itr);
+                osg::Image* image = osgDB::readImageFile(*itr);
                 if (image)
                 {
                     osg::Geometry* geometry = osg::createTexturedQuadGeometry(_origin,_width,_height);
@@ -1305,7 +1305,7 @@ osg::Node* GameEventHandler::createScene()
             osg::Geode* geode = new osg::Geode;
             geode->addDrawable(text);
             _scoreTextList.push_back(text);
-
+            
             textPosition -= _height*0.05f;
             _levelText = new osgText::Text;
             _levelText->setText("Level : 0");
@@ -1317,7 +1317,7 @@ osg::Node* GameEventHandler::createScene()
             _levelText->setAxisAlignment(osgText::Text::XZ_PLANE);
 
             geode->addDrawable(_levelText.get());
-
+            
 
 
             _gameGroup->addChild(geode);
@@ -1325,7 +1325,7 @@ osg::Node* GameEventHandler::createScene()
 
 
     }
-
+    
     _currentIndex = _welcomeIndex;
     _gameSwitch->setSingleChildOn(_currentIndex);
 
@@ -1338,7 +1338,7 @@ void GameEventHandler::createNewCatchable()
 
     unsigned int catachableIndex = (unsigned int)((float)_benignCatachables.size()*(float)rand()/(float)RAND_MAX);
     if (catachableIndex>=_benignCatachables.size()) catachableIndex = _benignCatachables.size()-1;
-
+    
     const std::string& filename = _benignCatachables[catachableIndex];
 
     float ratio = ((float)rand() / (float)RAND_MAX);
@@ -1356,7 +1356,7 @@ void GameEventHandler::createNewCatchable()
     float r = (float)rand() / (float)RAND_MAX;
     if (r < _chanceOfExplodingAtStart)
     {
-       catchableObject->explode();
+       catchableObject->explode(); 
     }
 
     _gameGroup->addChild(catchableObject->_object.get());
@@ -1369,7 +1369,7 @@ class CompileStateCallback : public osg::Operation
             osg::Referenced(true),
             osg::Operation("CompileStateCallback", false),
             _gameEventHandler(eh) {}
-
+        
         virtual void operator () (osg::Object* object)
         {
             osg::GraphicsContext* context = dynamic_cast<osg::GraphicsContext*>(object);
@@ -1380,7 +1380,7 @@ class CompileStateCallback : public osg::Operation
                 _gameEventHandler->compileGLObjects(*(context->getState()));
             }
         }
-
+        
         OpenThreads::Mutex  _mutex;
         GameEventHandler*  _gameEventHandler;
 };
@@ -1390,7 +1390,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 use node masks to create stereo images.");
     arguments.getApplicationUsage()->setCommandLineUsage(arguments.getApplicationName()+" [options] image_file_left_eye image_file_right_eye");
@@ -1410,8 +1410,8 @@ int main( int argc, char **argv )
 
     while (arguments.read("--boy")) seh->addPlayer(GameEventHandler::PLAYER_BOY);
     while (arguments.read("--girl")) seh->addPlayer(GameEventHandler::PLAYER_GIRL);
-
+    
-
+    
     // if user request help write it out to cout.
     if (arguments.read("-h") || arguments.read("--help"))
     {
@@ -1428,8 +1428,8 @@ int main( int argc, char **argv )
         arguments.writeErrorMessages(std::cout);
         return 1;
     }
-
+    
-
+    
     // enable the image cache so we don't need to keep loading the particle files
     osgDB::ReaderWriter::Options* options = new osgDB::ReaderWriter::Options;
     options->setObjectCacheHint(osgDB::ReaderWriter::Options::CACHE_IMAGES);
@@ -1454,7 +1454,7 @@ int main( int argc, char **argv )
 
     double fovy, aspectRatio, zNear, zFar;
     viewer.getCamera()->getProjectionMatrixAsPerspective(fovy, aspectRatio, zNear, zFar);
-    seh->setFOVY(osg::DegreesToRadians(fovy));
+    seh->setFOVY(osg::DegreesToRadians(fovy));    
 
     // todo for osgViewer - create default set up.
     viewer.setUpViewAcrossAllScreens();
@@ -1472,7 +1472,7 @@ int main( int argc, char **argv )
     }
 
     // todo for osgViewer - implement warp pointer that can be done relative to different coordinate frames
-    // viewer.requestWarpPointer(0.5f,0.5f);
+    // viewer.requestWarpPointer(0.5f,0.5f);        
 
     while( !viewer.done() )
     {
@@ -1480,8 +1480,8 @@ int main( int argc, char **argv )
 
         // fire off the cull and draw traversals of the scene.
         viewer.frame();
-
+        
     }
-
+    
     return 0;
 }

examples/osgclip/CMakeLists.txt

@@ -1,7 +1,6 @@
-#this file is automatically generated
+#this file is automatically generated 
+
 
 SET(TARGET_SRC osgclip.cpp )
-SET(TARGET_ADDED_LIBRARIES osgText )
-
 #### end var setup  ###
 SETUP_EXAMPLE(osgclip)

examples/osgclip/osgclip.cpp

@@ -38,12 +38,12 @@
 #include <osgViewer/Viewer>
 
 #include <osgUtil/Optimizer>
-#include <osgText/Text>
 
 
-osg::ref_ptr<osg::Node> decorate_with_clip_node(const osg::ref_ptr<osg::Node>& subgraph)
+osg::Node* decorate_with_clip_node(osg::Node* subgraph)
 {
-    osg::ref_ptr<osg::Group> rootnode = new osg::Group;
+    osg::Group* rootnode = new osg::Group;
+    
 
     // create wireframe view of the model so the user can see
     // what parts are being culled away.
@@ -52,16 +52,35 @@ osg::ref_ptr<osg::Node> decorate_with_clip_node(const osg::ref_ptr<osg::Node>& s
     osg::PolygonMode* polymode = new osg::PolygonMode;
     polymode->setMode(osg::PolygonMode::FRONT_AND_BACK,osg::PolygonMode::LINE);
     stateset->setAttributeAndModes(polymode,osg::StateAttribute::OVERRIDE|osg::StateAttribute::ON);
-
+    
     osg::Group* wireframe_subgraph = new osg::Group;
     wireframe_subgraph->setStateSet(stateset);
     wireframe_subgraph->addChild(subgraph);
     rootnode->addChild(wireframe_subgraph);
 
+/*
+    // simple approach to adding a clipnode above a subgraph.
+
+    // create clipped part.
+    osg::ClipNode* clipped_subgraph = new osg::ClipNode;
+
+    osg::BoundingSphere bs = subgraph->getBound();
+    bs.radius()*= 0.4f;
+
+    osg::BoundingBox bb;
+    bb.expandBy(bs);
+
+
+    clipped_subgraph->createClipBox(bb);
+    clipped_subgraph->addChild(subgraph);
+    rootnode->addChild(clipped_subgraph);
+*/
+
+
     // more complex approach to managing ClipNode, allowing
     // ClipNode node to be transformed independently from the subgraph
     // that it is clipping.
-
+    
     osg::MatrixTransform* transform= new osg::MatrixTransform;
 
     osg::NodeCallback* nc = new osg::AnimationPathCallback(subgraph->getBound().center(),osg::Vec3(0.0f,0.0f,1.0f),osg::inDegrees(45.0f));
@@ -92,104 +111,34 @@ osg::ref_ptr<osg::Node> decorate_with_clip_node(const osg::ref_ptr<osg::Node>& s
 }
 
 
-osg::ref_ptr<osg::Node> simple_decorate_with_clip_node(const osg::ref_ptr<osg::Node>& subgraph)
-{
-    osg::ref_ptr<osg::Group> rootnode = new osg::Group;
-
-
-    // more complex approach to managing ClipNode, allowing
-    // ClipNode node to be transformed independently from the subgraph
-    // that it is clipping.
-
-    osg::MatrixTransform* transform= new osg::MatrixTransform;
-
-    osg::NodeCallback* nc = new osg::AnimationPathCallback(subgraph->getBound().center(),osg::Vec3(0.0f,0.0f,1.0f),osg::inDegrees(45.0f));
-    transform->setUpdateCallback(nc);
-
-    osg::ClipNode* clipnode = new osg::ClipNode;
-    osg::BoundingSphere bs = subgraph->getBound();
-    bs.radius()*= 0.4f;
-
-    osg::BoundingBox bb;
-    bb.expandBy(bs);
-
-    clipnode->createClipBox(bb);
-    clipnode->setCullingActive(false);
-
-    transform->addChild(clipnode);
-    rootnode->addChild(transform);
-
-
-    // create clipped part.
-    osg::Group* clipped_subgraph = new osg::Group;
-
-    clipped_subgraph->setStateSet(clipnode->getStateSet());
-    clipped_subgraph->addChild(subgraph);
-    rootnode->addChild(clipped_subgraph);
-
-    return rootnode;
-}
-
 int main( int argc, char **argv )
 {
     // use an ArgumentParser object to manage the program arguments.
     osg::ArgumentParser arguments(&argc,argv);
 
-    osgViewer::Viewer viewer(arguments);
-
     // load the nodes from the commandline arguments.
-    osg::ref_ptr<osg::Group> scene = new osg::Group;
+    osg::Node* loadedModel = osgDB::readNodeFiles(arguments);
-
-    std::string textString;
-    while(arguments.read("--text", textString))
-    {
-        osg::ref_ptr<osgText::Text> text = new osgText::Text;
-        text->setFont("fonts/times.ttf");
-        text->setAxisAlignment(osgText::Text::XZ_PLANE);
-        text->setDrawMode(osgText::Text::TEXT|osgText::Text::ALIGNMENT|osgText::Text::BOUNDINGBOX|osgText::Text::FILLEDBOUNDINGBOX);
-        text->setText(textString);
-        scene->addChild(text);
-    }
-
-
-    osg::ref_ptr<osg::Node> loadedModel = osgDB::readRefNodeFiles(arguments);
-    if (loadedModel.valid())
-    {
-        scene->addChild(scene.get());
-    }
 
 
     // if not loaded assume no arguments passed in, try use default mode instead.
-    if (scene->getNumChildren()==0)
+    if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osgt");
-    {
-        loadedModel = osgDB::readRefNodeFile("cow.osgt");
-        scene->addChild(loadedModel.get());
-    }
 
 
-    if (scene->getNumChildren()==0)
+    if (!loadedModel)
     {
         osg::notify(osg::NOTICE)<<"Please specify a filename on the command line"<<std::endl;
         return 1;
     }
-
+  
     // decorate the scenegraph with a clip node.
-    osg::ref_ptr<osg::Node> rootnode;
+    osg::Node* rootnode = decorate_with_clip_node(loadedModel);
-
+      
-
-    if (arguments.read("--simple"))
-    {
-        rootnode = simple_decorate_with_clip_node(scene);
-    }
-    else
-    {
-        rootnode = decorate_with_clip_node(scene);
-    }
-
     // run optimization over the scene graph
     osgUtil::Optimizer optimzer;
     optimzer.optimize(rootnode);
-
+    
+    osgViewer::Viewer viewer;
+     
     // set the scene to render
     viewer.setSceneData(rootnode);
 

examples/osgcluster/broadcaster.cpp

@@ -19,7 +19,6 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/types.h>
-#include <iostream>
 
 #if !defined (WIN32) || defined(__CYGWIN__)
 #include <sys/ioctl.h>
@@ -46,8 +45,6 @@
     #include <net/soioctl.h>
 #elif defined(__CYGWIN__) 
     #include <unistd.h>
-#elif defined (__GNU__)
-    #include <unistd.h>
 #elif defined(__sun) 
     #include <unistd.h>
     #include <sys/sockio.h>
@@ -69,13 +66,6 @@
 
 Broadcaster::Broadcaster( void )
 {
-#if defined (__linux) || defined(__CYGWIN__)
-     _ifr_name = "eth0";
-#elif defined(__sun)
-     _ifr_name = "hme0";
-#elif !defined (WIN32)
-     _ifr_name = "ef0";
-#endif
     _port = 0;
     _initialized = false;
     _buffer = 0L;
@@ -135,7 +125,13 @@ bool Broadcaster::init( void )
 
 #if !defined (WIN32) || defined(__CYGWIN__)
         struct ifreq ifr;
-        strcpy( ifr.ifr_name, _ifr_name.c_str());
+#endif
+#if defined (__linux) || defined(__CYGWIN__)
+        strcpy( ifr.ifr_name, "eth0" );
+#elif defined(__sun)
+        strcpy( ifr.ifr_name, "hme0" );
+#elif !defined (WIN32)
+        strcpy( ifr.ifr_name, "ef0" );
 #endif
 #if defined (WIN32) // get the server address
         saddr.sin_addr.s_addr = htonl(INADDR_BROADCAST);
@@ -143,7 +139,6 @@ bool Broadcaster::init( void )
 #else
         if( (ioctl( _so, SIOCGIFBRDADDR, &ifr)) < 0 )
         {
-            printf(" ifr.ifr_name = %s\n",ifr.ifr_name);
             perror( "Broadcaster::init() Cannot get Broadcast Address" );
             return false;
         }
@@ -164,11 +159,6 @@ bool Broadcaster::init( void )
     return _initialized;
 }
 
-void Broadcaster::setIFRName( const std::string& name )
-{
-    _ifr_name = name;
-}
-
 void Broadcaster::setHost( const char *hostname )
 {
     struct hostent *h;
@@ -210,7 +200,6 @@ void Broadcaster::sync( void )
 #else
     unsigned int size = sizeof( struct sockaddr_in );
     sendto( _so, (const void *)_buffer, _buffer_size, 0, (struct sockaddr *)&saddr, size );
-    std::cout<<"sento("<<_buffer<<", "<<_buffer_size<<std::endl;
 #endif
 
 }

examples/osgcluster/broadcaster.h

@@ -21,8 +21,6 @@
 #ifndef __BROADCASTER_H
 #define __BROADCASTER_H
 
-#include <string>
-
 ////////////////////////////////////////////////////////////
 // Broadcaster.h
 //
@@ -46,10 +44,6 @@ class Broadcaster
 	// Set the buffer to be broadcast
 	void setBuffer( void *buffer, const unsigned int buffer_size );
 
-    // Set the IFRName i.e. eth0, will default to platform appropriate setting where possible.
-    void setIFRName( const std::string& name );
-
-
 	// Set a recipient host.  If this is used, the Broadcaster
 	// no longer broadcasts, but rather directs UDP packets at
 	// host.
@@ -62,9 +56,6 @@ class Broadcaster
 	bool init( void );
 
     private :
-
-        std::string _ifr_name;
-
 #if defined(WIN32) && !defined(__CYGWIN__)
         SOCKET _so;
 #else

examples/osgcluster/osgcluster.cpp

@@ -74,7 +74,7 @@ class CameraPacket {
         void writeEventQueue(osgViewer::Viewer& viewer);
 
         void setMasterKilled(const bool flag) { _masterKilled = flag; }
-        bool getMasterKilled() const { return _masterKilled; }
+        const bool getMasterKilled() const { return _masterKilled; }
 
         unsigned int    _byte_order;
         bool            _masterKilled;
@@ -461,7 +461,7 @@ int main( int argc, char **argv )
     arguments.getApplicationUsage()->addCommandLineOption("-o <float>","Offset angle of camera");
 
     // construct the viewer.
-    osgViewer::Viewer viewer(arguments);
+    osgViewer::Viewer viewer;
 
 
     // read up the osgcluster specific arguments.
@@ -469,13 +469,6 @@ int main( int argc, char **argv )
     while (arguments.read("-m")) viewerMode = MASTER;
     while (arguments.read("-s")) viewerMode = SLAVE;
 
-    unsigned int messageSize = 1024;
-    while (arguments.read("--size", messageSize)) {}
-
-
-    bool readWriteFrame = false;
-    while (arguments.read("--frame")) readWriteFrame = true;
-
     int socketNumber=8100;
     while (arguments.read("-n",socketNumber)) ;
 
@@ -495,21 +488,10 @@ int main( int argc, char **argv )
         return 1;
     }
 
-    // objects for managing the broadcasting and receiving of camera packets.
-    Broadcaster     bc;
-    Receiver        rc;
-
-    std::string ifrName;
-    if (arguments.read("--ifr-name", ifrName)) { bc.setIFRName(ifrName); }
-
-    bc.setPort(static_cast<short int>(socketNumber));
-    rc.setPort(static_cast<short int>(socketNumber));
-
-
     // any option left unread are converted into errors to write out later.
     arguments.reportRemainingOptionsAsUnrecognized();
 
-    // report any errors if they have occurred when parsing the program aguments.
+    // report any errors if they have occured when parsing the program aguments.
     if (arguments.errors())
     {
         arguments.writeErrorMessages(std::cout);
@@ -523,7 +505,7 @@ int main( int argc, char **argv )
     }
 
     // load model.
-    osg::ref_ptr<osg::Node> rootnode = osgDB::readRefNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> rootnode = osgDB::readNodeFiles(arguments);
 
     // set the scene to render
     viewer.setSceneData(rootnode.get());
@@ -556,40 +538,19 @@ int main( int argc, char **argv )
     // create the windows and run the threads.
     viewer.realize();
 
-    osg::ref_ptr<osg::Image> image;
-    if (readWriteFrame)
-    {
-        osgViewer::Viewer::Windows windows;
-        viewer.getWindows(windows);
-
-        if (windows.empty())
-        {
-            return 1;
-        }
-        unsigned int width = windows.front()->getTraits()->width;
-        unsigned int height = windows.front()->getTraits()->height;
-        image = new osg::Image;
-
-        if (windows.front()->getTraits()->alpha)
-        {
-            OSG_NOTICE<<"Setting up RGBA osg::Image, width = "<<width<<", height = "<<height<<std::endl;
-            image->allocateImage(width, height, 1, GL_RGBA, GL_UNSIGNED_BYTE);
-        }
-        else
-        {
-            OSG_NOTICE<<"Setting up RGB osg::Image, width = "<<width<<", height = "<<height<<std::endl;
-            image->allocateImage(width, height, 1, GL_RGB, GL_UNSIGNED_BYTE);
-        }
-
-        // if (image->getImageStepInBytes()>messageSize) messageSize = image->getImageStepInBytes();
-    }
 
     CameraPacket *cp = new CameraPacket;
 
+    // objects for managing the broadcasting and recieving of camera packets.
+    Broadcaster     bc;
+    Receiver        rc;
+
+    bc.setPort(static_cast<short int>(socketNumber));
+    rc.setPort(static_cast<short int>(socketNumber));
 
     bool masterKilled = false;
 
-    DataConverter scratchPad(messageSize);
+    DataConverter scratchPad(1024);
 
     while( !viewer.done() && !masterKilled )
     {
@@ -618,15 +579,10 @@ int main( int argc, char **argv )
 
                 bc.setBuffer(scratchPad._startPtr, scratchPad._numBytes);
 
+                std::cout << "bc.sync()"<<scratchPad._numBytes<<std::endl;
+
                 bc.sync();
 
-                if (image.valid())
-                {
-                    bc.setBuffer(image->data(), image->getImageStepInBytes());
-                    bc.sync();
-                }
-
-
             }
             break;
         case(SLAVE):
@@ -634,9 +590,7 @@ int main( int argc, char **argv )
 
                 rc.setBuffer(scratchPad._startPtr, scratchPad._numBytes);
 
-                unsigned int readsize = rc.sync();
+                rc.sync();
-
-                if (readsize) std::cout<<std::endl<<"readsize = "<<readsize<<std::endl;
 
                 scratchPad.reset();
                 scratchPad.read(*cp);
@@ -649,14 +603,6 @@ int main( int argc, char **argv )
                     // break out of while (!done) loop since we've now want to shut down.
                     masterKilled = true;
                 }
-
-                if (image)
-                {
-                    rc.setBuffer(image->data(), image->getImageStepInBytes());
-                    readsize = rc.sync();
-                    if (readsize) std::cout<<"image readsize = "<<readsize<<std::endl;
-                }
-
             }
             break;
         default:

examples/osgcluster/receiver.cpp

@@ -112,17 +112,17 @@ void Receiver::setBuffer( void *buffer, const unsigned int size )
     _buffer_size = size;
 }
 
-unsigned int Receiver::sync( void )
+void Receiver::sync( void )
 {
     if(!_initialized) init();
 
     if( _buffer == 0L )
     {
         fprintf( stderr, "Receiver::sync() - No buffer\n" );
-        return 0;
+        return;
     }
 
-#if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ ) || defined(__FreeBSD_kernel__) || defined(__GNU__)
+#if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ )
     socklen_t size; 
 #else
     int size;
@@ -161,6 +161,5 @@ unsigned int Receiver::sync( void )
         }
     }
 #endif
-    return static_cast<unsigned int>(_buffer_size);
 }
 

examples/osgcluster/receiver.h

@@ -46,8 +46,8 @@ class Receiver
  	// Define what port to listen and bind to
 	void setPort( const short port );
 
-	// Sync does a blocking wait to receive next message
+	// Sync does a blocking wait to recieve next message
-	unsigned int sync( void );
+	void sync( void );
 
     private :
 	bool init( void );

examples/osgcompositeviewer/osgcompositeviewer.cpp

@@ -125,42 +125,6 @@ public:
 
 };
 
-class EventHandler : public osgGA::GUIEventHandler {
-public:
-
-    EventHandler() {}
-
-    ~EventHandler() {}
-
-    bool handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa)
-    {
-        osgViewer::View* view = dynamic_cast<osgViewer::View*>(&aa);
-        if (!view) return false;
-
-        switch(ea.getEventType())
-        {
-            case(osgGA::GUIEventAdapter::KEYDOWN):
-            case(osgGA::GUIEventAdapter::KEYUP):
-                OSG_NOTICE<<"View "<<view<<", name="<<view->getName()<<" keyboard event "<<ea.getEventType()<<" key="<<ea.getKey()<<" ea.getX()="<<ea.getX()<<" ea.getY()="<<ea.getY()<<std::endl;
-                break;
-
-            case(osgGA::GUIEventAdapter::MOVE):
-            case(osgGA::GUIEventAdapter::DRAG):
-            case(osgGA::GUIEventAdapter::PUSH):
-            case(osgGA::GUIEventAdapter::RELEASE):
-                OSG_NOTICE<<"View "<<view<<", name="<<view->getName()<<" mouse event "<<ea.getEventType()<<" ea.getX()="<<ea.getX()<<" ea.getY()="<<ea.getY()<<std::endl;
-                break;
-
-            default:
-                // OSG_NOTICE<<"View "<<view<<", name="<<view->getName()<<" general event "<<ea.getEventType()<<std::endl;
-                break;
-        }
-
-        return false;
-    }
-
-};
-
 
 int main( int argc, char **argv )
 {
@@ -169,7 +133,7 @@ int main( int argc, char **argv )
     osg::ArgumentParser arguments(&argc,argv);
 
     // read the scene from the list of file specified commandline args.
-    osg::ref_ptr<osg::Node> scene = osgDB::readRefNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> scene = osgDB::readNodeFiles(arguments);
 
     if (!scene)
     {
@@ -185,7 +149,7 @@ int main( int argc, char **argv )
         {
             osgViewer::View* view = new osgViewer::View;
             view->setName("Single view");
-            view->setSceneData(osgDB::readRefNodeFile("fountain.osgt"));
+            view->setSceneData(osgDB::readNodeFile("fountain.osgt"));
 
             view->addEventHandler( new osgViewer::StatsHandler );
 
@@ -234,50 +198,6 @@ int main( int argc, char **argv )
     }
 
 
-
-    if (arguments.read("-4"))
-    {
-
-        // view one
-        {
-            osgViewer::View* view = new osgViewer::View;
-            view->setName("View one");
-            viewer.addView(view);
-
-            view->setUpViewInWindow(0, 0, 800, 600);
-            view->setSceneData(scene.get());
-            view->setCameraManipulator(new osgGA::TrackballManipulator);
-
-            // add the state manipulator
-            osg::ref_ptr<osgGA::StateSetManipulator> statesetManipulator = new osgGA::StateSetManipulator;
-            statesetManipulator->setStateSet(view->getCamera()->getOrCreateStateSet());
-
-            view->addEventHandler( statesetManipulator.get() );
-
-            view->addEventHandler( new EventHandler());
-        }
-
-        // view two
-        {
-            osgViewer::View* view = new osgViewer::View;
-            view->setName("View two");
-            viewer.addView(view);
-
-            view->setUpViewInWindow(1000, 0, 800, 600);
-            view->setSceneData(scene.get());
-            view->setCameraManipulator(new osgGA::TrackballManipulator);
-
-            view->addEventHandler( new osgViewer::StatsHandler );
-
-
-            // add the handler for doing the picking
-            view->addEventHandler(new PickHandler());
-
-            view->addEventHandler( new EventHandler());
-        }
-    }
-
-
     if (arguments.read("-3") || viewer.getNumViews()==0)
     {
 
@@ -363,7 +283,7 @@ int main( int argc, char **argv )
             view->setName("View three");
             viewer.addView(view);
 
-            view->setSceneData(osgDB::readRefNodeFile("cessnafire.osgt"));
+            view->setSceneData(osgDB::readNodeFile("cessnafire.osgt"));
 
             view->getCamera()->setName("Cam three");
             view->getCamera()->setProjectionMatrixAsPerspective(30.0, double(traits->width) / double(traits->height/2), 1.0, 1000.0);

examples/osgcomputeshaders/osgcomputeshaders.cpp

@@ -20,8 +20,7 @@
 // This example can work only if GL version is 4.3 or greater
 
 #include <osg/Texture2D>
-#include <osg/BindImageTexture>
+#include <osg/Geometry>
-#include <osg/DispatchCompute>
 #include <osg/Geode>
 #include <osgDB/ReadFile>
 #include <osgGA/StateSetManipulator>
@@ -44,7 +43,7 @@ static const char* computeSrc = {
 int main( int argc, char** argv )
 {
     osg::ArgumentParser arguments( &argc, argv );
-
+    
     // Create the texture as both the output of compute shader and the input of a normal quad
     osg::ref_ptr<osg::Texture2D> tex2D = new osg::Texture2D;
     tex2D->setTextureSize( 512, 512 );
@@ -53,24 +52,24 @@ int main( int argc, char** argv )
     tex2D->setInternalFormat( GL_R32F );
     tex2D->setSourceFormat( GL_RED );
     tex2D->setSourceType( GL_FLOAT );
-    // So we can use 'image2D' in the compute shader
+    tex2D->bindToImageUnit( 0, osg::Texture::WRITE_ONLY );  // So we can use 'image2D' in the compute shader
-    osg::ref_ptr<osg::BindImageTexture> imagbinding = new osg::BindImageTexture(0, tex2D.get(), osg::BindImageTexture::WRITE_ONLY, GL_R32F);
+    
-
-
     // The compute shader can't work with other kinds of shaders
     // It also requires the work group numbers. Setting them to 0 will disable the compute shader
     osg::ref_ptr<osg::Program> computeProg = new osg::Program;
+    computeProg->setComputeGroups( 512/16, 512/16, 1 );
     computeProg->addShader( new osg::Shader(osg::Shader::COMPUTE, computeSrc) );
-
+    
     // Create a node for outputting to the texture.
     // It is OK to have just an empty node here, but seems inbuilt uniforms like osg_FrameTime won't work then.
     // TODO: maybe we can have a custom drawable which also will implement glMemoryBarrier?
-    osg::ref_ptr<osg::Node> sourceNode = new osg::DispatchCompute(512/16, 512/16, 1 );
+    osg::Node* sourceNode = osgDB::readNodeFile("axes.osgt");
+    if ( !sourceNode ) sourceNode = new osg::Node;
     sourceNode->setDataVariance( osg::Object::DYNAMIC );
     sourceNode->getOrCreateStateSet()->setAttributeAndModes( computeProg.get() );
     sourceNode->getOrCreateStateSet()->addUniform( new osg::Uniform("targetTex", (int)0) );
     sourceNode->getOrCreateStateSet()->setTextureAttributeAndModes( 0, tex2D.get() );
-
+    
     // Display the texture on a quad. We will also be able to operate on the data if reading back to CPU side
     osg::Geometry* geom = osg::createTexturedQuadGeometry(
         osg::Vec3(), osg::Vec3(1.0f,0.0f,0.0f), osg::Vec3(0.0f,0.0f,1.0f) );
@@ -78,12 +77,12 @@ int main( int argc, char** argv )
     quad->addDrawable( geom );
     quad->getOrCreateStateSet()->setMode( GL_LIGHTING, osg::StateAttribute::OFF );
     quad->getOrCreateStateSet()->setTextureAttributeAndModes( 0, tex2D.get() );
-    quad->getOrCreateStateSet()->setAttributeAndModes(imagbinding.get());
+    
     // Create the scene graph and start the viewer
     osg::ref_ptr<osg::Group> scene = new osg::Group;
     scene->addChild( sourceNode );
     scene->addChild( quad.get() );
-
+    
     osgViewer::Viewer viewer;
     viewer.addEventHandler( new osgGA::StateSetManipulator(viewer.getCamera()->getOrCreateStateSet()) );
     viewer.addEventHandler( new osgViewer::StatsHandler );

examples/osgcopy/osgcopy.cpp

@@ -33,12 +33,12 @@
 
 #include <iostream>
 
-// Customize the CopyOp so that we add our own verbose
+// Customize the CopyOp so that we add our own verbose 
 // output of what's being copied.
 class MyCopyOp : public osg::CopyOp
 {
     public:
-
+    
         inline MyCopyOp(CopyFlags flags=SHALLOW_COPY):
             osg::CopyOp(flags),
             _indent(0),
@@ -46,11 +46,11 @@ class MyCopyOp : public osg::CopyOp
 
         inline void moveIn() const { _indent += _step; }
         inline void moveOut() const { _indent -= _step; }
-        inline void writeIndent() const
+        inline void writeIndent() const 
         {
             for(int i=0;i<_indent;++i) std::cout << " ";
         }
-
+    
         virtual osg::Referenced*     operator() (const osg::Referenced* ref) const
         {
             writeIndent(); std::cout << "copying Referenced "<<ref<<std::endl;
@@ -59,7 +59,7 @@ class MyCopyOp : public osg::CopyOp
             moveOut();
             return ret_ref;
         }
-
+        
         virtual osg::Object*         operator() (const osg::Object* obj) const
         {
             writeIndent(); std::cout << "copying Object "<<obj;
@@ -70,7 +70,7 @@ class MyCopyOp : public osg::CopyOp
             moveOut();
             return ret_obj;
         }
-
+        
         virtual osg::Node*           operator() (const osg::Node* node) const
         {
             writeIndent(); std::cout << "copying Node "<<node;
@@ -136,25 +136,25 @@ class MyCopyOp : public osg::CopyOp
             moveOut();
             return ret_image;
         }
-
+        
     protected:
-
+    
         // must be mutable since CopyOp is passed around as const to
         // the various clone/copy constructors.
         mutable int _indent;
         mutable int _step;
 };
 
-// this CopyOp class will preserve the multi-parent structure of the copied
+// this CopyOp class will preserve the multi-parent structure of the copied 
-// object, instead of expanding it into a tree. Works with the
+// object, instead of expanding it into a tree. Works with the 
 // DEEP_COPY_NODES flag.
 class GraphCopyOp : public osg::CopyOp
 {
     public:
-
+    
         inline GraphCopyOp(CopyFlags flags=SHALLOW_COPY):
             osg::CopyOp(flags) { _nodeCopyMap.clear();}
-
+            
         virtual osg::Node* operator() (const osg::Node* node) const
         {
             if (node && _flags&DEEP_COPY_NODES)
@@ -180,9 +180,9 @@ class GraphCopyOp : public osg::CopyOp
             else
                 return const_cast<osg::Node*>(node);
         }
-
+         
     protected:
-
+    
         // must be mutable since CopyOp is passed around as const to
         // the various clone/copy constructors.
         mutable std::map<const osg::Node*,osg::Node*> _nodeCopyMap;
@@ -198,19 +198,19 @@ int main( int argc, char **argv )
     osgViewer::Viewer viewer;
 
     // load the nodes from the commandline arguments.
-    osg::ref_ptr<osg::Node> rootnode = osgDB::readRefNodeFiles(arguments);
+    osg::Node* rootnode = osgDB::readNodeFiles(arguments);
     if (!rootnode)
     {
         osg::notify(osg::NOTICE)<<"Please specify a model filename on the command line."<<std::endl;
         return 1;
     }
-
+    
     // run optimization over the scene graph
     osgUtil::Optimizer optimzer;
     optimzer.optimize(rootnode);
-
+    
 // -------------    Start of copy specific code -------------------------------------------------------
-
+    
     // do a deep copy, using MyCopyOp to reveal whats going on under the hood,
     // in your own code you'd typically just use the basic osg::CopyOp something like
     osg::ref_ptr<osg::Node> mycopy = dynamic_cast<osg::Node*>(rootnode->clone(osg::CopyOp::DEEP_COPY_ALL));
@@ -219,7 +219,7 @@ int main( int argc, char **argv )
     // note, we need the dyanmic_cast because MS Visual Studio can't handle covarient
     // return types, so that clone has return just Object*.  bahh hum bug
     osg::ref_ptr<osg::Node> deep_copy = dynamic_cast<osg::Node*>(rootnode->clone(MyCopyOp(osg::CopyOp::DEEP_COPY_ALL)));
-
+    
     std::cout << "----------------------------------------------------------------"<<std::endl;
 
     // do a graph preserving deep copy.
@@ -260,18 +260,18 @@ int main( int argc, char **argv )
     //        DEEP_COPY_IMAGES = 64,
     //        DEEP_COPY_ALL = 0xffffffff
     // };
-    //
+    // 
     // These options you can use together such as :
     //    osg::Node* mycopy = dynamic_cast<osg::Node*>(rootnode->clone(osg::CopyOp::DEEP_COPY_NODES | DEEP_COPY_DRAWABLES));
     // Which shares state but creates copies of all nodes and drawables (which contain the geometry).
-    //
+    // 
     // You may also want to subclass from CopyOp to provide finer grained control of what gets shared (shallow copy) vs
     // cloned (deep copy).
-
+    
 
 
 // -------------    End of copy specific code -------------------------------------------------------
-
+     
     // set the scene to render
     viewer.setSceneData(rootnode);
 

examples/osgcubemap/osgcubemap.cpp

@@ -95,10 +95,10 @@ int main(int argc, char *argv[])
     osgViewer::Viewer viewer;
 
     // load the nodes from the commandline arguments.
-    osg::ref_ptr<osg::Node> rootnode = osgDB::readRefNodeFiles(arguments);
+    osg::Node* rootnode = osgDB::readNodeFiles(arguments);
 
     // if not loaded assume no arguments passed in, try use default mode instead.
-    if (!rootnode) rootnode = osgDB::readRefNodeFile("cessna.osgt");
+    if (!rootnode) rootnode = osgDB::readNodeFile("cessna.osgt");
 
     if (!rootnode)
     {
@@ -107,7 +107,7 @@ int main(int argc, char *argv[])
     }
 
     // create specular highlights
-    create_specular_highlights(rootnode.get());
+    create_specular_highlights(rootnode);
 
     // run optimization over the scene graph
     osgUtil::Optimizer optimzer;

examples/osgdatabaserevisions/osgdatabaserevisions.cpp

@@ -1,9 +1,9 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
  *
- * This application is open source and may be redistributed and/or modified
+ * This application is open source and may be redistributed and/or modified   
  * freely and without restriction, both in commercial and non commercial applications,
  * as long as this copyright notice is maintained.
- *
+ * 
  * This application 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.
@@ -50,7 +50,7 @@ int main(int argc, char** argv)
         arguments.getApplicationUsage()->write(std::cout, helpType);
         return 1;
     }
-
+    
     // report any errors if they have occurred when parsing the program arguments.
     if (arguments.errors())
     {
@@ -81,7 +81,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 );
@@ -95,13 +95,13 @@ int main(int argc, char** argv)
 
     // add the state manipulator
     viewer.addEventHandler( new osgGA::StateSetManipulator(viewer.getCamera()->getOrCreateStateSet()) );
-
+    
     // add the thread model handler
     viewer.addEventHandler(new osgViewer::ThreadingHandler);
 
     // add the window size toggle handler
     viewer.addEventHandler(new osgViewer::WindowSizeHandler);
-
+        
     // add the stats handler
     viewer.addEventHandler(new osgViewer::StatsHandler);
 
@@ -129,8 +129,8 @@ int main(int argc, char** argv)
 
 
     // load the data
-    osg::ref_ptr<osg::Node> loadedModel = osgDB::readRefNodeFile(file);
+    osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFile(file);
-    if (!loadedModel)
+    if (!loadedModel) 
     {
         std::cout << arguments.getApplicationName() <<": No data loaded" << std::endl;
         return 1;

examples/osgdeferred/CMakeLists.txt

@@ -1,12 +0,0 @@
-SET(TARGET_SRC 
-    osgdeferred.cpp
-)
-
-SET(TARGET_H
-    osgdeferred.h
-)
-
-SET(TARGET_ADDED_LIBRARIES osgShadow)
-
-#### end var setup  ###
-SETUP_EXAMPLE(osgdeferred)

examples/osgdeferred/osgdeferred.cpp

@@ -1,377 +0,0 @@
-
-/* OpenSceneGraph example, osgdeferred.
- *
- *  Original code by Michael Kapelko, published to osg example with permission
- *  OSG Deferred Shading ( https://bitbucket.org/kornerr/osg-deferred-shading )
- *  Shader cleanup, removal of osgFX EffectCompositor and exchange of textures
- *  done by Christian Buchner
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *  THE SOFTWARE.
- */
-
-#include "osgdeferred.h"
-
-#include <osg/AnimationPath>
-#include <osg/PolygonMode>
-#include <osgDB/ReadFile>
-#include <osgShadow/SoftShadowMap>
-#include <osgViewer/Viewer>
-#include <osgViewer/ViewerEventHandlers>
-#include <osgUtil/TangentSpaceGenerator>
-
-#ifdef OSG_LIBRARY_STATIC
-// in case of a static build...
-USE_OSGPLUGIN(osg2)
-USE_OSGPLUGIN(png)
-USE_OSGPLUGIN(jpeg)
-USE_OSGPLUGIN(glsl)
-USE_SERIALIZER_WRAPPER_LIBRARY(osg)
-USE_GRAPHICSWINDOW()
-#endif
-
-
-osg::TextureRectangle *createFloatTextureRectangle(int textureSize)
-{
-    osg::ref_ptr<osg::TextureRectangle> tex2D = new osg::TextureRectangle;
-    tex2D->setTextureSize(textureSize, textureSize);
-    tex2D->setInternalFormat(GL_RGBA16F_ARB);
-    tex2D->setSourceFormat(GL_RGBA);
-    tex2D->setSourceType(GL_FLOAT);
-    return tex2D.release();
-}
-
-osg::Camera *createHUDCamera(double left,
-                             double right,
-                             double bottom,
-                             double top)
-{
-    osg::ref_ptr<osg::Camera> camera = new osg::Camera;
-    camera->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
-    camera->setClearMask(GL_DEPTH_BUFFER_BIT);
-    camera->setRenderOrder(osg::Camera::POST_RENDER);
-    camera->setAllowEventFocus(false);
-    camera->setProjectionMatrix(osg::Matrix::ortho2D(left, right, bottom, top));
-    camera->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
-    return camera.release();
-}
-
-osg::ref_ptr<osg::LightSource> createLight(const osg::Vec3 &pos)
-{
-    osg::ref_ptr<osg::LightSource> light = new osg::LightSource;
-    light->getLight()->setPosition(osg::Vec4(pos.x(), pos.y(), pos.z(), 1));
-    light->getLight()->setAmbient(osg::Vec4(0.2, 0.2, 0.2, 1));
-    light->getLight()->setDiffuse(osg::Vec4(0.8, 0.8, 0.8, 1));
-    return light;
-}
-
-class CreateTangentSpace : public osg::NodeVisitor
-{
-public:
-    CreateTangentSpace() : NodeVisitor(NodeVisitor::TRAVERSE_ALL_CHILDREN), tsg(new osgUtil::TangentSpaceGenerator) {}
-    virtual void apply(osg::Geode& geode)
-    {
-        for (unsigned int i = 0; i < geode.getNumDrawables(); ++i)
-        {
-            osg::Geometry *geo = dynamic_cast<osg::Geometry *>(geode.getDrawable(i));
-            if (geo != NULL)
-            {
-                // assume the texture coordinate for normal maps is stored in unit #0
-                tsg->generate(geo, 0);
-                // pass2.vert expects the tangent array to be stored inside gl_MultiTexCoord1
-                geo->setTexCoordArray(1, tsg->getTangentArray());
-            }
-        }
-        traverse(geode);
-    }
-private:
-    osg::ref_ptr<osgUtil::TangentSpaceGenerator> tsg;
-};
-
-Pipeline createPipelinePlainOSG(
-        osg::ref_ptr<osg::Group> scene,
-        osg::ref_ptr<osgShadow::ShadowedScene> shadowedScene,
-        const osg::Vec3 lightPos)
-{
-    Pipeline p;
-    p.graph = new osg::Group;
-    p.textureSize = 1024;
-
-    // Pass 1 (shadow).
-    p.pass1Shadows = createFloatTextureRectangle(p.textureSize);
-    osg::ref_ptr<osg::Camera> pass1 =
-        createRTTCamera(osg::Camera::COLOR_BUFFER, p.pass1Shadows);
-    pass1->addChild(shadowedScene.get());
-
-    // pass2 shades expects tangent vectors to be available as texcoord array for texture #1
-    // we use osgUtil::TangentSpaceGenerator to generate these
-    CreateTangentSpace cts;
-    scene->accept(cts);
-
-    // Pass 2 (positions, normals, colors).
-    p.pass2Positions = createFloatTextureRectangle(p.textureSize);
-    p.pass2Normals   = createFloatTextureRectangle(p.textureSize);
-    p.pass2Colors    = createFloatTextureRectangle(p.textureSize);
-    osg::ref_ptr<osg::Camera> pass2 =
-        createRTTCamera(osg::Camera::COLOR_BUFFER0, p.pass2Positions);
-    pass2->attach(osg::Camera::COLOR_BUFFER1, p.pass2Normals);
-    pass2->attach(osg::Camera::COLOR_BUFFER2, p.pass2Colors);
-    pass2->addChild(scene.get());
-    osg::ref_ptr<osg::StateSet> ss = setShaderProgram(pass2, "shaders/pass2.vert", "shaders/pass2.frag");
-    ss->setTextureAttributeAndModes(0, createTexture("Images/whitemetal_diffuse.jpg"));
-    ss->setTextureAttributeAndModes(1, createTexture("Images/whitemetal_normal.jpg"));
-    ss->addUniform(new osg::Uniform("diffMap", 0));
-    ss->addUniform(new osg::Uniform("bumpMap", 1));
-    ss->addUniform(new osg::Uniform("useBumpMap", 1));
-
-    // Pass 3 (final).
-    p.pass3Final = createFloatTextureRectangle(p.textureSize);
-    osg::ref_ptr<osg::Camera> pass3 =
-        createRTTCamera(osg::Camera::COLOR_BUFFER, p.pass3Final, true);
-    ss = setShaderProgram(pass3, "shaders/pass3.vert", "shaders/pass3.frag");
-    ss->setTextureAttributeAndModes(0, p.pass2Positions);
-    ss->setTextureAttributeAndModes(1, p.pass2Normals);
-    ss->setTextureAttributeAndModes(2, p.pass2Colors);
-    ss->setTextureAttributeAndModes(3, p.pass1Shadows);
-    ss->addUniform(new osg::Uniform("posMap",    0));
-    ss->addUniform(new osg::Uniform("normalMap", 1));
-    ss->addUniform(new osg::Uniform("colorMap",  2));
-    ss->addUniform(new osg::Uniform("shadowMap", 3));
-    // Light position.
-    ss->addUniform(new osg::Uniform("lightPos", lightPos));
-    // Graph.
-    p.graph->addChild(pass1);
-    p.graph->addChild(pass2);
-    p.graph->addChild(pass3);
-    return p;
-}
-
-osg::Camera *createRTTCamera(osg::Camera::BufferComponent buffer,
-                             osg::Texture *tex,
-                             bool isAbsolute)
-{
-    osg::ref_ptr<osg::Camera> camera = new osg::Camera;
-    camera->setClearColor(osg::Vec4());
-    camera->setClearMask(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-    camera->setRenderTargetImplementation(osg::Camera::FRAME_BUFFER_OBJECT);
-    camera->setRenderOrder(osg::Camera::PRE_RENDER);
-    if (tex)
-    {
-        tex->setFilter(osg::Texture2D::MIN_FILTER, osg::Texture2D::LINEAR);
-        tex->setFilter(osg::Texture2D::MAG_FILTER, osg::Texture2D::LINEAR);
-        camera->setViewport(0, 0, tex->getTextureWidth(), tex->getTextureHeight());
-        camera->attach(buffer, tex);
-    }
-    if (isAbsolute)
-    {
-        camera->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
-        camera->setProjectionMatrix(osg::Matrix::ortho2D(0.0, 1.0, 0.0, 1.0));
-        camera->setViewMatrix(osg::Matrix::identity());
-        camera->addChild(createScreenQuad(1.0f, 1.0f));
-    }
-    return camera.release();
-}
-
-osg::ref_ptr<osg::Group> createSceneRoom()
-{
-    // Room.
-    osg::ref_ptr<osg::MatrixTransform> room = new osg::MatrixTransform;
-    osg::ref_ptr<osg::Node> roomModel = osgDB::readRefNodeFile("simpleroom.osgt");
-    room->addChild(roomModel);
-    room->setMatrix(osg::Matrix::translate(0, 0, 1));
-    // Torus.
-    osg::ref_ptr<osg::MatrixTransform> torus = new osg::MatrixTransform;
-    osg::ref_ptr<osg::Node> torusModel = osgDB::readRefNodeFile("torus.osgt");
-    torus->addChild(torusModel);
-    setAnimationPath(torus, osg::Vec3(0, 0, 15), 6, 16);
-    // Torus2.
-    osg::ref_ptr<osg::MatrixTransform> torus2 = new osg::MatrixTransform;
-    torus2->addChild(torusModel);
-    setAnimationPath(torus2, osg::Vec3(-20, 0, 10), 20, 0);
-    // Torus3.
-    osg::ref_ptr<osg::MatrixTransform> torus3 = new osg::MatrixTransform;
-    torus3->addChild(torusModel);
-    setAnimationPath(torus3, osg::Vec3(0, 0, 40), 3, 25);
-    // Scene.
-    osg::ref_ptr<osg::Group> scene = new osg::Group;
-    scene->addChild(room);
-    scene->addChild(torus);
-    scene->addChild(torus2);
-    scene->addChild(torus3);
-    return scene;
-}
-
-osg::Geode *createScreenQuad(float width,
-                             float height,
-                             float scale,
-                             osg::Vec3 corner)
-{
-    osg::Geometry* geom = osg::createTexturedQuadGeometry(
-        corner,
-        osg::Vec3(width, 0, 0),
-        osg::Vec3(0, height, 0),
-        0,
-        0,
-        scale,
-        scale);
-    osg::ref_ptr<osg::Geode> quad = new osg::Geode;
-    quad->addDrawable(geom);
-    int values = osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED;
-    quad->getOrCreateStateSet()->setAttribute(
-        new osg::PolygonMode(osg::PolygonMode::FRONT_AND_BACK,
-                             osg::PolygonMode::FILL),
-        values);
-    quad->getOrCreateStateSet()->setMode(GL_LIGHTING, values);
-    return quad.release();
-}
-
-osg::Texture2D *createTexture(const std::string &fileName)
-{
-    osg::ref_ptr<osg::Texture2D> texture = new osg::Texture2D;
-    texture->setImage(osgDB::readRefImageFile(fileName));
-    texture->setWrap(osg::Texture2D::WRAP_S, osg::Texture2D::REPEAT);
-    texture->setWrap(osg::Texture2D::WRAP_T, osg::Texture2D::REPEAT);
-    texture->setFilter(osg::Texture::MIN_FILTER, osg::Texture::LINEAR_MIPMAP_LINEAR);
-    texture->setFilter(osg::Texture::MAG_FILTER, osg::Texture::LINEAR);
-    texture->setMaxAnisotropy(16.0f);
-    return texture.release();
-}
-
-osg::ref_ptr<osg::Camera> createTextureDisplayQuad(
-    const osg::Vec3 &pos,
-    osg::StateAttribute *tex,
-    float scale,
-    float width,
-    float height)
-{
-    osg::ref_ptr<osg::Camera> hc = createHUDCamera();
-    hc->addChild(createScreenQuad(width, height, scale, pos));
-    hc->getOrCreateStateSet()->setTextureAttributeAndModes(0, tex);
-    return hc;
-}
-
-void setAnimationPath(osg::ref_ptr<osg::MatrixTransform> node,
-                      const osg::Vec3 &center,
-                      float time,
-                      float radius)
-{
-    // Create animation.
-    osg::ref_ptr<osg::AnimationPath> path = new osg::AnimationPath;
-    path->setLoopMode(osg::AnimationPath::LOOP);
-    unsigned int numSamples = 32;
-    float delta_yaw = 2.0f * osg::PI / (static_cast<float>(numSamples) - 1.0f);
-    float delta_time = time / static_cast<float>(numSamples);
-    for (unsigned int i = 0; i < numSamples; ++i)
-    {
-        float yaw = delta_yaw * static_cast<float>(i);
-        osg::Vec3 pos(center.x() + sinf(yaw)*radius,
-                      center.y() + cosf(yaw)*radius,
-                      center.z());
-        osg::Quat rot(-yaw, osg::Z_AXIS);
-        path->insert(delta_time * static_cast<float>(i),
-                     osg::AnimationPath::ControlPoint(pos, rot));
-    }
-    // Assign it.
-    node->setUpdateCallback(new osg::AnimationPathCallback(path.get()));
-}
-
-osg::ref_ptr<osg::StateSet> setShaderProgram(osg::ref_ptr<osg::Camera> pass,
-                                             const std::string& vert,
-                                             const std::string& frag)
-{
-    osg::ref_ptr<osg::Program> program = new osg::Program;
-    program->addShader(osgDB::readRefShaderFile(vert));
-    program->addShader(osgDB::readRefShaderFile(frag));
-    osg::ref_ptr<osg::StateSet> ss = pass->getOrCreateStateSet();
-    ss->setAttributeAndModes(
-        program.get(),
-        osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
-    return ss;
-}
-
-int main()
-{
-    // Useful declaration.
-    osg::ref_ptr<osg::StateSet> ss;
-    // Scene.
-    osg::Vec3 lightPos(0, 0, 80);
-    osg::ref_ptr<osg::Group> scene = createSceneRoom();
-    osg::ref_ptr<osg::LightSource> light = createLight(lightPos);
-    scene->addChild(light.get());
-    // Shadowed scene.
-    osg::ref_ptr<osgShadow::SoftShadowMap> shadowMap = new osgShadow::SoftShadowMap;
-    shadowMap->setJitteringScale(16);
-    shadowMap->addShader(osgDB::readRefShaderFile("shaders/pass1Shadow.frag"));
-    shadowMap->setLight(light.get());
-    osg::ref_ptr<osgShadow::ShadowedScene> shadowedScene = new osgShadow::ShadowedScene;
-    shadowedScene->setShadowTechnique(shadowMap.get());
-    shadowedScene->addChild(scene.get());
-    Pipeline p = createPipelinePlainOSG(scene, shadowedScene, lightPos);
-    // Quads to display 1 pass textures.
-    osg::ref_ptr<osg::Camera> qTexN =
-        createTextureDisplayQuad(osg::Vec3(0, 0.7, 0),
-                                 p.pass2Normals,
-                                 p.textureSize);
-    osg::ref_ptr<osg::Camera> qTexP =
-        createTextureDisplayQuad(osg::Vec3(0, 0.35, 0),
-                                 p.pass2Positions,
-                                 p.textureSize);
-    osg::ref_ptr<osg::Camera> qTexC =
-        createTextureDisplayQuad(osg::Vec3(0, 0, 0),
-                                 p.pass2Colors,
-                                 p.textureSize);
-    // Qaud to display 2 pass shadow texture.
-    osg::ref_ptr<osg::Camera> qTexS =
-        createTextureDisplayQuad(osg::Vec3(0.7, 0.7, 0),
-                                 p.pass1Shadows,
-                                 p.textureSize);
-    // Quad to display 3 pass final (screen) texture.
-    osg::ref_ptr<osg::Camera> qTexFinal =
-        createTextureDisplayQuad(osg::Vec3(0, 0, 0),
-                                 p.pass3Final,
-                                 p.textureSize,
-                                 1,
-                                 1);
-    // Must be processed before the first pass takes
-    // the result into pass1Shadows texture.
-    p.graph->insertChild(0, shadowedScene.get());
-    // Quads are displayed in order, so the biggest one (final) must be first,
-    // otherwise other quads won't be visible.
-    p.graph->addChild(qTexFinal.get());
-    p.graph->addChild(qTexN.get());
-    p.graph->addChild(qTexP.get());
-    p.graph->addChild(qTexC.get());
-    p.graph->addChild(qTexS.get());
-
-    // Display everything.
-    osgViewer::Viewer viewer;
-
-    // add the stats handler
-    viewer.addEventHandler(new osgViewer::StatsHandler);
-
-    // Make screenshots with 'c'.
-    viewer.addEventHandler(
-        new osgViewer::ScreenCaptureHandler(
-            new osgViewer::ScreenCaptureHandler::WriteToFile(
-                "screenshot",
-                "png",
-                osgViewer::ScreenCaptureHandler::WriteToFile::OVERWRITE)));
-
-    viewer.getCamera()->setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR);
-    viewer.setSceneData(p.graph.get());
-
-    return viewer.run();
-}
-