Commit Graph

15240 Commits

Author SHA1 Message Date
scrawl
1cd1ab1c60 Fix docs for Group::addChild to match implementation
Checking for duplicates is only done if ENSURE_CHILD_IS_UNIQUE is defined, but this is never defined anywhere.
2017-08-26 11:30:55 +00:00
OpenSceneGraph git repository
2c6c2bde3c Merge pull request #326 from emminizer/glcore3_cmakefix
SETUP_EXE in CMake now uses same define for including the GLCORE head…
2017-08-25 14:49:38 +01:00
OpenSceneGraph git repository
1d24b2dc44 Merge pull request #325 from emminizer/msvc2015_exportfix
Removed inappropriate use of OSG_EXPORT on DefaultIndirectCommandDrawArrays and De…
2017-08-25 14:48:42 +01:00
Daniel Emminizer
a9f0793e69 SETUP_EXE in CMake now uses same define for including the GLCORE headers as SETUP_LIBRARY and SETUP_PLUGIN. Fixes Windows build errors for applications. 2017-08-25 09:04:05 -04:00
Daniel Emminizer
2e456eeddc No longer using OSG_EXPORT on DefaultIndirectCommandDrawArrays and DefaultIndirectCommandDrawElements, fixing compile errors in MSVC 2015. 2017-08-25 08:55:25 -04:00
OpenSceneGraph git repository
830133b1a8 Merge pull request #324 from mp3butcher/osganimation
Add extensions
2017-08-25 10:04:40 +01:00
Julien Valentin
c89b08ea1f Add extensions 2017-08-25 00:19:22 +02:00
Robert Osfield
68e0b25d32 Cleaned up warnings and removed assorts. 2017-08-24 15:13:14 +01:00
OpenSceneGraph git repository
07ea948f50 Merge pull request #322 from mp3butcher/MDI7
fix osggpucull to fit both new BIB and MDI
2017-08-24 13:55:56 +01:00
Julien Valentin
2d1aaedb9c fix osggpucull to fit both new BIB and MDI 2017-08-24 14:20:10 +02:00
Robert Osfield
be2f2d6595 Bumped SO version to reflect changes in ABI 2017-08-24 11:17:43 +01:00
OpenSceneGraph git repository
cf91bb42f0 Merge pull request #321 from LaurensVoerman/tgaMissingColormap
fix gcc/VC compile warnings, reject color mapped tga files with missing colormap.
2017-08-24 11:08:38 +01:00
Laurens Voerman
9ef4859f55 fix gcc/VC compile warnings, reject color mapped tga files with missing colormap. 2017-08-24 11:37:21 +02:00
OpenSceneGraph git repository
f99b786a6e Merge pull request #320 from mp3butcher/MDI7
MultiDrawIndirect
2017-08-24 10:33:44 +01:00
Julien Valentin
107b7be95b Merge remote-tracking branch 'upstream/master' into MDI7 2017-08-24 11:26:23 +02:00
OpenSceneGraph git repository
b89384d810 Merge pull request #318 from mp3butcher/osganimation
change the design of BufferIndexBinding to work with BufferData instead of BufferObject +matrix transpose
2017-08-24 09:53:32 +01:00
Julien Valentin
3de1ce062c comply with osg::BufferIndexBinding new design (a miss) 2017-08-24 10:29:19 +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
3b03699fbc add a transpose method for 4x4
and a transpose3x3 to transpose only orthogonal part of a mat4x4
2017-08-23 23:49:36 +02:00
Robert Osfield
eefeb3bb93 Fixed underflow issue 2017-08-23 15:26:07 +01:00
Robert Osfield
3b69755117 Fixed comparison to properly handle texture coordinates being assigned 2017-08-23 14:51:18 +01:00
OpenSceneGraph git repository
90e27d3b7d Merge pull request #314 from LaurensVoerman/notify2
reduce the need to reallocate the std::ostream buffer behind osg::Notify
2017-08-23 14:48:04 +01:00
Robert Osfield
bb3b69962a Warning fixes 2017-08-23 14:39:35 +01:00
Laurens Voerman
682730fbe4 reduce the need to reallocate the std::ostream buffer behind osg::Notify (causing multitreading issues) by pre-allocating 4095 bytes. 2017-08-23 11:53:16 +02:00
OpenSceneGraph git repository
e4ed8490ac Merge pull request #315 from kornerr/master
Fix stat64 build issue with NDK 15 by definining it as stat for Android
2017-08-23 08:54:10 +01:00
Michael Kapelko
59d3b1ebac Fix stat64 build issue with NDK 15 by definining at stat for Android 2017-08-22 22:49:56 +03:00
Robert Osfield
1b65adeebc Updated ChangeLog 2017-08-22 12:04:18 +01:00
Robert Osfield
674c25fceb Added catch for controbutors list 2017-08-22 11:59:22 +01:00
Robert Osfield
0dbcfff679 Added name typo fix 2017-08-22 11:58:49 +01:00
OpenSceneGraph git repository
ad98bdd165 Merge pull request #311 from eligovision/master
Geometry::compileGLObjects function VAO fix
2017-08-22 09:22:41 +01:00
OpenSceneGraph git repository
6095c4f3d5 Merge pull request #312 from LaurensVoerman/vnc_plugin
ReaderWriterVNC.cpp fix g++ warnings
2017-08-22 09:21:24 +01:00
Laurens Voerman
3a50e2948b ReaderWriterVNC.cpp fix g++ warnings 2017-08-22 09:35:00 +02:00
Konstantin S. Matveyev
d1453a41c2 Geometry::compileGLObjects function VAO fix 2017-08-22 10:12:36 +03:00
OpenSceneGraph git repository
16bb0561ea Merge pull request #309 from mp3butcher/osganimation
add DrawElementTypeSimplifierVisitor constructor because default nodevisitor is TRAVERSE_NONE..
2017-08-22 08:01:40 +01:00
Julien Valentin
f97b1626b3 fix nodevisitor construction 2017-08-21 18:33:56 +02:00
Robert Osfield
af609dfb67 Revert commit 904619e219 as it was causeing build problems 2017-08-21 16:24:34 +01:00
Robert Osfield
50cd8850f8 Added handling of CPACK and automatically generated package files 2017-08-21 15:06:31 +01:00
Robert Osfield
8926f0e9c2 Using a PR from Sando Mani for requestioning a specific GL version as a base, cleaned up formattating, made the new code paths simpler and added clean up of memory 2017-08-21 11:40:45 +01:00
OpenSceneGraph git repository
70135d606e Merge pull request #307 from eligovision/master
[*] createTexturedQuadGeometry: fixed for GL3 spec
2017-08-20 19:53:41 +01:00
OpenSceneGraph git repository
dc005a0719 Merge pull request #308 from OpenMW/collada_valuetype_patch
Use osg::Quat::value_type instead of double in collada plugin
2017-08-20 19:52:31 +01:00
scrawl
fb214b62a1 Use osg::Quat::value_type instead of double in collada plugin
Note that although the value_type is currently always double, using the proper typedef will open the door to implementing a float Quaternion in the future (as I have done so in my own fork)
2017-08-20 15:56:40 +00:00
konstantin.matveyev
6841f37ccc [*] createTexturedQuadGeometry: fixed for GL3 spec: GL_QUADS -> GL_TRIANGLES 2017-08-20 18:01:49 +03:00
OpenSceneGraph git repository
55f5335f18 Merge pull request #306 from AnyOldName3/targa-type-one-support
Add support for type-1 (colour-mapped, uncompressed) targa images to …
2017-08-20 08:32:02 +01:00
AnyOldName3
67a0f815e4 Add support for type-1 (colour-mapped, uncompressed) targa images to the osgTGA plugin 2017-08-19 22:22:20 +01:00
OpenSceneGraph git repository
32f895bc5f Merge pull request #304 from eligovision/master
glClear should not be called with zero-mask in osgUtil::RenderStage::…
2017-08-19 17:20:40 +01:00
Robert Osfield
904619e219 Merged addition of "" around variable from 3.4 branch 2017-08-18 16:13:16 +01:00
Konstantin S. Matveyev
036add8e9e glClear should not be called with zero-mask in osgUtil::RenderStage::drawImplementation 2017-08-18 10:20:26 +03:00
Robert Osfield
bdbff4824b Fixed iterator comparison. 2017-08-18 08:11:57 +01:00
OpenSceneGraph git repository
fa61cca6ea Merge pull request #301 from LaurensVoerman/Submit_linkWithVariables
fix for visual studio trying to link "debug.lib" and "release.lib"
2017-08-17 13:55:13 +01:00
Robert Osfield
34b4e70015 Added version check for boolean, TRUE and FALSE settings 2017-08-17 10:52:59 +01:00