Updated ChangeLog for 3.4.1 release

Applied sizedInternalFormats change to 3.4 branch

.gitignore

@@ -0,0 +1,94 @@
+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

@@ -0,0 +1,36 @@
+matrix:
+  fast_finish: true
+  include:
+    #Linux build
+    - os: linux
+      dist: trusty
+      language: cpp
+      env:
+         #- LLVM_VERSION=3.8
+      sudo: false
+      cache:
+        apt: true
+        directories:
+          - $HOME/.ccache
+      compiler: 
+          #- clang 
+          - g++
+      addons:
+        apt:
+          sources:
+            #- llvm-toolchain-precise-3.8
+            - ubuntu-toolchain-r-test
+          packages:
+            #- clang-3.8
+            - g++
+            - cmake
+    # OSX build
+    - os: osx
+      language: cpp
+
+script:
+   - mkdir build
+   - cd build
+   - travis_wait 60 cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../product -DBUILD_OSG_EXAMPLES=ON ..
+   - make install -j3
+

AUTHORS.txt

@@ -1,11 +1,10 @@
-OpenSceneGraph Library 3.3.9
+OpenSceneGraph Library 3.4.1
 
-548 Contributors:
+562 Contributors:
 
 Firstname Surname
 -----------------
 Robert Osfield
-Don Burns
 Stephan Huber
 Paul Martz
 Farshid Lashkari
@@ -20,38 +19,41 @@ Eric Wing
 Cedric Pinson
 Brede Johansen
 Bob Kuehne
+Wojciech Lewandowski
 Michael Platings
 Geoff Michel
-Wojciech Lewandowski
 Eric Sokolowsky
-David Callu
 Laurens Voerman
+David Callu
 Colin McDonald
 Trajce Nikolov
 Tim Moore
 Martin Lavery
 Mattias Helsing
-Tree
 Jason Beverage
-Luigi Calori
+Tree
 Pjotr Svetachov
+Luigi Calori
+Alberto Luaces
 Mike Wittman
 Jan Peciva
 Chris Hanson
-Alberto Luaces
 Roland Smeenk
 Roger James
 Jeremy Moles
+Jannik Heller
 J.P. Delport
+Andy Skinner
 Magnus Kessler
 David Fries
-Andy Skinner
 Tom Jolley
 Paul Melis
 Luc Frauciel
 Aurelien Albert
 Pavel Moloshtan
 Brad Christiansen
+Torben Dannhauer
+Terry Welsh
 Olaf Flebbe
 Mathieu Marache
 Lionel Lagarde
@@ -61,36 +63,33 @@ Philip Lowman
 Per Fahlberg
 Norman Vine
 Chris Denham
-Terry Welsh
+Sherman Wilcox
 Serge Lages
 Romano Jos<6F> Magacho da Silva
-Jannik Heller
-Alberto Farre
-Torben Dannhauer
-Sherman Wilcox
-Robert Michael
 Mourad Boufarguine
+Alberto Farre
+Glenn Waldron
 Andr<EFBFBD> Garneau
 Adrian Egli
-Ruben Lopez
-Randall Hopper
-Jan Ciger
-Glenn Waldron
 Sebastian Messerschmidt
+Randall Hopper
+Kristofer Tingdahl
+Jan Ciger
+Ruben Lopez
+Robert Michael
 Gideon May
 Don Tidrow
 Stephane Lamoliatte
 Michael Gronager
 Martin Naylor
-Kristofer Tingdahl
 Joakim Simonsson
 David Spilling
 Daniel Sj<53>lie
 Bryan Thrall
+Andreas Ekstrand
 Rafa Gaitan
 Mike Connell
 Fabien Lavignotte
-Andreas Ekstrand
 Thomas Hogarth
 Riccardo Corsi
 Melchior Franz
@@ -99,9 +98,9 @@ Johannes Baeuerle
 Neil Hughes
 Martin Beckett
 Marc Helbling
+Jordi Torres
 Joran Jessurun
 Gino van den Bergen
-Frederic Marmond
 David Guthrie
 Csaba Halasz
 Cory Riddell
@@ -111,21 +110,21 @@ Yefei He
 Sondra Iverson
 Simon Julier
 Rune Schmidt Jensen
+Ravi Mathur
 Rainer Oder
 Nico Kruithof
 Martin Aumueller
 Mario Valle
 Lukasz Izdebski
 Jorge Izquierdo Ciges
-Jordi Torres
 Gordon Tomlinson
+Frederic Marmond
 Frederic Bouvier
 Carlo Camporesi
-Ben Discoe
+Bj<EFBFBD>rn Blissing
 Alexander Sinditskiy
 Thibault Genessay
 Sasa Bistrovic
-Ravi Mathur
 Ralf Habacker
 Neil Groves
 Mikhail Izmestev
@@ -133,8 +132,10 @@ Markus Trenkwalder
 Loic Dachary
 Joseph Steel
 John Shue
+Hartwig Wiesmann
 Brad Colbert
-Bj<EFBFBD>rn Blissing
+Ben Discoe
+Vladimir Chebaev
 Vivek Rajan
 Uwe Woessner
 Tony Horrobin
@@ -154,9 +155,9 @@ Martins Innus
 Maciej Krol
 Lilin Xiong
 Leandro Motta Barros
+Julien Valentin
 Johan Nouvel
 Javier Taibo
-Hartwig Wiesmann
 Donn Mielcarek
 Corbin Holtz
 Blasius Czink
@@ -167,7 +168,6 @@ Rudolf Wiedemann
 Maria Ten
 Liang Aibin
 Katharina Plugge
-Julien Valentin
 John Vidar Larring
 John Kelso
 John Ivar
@@ -182,10 +182,9 @@ Bradley Anderegg
 Andreas Goebel
 Alok Priyadarshi
 Ali Botorabi
-Alberto Barbati
 Alan Dickinson
+Wee See
 Vladimir Shabanov
-Vladimir Chebaev
 Tugkan Calapoglu
 Tim Daoust
 Sylvain Marie
@@ -196,8 +195,10 @@ Ryan Pavlik
 Robert Milharcic
 Rene Molenaar
 Piotr Domagalski
+Philippe Renon
 Phil Atkin
 Pawel Ksiezopolski
+Patrick Neary
 Nathan Monteleone
 Miha Rav<61>elj
 Miguel Escriva
@@ -225,6 +226,7 @@ Fabio Mierlo
 Doug McCorkle
 Donald Cipperly
 Don Leich
+Don Burns
 Dietmar Funck
 Colin Cochran
 Christian Ruzicka
@@ -239,9 +241,9 @@ Andreas Henne
 Anders Backman
 Alexander Wiebel
 Alessandro Terenzi
+Alberto Barbati
 Zach Deedler
 Yuzhong Shen
-Wee See
 Warren Macchi
 Vincent Bourdier
 Terrex
@@ -256,7 +258,6 @@ Raymond de Vries
 Ralf Kern
 Piotr Gwiazdowski
 Pierre Haritchabalet
-Philippe Renon
 Perry Miller
 Paul Palumbo
 Paul Obermeier
@@ -267,7 +268,6 @@ Morn
 Michael Mc Donnell
 Michael Henheffer
 Michael Guerrero
-Maya Leonard
 Max Bandazian
 Mathias Fiedler
 Mathew May
@@ -301,7 +301,6 @@ Giampaolo Vigan
 Gerrick Bivins
 George Tarantilis
 Ferdi Smit
-Eric Buehler
 Eduardo Poyart
 Edgar Ellis
 Dmitry Marakasov
@@ -317,6 +316,7 @@ Christian Kehl
 Bradley Baker Searles
 Brad Anderegg
 Aric Aumann
+Anish Thomas
 Andrew Sampson
 Andrew Lorino
 Alexandre Amalric
@@ -339,6 +339,8 @@ Valeriy Dubov
 Vaclav Bilek
 Tyge L<>vset
 Troy Yee
+Torben Dannahauer
+Tony Vasile
 Tomas Hogarth
 Tomas Hnilica
 Todd Furlong
@@ -361,6 +363,7 @@ Shane Arnott
 Sergey Kurdakov
 Sebastien Kuntz
 Ruth Lang
+Ruben The
 Ruben Smelik
 Ross Anderson
 Ronny Krueger
@@ -402,12 +405,14 @@ Oren Fromberg
 Oliver Neumann
 Ole-Morten Duesund
 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
@@ -415,6 +420,8 @@ Michael Morrison
 Michael Logan
 Michael Kapelko
 Michael Bach Jensen
+Maya Thu
+Maya Leonard
 Max Rhiener
 Max Behensky
 Mauricio Hofmam
@@ -431,9 +438,9 @@ Martin Beck
 Marius Kintel
 Mario Guimaraes
 Marcus Hein
+Marco Thu
 Marco Sciabica
 Marco Lehmann
-Maik Keller
 Lukas Diduch
 Louis Hamilton
 Likasz Izebski
@@ -455,11 +462,14 @@ 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
@@ -478,8 +488,10 @@ Hartmut Seichter
 Gunter Huber
 Gregory Jaegy
 Graeme Harkness
+Github It
 Gian Lorenzetto
 George Papagiannakis
+Geoff Thu
 Galen Faidley
 Frida Schlaug
 Frederic Smith
@@ -494,6 +506,8 @@ Ferdinand Cornelissen
 Fajran Iman
 Fabien Dachicourt
 Erik Johnson
+Eric Thu
+Eric Buehler
 Eduardo Alberto
 Edmond Gheury
 Ed Ralston
@@ -509,6 +523,7 @@ Daniel Stien
 Dan Minor
 C<EFBFBD>sar L. B. Silveira
 Cyril Brulebois
+Cory Slep
 Cl<EFBFBD>ment B<>sch
 Clay Fowler
 Claus Steuer
@@ -524,8 +539,8 @@ Carlos Garcea
 Bryce Eldridge
 Bruno Herbelin
 Brian Keener
+Brede Thu
 Brandon Hamm
-Bora Utka
 Bill Prendergast
 Bernardt Duvenhage
 Benoit Laniel
@@ -535,7 +550,6 @@ Bart Gallet
 Axel Volley
 Arjun Ramamurthy
 Anthousis Andreadis
-Anish Thomas
 Andy Preece
 Andrew Reyonolds
 Andreas Roth

CMakeLists.txt

@@ -53,12 +53,12 @@ PROJECT(OpenSceneGraph)
 
 SET(OPENSCENEGRAPH_MAJOR_VERSION 3)
 SET(OPENSCENEGRAPH_MINOR_VERSION 4)
-SET(OPENSCENEGRAPH_PATCH_VERSION 0)
+SET(OPENSCENEGRAPH_PATCH_VERSION 1)
-SET(OPENSCENEGRAPH_SOVERSION 130)
+SET(OPENSCENEGRAPH_SOVERSION 131)
 
 # 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
+# git tags will be treated as release candidates of given number
-SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 1)
+SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 0)
 
 SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})
 
@@ -114,27 +114,15 @@ IF(CMAKE_SYSTEM MATCHES IRIX)
     SET(CMAKE_THREAD_LIBS_INIT "" CACHE INTERNAL "")
 ENDIF()
 
-OPTION(OSG_MAINTAINER "Enable OpenSceneGraph maintainer build methods, such as making svn branches, tags, updating ChangeLog." OFF)
+OPTION(OSG_MAINTAINER "Enable OpenSceneGraph maintainer build methods, such as making git 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(SVNCOMMAND svn)
+    SET(GITCOMMAND git)
-    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})
@@ -142,31 +130,38 @@ 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 ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNTAGDIR}/${RELEASE_NAME} -m "Release ${RELEASE_NAME}"
+        COMMAND echo ${GITCOMMAND} tag -a ${RELEASE_NAME} -m ${RELEASE_MESSAGE}
+        COMMAND echo ${GITCOMMAND} push origin ${RELEASE_NAME}
     )
 
     ADD_CUSTOM_TARGET(tag-run
-        COMMAND ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNTAGDIR}/${RELEASE_NAME} -m "Release ${RELEASE_NAME}"
+        COMMAND ${GITCOMMAND} tag -a ${RELEASE_NAME} -m ${RELEASE_MESSAGE}
+        COMMAND ${GITCOMMAND} push origin ${RELEASE_NAME}
     )
 
     ADD_CUSTOM_TARGET(branch-test
-        COMMAND echo ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNBRANCHDIR}/${OPENSCENEGRAPH_BRANCH} -m "Branch ${OPENSCENEGRAPH_BRANCH}"
+        COMMAND echo ${GITCOMMAND} branch ${OPENSCENEGRAPH_BRANCH} -m ${BRANCH_MESSAGE}
+        COMMAND echo ${GITCOMMAND} push origin ${OPENSCENEGRAPH_BRANCH}
     )
 
     ADD_CUSTOM_TARGET(branch-run
-        COMMAND ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNBRANCHDIR}/${OPENSCENEGRAPH_BRANCH} -m "Branch ${OPENSCENEGRAPH_BRANCH}"
+        COMMAND ${GITCOMMAND} branch ${OPENSCENEGRAPH_BRANCH} -m ${BRANCH_MESSAGE}
+        COMMAND ${GITCOMMAND} push origin ${OPENSCENEGRAPH_BRANCH}
     )
 
     #
     # Provide target for generating ChangeLog
     #
-    SET(GENERATELOGS svn2cl)
+    SET(GITLOGFORMAT "%aD%nChecked in by : %an%n%s%b%n")
+    SET(GENERATELOGS git log --pretty=format:${GITLOGFORMAT})
 
     ADD_CUSTOM_TARGET(ChangeLog
-        COMMAND ${SVNCOMMAND} update
+        COMMAND ${GENERATELOGS} > ChangeLog
-        COMMAND ${GENERATELOGS} ${SVNSOURCEDIR}
     )
 
 ENDIF(OSG_MAINTAINER)
@@ -398,11 +393,12 @@ 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)
 
 
 # Map the OPENGL_PROFILE to OSG_GL*_AVAILABLE settings
-SET(OPENGL_PROFILE "GL2" CACHE STRING "OpenGL Profile to use, choose from GL2, GL3, GLES1, GLES2, GLES3")
+SET(OPENGL_PROFILE "GL2" CACHE STRING "OpenGL Profile to use, choose from GL1, GL2, GL3, GLES1, GLES2, GLES3")
 
 IF ((OPENGL_PROFILE STREQUAL "GL1") OR (OPENGL_PROFILE STREQUAL "GL2"))
     OPTION(OSG_GL1_AVAILABLE "Set to OFF to disable use of OpenGL 1.x functions library." ON )
@@ -519,39 +515,39 @@ ELSE()
 ENDIF()
 
 IF (OSG_GL1_AVAILABLE)
-    SET(OSG_GL1_FEATURES "true")
+    SET(OSG_GL1_FEATURES 1)
 ELSE()
-    SET(OSG_GL1_FEATURES "false")
+    SET(OSG_GL1_FEATURES 0)
 ENDIF()
 
 IF (OSG_GL2_AVAILABLE)
-    SET(OSG_GL2_FEATURES "true")
+    SET(OSG_GL2_FEATURES 1)
 ELSE()
-    SET(OSG_GL2_FEATURES "false")
+    SET(OSG_GL2_FEATURES 0)
 ENDIF()
 
 IF (OSG_GL3_AVAILABLE)
-    SET(OSG_GL3_FEATURES "true")
+    SET(OSG_GL3_FEATURES 1)
 ELSE()
-    SET(OSG_GL3_FEATURES "false")
+    SET(OSG_GL3_FEATURES 0)
 ENDIF()
 
 IF (OSG_GLES1_AVAILABLE)
-    SET(OSG_GLES1_FEATURES "true")
+    SET(OSG_GLES1_FEATURES 1)
 ELSE()
