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
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
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
OpenSceneGraph git repository
31d78b7bb3
Merge pull request #490 from torokati44/master
...
osgDB: Fix handling of return value of loadLibrary in Registry.
2018-03-02 09:43:24 +00:00
TÖRÖK Attila
b7c429a72a
osgDB: Fix handling of return value of loadLibrary in Registry.
...
"Unable to load ..." was printed if the library could be loaded,
and it wasn't if not.
2018-03-02 00:13:43 +01:00
OpenSceneGraph git repository
eafab0fc35
Merge pull request #488 from LaurensVoerman/submit_array_ext
...
remove _EXT from GL_MAX_ARRAY_TEXTURE_LAYERS_EXT
2018-02-28 14:10:15 +00:00
Laurens Voerman
c81317b5b0
remove _EXT from GL_MAX_ARRAY_TEXTURE_LAYERS_EXT and GL_TEXTURE_BINDING_2D_ARRAY_EXT
2018-02-28 14:11:41 +01:00
Robert Osfield
be723811c8
Added GUIEventHandler to allow one to write out models with event callbacks
2018-02-28 10:30:47 +00:00
Robert Osfield
99bcd95756
Replaced GL_TEXTURE_2D_ARRAY_EXT with GL_TEXTURE_2D_ARRAY
2018-02-28 08:50:48 +00:00
Robert Osfield
3dec244d5b
Changed GL enum to fix Windows build issue
2018-02-28 08:02:39 +00:00
Robert Osfield
6a4609c28f
Fixed precision issue with filling in the last element of the TransferFunction1D's osg::Image.
2018-02-27 19:09:18 +00:00
Robert Osfield
7b6eedbdf4
Restructured the way that applyTexParameters() is applied to address issues with Intel drivers not handling mipmap generations unless the tex parameters are reapplied on new upload of data.
2018-02-27 17:35:13 +00:00
Robert Osfield
39881b5576
Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph
2018-02-23 09:57:19 +00:00
Robert Osfield
2b13166c8d
Cleaned up the applying of the glDrawBuffers()
2018-02-23 09:55:00 +00:00
OpenSceneGraph git repository
ebf0e8f435
Merge pull request #485 from eligovision/OpenSceneGraph_gles
...
GLExtensions fix: No PBO on GLES2 by default
2018-02-23 08:28:59 +00:00
Konstantin S. Matveyev
e3df1e954d
GLExtensions fix: No PBO on GLES2 by default
2018-02-22 16:43:14 +03:00
OpenSceneGraph git repository
ffc8e54cdc
Merge pull request #484 from LaurensVoerman/submit_inventor_dllexport
...
Remove OSG_EXPORT from deprecated_osg::Geometry in inventor plugin.
2018-02-22 08:15:46 +00:00
Laurens Voerman
819fb2b14c
Remove OSG_EXPORT from deprecated_osg::Geometry in inventor plugin.
2018-02-21 13:38:42 +01:00
OpenSceneGraph git repository
56baa7bf04
Merge pull request #479 from LaurensVoerman/submit_vc14WarnC4800_v2
...
move Get/SetScalarvalue out of ValueObject and provide specialization…
2018-02-19 10:14:36 +00:00
Robert Osfield
f5021e8bc0
Added ADD_DEFINITIONS(-D_WINSOCK_DEPRECATED_NO_WARNINGS) to quieten warning
2018-02-19 10:07:14 +00:00
OpenSceneGraph git repository
2378b41e9f
Merge pull request #482 from hwiesmann/master
...
Addition of comments for ClusterCullingCallback
2018-02-19 08:39:42 +00:00
OpenSceneGraph git repository
c52ae4f99f
Changed the doxygen control characters and clarifications
2018-02-19 08:39:23 +00:00
OpenSceneGraph git repository
7200b21203
Merge pull request #483 from filnet/fix_log_messages
...
Fix log messages
2018-02-19 08:35:00 +00:00
