Robert Osfield
e884df59c7
Pulled in latest changes from 3.6 branch
2018-04-07 18:14:57 +01:00
Robert Osfield
159f0fd584
Refactored the way that margin is applied to the text buounding box to prevent growth of the bounding box each time Text::setPosition() is called.
2018-04-06 20:05:26 +01:00
Daniel Emminizer
5063a0b41a
osgDB: Added missing extern OSGDB_EXPORT.
2018-04-05 18:01:29 +01:00
Robert Osfield
decaf57fef
Quietened down debug message output for osgText shader setup and Drawable::createVertexArrayStateImplementation
2018-04-05 14:14:49 +01:00
Robert Osfield
146fe3e294
Fixed threading crash in osgFX that occurred when an osgFX node is added to the scene being rendered in multiple threaded windows.
2018-04-04 15:09:43 +01:00
Frank Bausch
72ab22e539
When testing XYZ/ECEF coordinate values that convert to LLA points with latitude = 90.0 or latitude = -90.0, the heights calculated by EllipsoidModel::convertXYZToLatLongHeight have substantial errors. With the provided change, points at the pole are handled more correctly. This has been tested against US NGA GoldData.
2018-04-04 08:50:39 +01:00
Robert Osfield
a34df91de7
Added a ShadowTechniue::setShadowedScene() virtual method to make it possible to implement techniques as fascades to other techniques
2018-04-03 15:29:54 +01:00
Robert Osfield
b920d482c7
Removed osgShadow::ShadowVolume as it functionality isn't functional
2018-04-03 11:35:31 +01:00
Robert Osfield
5c48904626
Rewrote the handling of AutoTransform::setAutoScaleToScreen(bool) functionality so that is disabling CullingActive when switched on.
2018-04-02 18:26:26 +01:00
Robert Osfield
f02c556874
Changed Layer::get*Value(..) methods to const
2018-03-30 12:39:52 +01:00
Robert Osfield
1e05e04a05
Maded TerrainTechnique::setTerrainTile(..), addNeighbour(..), removeNeighbour(..) and containsNeighbour(..) virtual and public to enable implementation of TerrainTechnique that act as a facade to actual TerrainTechnique implementations.
2018-03-29 11:35:34 +01:00
Konstantin S. Matveyev
b96587cead
GraphicsWindowIOS: multithreaded viewer's mode support added; updated for iOS-11 SDK; view rotations fixed; GLES2, GLES3 preprocessors fixed; tested on iPhone4 and upper
2018-03-27 08:49:01 +01:00
Hartwig
1b3928a017
Removal of compiler warnings caused by integer conversions
...
In most systems today sizeof(size_t) is larger than sizeof(GLsizei). Therefore, the inclusion of GLExtensions may introduce a lot of compiler warnings as array.size() (of type size_t) is passed to a function with a parameter of type GLsizei.
2018-03-25 19:04:10 +02:00
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
deef029823
Fixed member variable names to avoid conflicts with osg::Node
2018-03-23 20:07:08 +00:00
OpenSceneGraph git repository
4c3141b62e
Fixed indentation
2018-03-23 17:00:00 +00: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
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
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
Robert Osfield
98a7772fa7
Merge branch 'master' into shader_pipeline
2018-03-06 10:24:26 +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
Daniel Emminizer
28544a4e29
Minor typo fix on osg::StateAttribute
2018-03-05 10:26:54 -05:00
Robert Osfield
1b8567e11e
Added deprecated comments for ShaderComposer
2018-03-05 14:39:07 +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
Robert Osfield
351e8e3fe1
Merge branch 'master' into shader_pipeline
2018-02-19 11:23:29 +00: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
OpenSceneGraph git repository
c52ae4f99f
Changed the doxygen control characters and clarifications
2018-02-19 08:39:23 +00:00
Hartwig Wiesmann
f01383c02a
Addition of comments for ClusterCullingCallback
2018-02-18 08:49:41 +03:00
Hartwig
73a36679df
Addition of radius parameter for ClusterCullingCallback's constructor
...
The radius parameter is already present in ClusterCullingCallback's set method but has been forgotten in the constructor.
2018-02-15 21:10:59 +01:00
Laurens Voerman
b79d680580
move Get/SetScalarvalue out of ValueObject and provide specialization for GetScalarValue<bool> fixing MSVC waring C4800
2018-02-15 14:59:24 +01:00
Laurens Voerman
ec4881da5a
bugfix: GetScalarValue returns inverted values for booleans; SetScalarValue needs to be a SetValueVisitor
2018-02-13 17:38:35 +01:00
Robert Osfield
91f3e8fa59
Merge branch 'master' into shader_pipeline
2018-02-13 12:24:26 +00:00
Robert Osfield
b8e5f22cb7
Added virtual bool Texture::isDirty(contextID) method to help determine whether a GL texture object is likely to be out of date and needs updating
2018-02-13 12:01:57 +00:00
Robert Osfield
a0c23d914d
Merge branch 'master' into shader_pipeline
2018-02-07 09:27:53 +00:00
OpenSceneGraph git repository
6d1d1bb000
Revert "BindingTextureImage: a more complex condition for _texture->apply ?"
2018-02-02 09:54:31 +00:00
Robert Osfield
0c35541fc5
Merge branch 'master' into shader_pipeline
2018-01-27 10:56:09 +00:00
Julien Valentin
f4663b0e32
add ARB_BufferStorage extensions
2018-01-25 16:22:33 +01:00
Robert Osfield
368dd5dd92
Merge branch 'master' into shader_pipeline
2018-01-23 10:39:05 +00:00
OpenSceneGraph git repository
022d1df97d
Merge pull request #454 from mp3butcher/imagebinding
...
BindingTextureImage: a more complex condition for _texture->apply ?
2018-01-23 10:26:20 +00:00
Robert Osfield
1e8879f2e2
Merge branch 'master' into shader_pipeline
2018-01-23 10:08:27 +00:00
OpenSceneGraph git repository
3b2b2d762c
Merge pull request #456 from PissedCapslock/patch-2
...
Fixing typos in comments
2018-01-23 09:56:26 +00:00
Robin Stevens
dcbaa3e64a
Fixing typos in comments
2018-01-23 10:25:32 +01:00
Robin Stevens
5810d2ba18
Typo in comment
2018-01-23 10:20:49 +01:00
Robert Osfield
2f65456dd4
Merge branch 'master' into shader_pipeline
2018-01-21 13:11:51 +00:00
Robert Osfield
18d5a9159f
Restructured the system() fallback to be usable for C and C++
2018-01-21 12:09:49 +00:00
Julien Valentin
0aa8008f0a
add a virtual getBufferData to Texture
2018-01-21 01:23:38 +01:00