-    SET(OSG_GLES1_FEATURES "false")
+    SET(OSG_GLES1_FEATURES 0)
 ENDIF()
 
 IF (OSG_GLES2_AVAILABLE)
-    SET(OSG_GLES2_FEATURES "true")
+    SET(OSG_GLES2_FEATURES 1)
 ELSE()
-    SET(OSG_GLES2_FEATURES "false")
+    SET(OSG_GLES2_FEATURES 0)
 ENDIF()
 
 IF (OSG_GLES3_AVAILABLE)
-    SET(OSG_GLES3_FEATURES "true")
+    SET(OSG_GLES3_FEATURES 1)
 ELSE()
-    SET(OSG_GLES3_FEATURES "false")
+    SET(OSG_GLES3_FEATURES 0)
 ENDIF()
 
 IF(ANDROID)
@@ -574,12 +570,33 @@ ENDIF()
 
 
 ################################################################################
-# Set Config/OpenGL header file
+# Set Config header file
 
 SET(OPENSCENEGRAPH_CONFIG_HEADER "${PROJECT_BINARY_DIR}/include/osg/Config")
 CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Config.in"
                "${OPENSCENEGRAPH_CONFIG_HEADER}")
 
+
+################################################################################
+# Set OpenGL header file
+
+INCLUDE (CheckCXXSourceCompiles)
+#SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${OPENGL_INCLUDE_DIR})
+
+check_cxx_source_compiles(
+    "${OPENGL_HEADER1}
+    ${OPENGL_HEADER2}
+    int main() { GLint64 test; return 0; }"
+    GL_HEADER_HAS_GLINT64
+)
+
+check_cxx_source_compiles(
+    "${OPENGL_HEADER1}
+    ${OPENGL_HEADER2}
+    int main() { GLuint64 test; return 0; }"
+    GL_HEADER_HAS_GLUINT64
+)
+
 SET(OPENSCENEGRAPH_OPENGL_HEADER "${PROJECT_BINARY_DIR}/include/osg/GL")
 CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/GL.in"
                "${OPENSCENEGRAPH_OPENGL_HEADER}")
@@ -588,7 +605,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/GL.in"
 
 
 ################################################################################
-# Set Vertsion header file
+# Set Version header file
 
 SET(OPENSCENEGRAPH_VERSION_HEADER "${PROJECT_BINARY_DIR}/include/osg/Version")
 CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Version.in"
@@ -661,7 +678,6 @@ ELSE()
     ENDIF()
     FIND_PACKAGE(ZeroConf)
 
-    FIND_PACKAGE(Boost) # used by LIBLAS
     FIND_PACKAGE(LIBLAS)
 
     IF (NOT(OSG_USE_LOCAL_LUA_SOURCE))
@@ -692,11 +708,11 @@ IF(OSG_USE_QT AND NOT ANDROID)
 
     IF  (DESIRED_QT_VERSION)
         IF  (DESIRED_QT_VERSION MATCHES 5)
-              FIND_PACKAGE(Qt5Widgets)
+            FIND_PACKAGE(Qt5Widgets)
         ELSEIF (DESIRED_QT_VERSION MATCHES 4)
-              FIND_PACKAGE(Qt4)
+            FIND_PACKAGE(Qt4)
         ELSE()
-              FIND_PACKAGE(Qt3)
+            FIND_PACKAGE(Qt3)
         ENDIF()
 
     ELSE()
@@ -728,6 +744,13 @@ IF(OSG_USE_QT AND NOT ANDROID)
     #If we have found Qt5, let's try to top off by getting the webkit as well
     IF ( Qt5Widgets_FOUND )
         FIND_PACKAGE(Qt5WebKitWidgets 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()

CMakeModules/Find3rdPartyDependencies.cmake

@@ -49,7 +49,13 @@ 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)
 
 
@@ -58,8 +64,8 @@ ENDMACRO(FIND_DEPENDENCY DEPNAME INCLUDEFILE LIBRARY_NAMES_BASE SEARCHPATHLIST D
 ################################################################################################
 
 MACRO(SEARCH_3RDPARTY OSG_3RDPARTY_BIN)
-        FIND_DEPENDENCY(TIFF tiff.h libtiff ${OSG_3RDPARTY_BIN} "D" "_i")
+        FIND_DEPENDENCY(TIFF tiff.h "libtiff;tiff" ${OSG_3RDPARTY_BIN} "D" "")
-        FIND_DEPENDENCY(FREETYPE ft2build.h "freetype;freetype2311MT;freetype234;freetype234MT;freetype235;freetype237;freetype238;freetype244;freetype250;" ${OSG_3RDPARTY_BIN} "d" "")
+        FIND_DEPENDENCY(FREETYPE ft2build.h "freetype;freetype2311MT;freetype234;freetype234MT;freetype235;freetype237;freetype238;freetype244;freetype250;freetype27;" ${OSG_3RDPARTY_BIN} "d" "")
         IF(FREETYPE_FOUND)
             #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)
@@ -67,7 +73,7 @@ MACRO(SEARCH_3RDPARTY OSG_3RDPARTY_BIN)
             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" ${OSG_3RDPARTY_BIN} "D" "")
+        FIND_DEPENDENCY(CURL curl/curl.h "libcurl;curllib;libcurl_imp" ${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" "")
@@ -86,11 +92,13 @@ MACRO(SEARCH_3RDPARTY OSG_3RDPARTY_BIN)
                 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
-            SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARY} CACHE FILEPATH "" FORCE)
+            SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARY} CACHE FILEPATH "LibXML2 library for collada" 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)
@@ -104,7 +112,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 prebuilt dependencies situated side of OpenSceneGraph source.  Use OFF for avoiding." ON)
+OPTION(USE_3RDPARTY_BIN "Set to ON to use Mike or Torbens prebuilt dependencies situated side of OpenSceneGraph source.  Use OFF for avoiding." ON)
 IF(USE_3RDPARTY_BIN)
 
     # Check Architecture

CMakeModules/FindAVFoundation.cmake

@@ -30,7 +30,7 @@ ELSE()
       # AVFoundation exists since 10.7, but only 10.8 has all features necessary for OSG
       # so check the SDK-setting
 
