Commit Graph

15881 Commits

Author SHA1 Message Date
Robert Osfield
cc68d7f151 Streamline the animation path completion message 2019-02-25 15:09:12 +00:00
Daniel Trstenjak
5770774e00 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 15:08:38 +00:00
Daniel Trstenjak
5624a22fe4 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 17:34:26 +00:00
Björn Blissing
9905b90a18 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-20 17:19:04 +00:00
OpenSceneGraph git repository
6d5c6ad6cc
Merge pull request #704 from mp3butcher/patch-24
uncomment INLINE_DRAWABLE_DRAW
2019-02-20 16:54:23 +00:00
Robert Osfield
971eba37ad Added override for broken bindings 2019-02-20 16:31:58 +00:00
Julien Valentin
43574b52c1
uncomment INLINE_DRAWABLE_DRAW 2019-01-28 01:40:35 +01:00
Robert Osfield
625c771641 Updates for 3.6.4-rc3 2019-01-26 19:36:30 +00:00
OpenSceneGraph git repository
1504a54cd8
Merge pull request #702 from mp3butcher/fix36
add MeshReindexation flag
2019-01-26 18:21:47 +00:00
Robert Osfield
0f2e9e6557 Added missing {} to fix getPassed() bug introducted by previus commit 2019-01-26 18:10:44 +00:00
Daniel Trstenjak
cd150cbe96 OcclusionQueryNode: ensure a consistent value for '_passed' 2019-01-26 17:42:20 +00:00
Robert Osfield
02d7d980a7 Introduced a QueryGeometry::getQueryResult(const osg::Camera*) method as a more informative replacedment for QueryGeometry::getNumPixels(). 2019-01-26 16:33:23 +00:00
Daniel Trstenjak
c8521068a5 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 15:22:08 +00:00
mp3butcher
832d8d5228 fix variable name 2019-01-23 17:06:04 +01:00
OpenSceneGraph git repository
bdd0be2f8f Changed member variable name to be consistent with header 2019-01-23 17:03:27 +01:00
OpenSceneGraph git repository
968a427e00 Changed the member variable to be consistent with the method name. 2019-01-23 17:03:11 +01:00
mp3butcher
b8f9249bea add a bool parameter to allow forced reindexation of a mesh 2019-01-23 17:02:53 +01:00
Robert Osfield
e2fb88e187 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:40:13 +00:00
Robert Osfield
749dc86dd3 Fixed typo 2019-01-23 08:52:11 +00:00
Robert Osfield
84bae01643 Added separate test and rest of _currentVAO to State::resetCurrentVertexArrayStateOnMatch(..) method 2019-01-22 20:21:56 +00:00
Robert Osfield
8a5d1b9f44 Changed resetCurrentVertexArrayStateOnMatch() to reset _vas tp _globalVertexArrayState and currentVAO to 0. 2019-01-21 18:15:02 +00:00
Robert Osfield
488b4854b2 Added reset of the State::CurrentVertexArrayState() to prevent the State::_vas becoming a dangling pointer when VertexArrayState objects are deleted. 2019-01-21 17:36:40 +00:00
Robert Osfield
6455159757 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:16:53 +00:00
OpenSceneGraph git repository
2e68db5b55
Merge pull request #693 from LaurensVoerman/glObj_C4250
fix MSVC warning C4250: inherits 'X' via dominance (94x)
2019-01-17 17:24:22 +00:00
Laurens Voerman
2e29085669 fix MSVC warning C4250: inherits 'X' via dominance (94x) 2019-01-17 16:22:51 +01:00
Robert Osfield
f223fec92d Added derpecated and thread unsafe warning message to docs of ObjectCache::getgetFromObjectCache() 2019-01-14 11:56:23 +00:00
OpenSceneGraph git repository
cc3cb92ddc
Merge pull request #691 from LaurensVoerman/clrObjCache
clear temp objectCache in databaseRequest
2019-01-14 10:23:05 +00:00
Robert Osfield
4dcb2bbf3c Added using to quieten VS warnings 2019-01-14 09:55:00 +00:00
Laurens Voerman
eeb13d1efc clear temp objectCache in databaseRequest 2019-01-14 10:24:30 +01:00
Robert Osfield
fe98c3d7f5 Moved resizeGLObjects/releaseGLObjects out of Referenced to avoid multiple inheritance warnings 2019-01-12 11:27:18 +00:00
Robert Osfield
46b07141e8 Added read/writeObject() entry point to FBX plugin. 2019-01-10 09:45:32 +00:00
Robert Osfield
02bfd05d6f Upated ChangeLog 2019-01-09 10:22:54 +00:00
Robert Osfield
035abfdb71 Updated for 3.6.4-rc2 2019-01-09 10:19:34 +00:00
Robert Osfield
0c99326db3 Added cmake package configuration files to gitignore 2019-01-09 09:51:21 +00:00
Robert Osfield
8103da6ef1 Replaced use of heap with use of stack created ifstream to avoid potential memory leak 2019-01-09 09:51:21 +00:00
Robert Osfield
bd83044c08 Introduced use of ref_ptr<> and private destructor to tighen up memory management and avoid users attempting to inappropriately delete TexCoordRange. 2019-01-09 09:51:21 +00:00
Robert Osfield
f6b64afdfc Fixed for crashes on exit associaciated with VAO usage and vairous niche usage cases 2019-01-08 19:32:50 +00:00
Robert Osfield
1c65815f4e Fixed crash on exit issues with osgFX, osgParticle, osgSim and the osgforest example 2019-01-07 17:46:02 +00:00
Robert Osfield
5e9be10da6 Merged changes from master 2019-01-07 10:25:13 +00:00
Robert Osfield
820532ddff Updated rc number for 3.6.4 release candidate 2019-01-04 09:22:12 +00:00
Robert Osfield
6951c44464 Updated ChangeLog and AUTHORS in prep for 3.6.4 work 2019-01-04 09:10:39 +00:00
Robert Osfield
e12049ed47 Added use of sizeof to make code a bit more flexible 2019-01-04 08:14:41 +00:00
Robert Osfield
fd47b84bd7 Restructured the clean up of arrays/primitives and GL objects 2019-01-04 08:14:33 +00:00
Robert Osfield
b7947b13f3 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:06:45 +00:00
OpenSceneGraph git repository
7a601753e0
Merge pull request #679 from mp3butcher/patch-18
setup camera Read/Draw Buffer
2018-12-20 08:46:12 +00:00
Julien Valentin
07e5480b57
setup camera Read/Draw Buffer
fix flickering shadows in SingleThread
2018-12-19 18:30:26 +01:00
Robert Osfield
ea1e832d4d Removed examples from build as it was causing travis to timeout 2018-12-14 09:14:26 +00:00
OpenSceneGraph git repository
da7bf3ff81 Fixed indentation 2018-12-13 14:10:26 +00:00
OpenSceneGraph git repository
a6fbf73f36
Merge pull request #671 from mp3butcher/patch-16
remove useless code
2018-12-13 08:31:27 +00:00
OpenSceneGraph git repository
ef8fd268de
Merge pull request #672 from ccochran/OpenSceneGraph-3.6
Xcode 9/10 build fixes for OSG 3.6
2018-12-13 08:01:24 +00:00