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
Robert Osfield
556089e6a1
From Raymond de Vries, added support for latest FBX SDK
2018-03-12 10:43:56 +00:00
Robert Osfield
957bd4b886
Added FbxLayeredTexture support
2018-03-12 10:29:04 +00:00
Robert Osfield
125263f216
Refactored the texture setup to streamline it and make it easier to adapt
2018-03-10 17:51:52 +00:00
Alessandro Terenzi
9010fd8035
iOS CMake project generation improvements (bitcode option)
...
when building for iOS, Xcode allows developers to specify to enable or disable the 'bitcode' compilation option. There's not a preferred way to go and the choice is really up to the developer but considering that:
1. Currently the generated project defaults the option to YES
2. There are almost 90 projects targets that should be modified if one wants to disable the bitcode option (which considerably reduces the footprint of the app)
3. Even though one can select all the 90+ targets and set the option to NO for all of them, the updates could take a few seconds and could be error prone because one could miss to select some targets
I propose to add a CMake setting that is displayed only when building for iOS. By setting this option "before" the project generation would speed up things for developers and would avoid errors at compiling time.
2018-03-09 10:17:59 +00:00
Robert Osfield
e17f1c4e31
Refactored the handling if RESIZE, CLOSE, QUIT AND USER events so they are dispatched to all views associated with a window, or all views associated with a CompositeViewer
2018-03-08 16:26:01 +00:00
Robert Osfield
1020bddb15
Fixed recursive call bug
2018-03-08 10:47:07 +00:00
Robert Osfield
4e6e0f53be
Changed glDrawBuffer/glReadBuffer calls to use the new State::glDrawBuffers/glReadBuffers helper functions to enable lazy state updating to avoid unneccessary GL calls
2018-03-07 17:49:40 +00:00
Robert Osfield
4dac60540a
Changed the default values of _drawBuffer and _readBuffer to make sure that the lazy state updating in State.glDrawBuffers(GLenum)/glReadBuffers(Glenum) doesn't ever ignore the first call.
2018-03-07 17:44:48 +00:00
Robert Osfield
178cba7cf0
Fixed build error
2018-03-07 16:45:58 +00:00
Robert Osfield
98cdeac9f6
Added missing Camera::setDrawBuffer/setReadBuffer()
2018-03-06 16:54:57 +00:00
Robert Osfield
f8eabd38ba
Added missing Camera::setDrawBuffer() & setReadBuffer()
2018-03-06 16:42:11 +00:00
Robert Osfield
731065a32e
Added missing setDrawBufer/setReadBuffer calls
2018-03-06 16:23:20 +00:00
Robert Osfield
98a7772fa7
Merge branch 'master' into shader_pipeline
2018-03-06 10:24:26 +00:00
Robert Osfield
b03e76bdb9
Renamed numBytesPerPixel to numBytesPerComponent to be clearer
2018-03-06 09:58:31 +00:00
Robert Osfield
64341cfb72
Added State::glDrawBuffer/glReadBuffer() method to implement lazy state updating for glDrawBuffer and glReadBuffer
2018-03-06 09:49:02 +00:00
OpenSceneGraph git repository
ee3235e7e0
Merge pull request #491 from mmassing/readerwritergdal_fix_reading_of_multichannel_multibyte_images
...
ReaderWriterGDAL: fix stride when reading multi-channel images with…
2018-03-06 09:33:30 +00:00
OpenSceneGraph git repository
5b80ee91c6
Merge pull request #492 from emminizer/stateattribute-typo
...
Minor typo fix on osg::StateAttribute
2018-03-06 09:25:49 +00:00
Daniel Emminizer
28544a4e29
Minor typo fix on osg::StateAttribute
2018-03-05 10:26:54 -05:00
Manuel Massing
b4cf315d6f
- ReaderWriterGDAL: fix stride when reading multi-channel images with more than 1 byte per pixel
2018-03-05 15:48:24 +01:00
Robert Osfield
1b8567e11e
Added deprecated comments for ShaderComposer
2018-03-05 14:39:07 +00:00
Robert Osfield
5c4a5515de
Merge branch 'master' into shader_pipeline
2018-03-02 10:38:41 +00:00
