Robert Osfield
11f9bbf6ea
Merge branch 'master' into osganimation
2017-10-27 12:54:10 +01:00
OpenSceneGraph git repository
1126812f8f
Merge pull request #372 from openscenegraph/text_improvements
...
Text improvements, introducing implementation of Signed Distance Function texture generation and new shaders for outlines and shadows replacing old multi-pass approach
2017-10-26 14:26:01 +01:00
Robert Osfield
248805fedd
Fixed pre compilation osg::Program state leaking into the main scene graph rendering
2017-10-25 16:13:26 +01:00
Robert Osfield
9c9439ef73
Added DisplaySettings:s/getgTextShaderTechnique() and OSG_TEXT_SHADER_TECHNIQUE env var support to DisplaySettings.
...
Added using of DisplaySettings:getgTextShaderTechnique() to Text default constructor.
Added better debug output control in Text.cpp
2017-10-24 14:46:13 +01:00
Robert Osfield
1cd0a5fe03
Fixed Glyph::TextureInfo assignment bug
2017-10-24 11:36:00 +01:00
Robert Osfield
55a1764712
Renamed text_sdf.frag to text.frag and removed text_greyscale_frag.
...
Cleaned up setup of osgText::ShaderTechnique adding a NO_SHADER_TECHNIQUE option.
2017-10-23 16:07:24 +01:00
Robert Osfield
4b295c46d1
Restructed the way that GlyphTexture is set up to better support control of osgText::ShaderTechnique from osgText::Text
2017-10-23 14:50:35 +01:00
Hartwig
41e9cd3157
Replacement of commas with semicolons
2017-10-22 15:04:33 +02:00
Robert Osfield
817b6601d2
Added Text::s/getShaderTechnique()
2017-10-21 10:08:41 +01:00
Robert Osfield
97aeb16551
Moved osgText::GlyphTechnique::Features enum to osgText::ShaderTechinque enum to make it's roll clearer
2017-10-20 17:03:25 +01:00
Robert Osfield
6b75439ae4
Merge branch 'master' into text_improvements
2017-10-20 14:14:14 +01:00
Robert Osfield
068f47d91f
Build fixes with ref_ptr<> autoconversion disabled
2017-10-19 11:57:53 +01:00
Robert Osfield
879b54f6e9
Fixed GLX EGL build
2017-10-16 10:47:47 +01:00
Robert Osfield
639ced08fc
Removed inappropriate tabs&spaces
2017-10-16 10:38:33 +01:00
Robert Osfield
2303d6afc4
Cleaned up support for GL3 build
2017-10-13 17:03:31 +01:00
Laurens Voerman
274cea19bf
copySubImage support for block compressed images, added support for astc compressed type.
2017-10-13 16:54:04 +02:00
Robert Osfield
24bec09b9e
Removed the glyph image outline support as it's no longer required.
2017-10-13 13:01:57 +01:00
Robert Osfield
8b12d2d71a
Deprecated Text:BackdropImplementation, removing the backend as it no longer required when using shaders for backdrop effects
2017-10-13 11:42:25 +01:00
Robert Osfield
28561b2b77
Removed old multipass implemenmtations of backdrops as effect is now fully implememted in shaders
2017-10-13 08:40:58 +01:00
Robert Osfield
d6af00d9bd
Merge branch 'master' into text_improvements
2017-10-10 09:21:34 +01:00
OpenSceneGraph git repository
d74e340f32
Merge pull request #359 from eligovision/OpenSceneGraph_gles
...
Added defines: GL_ALPHA4/8/12/16 in osg/Image, this will fix compilat…
2017-10-09 10:03:21 +01:00
OpenSceneGraph git repository
5f985a36a2
Merge pull request #358 from eligovision/OpenSceneGraph_optimizer
...
VertexAttribDivisor compare function fix: index must be compared
2017-10-09 10:02:51 +01:00
Robert Osfield
9ac2b2eb7b
Added VertexArrayState::ArrayDispatch::className() method and implementation for each ArrayDispatch subclass to help with debugging
2017-10-06 17:47:19 +01:00
Konstantin S. Matveyev
1e1f69febc
Added defines: GL_ALPHA4/8/12/16 in osg/Image, this will fix compilation error while building for GLES2
2017-10-06 18:16:48 +03:00
Konstantin S. Matveyev
a87e57e946
VertexAttribDivisor compare function fix: index must be compared
2017-10-06 18:14:47 +03:00
Robert Osfield
ddf8c68d26
Added support for multiple --login url username password entries to osgviewer
2017-10-05 15:37:03 +01:00
Julien Valentin
d2162717b8
fix normalization bug (happen too early )
...
minor bug
bla
2017-10-04 07:23:46 +02:00
Robert Osfield
d2fa7c4317
Simplified and improved the glyph margin computation and usage
2017-09-29 20:21:13 +01:00
Robert Osfield
a1f519cbec
Removed debug info
2017-09-21 15:41:21 +01:00
Robert Osfield
78811462f1
Added support for only enabling SignedDistanceField shader path when font resolution is greater than 16.
2017-09-20 15:51:03 +01:00
Robert Osfield
e8eb1ee0c7
Added Text::assignStateSet() and usage to make sure the correct StateSet is setup for each combination of backdrop settings
2017-09-20 14:29:05 +01:00
Robert Osfield
370ca2b8a3
Fixed X11 GLES2 build
2017-09-19 17:01:58 +01:00
Robert Osfield
cc7cf54353
Added support for subsititing $VAR_NAME entries in shaders to enable writing shaders that work across GLSL versions.
2017-09-18 18:09:15 +01:00
Robert Osfield
722ed6fc5e
Shifted set up of osgText related StateSet from osgText::Font into into osg::TextBase/Text to enable grater control over state required for specific Text implementations
2017-09-12 11:50:47 +01:00
Robert Osfield
de47eb3666
Add support for generating outline and signed distance field channels in a RGBA packed GlyphTexture Image.
2017-09-08 16:59:43 +01:00
Julien Valentin
041a2a6e72
make preparedata skeleton independant (as it was with the Rig::buildInfluenceSet)
...
no more divergence with master i think
2017-09-04 01:56:43 +02: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
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
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
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
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
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
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
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
