Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Apr 13, 2015
  1. From Jannik Heller, typo fixes

    Robert OSFIELD authored
    git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14832 16af8721-9629-0410-8352-f15c8da7e697
  2. From Laurens Voerman, I have modified the FindOpenEXR.cmake to find t…

    Robert OSFIELD authored
    …he debug libraries, and to define a variable
    
    (OPENEXR_LIBRARIES_VARS) with the variable names that might have a _DEBUG version defined.
    
    
    git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14830 16af8721-9629-0410-8352-f15c8da7e697
Commits on Mar 12, 2015
  1. From Laurens Voerman, "attached is a zip with a modified version of:

    Robert OSFIELD authored
    OpenSceneGraph\CMakeModules\FindFBX.cmake
    
    This version can find fbx sdk 2015.1 and will prefer it over older versions.
    
    Tested with Visual Studio Express 2013 on 64bit windows 7"
    
    
    git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14782 16af8721-9629-0410-8352-f15c8da7e697
Commits on Feb 25, 2015
  1. From Dmitry Marakasov, "While packaging osg-3.3.3 I've discovered tha…

    Robert OSFIELD authored
    …t gstreamer detection is
    
    broken:
    
    -- Could NOT find GStreamer (missing:  GSTREAMER_BASE_INCLUDE_DIRS GSTREAMER_BASE_LIBRARIES GSTREAMER_GSTREAMER-APP_INCLUDE_DIRS GSTREAMER_GSTREAMER-APP_LIBRARIES GSTREAMER_GSTREAMER-PBUTILS_INCLUDE_DIRS GSTREAMER_GSTREAMER-PBUTILS_LIBRARIES) (found version "1.4.5")
    
    though all required modules are installed.
    
    There are two problems: first, module names are spelled incorrectly in root
    CMakeLists.txt (e.g. gstreamer-app instead of app), so variables expected
    for them are e.g. GSTREAMER_GSTREAMER-APP_INCLUDE_DIRS instead of
    GSTREAMER_APP_INCLUDE_DIRS.
    
    Second, gstreamer base component is detected as GSTREAMER while checked
    later as GSTREAMER_BASE. I've uncommented the detection as
    GSTREAMER_BASE, but obviously that should be revisited and only one
    detection left. With this patch, gstreamer is detected properly and
    the plugins is successfully built and installed."
    
    
    git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14719 16af8721-9629-0410-8352-f15c8da7e697
Commits on Jan 7, 2015
  1. From Javier Taibo, "I have found that since version 1.1, FFMPEG chang…

    Robert OSFIELD authored
    …ed the way audio streams are retrieved, from packed to planar format. SDL interprets packed audio, as is used in the osgmovie example. To make the audio work when the OSGffmpeg plug-in is compiled against recent FFMPEG versions, FFmpegDecoderAudio must check for planar formats and in these cases request the samples as packed. This way all works as before. It can be checked with osgmovie example application.
    
      $ osgmovie --audio movie.avi.ffmpeg
      FFmpegImageStream::open audio failed, audio stream will be disabled: unknown audio format
    
      With the attached FFmpegDecoderAudio.cpp, audio sounds correctly.
    
      I am also attaching a modified version of FindFFmpeg.cmake that allows to set as FFMPEG_DIR the ffmpeg compiled in the source directory structure. It should not break anything as it only adds some additional search paths.
    "
    
    
    git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14654 16af8721-9629-0410-8352-f15c8da7e697
Commits on Dec 24, 2014
  1. Removed debug message

    Robert OSFIELD authored
    git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14642 16af8721-9629-0410-8352-f15c8da7e697
Commits on Dec 23, 2014
  1. Changes to allow the COLLADA plugin to compile against the latest COL…

    Robert OSFIELD authored
    …LADA DOM version 2.4 as well as retaining compatibility with the old 2.2 DOM.
    
    git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14633 16af8721-9629-0410-8352-f15c8da7e697
Commits on Dec 19, 2014
  1. Added if () block to avoid script variables set to NOT-Found being us…

    Robert OSFIELD authored
    …ed in searching
    
    git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14624 16af8721-9629-0410-8352-f15c8da7e697
  2. Fixed script warnings

    Robert OSFIELD authored
    git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14623 16af8721-9629-0410-8352-f15c8da7e697
