Commit Graph

15221 Commits

Author SHA1 Message Date
scrawl
6048c1fbdc LineSegmentIntersector: respect the 'cullingActive' flag when testing drawable bounding box 2017-09-03 14:15:36 +00:00
Julien Valentin
381c2150d4 Merge remote-tracking branch 'upstream/master' into osganimation 2017-09-01 20:03:05 +02:00
Julien Valentin
a73c20d7f5 update serializer with new properties 2017-09-01 19:13:01 +02:00
Julien Valentin
9560548722 add MorphTransformHardware serializer 2017-09-01 18:10:40 +02:00
Julien Valentin
a2b29c1afd Merge remote-tracking branch 'upstream/osganimation' into osganimation 2017-09-01 18:04:32 +02:00
Julien Valentin
78dd81a8b4 add void InfluenceMap::removeUnexpressedBones(Skeleton &skel) const;
a bit experimental but work well without further process on my test set
2017-09-01 17:48:28 +02:00
OpenSceneGraph git repository
0e5acda26e Merge pull request #338 from mp3butcher/osganimation
clean and bugfix
2017-09-01 16:46:38 +01:00
OpenSceneGraph git repository
7aeb455597 Merge pull request #337 from mp3butcher/osganimbugfix
fix a bug in how vertexattributes are filled
2017-09-01 15:50:47 +01:00
Julien Valentin
0d02dfbbbd remove utility classes BoneWeight and IndexWeight in order to avoid unnecessary symbols
(but decrease a bit clarity of the code)
2017-09-01 16:23:49 +02:00
Julien Valentin
8b74b04de0 cleanup 2017-09-01 15:19:42 +02:00
Julien Valentin
dee9dc2164 a functional cleanup 2017-09-01 01:43:00 +02:00
Julien Valentin
5aa96727e9 clean and bugfixes 2017-08-31 20:57:19 +02:00
OpenSceneGraph git repository
34270cdcaa Merge pull request #333 from mp3butcher/osganimation
osgAnimation: change animationdata owner from riggeometry to rigtransformimplementations
2017-08-31 14:32:39 +01:00
Julien Valentin
b790986f37 few cleanup 2017-08-31 13:49:27 +02:00
Julien Valentin
068a032dac revert s/VertexIndexWeight/IndexWeight/ 2017-08-31 13:30:24 +02:00
Julien Valentin
0926bb783d fix example 2017-08-31 13:29:42 +02:00
Julien Valentin
4c4f760d4a fix a bug in how vertexattributes are filled 2017-08-30 23:19:49 +02:00
Julien Valentin
f4675a5648 I found the damn bug in RigTransformHW 2017-08-30 23:01:21 +02:00
Julien Valentin
1f628235d4 rehabilit an init method to ensure morphing po setted before skinning po in case of rigeom source that are morphgeom 2017-08-30 20:36:34 +02:00
Robert Osfield
07a8d082e4 Added --shader filename command line parsing and associated set up of osg::Program to allow shaders to be passed into example to customize rendering 2017-08-30 17:43:29 +01:00
Robert Osfield
81f93e34b8 Added --interval value commnad line option for setting the Font::setGlyphInterval() to experimentation of clamping of glyph images to user specified intervals in the glyph texture 2017-08-30 16:22:25 +01:00
Robert Osfield
1289c4ee41 Added osgText::Font::s/getGlyphInterval(int) and GlyphTexture::s/getGlyphInterval(int) and internal support for clmapping positions of glyph images an defined intervals, defaults to 1. 2017-08-30 16:21:03 +01:00
Julien Valentin
86ad54f671 add parameter to XXXTranformHW to customize reserved texture attribs and vertex attribs 2017-08-30 17:07:11 +02:00
Julien Valentin
705695b41d add a guard (if dirty) on uniform update 2017-08-30 15:48:45 +02:00
Julien Valentin
8fad310ce1 readd VertexInfluence whenever it's bad named and kinda useless 2017-08-30 15:30:03 +02:00
Julien Valentin
6d1193ee70 readd buildVertexInfluenceSet for backward compat 2017-08-30 14:59:31 +02:00
Julien Valentin
fd9b8f103e cleanup 2017-08-30 14:26:15 +02:00
Julien Valentin
985d766f05 uncomment normalization in rigtransformxxx 2017-08-30 12:55:45 +02:00
Julien Valentin
0ebf540d65 add and comment out normlization in rigtransformXXX 2017-08-30 12:09:54 +02:00
Robert Osfield
7323bb776b Added --margin texel_width and --margin-ration ratio to control the spacing between glyphs in the font. 2017-08-30 10:50:26 +01:00
Robert Osfield
20ecd5c60d Added --test command line option that sets up all the sizes and font settings required for a useufl unit test. 2017-08-30 10:16:18 +01:00
Julien Valentin
fe99b568a0 refactor: remove totally VertexInfluence (renamed BoneInfluenceList) everywhere 2017-08-30 11:12:17 +02:00
Robert Osfield
f3bbb686d2 Removed debug messages 2017-08-29 17:32:14 +01:00
Robert Osfield
5566a025b5 Added TextSettings struct to manage values used to set up the text. with the addition of following command line parameters:
--outline // enable outlne
   --shadow // enable shadow
   --offset ratio // set the backdrop offset
   --text-color r g b a // set the text body color
   --bd-color r g b a // set the shadow/outline color
   --bg-color r g b a // window background color
   -o filename // write create subgraph to disk using specified filename
