Robert Osfield
deef029823
Fixed member variable names to avoid conflicts with osg::Node
2018-03-23 20:07:08 +00:00
Robert Osfield
9797b0f56c
Removed Drawable writing out of StateSet as this is now done by Node
2018-03-23 20:06:44 +00:00
OpenSceneGraph git repository
22148711f8
Fixed indentation
2018-03-23 17:09:56 +00:00
OpenSceneGraph git repository
c40a0ded53
Fixed indentation
2018-03-23 17:04:30 +00:00
OpenSceneGraph git repository
c6d092a744
Fixed indentation
2018-03-23 17:01:15 +00:00
OpenSceneGraph git repository
4c3141b62e
Fixed indentation
2018-03-23 17:00:00 +00:00
OpenSceneGraph git repository
248f377e9a
Merge pull request #503 from kornerr/master
...
Provide osgemscripten example CMake flags in a more stable way
2018-03-23 16:37:44 +00:00
Michael Kapelko
1170f6247e
Provide osgemscripten example CMake flags in a more stable way
2018-03-23 18:07:07 +03:00
Haojia Yu
b37cbc665f
fix bugs
2018-03-23 22:51:04 +08:00
Haojia Yu
415a747049
Revert "Revert "write binary file with a specific so version""
...
This reverts commit 0ae6f7fea6
2018-03-23 22:49:47 +08:00
Haojia Yu
0ae6f7fea6
Revert "write binary file with a specific so version"
...
This reverts commit b5bf8864b1
2018-03-23 22:48:11 +08:00
Haojia Yu
b5bf8864b1
write binary file with a specific so version
...
when write binary file, like osgb file, users can set plugin string data, such as "TargetFileVersion=80", to options object, then the features of output file will be limitted to so version 80.
2018-03-23 22:31:12 +08:00
Robert Osfield
b48db74fa3
Changed the isBufferObjectSupported flag so that it's true when either VBO or PBO's are supported
2018-03-23 12:55:00 +00:00
Paul Obermeier
bb169979a1
Fixes for VS2008 and 2010 build
2018-03-22 17:35:13 +00:00
Robert Osfield
084927d5ae
Moved OPENGL_INCLUDE_DIR include into it's own INCLUDE_DIRECTORIES(SYSTEM ${OPENGL_INCLUDE_DIR}) entry to help with FreeBSD builds where a previous rev of the OSG has already been installed
2018-03-22 17:05:38 +00:00
Robert Osfield
023a8d99e9
Removed typedef and used osg::GraphicsContext::Cameras explictly to avoid any hiding of type
2018-03-22 09:04:47 +00:00
OpenSceneGraph git repository
d181aba978
Merge pull request #500 from Vic-Min/master
...
Fixed bug of determining availability of functions ‘pthread_getconcur…
2018-03-22 08:34:32 +00:00
Victor
2263ea5dcb
Fixed bug of determining availability of functions ‘pthread_getconcurrency’, ‘pthread_setconcurrency’, ‘pthread_setaffinity_np’ in ‘pthread’ library
...
CMake cannot find 'pthread_getconcurrency’, ‘pthread_setconcurrency’ and ‘pthread_setaffinity_np' functions in 'pthread' library because when linking internal cmake test did’t specifed ‘-l pthread’.
2018-03-21 19:44:25 +03:00
OpenSceneGraph git repository
a3b2f4083e
Merge pull request #497 from openscenegraph/shader_pipeline
...
Shader pipeline
2018-03-20 10:07:34 +00:00
Robert Osfield
58cb5227ff
Merge branch 'master' into shader_pipeline
2018-03-20 09:49:04 +00:00
Robert Osfield
f7d9974681
Updated version to 3.7.0 after making of the 3.6 stable release branch
2018-03-20 09:47:23 +00:00
Robert Osfield
12a7808aa6
Removed -m message that was causing problems with branch creation
2018-03-20 09:22:11 +00:00
Robert Osfield
383161c14c
Updated version numbers in prep for 3.6 branch
2018-03-20 09:12:58 +00:00
Robert Osfield
ba4791a15d
Updated ChangeLog and AUTHORS file
2018-03-20 09:02:05 +00:00
Robert Osfield
9d21e5de8c
Merge branch 'master' into shader_pipeline
2018-03-19 15:36:32 +00:00
Robert Osfield
950823fac9
Updated ChangeLog and updated version to 3.5.11
2018-03-19 14:27:18 +00:00
Robert Osfield
b563f1bd78
Fixed build issues when building with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION set to OFF
2018-03-19 14:08:47 +00:00
Robert Osfield
76c584ab25
Added osg::UnfiromBase* StateSet::getUniformBase(..) and osg::Uniform* StateSet::getUniform(..) methods to help with backwards compatibility
2018-03-19 12:08:28 +00:00
Robert Osfield
10e1c29d2e
Merge branch 'master' into shader_pipeline
2018-03-19 11:00:07 +00:00
Robert Osfield
b38a37c3bb
Fixed warnings
2018-03-19 10:42:09 +00:00
Robert Osfield
c3af787a3a
Merge branch 'master' into shader_pipeline
2018-03-16 13:35:22 +00:00
Robert Osfield
b7147ff532
Updated ShaderGen shaders
2018-03-16 11:33:03 +00:00
Robert Osfield
e5b67a6795
Removed the static osg::Program creation as it's not required
2018-03-15 16:50:47 +00:00
Robert Osfield
add6b3edee
Added --shader saderfilename command line option to enable one to manually specify which shaders to use for the uber program.
2018-03-15 16:49:58 +00:00
Robert Osfield
0308dfecf5
Introduced a _specverson to centralizer the control of this variable
2018-03-15 16:12:40 +00:00
Robert Osfield
d365a6a347
Added support for Collada DOM-2.5
2018-03-15 15:58:46 +00:00
Robert Osfield
689299c65c
Merge branch 'master' into shader_pipeline
2018-03-15 13:28:22 +00:00
OpenSceneGraph git repository
8229d19f21
Merge pull request #495 from aitormoreno/fix_installExamplesPDB
...
fix installation of PDB files from the examples.
2018-03-15 12:53:32 +00:00
Aitor Moreno
bcd2adf977
Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph into fix_installExamplesPDB
2018-03-14 16:56:08 +01:00
Aitor Moreno
79fde49084
(re)fix the installation of the PDB files
2018-03-14 16:54:05 +01:00
Robert Osfield
3585ecc28c
Merge branch 'master' into shader_pipeline
2018-03-14 09:20:08 +00:00
Robert Osfield
57f2b1fa27
Standardized the MSCV INSTALL lines between applications and examples
2018-03-14 08:39:12 +00:00
Robert Osfield
4447190dd6
Refactored osgUtil::ShaderGen to use #pragma(tic) shader composition.
2018-03-14 08:22:45 +00:00
Aitor Moreno
5fcaf18025
fix installation of PDB files from the examples.
2018-03-13 11:21:35 +01:00
OpenSceneGraph git repository
009580676f
Merge pull request #494 from pelicanmapping/fix-text-empty-checks
...
Added required empty vector checks to osg::Text
2018-03-13 08:47:53 +00:00
gwaldron
23b94c2468
Text: added code in accept(functor) methods to check for empty vectors before accessing front() element, which was causing a crash in some cases. Also fixed a negated null check in getCharacterCoords
2018-03-12 17:35:46 -04:00
Yaroslav Tarasov
f8199935fa
Fixed renamed of _textureDepth.
2018-03-12 16:14:30 +00:00
Robert Osfield
5c8a5307d6
From Colin McDonald, "If the glCreateProgram in osg::Program fails for any reason, then subsequently
...
Program::PerContextProgram::linkProgram would crash. I've put in some
checks to prevent that."
2018-03-12 15:55:35 +00:00
Robert Osfield
3f686d8719
Fixed indentation
2018-03-12 15:29:56 +00:00
Robert Osfield
7ce1938543
Improved indentation
2018-03-12 15:12:44 +00:00