Commits on Dec 18, 2014
  1. From Aitor Moreno, LAS plugin - depends upon boost and liblas and lib…

    Robert OSFIELD authored
    …las-c
    
    git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14622 16af8721-9629-0410-8352-f15c8da7e697
  2. From Mattias Helsing, "The addition of the GStreamer cmake find scrip…

    Robert OSFIELD authored
    …t broke my build because
    
    cmake vars weren't passed correctly to find_package_handler_args, so
    while the find script didn't find a single required GStreamer lib or
    include path it still reported GSTREAMER_FOUND=TRUE (and then tried to
    compile the new plugin). This fixes it and correctly reports missing
    components."
    
    
    git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14611 16af8721-9629-0410-8352-f15c8da7e697
Commits on Dec 17, 2014
  1. Added support for using SDL2 to the osgmovie to enable it to handle f…

    Robert OSFIELD authored
    …loating point audio formats
    
    git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14610 16af8721-9629-0410-8352-f15c8da7e697
  2. From Javier Taibo, " I have found that since version 1.1, FFMPEG chan…

    Robert OSFIELD authored
    …ged the way audio streams are retrieved, from packed to planar format. SDL interprets packed audio, as is used in the osgmovie example. To make the audio work when the OSGffmpeg plug-in is compiled against recent FFMPEG versions, FFmpegDecoderAudio must check for planar formats and in these cases request the samples as packed. This way all works as before. It can be checked with osgmovie example application.
    
      $ osgmovie --audio movie.avi.ffmpeg
      FFmpegImageStream::open audio failed, audio stream will be disabled: unknown audio format
    
      With the attached FFmpegDecoderAudio.cpp, audio sounds correctly.
    
      I am also attaching a modified version of FindFFmpeg.cmake that allows to set as FFMPEG_DIR the ffmpeg compiled in the source directory structure. It should not break anything as it only adds some additional search paths.
    
    "
    
    Note from Robert Osfield, I have found in testing that audio quality is not good for planar floating point formats, even with adding support for SDL2 to the osgmovie example. I haven't yet tracked down the cause of these audio problems or a solution.
    
    
    git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14609 16af8721-9629-0410-8352-f15c8da7e697
Commits on Dec 16, 2014
  1. From Julen Garcia, "Here there is a small plugin I use to play video …

    Robert OSFIELD authored
    …files. It is based on GStreamer http://gstreamer.freedesktop.org and I have used the FFmpeg plugin as inspiration."
    
    From Robert Osfield, fixed handled of row widths so that they are padded to a 4 byte boundary as certain row widths were being rendered incorrectly.
    
    
    git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14604 16af8721-9629-0410-8352-f15c8da7e697
Commits on Nov 24, 2014
  1. From Jan Klimke, "i noticed, that there are a couple of additional fl…

    Robert OSFIELD authored
    …aws when building osg for Mac OS X 10.10 Yosemite.
    
    The mac os sdk version is recognized by the current CMAKE script as 10.1 instead of 10.10 since it cuts the version string from the 4th place. I introduced a more reliable version checking based on splitting the returned version code into MAJOR MINOR and PATCH parts and reassemble the OSG sdk version afterwards.
    
    I replaced the existing CMake code against the following (returning now version 10.10 as expected):
    
     # Determine the canonical name of the selected Platform SDK
       EXECUTE_PROCESS(COMMAND "/usr/bin/sw_vers" "-productVersion"
                       OUTPUT_VARIABLE OSG_OSX_SDK_NAME
                       OUTPUT_STRIP_TRAILING_WHITESPACE)
       STRING(REPLACE "." ";" MACOS_VERSION_LIST ${OSG_OSX_SDK_NAME})
       LIST(GET MACOS_VERSION_LIST 0 MACOS_VERSION_MAJOR)
       LIST(GET MACOS_VERSION_LIST 1 MACOS_VERSION_MINOR)
       LIST(GET MACOS_VERSION_LIST 2 MACOS_VERSION_PATCH)
    
       SET(OSG_OSX_SDK_NAME "macosx${MACOS_VERSION_MAJOR}.${MACOS_VERSION_MINOR}")
    
    Also i added the check for the new Version to some more find scripts.
    
    Additionally the nil object in Objective C now seems to be equivalent with a null_ptr that cannot be passed as GLInt anymore. So i switched this in the PixelBufferCocoa.mm to pass a zero instead of nil.
    "
    
    
    git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14527 16af8721-9629-0410-8352-f15c8da7e697