-      IF(${OSG_OSX_SDK_NAME} STREQUAL "macosx10.8" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.9" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.10")
+      IF(${OSG_OSX_SDK_NAME} STREQUAL "macosx10.8" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.9" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.10" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.11")
           # nothing special here ;-)
       ELSE()
           MESSAGE("AVFoundation disabled for SDK < 10.8")

CMakeModules/FindAsio.cmake

@@ -14,7 +14,9 @@ FIND_PATH(ASIO_INCLUDE_DIR
 )
 
 SET(ASIO_FOUND "NO")
-FIND_PACKAGE( Boost 1.37 )
+IF(ASIO_INCLUDE_DIR)
-IF(Boost_FOUND AND ASIO_INCLUDE_DIR) 
+    FIND_PACKAGE( Boost 1.37 )
-  SET(ASIO_FOUND "YES")
+    IF(Boost_FOUND)
+        SET(ASIO_FOUND "YES")
+    ENDIF()
 ENDIF()

CMakeModules/FindCOLLADA.cmake

@@ -28,6 +28,8 @@ IF(APPLE)
     SET(COLLADA_BUILDNAME "mac")
 ELSEIF(MINGW)
     SET(COLLADA_BUILDNAME "mingw")
+ELSEIF(MSVC14)
+    SET(COLLADA_BUILDNAME "vc14")
 ELSEIF(MSVC12)
     SET(COLLADA_BUILDNAME "vc12")
 ELSEIF(MSVC11)
@@ -53,10 +55,16 @@ FIND_PATH(COLLADA_INCLUDE_DIR dae.h
     /usr/local/include
     /usr/local/include/colladadom
     /usr/local/include/collada-dom
+    /usr/local/include/collada-dom2.4
+    /usr/local/include/collada-dom2.2
     /opt/local/include/collada-dom
+    /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.4
+    /usr/include/collada-dom2.2
     /sw/include # Fink
     /opt/local/include # DarwinPorts
     /opt/csw/include # Blastwave
@@ -66,7 +74,7 @@ FIND_PATH(COLLADA_INCLUDE_DIR dae.h
 )
 
 FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY
-    NAMES collada_dom collada14dom Collada14Dom libcollada14dom21 libcollada14dom22 collada-dom2.4-dp
+    NAMES collada_dom collada14dom Collada14Dom libcollada14dom21 libcollada14dom22 collada-dom2.4-dp collada-dom2.4-dp-vc120-mt
     PATHS
     ${COLLADA_DOM_ROOT}/build/${COLLADA_BUILDNAME}-1.4
     ${COLLADA_DOM_ROOT}
@@ -90,7 +98,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.4-dp-d
+    NAMES collada_dom-d collada14dom-d Collada14Dom-d libcollada14dom21-d libcollada14dom22-d  collada-dom2.4-dp-d collada-dom2.4-dp-vc120-mt-d
     PATHS
     ${COLLADA_DOM_ROOT}/build/${COLLADA_BUILDNAME}-1.4-d
     ${COLLADA_DOM_ROOT}
@@ -178,7 +186,16 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
 
     FIND_PACKAGE(ZLIB)
     IF (ZLIB_FOUND)
-        SET(COLLADA_ZLIB_LIBRARY "${ZLIB_LIBRARY}" CACHE FILEPATH "" FORCE)
+        IF (ZLIB_LIBRARY_RELEASE)
+            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
@@ -244,7 +261,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
     )
 
     FIND_LIBRARY(COLLADA_BOOST_FILESYSTEM_LIBRARY
-        NAMES libboost_filesystem boost_filesystem boost_filesystem-mt libboost_filesystem-${COLLADA_BUILDNAME}0-mt libboost_filesystem-${COLLADA_BUILDNAME}0-mt-1_54 libboost_filesystem-${COLLADA_BUILDNAME}0-mt-1_55
+        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 libboost_filesystem-${COLLADA_BUILDNAME}0-mt-1_58 boost_filesystem-${COLLADA_BUILDNAME}0-mt-1_62
         PATHS
         ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
         ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
@@ -252,7 +269,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
     )
 
     FIND_LIBRARY(COLLADA_BOOST_FILESYSTEM_LIBRARY_DEBUG
-        NAMES libboost_filesystem-d boost_filesystem-d boost_filesystem-mt-d libboost_filesystem-${COLLADA_BUILDNAME}0-mt-gd libboost_filesystem-${COLLADA_BUILDNAME}0-mt-gd-1_54 libboost_filesystem-${COLLADA_BUILDNAME}0-mt-gd-1_55
+        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 libboost_filesystem-${COLLADA_BUILDNAME}0-mt-gd-1_58 boost_filesystem-${COLLADA_BUILDNAME}0-mt-gd-1_62
         PATHS
         ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
         ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
@@ -260,7 +277,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
     )
 
     FIND_LIBRARY(COLLADA_BOOST_SYSTEM_LIBRARY
-        NAMES libboost_system boost_system boost_system-mt libboost_system-${COLLADA_BUILDNAME}0-mt libboost_system-${COLLADA_BUILDNAME}0-mt-1_54 libboost_system-${COLLADA_BUILDNAME}0-mt-1_55
+        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  libboost_system-${COLLADA_BUILDNAME}0-mt-1_58 boost_system-${COLLADA_BUILDNAME}0-mt-1_62
         PATHS
         ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
         ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
@@ -268,7 +285,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG
     )
 
     FIND_LIBRARY(COLLADA_BOOST_SYSTEM_LIBRARY_DEBUG
-        NAMES libboost_system-d boost_system-d boost_system-mt-d libboost_system-${COLLADA_BUILDNAME}0-mt-gd libboost_system-${COLLADA_BUILDNAME}0-mt-gd-1_54 libboost_system-${COLLADA_BUILDNAME}0-mt-gd-1_55
+        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 libboost_system-${COLLADA_BUILDNAME}0-mt-gd-1_58 boost_system-${COLLADA_BUILDNAME}0-mt-gd-1_62
         PATHS
         ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
         ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw

CMakeModules/FindFBX.cmake

@@ -50,13 +50,13 @@ SET( FBX_SEARCH_PATHS
     $ENV{FBX_DIR}
     "$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"
@@ -96,8 +96,9 @@ 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
     )
 
@@ -134,8 +135,9 @@ 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/FindFreetype.cmake

@@ -1,25 +1,64 @@
-# - Locate FreeType library
+#.rst:
-# This module defines
+# FindFreetype
-#  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.
-#  This is the concatenation of the paths:
-#  FREETYPE_INCLUDE_DIR_ft2build
-#  FREETYPE_INCLUDE_DIR_freetype2
 #
-# $FREETYPE_DIR is an environment variable that would
+# Locate FreeType library
-# correspond to the ./configure --prefix=$FREETYPE_DIR
+#
-# used in building FREETYPE.
+# This module defines
+#
+# ::
+#
+#   FREETYPE_LIBRARIES, the library to link against
+#   FREETYPE_FOUND, if false, do not try to link to FREETYPE
+#   FREETYPE_INCLUDE_DIRS, where to find headers.
+#   FREETYPE_VERSION_STRING, the version of freetype found (since CMake 2.8.8)
+#   This is the concatenation of the paths:
+#   FREETYPE_INCLUDE_DIR_ft2build
+#   FREETYPE_INCLUDE_DIR_freetype2
+#
+#
+#
+# $FREETYPE_DIR is an environment variable that would correspond to the
+# ./configure --prefix=$FREETYPE_DIR used in building FREETYPE.
+
+#=============================================================================
+# Copyright 2000-2016 Kitware, Inc.
+# Copyright 2000-2011 Insight Software Consortium
+# 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.
-
+# Modifications by Alexander Neundorf.
-# prefer FindFreetype from cmake distribution
+# This file has been renamed to "FindFreetype.cmake" instead of the correct
-if(EXISTS ${CMAKE_ROOT}/Modules/FindFreetype.cmake)
+# "FindFreeType.cmake" in order to be compatible with the one from KDE4, Alex.
-  include(${CMAKE_ROOT}/Modules/FindFreetype.cmake)
-
-  if(FREETYPE_FOUND)
-    return()
-  endif()
-endif()
 
 # Ugh, FreeType seems to use some #include trickery which
 # makes this harder than it should be. It looks like they
@@ -29,113 +68,121 @@ endif()
 # 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
 # everything still works.
 
-FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h 
+# Adapted for OpenSceneGraph until the updates here for finding the debug Windows library freetyped are released with CMake
+
+set(FREETYPE_FIND_ARGS
+  HINTS
+    ENV FREETYPE_DIR
   PATHS
-  $ENV{FREETYPE_DIR}
+    /usr/X11R6
-  NO_DEFAULT_PATH
+    /usr/local/X11R6
-  PATH_SUFFIXES include    
+    /usr/local/X11
-)
+    /usr/freeware
-FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h 
+    ENV GTKMM_BASEPATH
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
+    [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
-  NO_DEFAULT_PATH
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;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(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h 
+find_path(
-  $ENV{FREETYPE_DIR}/include/freetype2
+  FREETYPE_INCLUDE_DIR_ft2build
-  NO_DEFAULT_PATH
+  ft2build.h
-)
+  ${FREETYPE_FIND_ARGS}
-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h 
+  PATH_SUFFIXES
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
+    include/freetype2
-  NO_DEFAULT_PATH
+    include
-  PATH_SUFFIXES include/freetype2
+    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(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h 
+find_path(
-  /usr/local/include/freetype2
+  FREETYPE_INCLUDE_DIR_freetype2
-  /usr/include/freetype2
+  NAMES
-  /usr/local/X11R6/include/freetype2
+    freetype/config/ftheader.h
-  /usr/local/X11/include/freetype2
+    config/ftheader.h
-  /usr/X11R6/include/freetype2
+  ${FREETYPE_FIND_ARGS}
-  /usr/X11/include/freetype2
+  PATH_SUFFIXES
-  /sw/include/freetype2
+    include/freetype2
-  /opt/local/include/freetype2
+    include
-  /opt/csw/include/freetype2
+    freetype2
-  /opt/include/freetype2
-  /usr/freeware/include/freetype2
 )
 
-FIND_LIBRARY(FREETYPE_LIBRARY 
+if(NOT FREETYPE_LIBRARY)
-  NAMES freetype libfreetype freetype219
+  find_library(FREETYPE_LIBRARY_RELEASE
-  PATHS
+    NAMES
-  $ENV{FREETYPE_DIR}
+      freetype
-  NO_DEFAULT_PATH
+      libfreetype
-  PATH_SUFFIXES lib64 lib 
+      freetype219
-)
+    ${FREETYPE_FIND_ARGS}
-FIND_LIBRARY(FREETYPE_LIBRARY 
+    PATH_SUFFIXES
-  NAMES freetype libfreetype freetype219
+      lib
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
+  )
-  NO_DEFAULT_PATH
+  find_library(FREETYPE_LIBRARY_DEBUG
-  PATH_SUFFIXES lib64 lib 
+    NAMES
-)
+      freetyped
-FIND_LIBRARY(FREETYPE_LIBRARY 
+      libfreetyped
-  NAMES freetype libfreetype freetype219
+      freetype219d
-  PATHS
+    ${FREETYPE_FIND_ARGS}
-  /usr/local
+    PATH_SUFFIXES
-  /usr
+      lib
-  /usr/local/X11R6
+  )
-  /usr/local/X11
+  include(SelectLibraryConfigurations) #OSG Look in CMake Modules dir
-  /usr/X11R6
+  select_library_configurations(FREETYPE)
-  /usr/X11
+endif()
-  /sw
+
-  /opt/local
+unset(FREETYPE_FIND_ARGS)
-  /opt/csw
+
-  /opt
+# set the user variables
-  /usr/freeware
+if(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
-  PATH_SUFFIXES lib64 lib
+  set(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR_ft2build};${FREETYPE_INCLUDE_DIR_freetype2}")
+  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
 )
 
-IF(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
+mark_as_advanced(
-  SET(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR_ft2build};${FREETYPE_INCLUDE_DIR_freetype2}")
+  FREETYPE_INCLUDE_DIR_freetype2
-ENDIF(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
+  FREETYPE_INCLUDE_DIR_ft2build
-
+)
-
-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

@@ -83,18 +83,18 @@ else ()
     find_package(PkgConfig)    
 
     macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _library)
-        pkg_check_modules(PC_${_component_prefix} QUIET ${_pkgconfig_name})
+        pkg_check_modules(${_component_prefix} QUIET ${_pkgconfig_name})
 
-        find_path(${_component_prefix}_INCLUDE_DIRS
+#        find_path(${_component_prefix}_INCLUDE_DIRS
-            NAMES ${_header}
+#            NAMES ${_header}
-            HINTS ${PC_${_component_prefix}_INCLUDE_DIRS} ${PC_${_component_prefix}_INCLUDEDIR}
+#            HINTS ${PC_${_component_prefix}_INCLUDE_DIRS} ${PC_${_component_prefix}_INCLUDEDIR}
-            PATH_SUFFIXES gstreamer-1.0
+#            PATH_SUFFIXES gstreamer-1.0
-        )
+#        )
 
-        find_library(${_component_prefix}_LIBRARIES
+#        find_library(${_component_prefix}_LIBRARIES
-            NAMES ${_library}
+#            NAMES ${_library}
-            HINTS ${PC_${_component_prefix}_LIBRARY_DIRS} ${PC_${_component_prefix}_LIBDIR}
+#            HINTS ${PC_${_component_prefix}_LIBRARY_DIRS} ${PC_${_component_prefix}_LIBDIR}
-        )
+#        )
     endmacro()
 endif ()
 

CMakeModules/FindLIBLAS.cmake

@@ -98,6 +98,10 @@ FIND_LIBLAS_LIBRARY(LIBLASC_LIBRARY las_c)
 
 set(LIBLAS_FOUND "NO")
 if(LIBLAS_LIBRARY AND LIBLASC_LIBRARY AND LIBLAS_INCLUDE_DIR)
-   set(LIBLAS_LIBRARIES ${LIBLAS_LIBRARY} ${LIBLASC_LIBRARY} )
+
-   set(LIBLAS_FOUND "YES")
+    FIND_PACKAGE(Boost) # used by LIBLAS
+    if(Boost_FOUND)
+        set(LIBLAS_LIBRARIES ${LIBLAS_LIBRARY} ${LIBLASC_LIBRARY} )
+        set(LIBLAS_FOUND "YES")
+    endif()
 endif()

CMakeModules/FindNVTT.cmake

@@ -98,6 +98,85 @@ FIND_LIBRARY(NVCORE_LIBRARY_DEBUG
   PATH_SUFFIXES lib64 lib lib/shared lib/static lib64/static
 )
 
+# NVTHREAD
+FIND_LIBRARY(NVTHREAD_LIBRARY
+  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
+  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
+  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
+  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
+)
 
 
 

CMakeModules/ModuleInstall.cmake

@@ -32,6 +32,12 @@ 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/OsgAndroidMacroUtils.cmake

@@ -67,7 +67,7 @@ MACRO(ANDROID_3RD_PARTY)
     #JPEG
     ################################################
     FIND_PATH(JPEG_INCLUDE_DIR Android.mk
-        ${CMAKE_SOURCE_DIR}/3rdparty/libjpeg
+        ${CMAKE_SOURCE_DIR}/3rdparty/libjpeg NO_CMAKE_FIND_ROOT_PATH
     )
     #set(ENV{AND_OSG_LIB_NAMES} "$ENV{AND_OSG_LIB_NAMES} libjpeg")
     #set(ENV{AND_OSG_LIB_PATHS} "$ENV{AND_OSG_LIB_PATHS}include ${JPEG_INCLUDE_DIR}/Android.mk \n")
@@ -82,7 +82,7 @@ MACRO(ANDROID_3RD_PARTY)
     #PNG
     ################################################
     FIND_PATH(PNG_INCLUDE_DIR Android.mk
-        ${CMAKE_SOURCE_DIR}/3rdparty/libpng
+        ${CMAKE_SOURCE_DIR}/3rdparty/libpng NO_CMAKE_FIND_ROOT_PATH
     )
     #set(ENV{AND_OSG_LIB_NAMES} "$ENV{AND_OSG_LIB_NAMES} libpng")
     #set(ENV{AND_OSG_LIB_PATHS} "$ENV{AND_OSG_LIB_PATHS}include ${PNG_INCLUDE_DIR}/Android.mk \n")
@@ -97,7 +97,7 @@ MACRO(ANDROID_3RD_PARTY)
     #GIF
     ################################################
     FIND_PATH(GIFLIB_INCLUDE_DIR Android.mk
-        ${CMAKE_SOURCE_DIR}/3rdparty/giflib
+        ${CMAKE_SOURCE_DIR}/3rdparty/giflib NO_CMAKE_FIND_ROOT_PATH
     )
     #set(ENV{AND_OSG_LIB_NAMES} "$ENV{AND_OSG_LIB_NAMES} libgif")
     #set(ENV{AND_OSG_LIB_PATHS} "$ENV{AND_OSG_LIB_PATHS}include ${GIFLIB_INCLUDE_DIR}/Android.mk \n")
@@ -112,7 +112,7 @@ MACRO(ANDROID_3RD_PARTY)
     #TIF
     ################################################
     FIND_PATH(TIFF_INCLUDE_DIR Android.mk
-        ${CMAKE_SOURCE_DIR}/3rdparty/libtiff
+        ${CMAKE_SOURCE_DIR}/3rdparty/libtiff NO_CMAKE_FIND_ROOT_PATH
     )
     #set(ENV{AND_OSG_LIB_NAMES} "$ENV{AND_OSG_LIB_NAMES} libtiff")
     #set(ENV{AND_OSG_LIB_PATHS} "$ENV{AND_OSG_LIB_PATHS}include ${TIFF_INCLUDE_DIR}/Android.mk \n")
@@ -142,7 +142,7 @@ MACRO(ANDROID_3RD_PARTY)
     #CURL
     ################################################
     FIND_PATH(CURL_DIR Android.mk
-        ${CMAKE_SOURCE_DIR}/3rdparty/curl
+        ${CMAKE_SOURCE_DIR}/3rdparty/curl NO_CMAKE_FIND_ROOT_PATH
     )
     #set(ENV{AND_OSG_LIB_NAMES} "$ENV{AND_OSG_LIB_NAMES} libcurl")
     #set(ENV{AND_OSG_LIB_PATHS} "$ENV{AND_OSG_LIB_PATHS}include ${CURL_DIR}/Android.mk \n")
@@ -159,11 +159,11 @@ MACRO(ANDROID_3RD_PARTY)
     #FREETYPE
     ################################################
     FIND_PATH(FREETYPE_DIR Android.mk
-        ${CMAKE_SOURCE_DIR}/3rdparty/freetype
+        ${CMAKE_SOURCE_DIR}/3rdparty/freetype NO_CMAKE_FIND_ROOT_PATH
     )
     #set(ENV{AND_OSG_LIB_NAMES} "$ENV{AND_OSG_LIB_NAMES} libft2")
     #set(ENV{AND_OSG_LIB_PATHS} "$ENV{AND_OSG_LIB_PATHS}include ${FREETYPE_DIR}/Android.mk \n")
-    set(FREETYPE_INCLUDE_DIRS "${FREETYPE_DIR}/include ${FREETYPE_DIR}/include/freetype/config")
+    set(FREETYPE_INCLUDE_DIRS ${FREETYPE_DIR}/include ${FREETYPE_DIR}/include/freetype/config)
     if(FREETYPE_DIR)
         message(STATUS "FREETYPE found ${FREETYPE_DIR}" )
         set(FREETYPE_FOUND "Yes")
@@ -175,7 +175,7 @@ MACRO(ANDROID_3RD_PARTY)
     #GDAL
     ################################################
     FIND_PATH(GDAL_DIR gdal.h
-        ${CMAKE_SOURCE_DIR}/3rdparty/gdal/include
+        ${CMAKE_SOURCE_DIR}/3rdparty/gdal/include NO_CMAKE_FIND_ROOT_PATH
     )
     set(GDAL_INCLUDE_DIR "${GDAL_DIR}")
     if(GDAL_DIR)

CMakeModules/OsgMacroUtils.cmake

@@ -43,7 +43,11 @@ SET(VALID_BUILDER_VERSION OFF)
 MACRO(LINK_WITH_VARIABLES TRGTNAME)
     FOREACH(varname ${ARGN})
         IF(${varname}_DEBUG)
-            TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${${varname}}" debug "${${varname}_DEBUG}")
+            IF(${varname}_RELEASE)
+                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}}" )
         ENDIF(${varname}_DEBUG)
@@ -123,9 +127,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})
@@ -326,6 +330,10 @@ 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}
@@ -428,6 +436,10 @@ 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)
@@ -457,6 +469,10 @@ 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_CURRENT_BINARY_DIR}/${TARGET_TARGETNAME}${CMAKE_RELWITHDEBINFO_POSTFIX}.pdb DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples CONFIGURATIONS RelWithDebInfo)
+                INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_TARGETNAME}${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples CONFIGURATIONS Debug)
+            ENDIF(MSVC)
         ENDIF(APPLE)
 
 ENDMACRO(SETUP_EXAMPLE)

NEWS.txt

@@ -1,6 +1,77 @@
 OSG News
 ========
 
+OpenSceneGraph 3.4.1 release is maintaince release that provide build/runtime improvements and better GLES support
+PERTHSHIRE, Scotland - 28th August 2017 - OpenSceneGraph Professional Services announces the release of OpenSceneGraph 3.4.1, 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 modeling 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:
+
+  * Improves to GLES support across platforms
+  * Full support for osgText and on screen stats across all platfroms, including GLES2 and core pofile
+  * Build fixes to allow compilation against recent 3rd party depdendency changes
+  * Range of runtime fixes
+
+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 562 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 modeling 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 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.

README.txt

@@ -23,7 +23,7 @@ more indepth instructions.
 
 Robert Osfield.
 Project Lead.
-3rd July 2015.
+28th August 2017.
 
 --
 

applications/osgarchive/osgarchive.cpp

