Commit Graph

15970 Commits

Author SHA1 Message Date
Ulrich Hertlein
eac4c9df60 Minor cmake cleanups and formatting 2019-02-07 19:16:00 +01: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
Dyuzz
00480d0575
add Vec3dArray* vertex output to avoid inaccuracy 2018-12-13 21:15:07 +08:00
Julien Valentin
eb22a0c26e remove dead code 2018-12-13 08:43:50 +00:00
OpenSceneGraph git repository
53b567c9a2
Merge pull request #659 from dquam/fbx_duplicate_fix
Fix duplicate geometries in FBX export.
2018-12-07 15:01:41 +00:00
Daniel Emminizer
a4b6d8afb5 osgText::String:createUTF8EncodedString() now supports 4-byte UTF-8 strings (code points over 0x100000). 2018-12-07 14:57:34 +00:00
Derek Quam
ffd5d20a69 Fix two bugs introduced when removing the Geode visitor from the FBX
exporter.

In the Geometry visitor, use getNodePath to check if the Geometry node
is root instead of getNumParents.

Reset the state inside buildFaces to prevent duplication when a
Group is inside of Group.
2018-11-28 14:21:37 -06:00
OpenSceneGraph git repository
3ea101df66
Merge pull request #660 from mxgrey/modernize_cmake
Create a config-file and export library targets for downstream users
2018-11-26 09:03:20 +00:00
OpenSceneGraph git repository
c8ad06a223
Merge pull request #663 from flashk/patch-9
Prefer FOURCC pixel format in DDS loader
2018-11-23 12:35:37 +00:00
Kent
7eab0dfc7f fix read texture fail 2018-11-23 17:52:53 +08:00
flashk
51f04fcc19
Prefer FOURCC pixel format in DDS loader
I have found that certain image editing programs export DDS images with both the DDPF_FOURCC and DDPF_RGB pixel format flags. The DDS loader will give preference to the DDPF_RGB flag and try to deduce the format from the RGB bit mask values instead of using the more reliable FOURCC flag. This causes some images to not load, even though the FOURCC flag is supported.  I've modified the loader so that it checks for the DDPF_FOURCC flag first, then falls back on deducing the format from the RGB bit masks.
2018-11-20 16:12:21 -08:00
Michael X. Grey
0bad4aabed
Merge pull request #1 from sbrkopac/modernize_cmake
added a new modern example of how to use cmake
2018-11-19 10:22:59 +08:00
Sam Brkopac
49bfdb7ed9 added a new modern example of how to use cmake 2018-11-16 12:42:40 -07:00
Michael X. Grey
23f680ef4a Export OpenThreads target for win32 2018-11-16 12:16:31 +08:00
Michael X. Grey
bb515c4816 Install config files to OSG-specific cmake directory 2018-11-15 16:54:58 +08:00
Michael X. Grey
ea9d61964d Fix target exporting 2018-11-15 16:38:18 +08:00
Michael X. Grey
3a850d8ace Delete unnecessary pkgconfig template files 2018-11-15 14:27:27 +08:00