FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,933 Commits 1 Branch 26 Tags 73 MiB
4b6722ab44
Commit Graph

14933 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Osfield
4b6722ab44 Added assignStateSet() to Text::setBackgroundColor() 2017-09-21 16:01:27 +01:00
Robert Osfield
12904105f8 Added support for toggling on use of the new SignedDistanceFunction function now built into osgText, just use --sdf to enable. 2017-09-21 15:52:07 +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
fb0a995d7b cleaned up exmple 2017-09-20 14:30:23 +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
420094174e Added commented out debug output to make it easier to test in future 2017-09-20 11:01:04 +01:00
Robert Osfield
fafa468fea Fixed OSG_PRECISION_FLOAT usage 2017-09-19 17:07:59 +01:00
Robert Osfield
370ca2b8a3 Fixed X11 GLES2 build 2017-09-19 17:01:58 +01:00
Robert Osfield
72cf6734a1 Added osgText/shaders to support greyscale and Signed Distance Field based text 2017-09-19 16:35:28 +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
5ade852172 Added constant sizeing vs changing label size relatve to font resolution, controlled by --constant-size and --scale-size command line options. 2017-09-15 15:14:19 +01:00
Robert Osfield
a12a43d352 Impprovide the computation of the Signed Distance Field 2017-09-14 15:58:38 +01:00
Robert Osfield
70b3a3a442 Fixed of shadow 2017-09-13 11:09:56 +01:00
Robert Osfield
1e11b89d04 Added --shadow-* command line variants to provide full control over the position of the text shadow 2017-09-13 11:08:51 +01:00
Robert Osfield
0d5a42f635 Added setting of the Text::BackdropImplementation type to USE_SHADERS when setting up shaders 2017-09-12 19:13:01 +01:00
Robert Osfield
7a50bdafe3 Changed the margin computation to properly account of the Signed Distance Function data 2017-09-12 16:03:35 +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
f98c23d460 Added extra command line paramter and osgText::Font settings to add better control of osgText::GlyphTexture generation to support signed distance field and outline image data. 2017-09-08 17:03:15 +01:00
Robert Osfield
2b010f019f Added setting of the original font reoslution to the created Glyph 2017-09-08 17:02:38 +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
Robert Osfield
77d4705182 Added KeyHandler for toggling "SIGNED_DISTANCE_FIELD" and "OUTLINE" #pragma(tic) shader defines to control the different shader paths. 
Keys to press are 'd' for toggle SIGNED_DISTANCE_FIELD and 'o' for OUTLINE.
 2017-09-06 16:53:54 +01:00
Robert Osfield
20ee12e986 To control the GlyphTexture Min/MagFilter values Added --min <value> and --mag <value> filter with LINEAR, NEAREST and LINEAR_MIPMAP_LINER options for values 2017-09-06 10:40:05 +01: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
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
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
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
63e833a398 Merge pull request #332 from denyskoch/fix-boundingsphere-inequality-operator 
Fix flawed BoundingSphere inequality operator
 2017-08-28 16:28:30 +01:00
Denys Koch
1d1bfa1b39 Fix flawed BoundingSphere inequality operator 2017-08-28 14:34:39 +02: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
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
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