OpenSceneGraph git repository
097d3ab4ed
Merge pull request #502 from Haojia521/OutputStreamUseTargertSoVersion
...
write binary file with a specific so version
2018-03-23 20:08:37 +00:00
Robert Osfield
837200ae08
Removed serailizers that are now supplied by osg::Node
2018-03-23 20:07:43 +00:00
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
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
023a8d99e9
Removed typedef and used osg::GraphicsContext::Cameras explictly to avoid any hiding of type
2018-03-22 09:04:47 +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
Robert Osfield
9d21e5de8c
Merge branch 'master' into shader_pipeline
2018-03-19 15:36:32 +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
0308dfecf5
Introduced a _specverson to centralizer the control of this variable
2018-03-15 16:12:40 +00:00
Robert Osfield
3585ecc28c
Merge branch 'master' into shader_pipeline
2018-03-14 09:20:08 +00:00
Robert Osfield
4447190dd6
Refactored osgUtil::ShaderGen to use #pragma(tic) shader composition.
2018-03-14 08:22:45 +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
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
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
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
5c4a5515de
Merge branch 'master' into shader_pipeline
2018-03-02 10:38:41 +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
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
8ed00f77dd
Merge branch 'master' into shader_pipeline
2018-02-28 10:31:30 +00: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
1ae954f5c3
Merge branch 'master' into shader_pipeline
2018-02-28 09:11:29 +00:00
Robert Osfield
99bcd95756
Replaced GL_TEXTURE_2D_ARRAY_EXT with GL_TEXTURE_2D_ARRAY
2018-02-28 08:50:48 +00:00
