FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,387 Commits 1 Branch 26 Tags
022d1df97d709de720718b238f3d9a3ee48409c8
Commit Graph

514 Commits

Author SHA1 Message Date
Philippe Renon
3e12972a03 osgText: fix typos related to SIGNED_DISTANCE_FIELD 2018-01-10 14:21:25 +01:00
Konstantin S. Matveyev
2d3ed2a3c7 TextBase: left alignment position fix 2017-12-12 12:08:50 +03:00
Robert Osfield
a6069c3226 Introduced Drawable::CreateVertexArrayStateCallback to enable customization of how VertexArrayState objects. 
Added public accessors to the Drawable::VertexArrayStateList.
 2017-11-29 14:22:31 +00:00
Robert Osfield
7f97b9f999 Added Text::getCharacterCorners(...) method to help applications that want to find out the positions of characters being rendered. 2017-11-21 13:41:57 +00:00
Robert Osfield
01c68ba5e5 Temporary workaround for the regression of intersection tests with osgText::Text. Added a local vertex array that is transformed by the last applied text matrix. 2017-11-06 19:53:38 +00:00
Robert Osfield
14f50ab31c Fixed CovertiScan reported uninitialized member variable 2017-10-31 17:39:34 +00:00
Robert Osfield
b3515d0e09 Build fix for when compiling with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION set to OFF 2017-10-27 13:48:52 +01:00
Laurens Voerman
93ef9d1dc9 use osg::maximum, not std::max 2017-10-27 09:41:28 +02:00
Robert Osfield
1e896777d1 Updated from OpenSceneGraph-Data/shader/text.frag to add fixes to handling of vertexColor's alpha values 2017-10-26 12:08:00 +01:00
Robert Osfield
5918735ebc Added update of glyph representation to ensure all the glyphs are assigned to the required GlyphTextures 2017-10-26 12:03:56 +01:00
Robert Osfield
fa58d01644 Added optimization for text where the colour alpha value is 0.0, returning early to aovid any GL calls. 2017-10-25 16:29:25 +01:00
Robert Osfield
8f658fbc32 Updated from OpenSceneGraph-Data/shaders/text.frag to address GLSL int to float conversion warning 2017-10-24 15:14:23 +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
1ecae6d33a Improved the Text::_shaderTechnique default setting using OSG_TEXT_SHADER_TECHNIQUE env var, options are ALL_FEATURES, GREYSCALE, SIGNED_DISTANCE_FIELD, SDF, NO_TEXT_SHADER, NONE. 2017-10-24 12:34:48 +01:00
Robert Osfield
c162a091fe Quitened down debug info 2017-10-24 12:07: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
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
0e39c129b7 Changed the precision setting of #pargma(tic) shader composition define setup to address GLES compatibility issues 2017-10-14 09:06:37 +01:00
Robert Osfield
2303d6afc4 Cleaned up support for GL3 build 2017-10-13 17:03:31 +01: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
846204ed9e Updated from OpenSceneGraph-Data/shaders/text_sdf.frag to add support for SHADOW 2017-10-12 18:45:38 +01:00
Robert Osfield
eebb679754 Updated text_sdf_frag.cpp from OpenSceneGraph-Data changes that add outline generation for non SIGNED_DISTANCE_FIELD text. 2017-10-12 11:12:47 +01:00
Robert Osfield
7fb37016fd Merge branch 'master' into text_improvements 2017-10-05 12:14:03 +01:00
Robert Osfield
2f19cd4b87 Improvements to the Signed Distance Field implementation. 2017-10-04 18:06:42 +01:00
Robert Osfield
d2fa7c4317 Simplified and improved the glyph margin computation and usage 2017-09-29 20:21:13 +01:00
Robert Osfield
beb5801eee Improved SDF generation 2017-09-29 10:39:02 +01:00
Robert Osfield
1f36f5bd8d Added setting of the FontResolution of the DefaultFont 2017-09-29 10:25:04 +01:00
Robert Osfield
75d23b2c10 Fixed update of GlyphTexture Image when copying new Glyph image's to it. 2017-09-27 11:09:22 +01:00
Robert Osfield
8c575c0cea UPdated from OpenSceneGraph-Data with handling of non textured text decoration 2017-09-26 15:32:41 +01:00
Robert Osfield
6ec9f0a3d3 Updated shader from OpenSceneGraph-Data/shaders to add fade out for SDF and non SDF pathways 2017-09-26 12:51:03 +01:00
Robert Osfield
ca5a8a81a2 Updated wiht OpenSceneGraph-Data/shader version that introduced use of textureLOD to reduce aliasing artifacts with SDF 2017-09-26 10:57:09 +01:00
Robert Osfield
845e1d4463 Updated shaders using latest OpenSceneGraph-Data/shader versions 2017-09-26 10:44:14 +01:00
Robert Osfield
6d4128324b Improvements to SDF and outline generation 2017-09-26 10:42:47 +01:00
Robert Osfield
708ae1c076 Fixed rendering old sytel outline 2017-09-22 12:22:58 +01:00
Remo E
49c336e514 addShader fix 2017-09-22 08:39:38 +02:00
Robert Osfield
b6bb0caf8d Removed debug output 2017-09-21 16:04:10 +01:00
Robert Osfield
4b6722ab44 Added assignStateSet() to Text::setBackgroundColor() 2017-09-21 16:01:27 +01:00
Robert Osfield
a1f519cbec Removed debug info 2017-09-21 15:41:21 +01:00
Robert Osfield
957a7d4e92 Moved enabling/disabling of SDF so it's done regardless of whether a backdrop is used. 2017-09-21 14:35:31 +01:00
Robert Osfield
e72a38c8b6 Umproved SDF computation. 2017-09-21 14:32:17 +01:00
Robert Osfield
e565a5e1c3 Removed no longer used code paths 2017-09-20 16:51:30 +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
b0829cc352 Updated text_sdf.frag shader to handle GLES2+ versions 2017-09-20 11:02:06 +01:00
Robert Osfield
fafa468fea Fixed OSG_PRECISION_FLOAT usage 2017-09-19 17:07:59 +01:00