FGFS-4.1/OpenSceneGraph
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,851 Commits 1 Branch 26 Tags
7b6135f0f730a7802ae36cd1f3043b0a858dfa3b
Commit Graph

137 Commits

Author SHA1 Message Date
Robert Osfield
d07fe93f34 Fixed memory leak with assignment of default value to ObjectSerializer 2018-09-06 11:53:35 +01:00
Robert Osfield
4291636619 Updated REMOVE_SERIALIZER( ImageAttachment ); block to use 154 version to retain compatibility with binaries made with 153 SOVERSION prior to the Imageattachement change 2018-05-23 17:02:28 +01:00
Julien Valentin
cea33e40df add wrapper for osg::DrawIndirectBufferObject 2018-04-25 09:49:56 +01:00
Robert Osfield
7ab1208c65 Renamed osg::ComputeDispatch to osg::DispatchCompute to make sure the nameing between GL and OSG is consistent i.e glDispatchCompute -> osg::DispatchCompute 
Updated AUTHORS.txt, NEWS.txt and README.txt for CMakeLists.txt for 3.6.0 release
 2018-04-07 17:59:55 +01:00
Robert Osfield
647b578ce6 Removed serailizers that are now supplied by osg::Node 2018-03-23 19:54:33 +00:00
Robert Osfield
9634688559 Removed Drawable writing out of StateSet as this is now done by Node 2018-03-23 18:07:36 +00:00
OpenSceneGraph git repository
a6a72755b8 Merge pull request #443 from mp3butcher/osgSampler1 
Add MinLOD MaxLOD and LODBias to Texture
 2018-01-14 12:40:34 +00:00
Julien Valentin
8894939577 add MinLOD MaxLOD and LODBias to Texture and its serializer 
as well as ShadowTextureMode None enum
 2018-01-13 21:20:32 +01:00
Robert Osfield
3e6d118d10 Disabled the use of the GeometryFinishedObjectReadCallback in the Geometry serializer as this doesn't look it's needed anymore. 2018-01-13 16:43:42 +00:00
Robert Osfield
df280811a1 Merged Program.cpp from shader_pipeline 2018-01-08 10:52:35 +00:00
Robert Osfield
9944d949fc Improvements to lua/OSG integration 2018-01-06 14:57:39 +00:00
Robert Osfield
2108141b4e Replaced old style access of ValueObject values to new ValueObject::getScaleValue() methods 2018-01-06 13:47:18 +00:00
Robert Osfield
bdff0955dc Added TextureCubeMap::setImage/getImage() methpds 2018-01-06 13:11:36 +00:00
Julien Valentin
e33a407aaf add BufferData associate to Image and subclasses 2018-01-04 22:50:30 +01:00
Julien Valentin
196256fdcd Evolve DSO 
add Node associate on Drawable based:
Drawable
Geometry
DrawPixels.cpp
ShapeDrawable.cpp
RigGeometry.cpp
ConnectedParticleSystem.cpp
FadeText.cpp
Text.cpp
Text3D.cpp
TextBase.cpp
 2018-01-04 05:15:13 +01:00
Julien Valentin
c605b24432 remove old BindImageTexture path 2018-01-02 18:29:42 +01:00
Julien Valentin
8a84ee7660 add (untested) BindImageTexture serializer 
TOREVIEW : my GLBoolean serializer macro seams hacky
 2018-01-02 18:12:52 +01:00
Robert Osfield
c0a276e850 Added back in serializer support for comput dispatch groups to retain backwards compatibility. 2017-11-29 10:11:35 +00:00
Julien Valentin
195df4f811 numgroup removed but introduce a reto compatibility bug in Program serializer 
hope nobody use it
 2017-11-28 17:39:32 +01:00
Julien Valentin
bf1b4ec2bb add ComputeDispatch class 
revoke glDispatch in PCProgram::useProgram
update example
 2017-11-28 17:30:04 +01:00
Robert Osfield
053ba83be6 Merged support for StateSet::DefineList from shader_pipeline branch 2017-10-30 09:32:04 +00:00
Julien Valentin
b540ed70ba add osg::Program::BindUniformBlock serialization 2017-10-12 20:09:55 +02:00
Konstantin S. Matveyev
8055ec9156 osg serializers fixed for static build, ShaderAttribute wrapper added 2017-09-15 12:36:19 +03:00
Julien Valentin
107b7be95b Merge remote-tracking branch 'upstream/master' into MDI7 2017-08-24 11:26:23 +02:00
Julien Valentin
d49f0d67af change the design of BufferIndexBinding to work with BufferData instead of BufferObject 
allow convenient BufferData abstraction +  serialization of BufferIndexBinding
 2017-08-24 03:28:55 +02:00
Julien Valentin
3965b4e66e fix a bug in MDI serializer 2017-08-01 02:18:15 +02:00
mp3butcher
b26fa74e7e add untested serializers for PrimitiveSetIndirect 2017-07-26 23:38:20 +02:00
OpenSceneGraph git repository
373204ef7f Merge pull request #236 from mp3butcher/ScriptBranch 
add ScriptNodeCallback serializer
 2017-03-29 09:27:58 +01:00