2017-08-29 17:19:26 +01:00
Julien Valentin
fae9729560 swap priority in BonePtrWeight comparator< yeild the same VG set 2017-08-29 17:41:38 +02:00
Julien Valentin
ce6a316bde cleanup 2017-08-29 17:41:26 +02:00
Julien Valentin
186691a9db remove virtual qualifier for deprecated method 2017-08-29 15:10:05 +02:00
Julien Valentin
21bcd61c92 add MorphTransformHW for RigGeometry sources that are MorphGeometry 2017-08-29 14:49:19 +02:00
Julien Valentin
059fc70337 set defaut implementation at creation 2017-08-29 14:49:11 +02:00
Robert Osfield
37487b0c0b Added --ortho command line option to toggle use of orthographic camera or default perspective one 2017-08-29 13:48:06 +01:00
Robert Osfield
c36e47188b Added argument parsing to viewer constructor 2017-08-29 12:21:14 +01:00
OpenSceneGraph git repository
5ccda08770 Merge pull request #334 from mathieu/ValidateProgramTooEarly
Under macOS the glValidateProgram reports too many errors
2017-08-29 10:51:06 +01:00
Mathieu MARACHE
e2f826b8fc Under macOS the glValidateProgram reports too many
false negatives (errors) about missing buffers, etc..

From the internet https://stackoverflow.com/questions/15335510/opengl-glvalidateprogram-error-on-mac-os-x :
« […] The purpose of glValidateProgram is not to use it as an added "check" step after linking the program, because the GL and application state is hardly ready for actually using that program at this point, probably it's even before we get around to initializing the default framebuffer (its bitdepth, its multisample buffers, etc), and that's what the error hints at.

An appropriate place to call glValidateProgram would be right before you make a real render call. »
2017-08-29 11:34:27 +02:00
Julien Valentin
0c9a624026 few refactoring and fixes 2017-08-29 04:08:55 +02:00
Julien Valentin
b3402d9344 readd the 2 methods in InfluenceMap just in case 2017-08-29 00:34:26 +02:00
Julien Valentin
9856cecb71 cleanup 2017-08-29 00:09:38 +02:00
Julien Valentin
4a626cea20 remove VertexInfluenceSet 2017-08-29 00:07:07 +02:00
Julien Valentin
350756e738 add 2 method to VertexInfluenceMap:
normalize and cullInfluenceCountPerVertex
2017-08-28 18:42:22 +02:00
Julien Valentin
5123614f89 comply with refactoring 2017-08-28 18:27:23 +02:00
Julien Valentin
925f1524cf total removal of the old path 2017-08-28 18:16:30 +02:00