Commit Graph

15216 Commits

Author SHA1 Message Date
Julien Valentin
6d55d8d341 minor fixes
removed unused
2017-08-28 16:08:14 +02:00
Julien Valentin
2aab28149f reroot to rigtransform::prepareData old path to rig::buildvertexinfluence 2017-08-28 15:59:13 +02:00
Julien Valentin
7659b23f38 remove unused 2017-08-28 15:44:09 +02:00
Julien Valentin
3efaccb298 add prepareData for RigTransformHW 2017-08-28 15:41:14 +02:00
Julien Valentin
4b56a4d3be minor changes+fix 2017-08-28 15:40:04 +02:00
Julien Valentin
2b5ac5b4db add default constructor for IndexWeight with invalid indices 2017-08-28 15:27:46 +02:00
Julien Valentin
f899a8dde5 add prepareData for rigttransform software 2017-08-28 14:44:09 +02:00
Denys Koch
1d1bfa1b39 Fix flawed BoundingSphere inequality operator 2017-08-28 14:34:39 +02:00
Julien Valentin
e216833286 few refactoring 2017-08-28 14:23:15 +02:00
OpenSceneGraph git repository
1aeb27b54f Merge pull request #331 from mp3butcher/osganimation
Osganimation fix a bug introduced when readding transformsoftwareMethod
2017-08-28 13:18:37 +01:00
Julien Valentin
f995c9187e Merge remote-tracking branch 'upstream/osganimation' into osganimation 2017-08-28 13:34:06 +02:00
Julien Valentin
66aedbb0b3 fix a bug introduced when readding transformsoftwareMethod 2017-08-28 13:25:04 +02:00
Robert Osfield
5d55ffe6ee Merge branch 'osganimation' of https://github.com/mp3butcher/OpenSceneGraph into osganimation 2017-08-28 10:28:18 +01:00
OpenSceneGraph git repository
26d0d3f424 Merge pull request #330 from mathieu/ProgramFixFunctionAvailableCoreProfile
osg::Program::isFixedFunction() should'nt return true if fixed function unavailable
2017-08-28 10:02:27 +01:00
Mathieu MARACHE
1408c2664e
osg::Program::isFixedFunction() should'nt return true fixed function is unavailable, even if _shaderList.empty() is true 2017-08-28 09:44:10 +02:00
Julien Valentin
6dc6bd5b92 fix a bug introduced when readding transformsoftwareMethod 2017-08-28 05:26:20 +02:00
Julien Valentin
f46fdb4d4e add a new prepareData method to the interface 2017-08-28 05:17:17 +02:00
Julien Valentin
2b2a8f3d2e MorphTransformHardware using TBO added 2017-08-28 04:51:52 +02:00
Julien Valentin
ed04e2735e readd virtual void transformSoftwareMethod() for retrocompatibity 2017-08-28 04:42:51 +02:00
OpenSceneGraph git repository
cf06256997 Merge pull request #327 from kornerr/master
Fix Emscripten build errors
2017-08-27 18:08:09 +01:00
OpenSceneGraph git repository
5efdcd5655 Merge pull request #328 from scrawl/group-docs
Fix docs for Group::addChild to match implementation
2017-08-27 18:07:21 +01:00
Julien Valentin
ca224c81dd replace VertexInfluence to BoneInfluenceList
and VertexIndexWeight to IndexWeight

fix in example
2017-08-27 05:21:37 +02:00
Julien Valentin
4f0256bcc3 remove unused code and remove a commented section 2017-08-27 01:36:21 +02:00
Julien Valentin
0729e883d8 update serializers 2017-08-26 23:17:54 +02:00
Julien Valentin
32aaeccee1 refactoring and fixes
only change in design: decouplage between MorphGeometry and MorphTransform technique
no real change in behavior (i hope)
2017-08-26 23:06:39 +02:00
Michael Kapelko
871d8c54ec Fix Emscripten build errors 2017-08-26 19:25:00 +03:00
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