mp3butcher
9d490bbf1c add ScriptNodeCallback serializer 2017-03-28 22:37:34 +02:00
mp3butcher
3142b682f2 remove spaces in the previsouly added macro 2017-03-28 22:19:32 +02:00
mp3butcher
fc3afbe449 oups forgot an associaterevisions 2017-03-28 22:14:44 +02:00
mp3butcher
0555bc4bc7 add BufferData associate as well as revisionassociate in PrimitiveSet Seriliazer 2017-03-28 20:48:35 +02:00
Robert Osfield
70e7cb886b Added serializers for BufferObject and BufferData 2017-03-27 20:02:33 +01:00
mp3butcher
46a37618ef add new serializers 2017-03-26 15:59:36 +02:00
Robert Osfield
e74f8f4bbe Added TextureBuffer serializer 2017-03-22 14:20:03 +00:00
Marcel Pursche
422587a285 Added serializer for Texture2DMultisample 2017-03-22 10:47:58 +01:00
Robert Osfield
cd56639e67 Added CullingActive support for Drawable serializer 2016-10-07 11:13:40 +01:00
Robert Osfield
e09403a80c Added intializer for char[] to squash Coverity "defect". 2016-06-20 12:20:44 +01:00
Robert Osfield
41ce857c93 Fixed clang warnings 2016-06-03 09:33:47 +01:00
Robert Osfield
9bde2ef631 Added support for NodeMask to osg::Drawable serializers 2016-02-11 16:25:47 +00:00
Robert Osfield
b141c0f63e Changed the prototype from NULL to osg::DummyObject to address a bug in reading .osgt + .osgx where an image is written out but fails to read the file causes subsequent parts of the file to be mis-read 2016-01-22 10:09:00 +00:00
Robert Osfield
5cb486f7c5 Added osg::MultiDrawArrays which wraps up glMultiDrawArrays extension. 2016-01-22 09:47:49 +00:00
Robert Osfield
340615de55 Replaced dynamic_cast<*Callback> with as*Callback() implementation/usage. 2016-01-18 19:04:28 +00:00
Robert Osfield
dd996a3289 Introduced CMake option OSG_PROVIDE_READFILE option that defaults to ON, but when switched to OFF disables the building of the osgDB::read*File() methods, 
forcing users to use osgDB::readRef*File() methods.  The later is preferable as it closes a potential threading bug when using paging databases in conjunction
with the osgDB::Registry Object Cache.  This threading bug occurs when one thread gets an object from the Cache via an osgDB::read*File() call where only
a pointer to the object is passed back, so taking a reference to the object is delayed till it gets reassigned to a ref_ptr<>, but at the same time another
thread calls a flush of the Object Cache deleting this object as it's referenceCount is now zero.  Using osgDB::readREf*File() makes sure the a ref_ptr<> is
passed back and the referenceCount never goes to zero.

To ensure the OSG builds when OSG_PROVIDE_READFILE is to OFF the many cases of osgDB::read*File() usage had to be replaced with a ref_ptr<> osgDB::readRef*File()
usage.  The avoid this change causing lots of other client code to be rewritten to handle the use of ref_ptr<> in place of C pointer I introduced a serious of
templte methods in various class to adapt ref_ptr<> to the underly C pointer to be passed to old OSG API's, example of this is found in include/osg/Group:

    bool addChild(Node* child); // old method which can only be used with a Node*

    tempalte<class T> bool addChild(const osg::ref_ptr<T>& child) { return addChild(child.get()); } // adapter template method

These changes together cover 149 modified files, so it's a large submission. This extent of changes are warrent to make use of the Object Cache
and multi-threaded loaded more robust.



git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@15164 16af8721-9629-0410-8352-f15c8da7e697
 2015-10-22 13:42:19 +00:00
Robert Osfield
62764a56c5 Added support for serializing Camera::ImplicitBufferAttachmentRenderMask and ImplicitBufferAttachmentResolveMask properties. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@15135 16af8721-9629-0410-8352-f15c8da7e697
 2015-09-24 10:52:35 +00:00
Robert Osfield
80e5338194 Fixed line endings. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@15132 16af8721-9629-0410-8352-f15c8da7e697
 2015-09-24 09:29:03 +00:00
Robert Osfield
74ddaeaf50 From Mathias Froehlich, added seriliazers for new osg::ClipControl 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14930 16af8721-9629-0410-8352-f15c8da7e697
 2015-07-01 05:10:20 +00:00
Robert Osfield
11a55ea6de Added supoort for osg::CullSettings/Camera::InheritanceMaskActionOnAttributeSetting and InheritanceMask properties. 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14904 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-09 16:49:20 +00:00
Robert Osfield
e7244e654a Build fix for when Uniform::Callback isn't defined 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14887 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-03 08:38:18 +00:00
Robert Osfield
da73723949 From Konstantin Matveyev, serializer support for UniformCallback 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14886 16af8721-9629-0410-8352-f15c8da7e697
 2015-06-02 10:25:13 +00:00