Commits on Nov 21, 2014
  1. From Rafa Gaitan, "I finally had some time to change the build system…

    Robert OSFIELD authored
    … for Android using a Toolchain, which, I think, will be easier to maintain and uses cmake standard system to build it.
    
    My changes:
    -------------------
    - I changed the cmake files and added a toolchain for building OSG in Android. The toolchain is based on the one used at OpenCV. For building OSG for android you just need to do:
    
        mkdir build_android_static_gles2 && cd build_android_static_gles2
        cmake .. -DANDROID_NDK=<path-to-the-android-ndk>
                      -DCMAKE_TOOLCHAIN_FILE=../PlatformSpecifics/Android/android.toolchain.cmake
                      -DOPENGL_PROFILE="GLES2"
                      -DDYNAMIC_OPENTHREADS=OFF
                      -DDYNAMIC_OPENSCENEGRAPH=OFF
                      -DANDROID_NATIVE_API_LEVEL=15 # optional
                      -DANDROID_ABI=armeabim #optional
                      -DCMAKE_INSTALL_PREFIX=<path-to-the-install-path> #optional
    make -j 8
    make install
    
        The OPENGL_PROFILE works as expected, changing it to "GLES1" it builds and links OSG using GLES1.
        The DYNAMIC_OPENTHREADS/DYNAMIC_OPENSCENEGRAPH parameters also allows to build the dynamic libraries
    
    - I also added some build fixes for android related to the texture formats and added some missing USE_OSG_SERIALIZER_WRAPPER in the osg serializer library to support loading osgb files in static."
    
    
    git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14514 16af8721-9629-0410-8352-f15c8da7e697
  2. From Björn Blissing, fix for ambiguous defines in Atomic.cpp when com…

    Robert OSFIELD authored
    …piling with MinGW and GCC
    
    git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14513 16af8721-9629-0410-8352-f15c8da7e697
Commits on May 6, 2014
  1. From Stephan Huber, "Please revert the change to FindQuickTime.cmake …

    Robert OSFIELD authored
    …as this breaks compilation for IOS and possibly OS X."
Commits on Apr 29, 2014
  1. From Mattias Helsing, "I finally got to fix the cmake Modules that ha…

    Robert OSFIELD authored
    …ve duplicates in later
    
    version of cmake. See attached submission. I have tested the ones that
    I compile myself (GDAL, Freetype, ZLIB) on ubuntu 12.04 with
    cmake-2.8.7."
  2. From Paul Martz, "There is no standard place for gl/glcorearb.h on Wi…

    Robert OSFIELD authored
    …ndows. Previously, the only way to get OSG to build for core profile was to append an additional include directory ("/I") onto the CFLAGS variables This submission adds a FindGLCORE.cmake script so that the path to gl/glcorearb.h can be specified with a variable, GLCORE_ROOT, either in CMake or the environment.
    
    Currently this submission is Windows-only. I don't think OSX or Linux require any help in locating gl/glcorearb.h. But if they do, this submission can be easily modified.
    
    Files:
     - "CMakeLists.txt" is the top-level file.
     - FindGLCORE.cmake" and "OsgMacroUtils.cmake" go in CMakeModules.
    "
Commits on Apr 24, 2014
  1. From Mattias Helsing, "Seems I was only half right given what you ask…

    Robert OSFIELD authored
    …ed for. CMP0017 only
    
    says that modules that are found and ran from cmake modules dir should
    prefer cmake-provided modules. find_package() and include() still look
    in CMAKE_MODULE_PATH first.
    
    After some investigating I've come up with a proposal examplified in
    the attached FindGDAL.cmake script. It simply calls the cmake provided
    FindGDAL.cmake if it exists and returns if it succeeds in finding GDAL
    using that, otherwise continue with our local cmake code.
    Pro: Wont clutter our root CMakeLists.txt
    Con: If we begin to write more advanced Findxxx modules (using
    COMPONENTS, REQUIRED etc.) we may have to revise this scheme.
    "
Commits on Apr 13, 2014
  1. Renamed FindFreeType.cmake to FindFreetype.cmake to enable CMake buil…

    Robert OSFIELD authored
    …d to pick up on CMake's own FindFreetype.cmake when it's available.
