Commit Graph

16116 Commits

Author SHA1 Message Date
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
Julien Valentin
064c39a7f3
remove dead code 2018-12-11 23:56:47 +01:00
Thomas Hogarth
5eb9ab1d75 removed ios simulator reference, adjusted readme 2018-12-10 08:23:04 -07:00
Thomas Hogarth
e8ba57b22f Improved iOS cmake support for xcode 9.4 and cmake 3.11 2018-12-10 08:22:36 -07:00
OpenSceneGraph git repository
47aa320787
Merge pull request #670 from emminizer/four-byte-utf8
osgText::String:createUTF8EncodedString() now supports 4-byte UTF-8 strings (code points over 0x100000)
2018-12-07 14:53:52 +00:00
Daniel Emminizer
3a3ddfce49 osgText::String:createUTF8EncodedString() now supports 4-byte UTF-8 strings (code points over 0x100000). 2018-12-06 14:10:14 -05:00
flashk
dc2aa77d98 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-23 12:36:45 +00:00
Robert Osfield
aa6cd2d7da Added, currently commented out, alias for .vsga and .vsgb to help with automatic loading a vsg plugin when .vsga and .vsgb files are encountered. 2018-11-20 14:24:24 +00:00
Robert Osfield
658fd4d19d Added support for reading and writing images 2018-11-20 14:19:37 +00:00
Robert Osfield
8b4359b77e Restructed the setting of the OSG_GL_CONTEXT_VERSION to allow script to set it's default value 2018-11-11 10:14:50 +00:00
Robert Osfield
c5d00bc223 Added make clobber target, imported in from the VSG project. 2018-11-09 11:28:57 +00:00
Robert Osfield
1eedae844e Removed 12 year old workaround that is no longer required and was causing a misleading info message "OpenGL extension '' is not supported." to be reported. 2018-11-09 11:25:16 +00:00
OpenSceneGraph git repository
e819ea9c0e Replaced tabs with spaces to fix indentation 2018-11-03 16:16:19 +00:00
flashk
15b9a493ed Fix handling of alpha values in animated gifs
The gif loader was incorrectly setting pixels as transparent in certain animated gifs. It was ignoring the disposal method value in the extension block and always overwriting the alpha value in each frame. It is common for some animated gifs to set the disposal method so that the previous alpha value is retained. This patch modifies the loader to respect the disposal method flag.
2018-11-03 16:16:10 +00:00
Robert Osfield
0341d6f873 Removed reprecated C++ usage 2018-11-01 09:13:43 +00:00
Emil Knabe
3577fd9d90 Added support for FBX 2019 2018-10-29 08:25:18 +00:00