Chris Djali
fbb5839298
Resolve OpenGL error caused by confusion between geometry shader implementations.
...
There are two types of Geometry Shaders in OpenGL. One is provided by `GL_EXT_geometry_shader4` and `GL_ARB_geometry_shader4` and requires that certain parameters are set with calls to `glProgramParameteri` before the program is linked. The other is provided by OpenGL 3.2 as a core feature and by the GLES extensions `GL_EXT_geometry_shader` and `GL_OES_geometry_shader` and requires these parameters to be set in the GLSL source itself.
The value of `isGeometryShader4Supported` is being used to determine if the `glProgramParameteri` calls should occur, so it should only be `true` when one of the extensions requiring them is present.
2019-02-26 17:19:06 +00:00
Robert Osfield
572e1d75a4
Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph
2019-02-25 15:07:38 +00:00
Robert Osfield
08ea80c904
Streamline the animation path completion message
2019-02-25 15:06:54 +00:00
OpenSceneGraph git repository
66a0168353
Merge pull request #714 from dan-t/reset_occlusion_query_test_result
...
OcclusionQueryNode: reset the test result of the invalid geometry
2019-02-25 15:06:17 +00:00
Daniel Trstenjak
b431c29d44
OcclusionQueryNode: reset the test result of the invalid geometry
...
There're cases that the occlusion test result has been retrieved
after the query geometry has been changed, it's the result of the
geometry before the change.
2019-02-25 11:31:12 +01:00
OpenSceneGraph git repository
0614896c12
Merge pull request #713 from dan-t/ensure_valid_query_geometry
...
Ensure valid occlusion query geometry
2019-02-21 17:33:18 +00:00
Daniel Trstenjak
71997fa747
OcclusionQueryNode: ensure a valid query geometry
...
If the query geometry is invalid then don't do any occlusion queries and
never traverse the subgraphs.
2019-02-21 14:42:35 +01:00
OpenSceneGraph git repository
862788e14e
Merge pull request #711 from uhertlein/macos_10_14
...
Cleanups and support for macOS 10.14
2019-02-20 17:20:35 +00:00
OpenSceneGraph git repository
742b0607d5
Merge pull request #710 from bjornblissing/fbx-filename
...
Add search location for textures in FBX plugin
2019-02-20 17:17:34 +00:00
OpenSceneGraph git repository
af32a24cf2
Merge pull request #707 from dquam/patch-1
...
Undo small change to FindOpenCascade.cmake
2019-02-20 17:01:38 +00:00
Julien Valentin
91c6b80020
uncomment INLINE_DRAWABLE_DRAW
2019-02-20 16:55:08 +00:00
Robert Osfield
552ecb7674
Added override for broken bindings
2019-02-20 16:38:11 +00:00
Ulrich Hertlein
10af927260
Support for macOS 10.14
...
- 10.14 drops libstdc++
- drops support for Carbon :-)
- drops support for macOS < 10.9
2019-02-07 19:18:11 +01:00
Ulrich Hertlein
eac4c9df60
Minor cmake cleanups and formatting
2019-02-07 19:16:00 +01:00
Björn Blissing
3284d0545c
Add search location for textures in FBX plugin
...
The FBX plugin may fail texture lookup even if the texture is located in
the same folder as the model file. This change tries, as a last resort,
to check if the texture filename is available in the same folder as the
model.
2019-02-04 14:46:42 +01:00
dquam
389d55a98a
Undo small change to FindOpenCascade.cmake
...
Re-add FIND_OPENCASCADE_LIBRARY(OPENCASCADE_TKXCAF TKXCAF) to the cmake file.
2019-01-29 10:07:05 -06:00
Robert Osfield
070e55e8e0
Added missing {} to fix getPassed() bug introducted by previus commit
2019-01-26 18:12:19 +00:00
Daniel Trstenjak
733f78a0b4
OcclusionQueryNode: ensure a consistent value for '_passed'
2019-01-26 18:12:19 +00:00
Robert Osfield
6eb0da3a16
Introduced a QueryGeometry::getQueryResult(const osg::Camera*) method as a more informative replacedment for QueryGeometry::getNumPixels().
2019-01-26 18:12:19 +00:00
Daniel Trstenjak
f21ca61476
OcclusionQueryNode: add resetting of queries
...
If there's a big view change then it might not be appropriate to wait
for '_queryFrameCount' till the next query is issued, because then
geometry might pop into the view after '_queryFrameCount'.
This is especially important for applications not having a constant
frame rate, but just issue a new frame on demand.
2019-01-26 18:12:19 +00:00
Robert Osfield
c6eb63d529
Commented out the reset of the _vertexArrayObject = 0 as it was break later State::resetCurrentVertexArrayStateOnMatch() calls ability to reset the State::_currentVAO when required.
2019-01-23 15:42:41 +00:00
Robert Osfield
276ca14376
Fixed typo
2019-01-23 08:52:44 +00:00
Robert Osfield
587c893f84
Added separate test and rest of _currentVAO to State::resetCurrentVertexArrayStateOnMatch(..) method
2019-01-22 20:22:49 +00:00
Robert Osfield
aee747885a
Changed resetCurrentVertexArrayStateOnMatch() to reset _vas tp _globalVertexArrayState and currentVAO to 0.
2019-01-21 18:13:43 +00:00
Robert Osfield
336791ca35
Added reset of the State::CurrentVertexArrayState() to prevent the State::_vas becoming a dangling pointer when VertexArrayState objects are deleted.
2019-01-21 17:38:40 +00:00
Robert Osfield
68e4341cb4
Added calling of releaseGLObjects() and resizeGLObjects() to the Camera DrawCallback's to enable the draw callbacks to clean up their own GL objects.
2019-01-19 16:18:48 +00:00
Laurens Voerman
664d597e20
fix MSVC warning C4250: inherits 'X' via dominance (94x)
2019-01-17 17:40:29 +00:00
Robert Osfield
cb90d269e4
Added derpecated and thread unsafe warning message to docs of ObjectCache::getgetFromObjectCache()
2019-01-14 11:55:24 +00:00
Laurens Voerman
805e54752a
clear temp objectCache in databaseRequest
2019-01-14 10:40:42 +00:00
Robert Osfield
d01a262f84
Added using to quieten VS warnings
2019-01-14 10:13:41 +00:00
Robert Osfield
32db852c77
Moved resizeGLObjects/releaseGLObjects out of Referenced to avoid multiple inheritance warnings
2019-01-12 11:28:25 +00:00
Robert Osfield
1c3b2d2285
Added read/writeObject() entry point to FBX plugin.
2019-01-10 09:48:03 +00:00
Robert Osfield
c43bc0882e
Added cmake package configuration files to gitignore
2019-01-09 08:51:29 +00:00
Robert Osfield
45872fbb68
Replaced use of heap with use of stack created ifstream to avoid potential memory leak
2019-01-09 08:43:08 +00:00
Robert Osfield
3da76932e6
Introduced use of ref_ptr<> and private destructor to tighen up memory management and avoid users attempting to inappropriately delete TexCoordRange.
2019-01-09 08:38:16 +00:00
Robert Osfield
466bbc6740
Fixed for crashes on exit associaciated with VAO usage and vairous niche usage cases
2019-01-08 19:35:37 +00:00
Robert Osfield
dd9ccbad86
Fixed crash on exit issues with osgFX, osgParticle, osgSim and the osgforest example
2019-01-08 19:35:29 +00:00
OpenSceneGraph git repository
c1a491bd54
Merge pull request #683 from 0871087123/readtexture_bug_fix
...
Readtexture bug fix
2019-01-07 08:31:58 +00:00
Kent
51cfa0fa26
fix readtexture issue
2019-01-07 10:38:14 +08:00
kent
32400af6c1
Merge branch 'master' of github.com:openscenegraph/OpenSceneGraph
2019-01-04 21:21:56 +08:00
Robert Osfield
7efe889537
Added use of sizeof to make code a bit more flexible
2019-01-04 08:10:15 +00:00
Robert Osfield
49cf25718c
Restructured the clean up of arrays/primitives and GL objects
2019-01-04 08:08:07 +00:00
Robert Osfield
25c60dc675
Cleaned up Geometry::dirtyGLOjects() and Geometry::releaseGLObjects()
2018-12-31 12:14:26 +00:00
Robert Osfield
337f24051b
Changed the clean up of the GL objects on destruction so that the destructors of the arrays/primitives themselves do the release rather than have it done explictly in the destructor. This allows arrays/primitives to be shared.
2018-12-31 11:09:21 +00:00
Julien Valentin
dd94de3121
setup camera Read/Draw Buffer
...
fix flickering shadows in SingleThread
2018-12-20 08:49:38 +00:00
Robert Osfield
74462c46b9
Removed examples from build as it was causing travis to timeout
2018-12-14 09:17:05 +00:00
Robert Osfield
ab32dd859b
Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph
2018-12-13 14:08:20 +00:00
OpenSceneGraph git repository
22b1ec8fda
Merge pull request #673 from Dyuzz/patch-1
...
add Vec3dArray* vertex output to avoid inaccuracy
2018-12-13 14:07:44 +00:00
OpenSceneGraph git repository
d090be7b49
Fixed indentation
2018-12-13 14:06:51 +00:00
OpenSceneGraph git repository
a7623e3b04
Chnaged tabs to four spaces to fix indentation
2018-12-13 14:05:31 +00:00