Commits on Apr 9, 2014
  1. From Paul Cheyrou-Lagreze, "Attached is fix/feature for FBX osgplugin…

    Robert OSFIELD authored
    …s against latest trunk:
    
    - ReaderWriterFBX.cpp: add "z up scene axis" support:  FBX provides facility to convert model scene axis during conversion. Currently fbx plugin convert axis to fbx:opengl axis system (which is arbitrarily at Y up, as opengl is in reality axis agnostic) and sometimes what is needed is Z up so added an option for Z up conversion
    
    - FindFBX.cmake: add support for latest fbx sdk ( 2014.2 )"
Commits on Apr 8, 2014
  1. Added extra search paths to add compatibility with Kubuntu/Ubuntu 14.…

    Robert OSFIELD authored
    …04 now locaton for freetype
Commits on Jan 28, 2014
  1. Fixed MingW build's handling of debug d postfix.

    Robert OSFIELD authored
Commits on Jan 24, 2014
  1. From Torben Dannahuer, "modified findcollada.cmake which can now dete…

    Robert OSFIELD authored
    …ct Boost 1.55 libraries, which are used by Collada in my 3rdParty package"
Commits on Jan 7, 2014
Commits on Jan 6, 2014
  1. Renamed the OSGSIM cmake variable to OSGSIM_LIBRARY to be consistent …

    Robert OSFIELD authored
    …with the rest of the variables.
Commits on Nov 22, 2013
  1. From Kristofer Tingdahl, Build fix for svg plugin that makes sure the…

    Robert OSFIELD authored
    … version of librsvg is at sufficient, and fixed a missing virtual destructor warning.
Commits on Nov 18, 2013
  1. From Stephan Huber, "minor ios-fixes/-enhancements

    Robert OSFIELD authored
    * force _OPENTHREADS_ATOMIC_USE_BSD_ATOMIC for IOS device + simulator as the test does not pick the right implementation
    * fixed a small compile-bug for iphone-example
    * added a check to prevent multiple realization of a GraphicsWindowIOS-object
    "
Commits on Nov 1, 2013
  1. From Stephan Huber, "Build Problem with osgGA at MacOS with Xcode 5".…

    Robert OSFIELD authored
    ….."attached you'll find a possible solution for the issue. This will add a new option to cmake called OSG_CXX_LANGUAGE_STANDARD which defaults to C++11. If you set it to C++98 it will setup the project accordingly."
Commits on Oct 10, 2013
  1. Laurens Voerman, "my cmake (2.8.10.2 generating for Visual Studio 11 …

    Robert OSFIELD authored
    …Win64) doesn't like
    
    include(${CMAKE_MODULE_PATH}/FindPackageHandleStandardArgs.cmake)
    in CMakeModules/FindLua52.cmake
    changing to a more common
        include(FindPackageHandleStandardArgs)
    solves my problem."
Commits on Oct 7, 2013
  1. From Stephan Huber, "attached you’ll find a bunch of fixes + enhancem…

    Robert OSFIELD authored
    …ents for iOS and OS X based on current trunk. I incorporated + tested the submission from Colin Cochran, so his submission is not needed anymore.
    
    * fixed a bug with multi-touch and touch-id-generation on iOS and OS X. (will fix a bug reported by Colin Cochran, without ditching the existing logic)
    * removed unnecessary warning-flagss when generating xcode-projects via cmake, will enable the usage of OSG_AGGRESSIVE_WARNING_FLAGS
    * added support for 10.9 (OS X)
    * new cmake-variable: IPHONE_VERSION_MIN, this will set the deployment-target (previously hard-coded) If you set the IPHONE_VERSION_MIN to something like 7.0 osg gets compiled also for 64bit (amd64)
    * cmake defaults now to the clang compiler if IPHONE_VERSION_MIN > 4.2
    * cmake now sets some xcode-settings so the compiler uses the c++98-standard (clang defaults to c++11, w/o this I got a lot of linking errors)
    * removed include-dir for avfoundation-plugin as not needed on OSX/IOS.
    * enhanced the ios-example, will now show multitouch-information on a hud (similar to the  osgmultitouch-example), and more importantly, will compile + link out of the box
    * small enhancements for the osc-device-plugin (send only one msg for MOVE/DRAG, even if multiple msgs/event is enabled)
    * better memory-handling for the zeroconf-plugin
    * fixed a possible bug in the rest-http-plugin when receiving mouse-events.
    * incorporated a fix from Colin Cochran "forwarded touch events are not transformed into the GL UIView“
    "
  2. Cleaned up line endings

    Robert OSFIELD authored
Commits on Oct 4, 2013
Something went wrong with that request. Please try again.