@@ -135,7 +135,7 @@ int main( int argc, char **argv )
                 ++itr)
             {
                 std::cout<<"reading "<<*itr<<std::endl;
-                osg::ref_ptr<osg::Object> obj = osgDB::readObjectFile(*itr);
+                osg::ref_ptr<osg::Object> obj = osgDB::readRefObjectFile(*itr);
                 if (obj.valid())
                 {
                     std::cout<<"  write to archive "<<*itr<<std::endl;

applications/osgconv/osgconv.cpp

@@ -157,6 +157,7 @@ public:
         }
 
         osg::ref_ptr<osg::State> state = new osg::State;
+        state->initializeExtensionProcs();
 
         for(TextureSet::iterator itr=_textureSet.begin();
             itr!=_textureSet.end();
@@ -771,7 +772,7 @@ int main( int argc, char **argv )
 
     osg::Timer_t startTick = osg::Timer::instance()->tick();
 
-    osg::ref_ptr<osg::Node> root = osgDB::readNodeFiles(fileNames);
+    osg::ref_ptr<osg::Node> root = osgDB::readRefNodeFiles(fileNames);
 
     if (root.valid())
     {

applications/osgfilecache/osgfilecache.cpp

@@ -272,9 +272,9 @@ public:
         }
     }
 
-    osg::Node* readNodeFileAndWriteToCache(const std::string& filename)
+    osg::ref_ptr<osg::Node> readNodeFileAndWriteToCache(const std::string& filename)
     {
-        osg::Node* node = 0;
+        osg::ref_ptr<osg::Node> node = 0;
         if (_fileCache.valid() )
         {
             if (_fileCache->existsInCache(filename))
@@ -286,7 +286,7 @@ public:
             {
                 osg::notify(osg::NOTICE)<<"reading : "<<filename<<std::endl;
 
-                node = osgDB::readNodeFile(filename);
+                node = osgDB::readRefNodeFile(filename);
                 if (node)
                 {
                     osg::notify(osg::NOTICE)<<"write to FileCache : "<<filename<<std::endl;
@@ -298,7 +298,7 @@ public:
         else
         {
             osg::notify(osg::NOTICE)<<"reading : "<<filename<<std::endl;
-            node = osgDB::readNodeFile(filename);
+            node = osgDB::readRefNodeFile(filename);
         }
         return node;
     }

applications/osgversion/Contributors.cpp

@@ -260,7 +260,22 @@ const char* invalidNames[] =
     "PushStackValueVisitor",
     "RayIntersector",
     "OpenSceneGraph-Data",
-    "Node"
+    "Node",
+    "AlphaFunc",
+    "CompositeViewer",
+    "OpenSceneGraph-3",
+    "DisplaySettings::SHADER_NONE",
+    "CodeDocs",
+    "Mon",
+    "Tue",
+    "Wed",
+    "Fri",
+    "Sat",
+    "Sun",
+    "I",
+    "TriangleFunctor",
+    "PrimitiveFunctor",
+    "OpenMW"
 };
 
 
@@ -483,7 +498,9 @@ TypoCorrection typoCorrections[] =
     {"Janik", "Jannik"},
     {"Viganò", "Vigan<EFBFBD>"},
     {"Vigano", "Vigan<EFBFBD>"},
-    {"Frashud", "Farshid"}
+    {"Frashud", "Farshid"},
+    {"Dannahauer","Dannahauer"},
+    {"Sando","Sandro"}
 };
 
 
@@ -497,6 +514,16 @@ struct NameCorrection
 
 NameCorrection nameCorrections[] =
 {
+    {"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",

applications/osgviewer/osgviewer.cpp

@@ -87,10 +87,10 @@ int main(int argc, char** argv)
     std::string device;
     while(arguments.read("--device", device))
     {
-        osg::ref_ptr<osgGA::Device> dev = osgDB::readFile<osgGA::Device>(device);
+        osg::ref_ptr<osgGA::Device> dev = osgDB::readRefFile<osgGA::Device>(device);
         if (dev.valid())
         {
-            viewer.addDevice(dev.get());
+            viewer.addDevice(dev);
         }
     }
 
@@ -152,7 +152,7 @@ int main(int argc, char** argv)
     viewer.addEventHandler(new osgViewer::ScreenCaptureHandler);
 
     // load the data
-    osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> loadedModel = osgDB::readRefNodeFiles(arguments);
     if (!loadedModel)
     {
         std::cout << arguments.getApplicationName() <<": No data loaded" << std::endl;
@@ -172,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.get());
+    optimizer.optimize(loadedModel);
 
-    viewer.setSceneData( loadedModel.get() );
+    viewer.setSceneData(loadedModel);
 
     viewer.realize();
 

applications/present3D/Cluster.cpp

@@ -33,7 +33,7 @@
 #if defined(__linux)
     #include <unistd.h>
     #include <linux/sockios.h>
-#elif defined(__FreeBSD__) || defined(__DragonFly__)
+#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
     #include <unistd.h>
     #include <sys/sockio.h>
 #elif defined(__sgi)
@@ -41,6 +41,8 @@
     #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>
@@ -338,7 +340,7 @@ void Receiver::sync( void )
     }
 
 #if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ ) || \
-    defined(__DragonFly__)
+    defined(__DragonFly__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
     socklen_t
 #else
     int

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 = readImageFile(filename.c_str(), local_options.get());
+        osg::ref_ptr<osg::Image> image = readRefImageFile(filename.c_str(), local_options.get());
-        if (image.valid()) nodeList.push_back(osg::createGeodeForImage(image.get()));
+        if (image.valid()) nodeList.push_back(osg::createGeodeForImage(image));
     }
 
     while (arguments.read("--movie",filename))
     {
-        osg::ref_ptr<osg::Image> image = readImageFile(filename.c_str(), local_options.get());
+        osg::ref_ptr<osg::Image> image = readRefImageFile(filename.c_str(), local_options.get());
         osg::ref_ptr<osg::ImageStream> imageStream = dynamic_cast<osg::ImageStream*>(image.get());
         if (image.valid())
         {
             imageStream->play();
-            nodeList.push_back(osg::createGeodeForImage(imageStream.get()));
+            nodeList.push_back(osg::createGeodeForImage(imageStream));
         }
     }
 
     while (arguments.read("--dem",filename))
     {
-        osg::HeightField* hf = readHeightFieldFile(filename.c_str(), local_options.get());
+        osg::ref_ptr<osg::HeightField> hf = readRefHeightFieldFile(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::Node *node = osgDB::readNodeFile( arguments[pos], local_options.get());
+            osg::ref_ptr<osg::Node> node = osgDB::readRefNodeFile( arguments[pos], local_options.get());
 
             if(node)
             {

applications/present3D/present3D.cpp

@@ -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::readFile<osgGA::Device>(device_name);
+    osg::ref_ptr<osgGA::Device> dev = osgDB::readRefFile<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::readImageFile("devices.live");
+        osgDB::readRefImageFile("devices.live");
         return 1;
     }
 
@@ -451,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::readFile<osgGA::Device>(server_address+":"+server_port+"/"+document_root+".resthttp", device_options.get());
+        osg::ref_ptr<osgGA::Device> rest_http_device = osgDB::readRefFile<osgGA::Device>(server_address+":"+server_port+"/"+document_root+".resthttp", device_options.get());
         if (rest_http_device.valid())
         {
             viewer.addDevice(rest_http_device.get());

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::readShaderFile(filename);
+        osg::ref_ptr<osg::Shader> shader = osgDB::readRefShaderFile(filename);
         if (shader.valid())
         {
             std::string name = osgDB::getStrippedName(filename);

examples/osgSSBO/osgSSBO.cpp

@@ -119,7 +119,6 @@ enum BufferOffset
 
 const int __numDataValuesPerChannel = OFFSET_END;
 const int __numChannels = 4;
-const float __particleRenderScaleMultiplier = 0.3;
 
 //512x512x4x7 = 7.340.032 floats in SSBO on GPU
 const int NUM_ELEMENTS_X = 512;
@@ -312,7 +311,7 @@ public:
 //set  OSG_FILE_PATH for loading axes.osgt
 void ComputeNode::addHelperGeometry()
 {
-    _helperNode = osgDB::readNodeFile("axes.osgt");
+    _helperNode = osgDB::readRefNodeFile("axes.osgt");
 
     if (_helperNode.valid())
     {
@@ -465,8 +464,8 @@ void ComputeNode::addDataMonitor(osg::Vec3 placement, osg::Vec3 relativePlacemen
     ss->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
 
     //add a label
-    osgText::Text* text = new osgText::Text;
+    osg::ref_ptr<osgText::Text> text = new osgText::Text;
-    osgText::Font* font = osgText::readFontFile("fonts/arial.ttf");
+    osg::ref_ptr<osgText::Font> font = osgText::readRefFontFile("fonts/arial.ttf");
     text->setFont(font);
     text->setColor(osg::Vec4(1, 1, 1, 1));
     text->setCharacterSize(0.1*scale);

examples/osganalysis/osganalysis.cpp

@@ -540,6 +540,7 @@ public:
                             const std::string& outputFilename,
                              SceneGraphProcessor* sceneGraphProcessor,
                              osgUtil::IncrementalCompileOperation* ico):
+        osg::Referenced(true),
         Operation("DatabasePaging Operation", false),
         _filename(filename),
         _outputFilename(outputFilename),
@@ -554,7 +555,7 @@ public:
         osg::notify(osg::NOTICE)<<"LoadAndCompileOperation "<<_filename<<std::endl;
 
         _modelReadyToMerge = false;
-        _loadedModel = osgDB::readNodeFile(_filename);
+        _loadedModel = osgDB::readRefNodeFile(_filename);
 
         if (_loadedModel.valid())
         {

examples/osganimate/osganimate.cpp

@@ -136,9 +136,9 @@ osg::Node* createMovingModel(const osg::Vec3& center, float radius)
 
     osg::AnimationPath* animationPath = createAnimationPath(center,radius,animationLength);
 
-    osg::Group* model = new osg::Group;
+    osg::ref_ptr<osg::Group> model = new osg::Group;
 
-    osg::Node* glider = osgDB::readNodeFile("glider.osgt");
+    osg::ref_ptr<osg::Node> glider = osgDB::readRefNodeFile("glider.osgt");
     if (glider)
     {
         const osg::BoundingSphere& bs = glider->getBound();
@@ -159,7 +159,7 @@ osg::Node* createMovingModel(const osg::Vec3& center, float radius)
         model->addChild(xform);
     }
 
-    osg::Node* cessna = osgDB::readNodeFile("cessna.osgt");
+    osg::ref_ptr<osg::Node> cessna = osgDB::readRefNodeFile("cessna.osgt");
     if (cessna)
     {
         const osg::BoundingSphere& bs = cessna->getBound();
@@ -173,26 +173,26 @@ osg::Node* createMovingModel(const osg::Vec3& center, float radius)
 
         positioned->addChild(cessna);
 
-        osg::MatrixTransform* xform = new osg::MatrixTransform;
+        osg::ref_ptr<osg::MatrixTransform> xform = new osg::MatrixTransform;
         xform->setUpdateCallback(new osg::AnimationPathCallback(animationPath,0.0f,2.0));
         xform->addChild(positioned);
 
         model->addChild(xform);
     }
 
-    return model;
+    return model.release();
 }
 
-osg::Node* createModel(bool overlay, osgSim::OverlayNode::OverlayTechnique technique)
+osg::ref_ptr<osg::Group> createModel(bool overlay, osgSim::OverlayNode::OverlayTechnique technique)
 {
     osg::Vec3 center(0.0f,0.0f,0.0f);
     float radius = 100.0f;
 
-    osg::Group* root = new osg::Group;
+    osg::ref_ptr<osg::Group> root = new osg::Group;
 
     float baseHeight = center.z()-radius*0.5;
-    osg::Node* baseModel = createBase(osg::Vec3(center.x(), center.y(), baseHeight),radius);
+    osg::ref_ptr<osg::Node> baseModel = createBase(osg::Vec3(center.x(), center.y(), baseHeight),radius);
-    osg::Node* movingModel = createMovingModel(center,radius*0.8f);
+    osg::ref_ptr<osg::Node> movingModel = createMovingModel(center,radius*0.8f);
 
     if (overlay)
     {
@@ -232,14 +232,14 @@ int main( int argc, char **argv )
     osgViewer::Viewer viewer;
 
     // load the nodes from the commandline arguments.
-    osg::Node* model = createModel(overlay, technique);
+    osg::ref_ptr<osg::Group> model = createModel(overlay, technique);
     if (!model)
     {
         return 1;
     }
 
     // tilt the scene so the default eye position is looking down on the model.
-    osg::MatrixTransform* rootnode = new osg::MatrixTransform;
+    osg::ref_ptr<osg::MatrixTransform> rootnode = new osg::MatrixTransform;
     rootnode->setMatrix(osg::Matrix::rotate(osg::inDegrees(30.0f),1.0f,0.0f,0.0f));
     rootnode->addChild(model);
 

examples/osganimationhardware/osganimationhardware.cpp

@@ -196,8 +196,8 @@ int main (int argc, char* argv[])
     while (psr.read("--software")) { 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*>(osgDB::readNodeFiles(psr));
+    osg::ref_ptr<osg::Group> root = dynamic_cast<osg::Group*>(node.get());
     if (!root)
     {
         std::cout << psr.getApplicationName() <<": No data loaded" << std::endl;

examples/osganimationmorph/osganimationmorph.cpp

@@ -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::readNodeFile(name);
+    osg::ref_ptr<osg::Node> shape0 = osgDB::readRefNodeFile(name);
     if (shape0)
     {
         GeometryFinder finder;

examples/osganimationtimeline/osganimationtimeline.cpp

@@ -163,7 +163,8 @@ int main (int argc, char* argv[])
         file = psr[1];
 
     // replace the manager
-    osg::Group* root = dynamic_cast<osg::Group*>(osgDB::readNodeFile(file));
+    osg::ref_ptr<osg::Node> loadedmodel = osgDB::readRefNodeFile(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.cpp

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

examples/osgatomiccounter/osgatomiccounter.cpp

@@ -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::readNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> loadedModel = osgDB::readRefNodeFiles(arguments);
     if (!loadedModel)
     {
         osg::Geometry * quad = osg::createTexturedQuadGeometry(osg::Vec3f(-2.0f, 0.0f, -2.0f),

examples/osgautocapture/osgautocapture.cpp

@@ -287,7 +287,7 @@ int main( int argc, char **argv )
     }
 
     // load the data
-    osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> loadedModel = osgDB::readRefNodeFiles(arguments);
     if (!loadedModel)
     {
         std::cout << arguments.getApplicationName() <<": No data loaded" << std::endl;

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::Image* image=NULL)
+osg::Drawable* createSquare(const osg::Vec3& corner,const osg::Vec3& width,const osg::Vec3& height, osg::ref_ptr<osg::Image> image)
 {
     // set up the Geometry.
-    osg::Geometry* geom = new osg::Geometry;
+    osg::ref_ptr<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;
+    return geom.release();
 }
 
 osg::Drawable* createAxis(const osg::Vec3& corner,const osg::Vec3& xdir,const osg::Vec3& ydir,const osg::Vec3& zdir)
 {
     // set up the Geometry.
-    osg::Geometry* geom = new osg::Geometry;
+    osg::ref_ptr<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;
+    return geom.release();
 }
 
-osg::Node* createModel()
+osg::ref_ptr<osg::Node> createModel()
 {
 
     // create the root node which will hold the model.
-    osg::Group* root = new osg::Group();
+    osg::ref_ptr<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::readImageFile("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::readRefImageFile("Images/reflect.rgb")),
         osg::Vec3(0.0f,0.0f,0.0f));
 
     osg::Billboard* x_arrow = new osg::Billboard();
@@ -142,7 +142,7 @@ 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::readImageFile("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::readRefImageFile("Cubemap_axis/posx.png")),
        osg::Vec3(5.0f,0.0f,0.0f));
 
     osg::Billboard* y_arrow = new osg::Billboard();
@@ -150,7 +150,7 @@ 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::readImageFile("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::readRefImageFile("Cubemap_axis/posy.png")),
         osg::Vec3(0.0f,5.0f,0.0f));
 
     osg::Billboard* z_arrow = new osg::Billboard();
@@ -158,7 +158,7 @@ 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::readImageFile("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::readRefImageFile("Cubemap_axis/posz.png")),
         osg::Vec3(0.0f,0.0f,5.0f));
 
 

examples/osgblenddrawbuffers/osgblenddrawbuffers.cpp

@@ -71,9 +71,17 @@ 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::Camera* mrtCam = createMRTCamera( textures );
+    osg::ref_ptr<osg::Camera> mrtCam = createMRTCamera( textures );
-    mrtCam->addChild( osgDB::readNodeFile("cessna.osgt") );
+    mrtCam->addChild( cessna );
 
     // Create shader program to be used
     const char* mrtFragmentCode = {
@@ -87,8 +95,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::StateSet* ss = mrtCam->getOrCreateStateSet();
+    osg::ref_ptr<osg::StateSet> ss = mrtCam->getOrCreateStateSet();
-    ss->setAttributeAndModes( program.get() );
+    ss->setAttributeAndModes( program );
 
     // Apply blending to the original scene in MRT
     if ( !useGlobalBlending )
@@ -103,8 +111,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.get() );
+        ss->setAttribute( blend0 );
-        ss->setAttributeAndModes( colormask3.get() );
+        ss->setAttributeAndModes( colormask3 );
     }
     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::Node* loadedModel = osgDB::readNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> loadedModel = osgDB::readRefNodeFiles(arguments);
 
     // if not loaded assume no arguments passed in, try use default mode instead.
-    if (!loadedModel) loadedModel = osgDB::readNodeFile("cessnafire.osgt");
+    if (!loadedModel) loadedModel = osgDB::readRefNodeFile("cessnafire.osgt");
 
     if (!loadedModel)
     {
@@ -150,11 +150,11 @@ int main( int argc, char **argv )
         return 1;
     }
 
-    osg::Group* root = new osg::Group;
+    osg::ref_ptr<osg::Group> root = new osg::Group;
     root->addChild(loadedModel);
 
 
-    osg::StateSet* stateset = new osg::StateSet;
+    osg::ref_ptr<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

@@ -239,10 +239,10 @@ int main( int argc, char **argv )
     }
     else
     {
-        rootnode = osgDB::readNodeFiles(arguments);
+        rootnode = osgDB::readRefNodeFiles(arguments);
 
         // if not loaded assume no arguments passed in, try use default mode instead.
-        if (!rootnode) rootnode = osgDB::readNodeFile("cow.osgt");
+        if (!rootnode) rootnode = osgDB::readRefNodeFile("cow.osgt");
 
         if (!rootnode)
         {

examples/osgcamera/osgcamera.cpp

@@ -51,7 +51,7 @@ public:
             {
                 if (ea.getKey()=='l')
                 {
-                    osg::ref_ptr<osg::Node> model = osgDB::readNodeFile( _filenames[_position] );
+                    osg::ref_ptr<osg::Node> model = osgDB::readRefNodeFile( _filenames[_position] );
                     ++_position;
                     if (_position>=_filenames.size()) _position = 0;
 
@@ -214,7 +214,7 @@ int main( int argc, char **argv )
         osg::ref_ptr<osg::Node> model;
         if (sharedModel)
         {
-            model = osgDB::readNodeFiles(arguments);
+            model = osgDB::readRefNodeFiles(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::readNodeFiles(arguments);
+                    osg::ref_ptr<osg::Node> node = osgDB::readRefNodeFiles(arguments);
                     if (!node) return 0;
 
                     if (enableVBO)
@@ -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::readObjectFile(configfile);
+        osg::ref_ptr<osg::Object> object = osgDB::readRefObjectFile(configfile);
         osgViewer::View* view = dynamic_cast<osgViewer::View*>(object.get());
         if (view)
         {
@@ -329,9 +329,9 @@ int main( int argc, char **argv )
     else
     {
         // load the scene.
-        osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFiles(arguments);
+        osg::ref_ptr<osg::Node> loadedModel = osgDB::readRefNodeFiles(arguments);
 
-        if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osgt");
+        if (!loadedModel) loadedModel = osgDB::readRefNodeFile("cow.osgt");
 
         if (!loadedModel)
         {
@@ -339,7 +339,7 @@ int main( int argc, char **argv )
             return 1;
         }
 
-        viewer.setSceneData(loadedModel.get());
+        viewer.setSceneData(loadedModel);
     }
 
     viewer.realize();

examples/osgcatch/osgcatch.cpp

@@ -117,7 +117,7 @@ void Character::setCharacter(const std::string& filename, const std::string& nam
 
     float _characterSize = _width.length()*0.2f;
 
-    osg::Image* image = osgDB::readImageFile(filename);
+    osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(filename);
     if (image)
     {
         osg::Vec3 pos(-0.5f*_characterSize,0.0f,0.0f);
@@ -153,7 +153,7 @@ void Character::setLives(const std::string& filename, const osg::Vec3& origin, c
     _numLives = numLives;
     _livesSwitch = new osg::Switch;
 
-    osg::Image* image = osgDB::readImageFile(filename);
+    osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(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::Image* image = osgDB::readImageFile(filename);
+    osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(filename);
     if (image)
     {
         osg::StateSet* stateset = _catchSwitch->getOrCreateStateSet();
@@ -349,7 +349,7 @@ class CatchableObject  : public osg::Referenced
         */
         inline void setToGravity(float scale = 1.0f) { _acceleration.set(0, 0, -9.81f*scale); }
 
-        /// Set the fluid parameters as for air (20<EFBFBD>C temperature).
+        /// Set the fluid parameters as for air (20C temperature).
         inline void setFluidToAir()
         {
             setToGravity(1.0f);
@@ -357,7 +357,7 @@ class CatchableObject  : public osg::Referenced
             setFluidViscosity(1.8e-5f);
         }
 
-        /// Set the fluid parameters as for pure water (20<EFBFBD>C temperature).
+        /// Set the fluid parameters as for pure water (20C temperature).
         inline void setFluidToWater()
         {
             setToGravity(1.0f);
@@ -395,7 +395,7 @@ void CatchableObject::setUpCatchablesMap(const FileList& fileList)
         ++itr)
     {
         const std::string& filename = *itr;
-        osg::Image* image = osgDB::readImageFile(filename);
+        osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(filename);
         if (image)
         {
             osg::ref_ptr<osg::StateSet> stateset = new osg::StateSet();
@@ -1045,10 +1045,10 @@ osg::Node* GameEventHandler::createScene()
 
     // set up welcome subgraph
     {
-        osg::Geode* geode = new osg::Geode;
+        osg::ref_ptr<osg::Geode> geode = new osg::Geode;
 
         // set up the background
-        osg::Image* image = osgDB::readImageFile("Catch/Welcome.jpg");
+        osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile("Catch/Welcome.jpg");
         if (image)
         {
             osg::Geometry* geometry = osg::createTexturedQuadGeometry(_origin,_width,_height);
@@ -1121,9 +1121,9 @@ osg::Node* GameEventHandler::createScene()
 
     // set up you've lost subgraph
     {
-        osg::Geode* geode = new osg::Geode;
+        osg::ref_ptr<osg::Geode> geode = new osg::Geode;
 
-        osg::Image* image = osgDB::readImageFile("Catch/YouLost.jpg");
+        osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile("Catch/YouLost.jpg");
         if (image)
         {
             osg::Geometry* geometry = osg::createTexturedQuadGeometry(_origin,_width,_height);
@@ -1184,9 +1184,9 @@ osg::Node* GameEventHandler::createScene()
 
     // set up you've won subgraph
     {
-        osg::Geode* geode = new osg::Geode;
+        osg::ref_ptr<osg::Geode> geode = new osg::Geode;
 
-        osg::Image* image = osgDB::readImageFile("Catch/YouWon.jpg");
+        osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile("Catch/YouWon.jpg");
         if (image)
         {
             osg::Geometry* geometry = osg::createTexturedQuadGeometry(_origin,_width,_height);
@@ -1269,7 +1269,7 @@ osg::Node* GameEventHandler::createScene()
                 ++itr)
             {
 
-                osg::Image* image = osgDB::readImageFile(*itr);
+                osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(*itr);
                 if (image)
                 {
                     osg::Geometry* geometry = osg::createTexturedQuadGeometry(_origin,_width,_height);
@@ -1366,6 +1366,7 @@ class CompileStateCallback : public osg::Operation
 {
     public:
         CompileStateCallback(GameEventHandler* eh):
+            osg::Referenced(true),
             osg::Operation("CompileStateCallback", false),
             _gameEventHandler(eh) {}
 

examples/osgclip/osgclip.cpp

@@ -40,10 +40,9 @@
 #include <osgUtil/Optimizer>
 
 
-osg::Node* decorate_with_clip_node(osg::Node* subgraph)
+osg::ref_ptr<osg::Node> decorate_with_clip_node(const osg::ref_ptr<osg::Node>& subgraph)
 {
-    osg::Group* rootnode = new osg::Group;
+    osg::ref_ptr<osg::Group> rootnode = new osg::Group;
-    
 
     // create wireframe view of the model so the user can see
     // what parts are being culled away.
@@ -117,11 +116,11 @@ int main( int argc, char **argv )
     osg::ArgumentParser arguments(&argc,argv);
 
     // load the nodes from the commandline arguments.
-    osg::Node* loadedModel = osgDB::readNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> loadedModel = osgDB::readRefNodeFiles(arguments);
 
 
     // if not loaded assume no arguments passed in, try use default mode instead.
-    if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osgt");
+    if (!loadedModel) loadedModel = osgDB::readRefNodeFile("cow.osgt");
 
 
     if (!loadedModel)
@@ -131,7 +130,7 @@ int main( int argc, char **argv )
     }
 
     // decorate the scenegraph with a clip node.
-    osg::Node* rootnode = decorate_with_clip_node(loadedModel);
+    osg::ref_ptr<osg::Node> rootnode = decorate_with_clip_node(loadedModel);
 
     // run optimization over the scene graph
     osgUtil::Optimizer optimzer;

examples/osgcluster/broadcaster.cpp

@@ -45,6 +45,8 @@
     #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>

examples/osgcluster/osgcluster.cpp

@@ -44,7 +44,6 @@
 #include "broadcaster.h"
 
 
-const unsigned int MAX_NUM_EVENTS = 10;
 const unsigned int SWAP_BYTES_COMPARE = 0x12345678;
 class CameraPacket {
     public:
@@ -506,7 +505,7 @@ int main( int argc, char **argv )
     }
 
     // load model.
-    osg::ref_ptr<osg::Node> rootnode = osgDB::readNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> rootnode = osgDB::readRefNodeFiles(arguments);
 
     // set the scene to render
     viewer.setSceneData(rootnode.get());

examples/osgcluster/receiver.cpp

@@ -122,7 +122,7 @@ void Receiver::sync( void )
         return;
     }
 
-#if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ )
+#if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ ) || defined(__FreeBSD_kernel__) || defined(__GNU__)
     socklen_t size; 
 #else
     int size;

examples/osgcompositeviewer/osgcompositeviewer.cpp

@@ -133,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::readNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> scene = osgDB::readRefNodeFiles(arguments);
 
     if (!scene)
     {
@@ -149,7 +149,7 @@ int main( int argc, char **argv )
         {
             osgViewer::View* view = new osgViewer::View;
             view->setName("Single view");
-            view->setSceneData(osgDB::readNodeFile("fountain.osgt"));
+            view->setSceneData(osgDB::readRefNodeFile("fountain.osgt"));
 
             view->addEventHandler( new osgViewer::StatsHandler );
 
@@ -283,7 +283,7 @@ int main( int argc, char **argv )
             view->setName("View three");
             viewer.addView(view);
 
-            view->setSceneData(osgDB::readNodeFile("cessnafire.osgt"));
+            view->setSceneData(osgDB::readRefNodeFile("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

@@ -63,7 +63,7 @@ int main( int argc, char** argv )
     // 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::Node* sourceNode = osgDB::readNodeFile("axes.osgt");
+    osg::ref_ptr<osg::Node> sourceNode = osgDB::readRefNodeFile("axes.osgt");
     if ( !sourceNode ) sourceNode = new osg::Node;
     sourceNode->setDataVariance( osg::Object::DYNAMIC );
     sourceNode->getOrCreateStateSet()->setAttributeAndModes( computeProg.get() );

examples/osgcopy/osgcopy.cpp

@@ -198,7 +198,7 @@ int main( int argc, char **argv )
     osgViewer::Viewer viewer;
 
     // load the nodes from the commandline arguments.
-    osg::Node* rootnode = osgDB::readNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> rootnode = osgDB::readRefNodeFiles(arguments);
     if (!rootnode)
     {
         osg::notify(osg::NOTICE)<<"Please specify a model filename on the command line."<<std::endl;

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

examples/osgdatabaserevisions/osgdatabaserevisions.cpp

@@ -129,7 +129,7 @@ int main(int argc, char** argv)
 
 
     // load the data
-    osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFile(file);
+    osg::ref_ptr<osg::Node> loadedModel = osgDB::readRefNodeFile(file);
     if (!loadedModel)
     {
         std::cout << arguments.getApplicationName() <<": No data loaded" << std::endl;

examples/osgdelaunay/osgdelaunay.cpp

@@ -224,7 +224,7 @@ public:
         osg::StateSet *dstate=   gm->getOrCreateStateSet(  );
         dstate->setMode( GL_LIGHTING, osg::StateAttribute::ON );
 
-        osg::Image* image = osgDB::readImageFile("Images/Brick-Std-Orange.TGA");
+        osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile("Images/Brick-Std-Orange.TGA");
         if (image)
         {
             osg::Texture2D* txt = new osg::Texture2D;
@@ -354,7 +354,7 @@ osg::Group *makedelaunay(const int ndcs)
 
     osg::Vec3Array *points=new osg::Vec3Array;
 
-    osg::Image* image = osgDB::readImageFile("Images/blueFlowers.png");
+    osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile("Images/blueFlowers.png");
     if (image)
     {
         osg::Texture2D* texture = new osg::Texture2D;
@@ -817,7 +817,7 @@ osg::Geometry *WallConstraint::makeWallGeometry() const
 {
     osg::ref_ptr<osg::Geometry> gm=new osg::Geometry; // the wall
     if (texture!="") {
-        osg::Image* image = osgDB::readImageFile(texture.c_str());
+        osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(texture.c_str());
         if (image)
         {
             osg::Texture2D* txt = new osg::Texture2D;
@@ -1005,7 +1005,7 @@ deprecated_osg::Geometry *ArealConstraint::makeWallGeometry( osg::Vec3Array *pt)
     tscx->retessellatePolygons(*(edges)); // find all edges
 
     if (walltexture!="") {
-        osg::Image* image = osgDB::readImageFile(walltexture.c_str());
+        osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(walltexture.c_str());
         if (image)
         {
             osg::Texture2D* txt = new osg::Texture2D;
@@ -1062,7 +1062,7 @@ deprecated_osg::Geometry * ArealConstraint::makeAreal( osg::Vec3Array *points)
         gm->setNormalArray(getCanopyNormals(points));
         gm->setNormalBinding(deprecated_osg::Geometry::BIND_PER_PRIMITIVE);
         gm->setTexCoordArray(0,getCanopyTexcoords(points));
-        osg::Image* image = osgDB::readImageFile(texture);
+        osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(texture);
         if (image)
         {
             osg::Texture2D* txt = new osg::Texture2D;
@@ -1238,7 +1238,7 @@ deprecated_osg::Geometry * LinearConstraint::makeGeometry(const osg::Vec3Array *
     if (_midline->size()>0) {
         osg::ref_ptr<osg::Vec3Array> locpts=getPoints(points);
         if (texture!="") {
-            osg::Image* image = osgDB::readImageFile(texture.c_str());
+            osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(texture.c_str());
             if (image)
             {
                 osg::Texture2D* txt = new osg::Texture2D;

examples/osgdepthpartition/osgdepthpartition.cpp

@@ -139,7 +139,7 @@ int main( int argc, char **argv )
     bool needToSetHomePosition = false;
 
     // read the scene from the list of file specified commandline args.
-    osg::ref_ptr<osg::Node> scene = osgDB::readNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> scene = osgDB::readRefNodeFiles(arguments);
 
     // if one hasn't been loaded create an earth and sun test model.
     if (!scene)

examples/osgdepthpeeling/osgdepthpeeling.cpp

@@ -232,7 +232,7 @@ int main( int argc, char **argv )
   viewer.getCamera()->setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR);
 
   // read the model to do depth peeling with
-  osg::Node* loadedModel = osgDB::readNodeFile(arguments.argv()[1]);
+  osg::ref_ptr<osg::Node> loadedModel = osgDB::readRefNodeFile(arguments.argv()[1]);
 
   if (!loadedModel)
     return 1;

examples/osgdistortion/osgdistortion.cpp

@@ -703,10 +703,10 @@ int main(int argc, char** argv)
     osgViewer::Viewer viewer(arguments);
 
     // load the nodes from the commandline arguments.
-    osg::Node* loadedModel = osgDB::readNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> loadedModel = osgDB::readRefNodeFiles(arguments);
 
     // if not loaded assume no arguments passed in, try use default mode instead.
-    if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osgt");
+    if (!loadedModel) loadedModel = osgDB::readRefNodeFile("cow.osgt");
 
     if (!loadedModel)
     {
@@ -731,7 +731,7 @@ int main(int argc, char** argv)
     }
     else
     {
-        osg::Node* distortionNode = createDistortionSubgraph( options, loadedModel, viewer.getCamera()->getClearColor());
+        osg::Node* distortionNode = createDistortionSubgraph( options, loadedModel.get(), viewer.getCamera()->getClearColor());
         viewer.setSceneData( distortionNode );
     }
 

examples/osgdrawinstanced/osgdrawinstanced.cpp

@@ -97,7 +97,7 @@ createStateSet()
     ss->setAttribute( program.get(),
         osg::StateAttribute::ON | osg::StateAttribute::PROTECTED );
 
-    osg::ref_ptr< osg::Image> iLogo = osgDB::readImageFile( "Images/osg128.png" );
+    osg::ref_ptr< osg::Image> iLogo = osgDB::readRefImageFile( "Images/osg128.png" );
     if( !iLogo.valid() )
     {
         osg::notify( osg::ALWAYS ) << "Can't open image file osg128.png" << std::endl;

examples/osgfadetext/osgfadetext.cpp

@@ -51,7 +51,7 @@ osg::Node* createEarth()
     geode->addDrawable(sd);
 
     std::string filename = osgDB::findDataFile("Images/land_shallow_topo_2048.jpg");
-    geode->getOrCreateStateSet()->setTextureAttributeAndModes(0, new osg::Texture2D(osgDB::readImageFile(filename)));
+    geode->getOrCreateStateSet()->setTextureAttributeAndModes(0, new osg::Texture2D(osgDB::readRefImageFile(filename)));
 
     osg::CoordinateSystemNode* csn = new osg::CoordinateSystemNode;
     csn->setEllipsoidModel(new osg::EllipsoidModel());

examples/osgfont/osgfont.cpp

@@ -62,7 +62,7 @@ osgText::Text* createLabel(const std::string& l, const char* f, unsigned int siz
     static osg::Vec3 pos(10.0f, 10.0f, 0.0f);
 
     osgText::Text* label = new osgText::Text();
-    osgText::Font* font  = osgText::readFontFile(f);
+    osg::ref_ptr<osgText::Font> font  = osgText::readRefFontFile(f);
 
     label->setFont(font);
     label->setCharacterSize(size);

examples/osgforest/osgforest.cpp

@@ -388,7 +388,7 @@ osg::Geode* ForestTechniqueManager::createTerrain(const osg::Vec3& origin, const
     // ---------------------------------------
     osg::StateSet* stateset = new osg::StateSet();
 
-    osg::Image* image = osgDB::readImageFile("Images/lz.rgb");
+    osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile("Images/lz.rgb");
     if (image)
     {
         osg::Texture2D* texture = new osg::Texture2D;
@@ -1182,7 +1182,7 @@ osg::Node* ForestTechniqueManager::createScene(unsigned int numTreesToCreates, u
     osg::Texture2D *tex = new osg::Texture2D;
     tex->setWrap( osg::Texture2D::WRAP_S, osg::Texture2D::CLAMP );
     tex->setWrap( osg::Texture2D::WRAP_T, osg::Texture2D::CLAMP );
-    tex->setImage(osgDB::readImageFile("Images/tree0.rgba"));
+    tex->setImage(osgDB::readRefImageFile("Images/tree0.rgba"));
 
     osg::StateSet *dstate = new osg::StateSet;
     {

examples/osgfpdepth/osgfpdepth.cpp

@@ -963,7 +963,7 @@ int main(int argc, char **argv)
         arguments.getApplicationUsage()->write(std::cout,osg::ApplicationUsage::COMMAND_LINE_OPTION);
         return 1;
     }
-    ref_ptr<Node> loadedModel = osgDB::readNodeFiles(arguments);
+    ref_ptr<Node> loadedModel = osgDB::readRefNodeFiles(arguments);
     if (!loadedModel) {
         cerr << "couldn't load " << argv[1] << "\n";
         return 1;

examples/osgfxbrowser/osgfxbrowser.cpp

@@ -175,10 +175,10 @@ protected:
                 float zPos = -0.1; // note from Robert, was 0.1f, but now must be -0.1f to keep text visible??#!? due
                                    // to some other change in the OSG not tracked down yet...
 
-        osg::ref_ptr<osgText::Font> arial = osgText::readFontFile("fonts/arial.ttf");
+        osg::ref_ptr<osgText::Font> arial = osgText::readRefFontFile("fonts/arial.ttf");
 
         osg::ref_ptr<osgText::Text> hints = new osgText::Text;
-        hints->setFont(arial.get());
+        hints->setFont(arial);
         hints->setColor(_hints_color);
         hints->setAlignment(osgText::Text::CENTER_BOTTOM);
         hints->setCharacterSize(13);
@@ -336,10 +336,10 @@ int main(int argc, char *argv[])
     }
 
     // read the scene from the list of file specified commandline args.
-    osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> loadedModel = osgDB::readRefNodeFiles(arguments);
 
     // if not loaded assume no arguments passed in, try use default mode instead.
-    if (!loadedModel) loadedModel = osgDB::readNodeFile("dumptruck.osgt");
+    if (!loadedModel) loadedModel = osgDB::readRefNodeFile("dumptruck.osgt");
 
     if (!loadedModel)
     {

examples/osggameoflife/osggameoflife.cpp

@@ -117,14 +117,14 @@ int main(int argc, char *argv[])
     }
 
     // load the image
-    osg::ref_ptr<osg::Image> startIm = osgDB::readImageFile(startName);
+    osg::ref_ptr<osg::Image> startIm = osgDB::readRefImageFile(startName);
 
     if (!startIm) {
         std::cout << "Could not load start image.\n";
         return(1);
     }
 
-    osg::Node* scene = createScene(startIm.get());
+    osg::ref_ptr<osg::Node> scene = createScene(startIm.get());
 
     // construct the viewer.
     osgViewer::Viewer viewer;

examples/osggeometry/osggeometry.cpp

@@ -550,7 +550,7 @@ osg::Node* createBackground()
 {
 
     // we'll create a texture mapped quad to sit behind the Geometry
-    osg::Image* image = osgDB::readImageFile("Images/primitives.gif");
+    osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile("Images/primitives.gif");
     if (!image) return NULL;
 
 

examples/osggpx/osggpx.cpp

@@ -434,8 +434,8 @@ int main(int argv, char **argc)
 
     osg::ref_ptr<osg::Group> group = new osg::Group;
 
-    osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> loadedModel = osgDB::readRefNodeFiles(arguments);
-    if (loadedModel.valid()) group->addChild(loadedModel.get());
+    if (loadedModel.valid()) group->addChild(loadedModel);
 
     for(Tracks::iterator itr = tracks.begin();
         itr != tracks.end();

examples/osggraphicscost/osggraphicscost.cpp

@@ -29,6 +29,7 @@ class CalibrateCostEsimator : public osg::GraphicsOperation
 public:
 
     CalibrateCostEsimator(osg::GraphicsCostEstimator* gce):
+        osg::Referenced(true),
         osg::GraphicsOperation("CalbirateCostEstimator",false),
         _gce(gce) {}
 
@@ -51,12 +52,12 @@ int main(int argc, char** argv)
     osgViewer::Viewer viewer(arguments);
 
 
-    osg::ref_ptr<osg::Node> node = osgDB::readNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> node = osgDB::readRefNodeFiles(arguments);
     if (!node) return 0;
 
     osg::ref_ptr<osg::GraphicsCostEstimator> gce = new osg::GraphicsCostEstimator;
 
-    viewer.setSceneData(node.get());
+    viewer.setSceneData(node);
 
     viewer.realize();
 

examples/osghangglide/base.cpp

@@ -67,7 +67,7 @@ Node *makeBase( void )
 
     Texture2D *tex = new Texture2D;
 
-    tex->setImage(osgDB::readImageFile("Images/water.rgb"));
+    tex->setImage(osgDB::readRefImageFile("Images/water.rgb"));
     tex->setWrap( Texture2D::WRAP_S, Texture2D::REPEAT );
     tex->setWrap( Texture2D::WRAP_T, Texture2D::REPEAT );
 

examples/osghangglide/sky.cpp

@@ -112,7 +112,7 @@ Node *makeSky( void )
 
 
     Texture2D *tex = new Texture2D;
-    tex->setImage(osgDB::readImageFile("Images/white.rgb"));
+    tex->setImage(osgDB::readRefImageFile("Images/white.rgb"));
 
     StateSet *dstate = new StateSet;
 

examples/osghangglide/tank.cpp

@@ -171,7 +171,7 @@ Node *makeTank( void )
 
     tex->setWrap( Texture2D::WRAP_S, Texture2D::REPEAT );
     tex->setWrap( Texture2D::WRAP_T, Texture2D::REPEAT );
-    tex->setImage(osgDB::readImageFile("Images/tank.rgb"));
+    tex->setImage(osgDB::readRefImageFile("Images/tank.rgb"));
 
     StateSet *dstate = new StateSet;
     dstate->setTextureAttributeAndModes(0, tex, StateAttribute::ON );

examples/osghangglide/terrain.cpp

@@ -131,7 +131,7 @@ Node *makeTerrain( void )
 
     Texture2D *tex = new Texture2D;
 
-    tex->setImage(osgDB::readImageFile("Images/lz.rgb"));
+    tex->setImage(osgDB::readRefImageFile("Images/lz.rgb"));
 
     StateSet *dstate = new StateSet;
     dstate->setMode( GL_LIGHTING, StateAttribute::OFF );

examples/osghangglide/trees.cpp

@@ -234,7 +234,7 @@ Node *makeTrees( void )
     struct _tree  *t;
 
     Texture2D *tex = new Texture2D;
-    tex->setImage(osgDB::readImageFile("Images/tree0.rgba"));
+    tex->setImage(osgDB::readRefImageFile("Images/tree0.rgba"));
 
     StateSet *dstate = new StateSet;
 

examples/osghud/osghud.cpp

@@ -284,10 +284,10 @@ int main( int argc, char **argv )
 
 
     // read the scene from the list of file specified commandline args.
-    osg::ref_ptr<osg::Node> scene = osgDB::readNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> scene = osgDB::readRefNodeFiles(arguments);
 
     // if not loaded assume no arguments passed in, try use default model instead.
-    if (!scene) scene = osgDB::readNodeFile("dumptruck.osgt");
+    if (!scene) scene = osgDB::readRefNodeFile("dumptruck.osgt");
 
 
     if (!scene)
@@ -320,7 +320,7 @@ int main( int argc, char **argv )
         viewer.addSlave(hudCamera, false);
 
         // set the scene to render
-        viewer.setSceneData(scene.get());
+        viewer.setSceneData(scene);
 
         return viewer.run();
 
@@ -334,7 +334,7 @@ int main( int argc, char **argv )
         osgViewer::View* view = new osgViewer::View;
         viewer.addView(view);
 
-        view->setSceneData(scene.get());
+        view->setSceneData(scene);
         view->setUpViewAcrossAllScreens();;
         view->setCameraManipulator(new osgGA::TrackballManipulator);
 
@@ -375,11 +375,11 @@ int main( int argc, char **argv )
         osg::ref_ptr<osg::Group> group = new osg::Group;
 
         // add the HUD subgraph.
-        if (scene.valid()) group->addChild(scene.get());
+        if (scene.valid()) group->addChild(scene);
         group->addChild(createHUD());
 
         // set the scene to render
-        viewer.setSceneData(group.get());
+        viewer.setSceneData(group);
 
         return viewer.run();
     }

examples/osgimagesequence/osgimagesequence.cpp

@@ -111,7 +111,7 @@ osg::StateSet* createState(osg::ArgumentParser& arguments)
             const std::string& filename = *itr;
             if (preLoad)
             {
-                osg::ref_ptr<osg::Image> image = osgDB::readImageFile(filename);
+                osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(filename);
                 if (image.valid())
                 {
                     imageSequence->addImage(image.get());
@@ -144,12 +144,12 @@ osg::StateSet* createState(osg::ArgumentParser& arguments)
         {
             imageSequence->setLength(4.0);
         }
-        imageSequence->addImage(osgDB::readImageFile("Cubemap_axis/posx.png"));
+        imageSequence->addImage(osgDB::readRefImageFile("Cubemap_axis/posx.png"));
-        imageSequence->addImage(osgDB::readImageFile("Cubemap_axis/negx.png"));
+        imageSequence->addImage(osgDB::readRefImageFile("Cubemap_axis/negx.png"));
-        imageSequence->addImage(osgDB::readImageFile("Cubemap_axis/posy.png"));
+        imageSequence->addImage(osgDB::readRefImageFile("Cubemap_axis/posy.png"));
-        imageSequence->addImage(osgDB::readImageFile("Cubemap_axis/negy.png"));
+        imageSequence->addImage(osgDB::readRefImageFile("Cubemap_axis/negy.png"));
-        imageSequence->addImage(osgDB::readImageFile("Cubemap_axis/posz.png"));
+        imageSequence->addImage(osgDB::readRefImageFile("Cubemap_axis/posz.png"));
-        imageSequence->addImage(osgDB::readImageFile("Cubemap_axis/negz.png"));
+        imageSequence->addImage(osgDB::readRefImageFile("Cubemap_axis/negz.png"));
     }
 
     // start the image sequence playing

examples/osgimpostor/osgimpostor.cpp

@@ -244,7 +244,7 @@ int main( int argc, char **argv )
 
 
     // load the nodes from the commandline arguments.
-    osg::ref_ptr<osg::Node> model = osgDB::readNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> model = osgDB::readRefNodeFiles(arguments);
     if (model)
     {
         // the osgSim::InsertImpostorsVisitor used lower down to insert impostors
@@ -280,7 +280,7 @@ int main( int argc, char **argv )
         // on it right now as it requires a getRoots() method to be added to
         // osg::Node, and we're about to make a release so no new features!
         osg::ref_ptr<osg::Group> rootnode = new osg::Group;
-        rootnode->addChild(model.get());
+        rootnode->addChild(model);
 
 
         // now insert impostors in the model using the InsertImpostorsVisitor.
@@ -304,7 +304,7 @@ int main( int argc, char **argv )
     }
 
     // add model to viewer.
-    viewer.setSceneData(model.get());
+    viewer.setSceneData(model);
 
     return viewer.run();
 }

examples/osgintersection/osgintersection.cpp

@@ -38,7 +38,7 @@ struct MyReadCallback : public osgUtil::IntersectionVisitor::ReadCallback
 {
     virtual osg::Node* readNodeFile(const std::string& filename)
     {
-        return osgDB::readNodeFile(filename);
+        return osgDB::readRefNodeFile(filename).release();
     }
 };
 
@@ -48,7 +48,7 @@ int main(int argc, char **argv)
     // use an ArgumentParser object to manage the program arguments.
     osg::ArgumentParser arguments(&argc,argv);
 
-    osg::ref_ptr<osg::Node> scene = osgDB::readNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> scene = osgDB::readRefNodeFiles(arguments);
 
     if (!scene)
     {

examples/osgkdtree/osgkdtree.cpp

@@ -56,7 +56,7 @@ int main(int argc, char **argv)
 
     osgDB::Registry::instance()->setBuildKdTreesHint(osgDB::ReaderWriter::Options::BUILD_KDTREES);
 
-    osg::ref_ptr<osg::Node> scene = osgDB::readNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> scene = osgDB::readRefNodeFiles(arguments);
 
     if (!scene)
     {
@@ -65,6 +65,6 @@ int main(int argc, char **argv)
     }
 
     osgViewer::Viewer viewer;
-    viewer.setSceneData(scene.get());
+    viewer.setSceneData(scene);
     return viewer.run();
 }

examples/osgkeyboardmouse/osgkeyboardmouse.cpp

@@ -341,10 +341,10 @@ int main( int argc, char **argv )
     osg::ref_ptr<osg::Node> loadedModel;
 
     // load the scene.
-    if (argc>1) loadedModel = osgDB::readNodeFile(argv[1]);
+    if (argc>1) loadedModel = osgDB::readRefNodeFile(argv[1]);
 
     // if not loaded assume no arguments passed in, try use default mode instead.
-    if (!loadedModel) loadedModel = osgDB::readNodeFile("dumptruck.osgt");
+    if (!loadedModel) loadedModel = osgDB::readRefNodeFile("dumptruck.osgt");
 
     if (!loadedModel)
     {
@@ -374,7 +374,7 @@ int main( int argc, char **argv )
     osgViewer::Viewer viewer;
     viewer.getCamera()->setGraphicsContext(gc.get());
     viewer.getCamera()->setViewport(0,0,800,600);
-    viewer.setSceneData(loadedModel.get());
+    viewer.setSceneData(loadedModel);
 
     // create a tracball manipulator to move the camera around in response to keyboard/mouse events
     viewer.setCameraManipulator( new osgGA::TrackballManipulator );

examples/osgkeystone/osgkeystone.cpp

@@ -45,7 +45,7 @@ int main( int argc, char **argv )
     osg::DisplaySettings* ds = viewer.getDisplaySettings() ? viewer.getDisplaySettings() : osg::DisplaySettings::instance().get();
     ds->readCommandLine(arguments);
 
-    osg::ref_ptr<osg::Node> model = osgDB::readNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> model = osgDB::readRefNodeFiles(arguments);
 
     if (!model)
     {
@@ -57,7 +57,7 @@ int main( int argc, char **argv )
     OSG_NOTICE<<"Stereo "<<ds->getStereo()<<std::endl;
     OSG_NOTICE<<"StereoMode "<<ds->getStereoMode()<<std::endl;
 
-    viewer.setSceneData(model.get());
+    viewer.setSceneData(model);
 
     // add the state manipulator
     viewer.addEventHandler( new osgGA::StateSetManipulator(viewer.getCamera()->getOrCreateStateSet()) );

examples/osglauncher/osglauncher.cpp

@@ -291,7 +291,7 @@ void SetObjectTextureState(osg::Geode *geodeCurrent, std::string texture)
     osg::StateSet* stateTexture = geodeCurrent->getOrCreateStateSet();
 
     // load texture.jpg as an image
-    osg::Image* imgTexture = osgDB::readImageFile( texture );
+    osg::ref_ptr<osg::Image> imgTexture = osgDB::readRefImageFile( texture );
 
     // if the image is successfully loaded
     if (imgTexture)

examples/osglight/osglight.cpp

@@ -226,7 +226,7 @@ osg::Geometry* createWall(const osg::Vec3& v1,const osg::Vec3& v2,const osg::Vec
 }
 
 
-osg::Node* createRoom(osg::Node* loadedModel)
+osg::ref_ptr<osg::Node> createRoom(const osg::ref_ptr<osg::Node>& loadedModel)
 {
     // default scale for this model.
     osg::BoundingSphere bs(osg::Vec3(0.0f,0.0f,0.0f),1.0f);
@@ -323,20 +323,20 @@ int main( int argc, char **argv )
     osgViewer::Viewer viewer;
 
     // load the nodes from the commandline arguments.
-    osg::Node* loadedModel = osgDB::readNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> loadedModel = osgDB::readRefNodeFiles(arguments);
 
     // if not loaded assume no arguments passed in, try use default mode instead.
-    if (!loadedModel) loadedModel = osgDB::readNodeFile("glider.osgt");
+    if (!loadedModel) loadedModel = osgDB::readRefNodeFile("glider.osgt");
 
     // create a room made of foor walls, a floor, a roof, and swinging light fitting.
-    osg::Node* rootnode = createRoom(loadedModel);
+    osg::ref_ptr<osg::Node> rootnode = createRoom(loadedModel);
 
     // run optimization over the scene graph
     osgUtil::Optimizer optimzer;
     optimzer.optimize(rootnode);
 
     // add a viewport to the viewer and attach the scene graph.
-    viewer.setSceneData( rootnode );
+    viewer.setSceneData(rootnode);
 
 
     // create the windows and run the threads.

examples/osglightpoint/osglightpoint.cpp

@@ -129,7 +129,7 @@ osg::Node* createLightPointsDatabase()
 
             // Set point sprite texture in LightPointNode StateSet.
             osg::Texture2D *tex = new osg::Texture2D();
-            tex->setImage(osgDB::readImageFile("Images/particle.rgb"));
+            tex->setImage(osgDB::readRefImageFile("Images/particle.rgb"));
             set->setTextureAttributeAndModes(0, tex, osg::StateAttribute::ON);
         }
 
@@ -232,7 +232,7 @@ int main( int argc, char **argv )
     osg::Group* rootnode = new osg::Group;
 
     // load the nodes from the commandline arguments.
-    rootnode->addChild(osgDB::readNodeFiles(arguments));
+    rootnode->addChild(osgDB::readRefNodeFiles(arguments));
     rootnode->addChild(createLightPointsDatabase());
     rootnode->addChild(CreateBlinkSequenceLightNode());
 

examples/osglogicop/osglogicop.cpp

@@ -142,10 +142,10 @@ int main( int argc, char **argv )
     osg::ArgumentParser arguments(&argc,argv);
 
     // load the nodes from the commandline arguments.
-    osg::Node* loadedModel = osgDB::readNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> loadedModel = osgDB::readRefNodeFiles(arguments);
 
     // if not loaded assume no arguments passed in, try use default mode instead.
-    if (!loadedModel) loadedModel = osgDB::readNodeFile("glider.osgt");
+    if (!loadedModel) loadedModel = osgDB::readRefNodeFile("glider.osgt");
 
     if (!loadedModel)
     {
@@ -153,11 +153,11 @@ int main( int argc, char **argv )
         return 1;
     }
 
-    osg::Group* root = new osg::Group;
+    osg::ref_ptr<osg::Group> root = new osg::Group;
     root->addChild(loadedModel);
 
-    osg::StateSet*  stateset =  new osg::StateSet;
+    osg::ref_ptr<osg::StateSet>  stateset =  new osg::StateSet;
-    osg::LogicOp*   logicOp =   new osg::LogicOp(osg::LogicOp::OR_INVERTED);
+    osg::ref_ptr<osg::LogicOp>   logicOp =   new osg::LogicOp(osg::LogicOp::OR_INVERTED);
 
     stateset->setAttributeAndModes(logicOp,osg::StateAttribute::OVERRIDE|osg::StateAttribute::ON);
 
@@ -170,7 +170,7 @@ int main( int argc, char **argv )
     // construct the viewer.
     osgViewer::Viewer viewer;
 
-    viewer.addEventHandler(new TechniqueEventHandler(logicOp));
+    viewer.addEventHandler(new TechniqueEventHandler(logicOp.get()));
 
     // run optimization over the scene graph
     osgUtil::Optimizer optimzer;

examples/osglogo/osglogo.cpp

@@ -234,7 +234,7 @@ osg:: Node* createGlobe(const osg::BoundingBox& bb,float ratio, const std::strin
     osg::MatrixTransform* xform = new osg::MatrixTransform;
     xform->setUpdateCallback(new osg::AnimationPathCallback(bb.center(),osg::Vec3(0.0f,0.0f,1.0f),osg::inDegrees(10.0f)));
 
-    osg::Node* bluemarble = filename.empty() ? 0 : osgDB::readNodeFile(filename.c_str());
+    osg::ref_ptr<osg::Node> bluemarble = filename.empty() ? 0 : osgDB::readRefNodeFile(filename.c_str());
     if (bluemarble)
     {
         const osg::BoundingSphere& bs = bluemarble->getBound();
@@ -252,7 +252,7 @@ osg:: Node* createGlobe(const osg::BoundingBox& bb,float ratio, const std::strin
 
         osg::StateSet* stateset = geode->getOrCreateStateSet();
 
-        osg::Image* image = osgDB::readImageFile("Images/land_shallow_topo_2048.jpg");
+        osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile("Images/land_shallow_topo_2048.jpg");
         if (image)
         {
             osg::Texture2D* texture = new osg::Texture2D;

examples/osgmanipulator/osgmanipulator.cpp

@@ -453,7 +453,7 @@ int main( int argc, char **argv )
     osg::Timer_t start_tick = osg::Timer::instance()->tick();
 
     // read the scene from the list of file specified command line args.
-    osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> loadedModel = osgDB::readRefNodeFiles(arguments);
 
     // if no model has been successfully loaded report failure.
     bool tragger2Scene(true);
@@ -481,14 +481,14 @@ int main( int argc, char **argv )
 
     // optimize the scene graph, remove redundant nodes and state etc.
     osgUtil::Optimizer optimizer;
-    optimizer.optimize(loadedModel.get());
+    optimizer.optimize(loadedModel);
 
 
     // pass the loaded scene graph to the viewer.
     if ( tragger2Scene ) {
         viewer.setSceneData(addDraggerToScene(loadedModel.get(), dragger_name, fixedSizeInScreen));
     } else {
-        viewer.setSceneData(loadedModel.get());
+        viewer.setSceneData(loadedModel);
     }
 
 

examples/osgmotionblur/osgmotionblur.cpp

@@ -26,6 +26,7 @@ class MotionBlurOperation: public osg::Operation
 {
 public:
     MotionBlurOperation(double persistence):
+        osg::Referenced(true),
         osg::Operation("MotionBlur",true),
         cleared_(false),
         persistence_(persistence)
@@ -95,10 +96,10 @@ int main( int argc, char **argv )
     arguments.read("-P", persistence) || arguments.read("--persistence", persistence);
 
     // read the scene from the list of file specified commandline args.
-    osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> loadedModel = osgDB::readRefNodeFiles(arguments);
 
     // if not loaded assume no arguments passed in, try use default mode instead.
-    if (!loadedModel) loadedModel = osgDB::readNodeFile("cow.osgt");
+    if (!loadedModel) loadedModel = osgDB::readRefNodeFile("cow.osgt");
 
     // if no model has been successfully loaded report failure.
     if (!loadedModel)

examples/osgmovie/osgmovie.cpp

@@ -469,23 +469,46 @@ int main(int argc, char** argv)
     {
         //useTextureRectangle = false;
 
-        static const char *shaderSourceTextureRec = {
+        static const char *shaderSourceTextureVertex = {
-            "uniform vec4 cutoff_color;\n"
+            "#ifdef GL_ES\n"
-            "uniform samplerRect movie_texture;\n"
+            "    precision highp float;\n"
+            "    precision highp int;\n"
+            "#endif\n"
+            "varying vec4 texcoord;\n"
             "void main(void)\n"
             "{\n"
-            "    vec4 texture_color = textureRect(movie_texture, gl_TexCoord[0].st); \n"
+            "    texcoord = gl_MultiTexCoord0; \n"
+            "    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\n"
+            "}\n"
+        };
+
+        static const char *shaderSourceTextureRec = {
+            "#ifdef GL_ES\n"
+            "    precision highp float;\n"
+            "    precision highp int;\n"
+            "#endif\n"
+            "uniform vec4 cutoff_color;\n"
+            "uniform samplerRect movie_texture;\n"
+            "varying vec4 texcoord;\n"
+            "void main(void)\n"
+            "{\n"
+            "    vec4 texture_color = textureRect(movie_texture, texcoord.st); \n"
             "    if (all(lessThanEqual(texture_color,cutoff_color))) discard; \n"
             "    gl_FragColor = texture_color;\n"
             "}\n"
         };
 
         static const char *shaderSourceTexture2D = {
+            "#ifdef GL_ES\n"
+            "    precision highp float;\n"
+            "    precision highp int;\n"
+            "#endif\n"
             "uniform vec4 cutoff_color;\n"
             "uniform sampler2D movie_texture;\n"
+            "varying vec4 texcoord;\n"
             "void main(void)\n"
             "{\n"
-            "    vec4 texture_color = texture2D(movie_texture, gl_TexCoord[0].st); \n"
+            "    vec4 texture_color = texture2D(movie_texture, texcoord.st); \n"
             "    if (all(lessThanEqual(texture_color,cutoff_color))) discard; \n"
             "    gl_FragColor = texture_color;\n"
             "}\n"
@@ -493,6 +516,9 @@ int main(int argc, char** argv)
 
         osg::Program* program = new osg::Program;
 
+
+        program->addShader(new osg::Shader(osg::Shader::VERTEX, shaderSourceTextureVertex));
+
         program->addShader(new osg::Shader(osg::Shader::FRAGMENT,
                                            useTextureRectangle ? shaderSourceTextureRec : shaderSourceTexture2D));
 
@@ -520,8 +546,8 @@ int main(int argc, char** argv)
     {
         if (arguments.isString(i))
         {
-            osg::Image* image = osgDB::readImageFile(arguments[i]);
+            osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(arguments[i]);
-            osg::ImageStream* imagestream = dynamic_cast<osg::ImageStream*>(image);
+            osg::ImageStream* imagestream = dynamic_cast<osg::ImageStream*>(image.get());
             if (imagestream)
             {
                 osg::ImageStream::AudioStreams& audioStreams = imagestream->getAudioStreams();
@@ -550,7 +576,7 @@ int main(int argc, char** argv)
                 float width = image->s() * image->getPixelAspectRatio();
                 float height = image->t();
 
-                osg::ref_ptr<osg::Drawable> drawable = myCreateTexturedQuadGeometry(pos, width, height,image, useTextureRectangle, xyPlane, flip);
+                osg::ref_ptr<osg::Drawable> drawable = myCreateTexturedQuadGeometry(pos, width, height, image.get(), useTextureRectangle, xyPlane, flip);
 
                 if (image->isImageTranslucent())
                 {

examples/osgmultiplemovies/osgmultiplemovies.cpp

@@ -362,7 +362,7 @@ private:
 
 static osg::Node* readImageStream(const std::string& file_name, osg::Vec3& p, float desired_height, osgDB::Options* options)
 {
-    osg::ref_ptr<osg::Object> obj = osgDB::readObjectFile(file_name, options);
+    osg::ref_ptr<osg::Object> obj = osgDB::readRefObjectFile(file_name, options);
     osg::ref_ptr<osg::Texture> tex = dynamic_cast<osg::Texture*>(obj.get());
     osg::Geometry* geo(NULL);
     float w(0);
@@ -374,7 +374,7 @@ static osg::Node* readImageStream(const std::string& file_name, osg::Vec3& p, fl
         // try readImageFile if readObjectFile failed
         if (!img_stream)
         {
-            img_stream = dynamic_cast<osg::ImageStream*>(osgDB::readImageFile(file_name, options));
+            img_stream = osgDB::readRefFile<osg::ImageStream>(file_name, options);
         }
 
         if (img_stream)
@@ -531,7 +531,9 @@ private:
         if (!tex) {
             osg::ref_ptr<osg::ImageStream> stream = dynamic_cast<osg::ImageStream*>(obj.get());
             if (!stream)
-                stream = dynamic_cast<osg::ImageStream*>(osgDB::readImageFile(_files[_currentFile], _options.get()));
+            {
+                stream = osgDB::readRefFile<osg::ImageStream>(_files[_currentFile], _options.get());
+            }
 
             if (stream)
             {

examples/osgmultitexture/osgmultitexture.cpp

@@ -44,10 +44,10 @@ int main( int argc, char **argv )
     osgViewer::Viewer viewer;
 
     // load the nodes from the commandline arguments.
-    osg::Node* rootnode = osgDB::readNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> rootnode = osgDB::readRefNodeFiles(arguments);
 
     // if not loaded assume no arguments passed in, try use default mode instead.
-    if (!rootnode) rootnode = osgDB::readNodeFile("cessnafire.osgt");
+    if (!rootnode) rootnode = osgDB::readRefNodeFile("cessnafire.osgt");
 
     if (!rootnode)
     {
@@ -55,7 +55,7 @@ int main( int argc, char **argv )
         return 1;
     }
 
-    osg::Image* image = osgDB::readImageFile("Images/reflect.rgb");
+    osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile("Images/reflect.rgb");
     if (image)
     {
         osg::Texture2D* texture = new osg::Texture2D;

examples/osgmultitexturecontrol/osgmultitexturecontrol.cpp

@@ -72,8 +72,8 @@ public:
     T* _foundNode;
 };
 
-template<class T>
+template<class T, class R>
-T* findTopMostNodeOfType(osg::Node* node)
+T* findTopMostNodeOfType(R node)
 {
     if (!node) return 0;
 
@@ -338,7 +338,7 @@ int main( int argc, char **argv )
     // set up the scene graph
     {
         // load the nodes from the commandline arguments.
-        osg::Node* rootnode = osgDB::readNodeFiles(arguments);
+        osg::ref_ptr<osg::Node> rootnode = osgDB::readRefNodeFiles(arguments);
 
         if (!rootnode)
         {

examples/osgmultitouch/osgmultitouch.cpp

@@ -284,10 +284,10 @@ int main( int argc, char **argv )
     }
 
     // read the scene from the list of file specified commandline args.
-    osg::ref_ptr<osg::Node> scene = osgDB::readNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> scene = osgDB::readRefNodeFiles(arguments);
 
     // if not loaded assume no arguments passed in, try use default model instead.
-    if (!scene) scene = osgDB::readNodeFile("dumptruck.osgt");
+    if (!scene) scene = osgDB::readRefNodeFile("dumptruck.osgt");
 
     if (!scene)
     {
@@ -307,10 +307,10 @@ int main( int argc, char **argv )
     std::string device;
     while(arguments.read("--device", device))
     {
-        osg::ref_ptr<osgGA::Device> dev = osgDB::readFile<osgGA::Device>(device);
+        osg::ref_ptr<osgGA::Device> dev = osgDB::readRefFile<osgGA::Device>(device);
         if (dev.valid())
         {
-            viewer.addDevice(dev.get());
+            viewer.addDevice(dev);
         }
     }
 
@@ -318,7 +318,7 @@ int main( int argc, char **argv )
     osg::ref_ptr<osg::Group> group  = new osg::Group;
 
     // add the HUD subgraph.
-    if (scene.valid()) group->addChild(scene.get());
+    if (scene) group->addChild(scene);
 
     viewer.setCameraManipulator(new osgGA::MultiTouchTrackballManipulator());
     viewer.realize();

examples/osgmultiviewpaging/osgmultiviewpaging.cpp

@@ -64,11 +64,11 @@ 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::readNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> scene = osgDB::readRefNodeFiles(arguments);
 
     if (!scene)
     {
-        scene = osgDB::readNodeFile("http://www.openscenegraph.org/data/earth_bayarea/earth.ive");
+        scene = osgDB::readRefNodeFile("http://www.openscenegraph.org/data/earth_bayarea/earth.ive");
     }
 
     if (!scene)
@@ -123,7 +123,7 @@ int main( int argc, char **argv )
             view->setName("View one");
             viewer.addView(view);
 
-            view->setSceneData(scene.get());
+            view->setSceneData(scene);
             view->getCamera()->setName("Cam one");
             view->getCamera()->setViewport(new osg::Viewport(0,0, traits->width/2, traits->height/2));
             view->getCamera()->setGraphicsContext(gc.get());
@@ -148,7 +148,7 @@ int main( int argc, char **argv )
             view->setName("View two");
             viewer.addView(view);
 
-            view->setSceneData(scene.get());
+            view->setSceneData(scene);
             view->getCamera()->setName("Cam two");
             view->getCamera()->setViewport(new osg::Viewport(traits->width/2,0, traits->width/2, traits->height/2));
             view->getCamera()->setGraphicsContext(gc.get());
@@ -162,7 +162,7 @@ int main( int argc, char **argv )
             view->setName("View three");
             viewer.addView(view);
 
-            view->setSceneData(scene.get());
+            view->setSceneData(scene);
 
             view->getCamera()->setName("Cam three");
             view->getCamera()->setProjectionMatrixAsPerspective(30.0, double(traits->width) / double(traits->height/2), 1.0, 1000.0);

examples/osgoccluder/osgoccluder.cpp

@@ -311,10 +311,10 @@ int main( int argc, char **argv )
     }
 
     // load the nodes from the commandline arguments.
-    osg::Node* loadedmodel = osgDB::readNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> loadedmodel = osgDB::readRefNodeFiles(arguments);
 
     // if not loaded assume no arguments passed in, try using default mode instead.
-    if (!loadedmodel) loadedmodel = osgDB::readNodeFile("glider.osgt");
+    if (!loadedmodel) loadedmodel = osgDB::readRefNodeFile("glider.osgt");
 
     if (!loadedmodel)
     {
@@ -336,12 +336,12 @@ int main( int argc, char **argv )
     }
     else
     {
-        rootnode = createOccludersAroundModel(loadedmodel);
+        rootnode = createOccludersAroundModel(loadedmodel.get());
     }
 
 
     // add a viewport to the viewer and attach the scene graph.
-    viewer.setSceneData( rootnode.get() );
+    viewer.setSceneData( rootnode );
 
     return viewer.run();
 }

examples/osgocclusionquery/osgocclusionquery.cpp

@@ -749,8 +749,8 @@ int main(int argc, char** argv)
 
     if (arguments.argc()>1)
     {
-        root = osgDB::readNodeFiles( arguments );
+        root = osgDB::readRefNodeFiles( arguments );
-        if (root.valid())
+        if (root)
         {
             // Run a NodeVisitor to insert OcclusionQueryNodes in the scene graph.
             OcclusionQueryVisitor oqv;
@@ -787,10 +787,10 @@ int main(int argc, char** argv)
     if (optimize)
     {
         osgUtil::Optimizer optimizer;
-        optimizer.optimize( root.get() );
+        optimizer.optimize( root );
     }
 
-    viewer.setSceneData( root.get() );
+    viewer.setSceneData( root );
 
     KeyHandler* kh = new KeyHandler( *root );
     viewer.addEventHandler( kh );

examples/osgoit/DepthPeeling.cpp

@@ -139,10 +139,8 @@ protected:
 };
 
 
-DepthPeeling::CullCallback::CullCallback(unsigned int texUnit, unsigned int texWidth, unsigned int texHeight, unsigned int offsetValue) :
+DepthPeeling::CullCallback::CullCallback(unsigned int texUnit, unsigned int offsetValue) :
     _texUnit(texUnit),
-    _texWidth(texWidth),
-    _texHeight(texHeight),
     _offsetValue(offsetValue)
 {
 }
@@ -317,7 +315,7 @@ void DepthPeeling::createPeeling()
     // create some uniform and cull callback objects
     osg::Uniform *depthOff = new osg::Uniform("depthtest", (bool)false);
     osg::Uniform *depthOn  = new osg::Uniform("depthtest", (bool)true);
-    CullCallback *ccb      = new CullCallback(_texUnit, _texWidth, _texHeight, _offsetValue);
+    CullCallback *ccb      = new CullCallback(_texUnit, _offsetValue);
 
     // create a node for solid model rendering
     osg::Group *pre_solidNode = new osg::Group;
@@ -412,7 +410,7 @@ void DepthPeeling::createPeeling()
     _compositeCamera->setReferenceFrame(osg::Transform::ABSOLUTE_RF);
     _compositeCamera->setViewMatrix(osg::Matrix());
     _compositeCamera->setProjectionMatrix(osg::Matrix::ortho2D(0, 1, 0, 1));
-    _compositeCamera->setCullCallback(new CullCallback(0, _texWidth, _texHeight, 0));
+    _compositeCamera->setCullCallback(new CullCallback(0, 0));
     osg::StateSet* stateSet = _compositeCamera->getOrCreateStateSet();
     stateSet->setRenderBinDetails(100, "TraversalOrderBin", osg::StateSet::OVERRIDE_RENDERBIN_DETAILS);
     _root->addChild(_compositeCamera.get());

examples/osgoit/DepthPeeling.h

@@ -63,13 +63,11 @@ protected:
 
     class CullCallback : public osg::NodeCallback {
     public:
-        CullCallback(unsigned int texUnit, unsigned int texWidth, unsigned int texHeight, unsigned int offsetValue);
+        CullCallback(unsigned int texUnit, unsigned int offsetValue);
         virtual void operator()(osg::Node* node, osg::NodeVisitor* nv);
 
     private:
         unsigned int _texUnit;
-        unsigned int _texWidth;
-        unsigned int _texHeight;
         unsigned int _offsetValue;
     };
 

examples/osgoit/osgoit.cpp

@@ -66,12 +66,12 @@ int main(int argc, char** argv)
     arguments.reportRemainingOptionsAsUnrecognized();
 
     // read the dump truck, we will need it twice
-    osg::ref_ptr<osg::Node> dt = osgDB::readNodeFile("dumptruck.osg");
+    osg::ref_ptr<osg::Node> dt = osgDB::readRefNodeFile("dumptruck.osg");
 
     // display a solid version of the dump truck
     osg::ref_ptr<osg::PositionAttitudeTransform> solidModel = new osg::PositionAttitudeTransform;
     solidModel->setPosition(osg::Vec3f(7.0f, -2.0f, 7.0f));
-    solidModel->addChild(dt.get());
+    solidModel->addChild(dt);
 
     // generate the 3D heatmap surface to display
     osg::ref_ptr<Heatmap> hm = new Heatmap(30, 30, 10, 30, 30, 1.0, 0.25);

examples/osgoscdevice/osgoscdevice.cpp

@@ -377,7 +377,7 @@ public:
 
             std::ostringstream ss ;
             ss << host << ":" << port << ".sender.osc";
-            _device = osgDB::readFile<osgGA::Device>(ss.str());
+            _device = osgDB::readRefFile<osgGA::Device>(ss.str());
 
             osgGA::EventVisitor* ev = dynamic_cast<osgGA::EventVisitor*>(nv);
             osgViewer::View* view = ev ? dynamic_cast<osgViewer::View*>(ev->getActionAdapter()) : NULL;
@@ -403,7 +403,7 @@ int main( int argc, char **argv )
 
 
     // read the scene from the list of file specified commandline args.
-    osg::ref_ptr<osg::Node> scene = osgDB::readNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> scene = osgDB::readRefNodeFiles(arguments);
 
     if (!scene)
     {
@@ -463,15 +463,15 @@ int main( int argc, char **argv )
         view->addEventHandler( new osgViewer::StatsHandler );
         view->addEventHandler( new UserEventHandler(text) );
 
-        osg::ref_ptr<osgGA::Device> device = osgDB::readFile<osgGA::Device>("0.0.0.0:9000.receiver.osc");
+        osg::ref_ptr<osgGA::Device> device = osgDB::readRefFile<osgGA::Device>("0.0.0.0:9000.receiver.osc");
         if (device.valid() && (device->getCapabilities() & osgGA::Device::RECEIVE_EVENTS))
         {
-            view->addDevice(device.get());
+            view->addDevice(device);
 
             // add a zeroconf device, advertising the osc-device
             if(use_zeroconf)
             {
-                osgGA::Device* zeroconf_device = osgDB::readFile<osgGA::Device>("_osc._udp:9000.advertise.zeroconf");
+                osg::ref_ptr<osgGA::Device> zeroconf_device = osgDB::readRefFile<osgGA::Device>("_osc._udp:9000.advertise.zeroconf");
                 if (zeroconf_device)
                 {
                     view->addDevice(zeroconf_device);
@@ -527,7 +527,7 @@ int main( int argc, char **argv )
 
         if (use_zeroconf)
         {
-            osgGA::Device* zeroconf_device = osgDB::readFile<osgGA::Device>("_osc._udp.discover.zeroconf");
+            osg::ref_ptr<osgGA::Device> zeroconf_device = osgDB::readRefFile<osgGA::Device>("_osc._udp.discover.zeroconf");
             if(zeroconf_device) {
                 view->addDevice(zeroconf_device);
                 view->getEventHandlers().push_front(new OscServiceDiscoveredEventHandler());
@@ -536,7 +536,7 @@ int main( int argc, char **argv )
         }
         else
         {
-            osg::ref_ptr<osgGA::Device> device = osgDB::readFile<osgGA::Device>("localhost:9000.sender.osc");
+            osg::ref_ptr<osgGA::Device> device = osgDB::readRefFile<osgGA::Device>("localhost:9000.sender.osc");
             if (device.valid() && (device->getCapabilities() & osgGA::Device::SEND_EVENTS))
             {
                 // add as first event handler, so it gets ALL events ...

examples/osgoutline/osgoutline.cpp

@@ -25,7 +25,7 @@ int main(int argc, char** argv)
 
     // load outlined object
     std::string modelFilename = arguments.argc() > 1 ? arguments[1] : "dumptruck.osgt";
-    osg::ref_ptr<osg::Node> outlineModel = osgDB::readNodeFile(modelFilename);
+    osg::ref_ptr<osg::Node> outlineModel = osgDB::readRefNodeFile(modelFilename);
     if (!outlineModel)
     {
         osg::notify(osg::FATAL) << "Unable to load model '" << modelFilename << "'\n";
@@ -38,18 +38,18 @@ int main(int argc, char** argv)
     {
         // create outline effect
         osg::ref_ptr<osgFX::Outline> outline = new osgFX::Outline;
-        root->addChild(outline.get());
+        root->addChild(outline);
 
         outline->setWidth(8);
         outline->setColor(osg::Vec4(1,1,0,1));
-        outline->addChild(outlineModel.get());
+        outline->addChild(outlineModel);
     }
 
     if (testOcclusion)
     {
         // load occluder
         std::string occludedModelFilename = "cow.osgt";
-        osg::ref_ptr<osg::Node> occludedModel = osgDB::readNodeFile(occludedModelFilename);
+        osg::ref_ptr<osg::Node> occludedModel = osgDB::readRefNodeFile(occludedModelFilename);
         if (!occludedModel)
         {
             osg::notify(osg::FATAL) << "Unable to load model '" << occludedModelFilename << "'\n";
@@ -63,14 +63,14 @@ int main(int argc, char** argv)
         // occluder behind outlined model
         osg::ref_ptr<osg::PositionAttitudeTransform> modelTransform0 = new osg::PositionAttitudeTransform;
         modelTransform0->setPosition(bsphere.center() + occluderOffset);
-        modelTransform0->addChild(occludedModel.get());
+        modelTransform0->addChild(occludedModel);
-        root->addChild(modelTransform0.get());
+        root->addChild(modelTransform0);
 
         // occluder in front of outlined model
         osg::ref_ptr<osg::PositionAttitudeTransform> modelTransform1 = new osg::PositionAttitudeTransform;
         modelTransform1->setPosition(bsphere.center() - occluderOffset);
-        modelTransform1->addChild(occludedModel.get());
+        modelTransform1->addChild(occludedModel);
-        root->addChild(modelTransform1.get());
+        root->addChild(modelTransform1);
     }
 
     // must have stencil buffer...
@@ -78,7 +78,7 @@ int main(int argc, char** argv)
 
     // construct the viewer
     osgViewer::Viewer viewer;
-    viewer.setSceneData(root.get());
+    viewer.setSceneData(root);
 
     // must clear stencil buffer...
     unsigned int clearMask = viewer.getCamera()->getClearMask();

examples/osgpagedlod/osgpagedlod.cpp

@@ -254,7 +254,7 @@ int main( int argc, char **argv )
 //     }
 
 
-    osg::ref_ptr<osg::Node> model = osgDB::readNodeFiles(arguments);
+    osg::ref_ptr<osg::Node> model = osgDB::readRefNodeFiles(arguments);
 
     if (!model)
     {

examples/osgparametric/osgparametric.cpp

@@ -163,7 +163,7 @@ osg::Node* createModel(const std::string& shader, const std::string& textureFile
             osg::Shader* vertex_shader = new osg::Shader(osg::Shader::VERTEX, vertexShaderSource_texture);
             program->addShader(vertex_shader);
 
-            osg::Image* image = 0;
+            osg::ref_ptr<osg::Image> image;
 
             if (terrainFileName.empty())
             {
@@ -184,7 +184,7 @@ osg::Node* createModel(const std::string& shader, const std::string& textureFile
             }
             else
             {
-                image = osgDB::readImageFile(terrainFileName);
+                image = osgDB::readRefImageFile(terrainFileName);
 
                 num_x = image->s();
                 num_y = image->t();
@@ -206,7 +206,7 @@ osg::Node* createModel(const std::string& shader, const std::string& textureFile
         osg::Shader* fragment_shader = new osg::Shader(osg::Shader::FRAGMENT, fragmentShaderSource);
         program->addShader(fragment_shader);
 
-        osg::Texture2D* texture = new osg::Texture2D(osgDB::readImageFile(textureFileName));
+        osg::Texture2D* texture = new osg::Texture2D(osgDB::readRefImageFile(textureFileName));
         stateset->setTextureAttributeAndModes(0,texture);
 
         osg::Uniform* baseTextureSampler = new osg::Uniform("baseTexture",0);