Julien Valentin
c61e4fb15c
fix InfluenceMap "remove useless bones" method
2017-10-27 15:10:54 +02:00
Robert Osfield
11f9bbf6ea
Merge branch 'master' into osganimation
2017-10-27 12:54:10 +01:00
Laurens Voerman
93ef9d1dc9
use osg::maximum, not std::max
2017-10-27 09:41:28 +02: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
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
248805fedd
Fixed pre compilation osg::Program state leaking into the main scene graph rendering
2017-10-25 16:13:26 +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
Hartwig
2fc3387429
BUG FIX - Addition of missing #endif directive
2017-10-22 22:13:46 +02:00
Hartwig
abb7f46371
Removal of compiler warning for Cocoa builds
2017-10-22 13:47:51 +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
38e5fdadf0
From Ralf Habacker, patch refactoring struct ObjOptionsStruct
...
in obj plugin into a real class, which is a preparation for further obj
related patches.
2017-10-20 11:52:48 +01:00
Robert Osfield
a2ad1c9606
Added built-in support for lighting.vert
2017-10-20 11:37:41 +01:00
Robert Osfield
4645cc789e
Updated shaders from OpenSceneGraph-Data/shaders
2017-10-20 10:18:21 +01:00
Robert Osfield
24c2a0ca60
Moved the assignment of the ModifiedCount to before GL texture calls.
2017-10-19 20:57:25 +01:00
Robert Osfield
068f47d91f
Build fixes with ref_ptr<> autoconversion disabled
2017-10-19 11:57:53 +01:00
Robert Osfield
6496c304f9
Implemented inplace replacement
2017-10-18 10:32:18 +01:00
David Siñuela Pastor
cc8a34cd14
Do not break systems with cr as line endings
2017-10-18 10:30:57 +01:00
Robert Osfield
ad45bf1d61
Fixed warning
2017-10-16 11:52:54 +01:00
OpenSceneGraph git repository
7b9f44cb17
Merge pull request #364 from mp3butcher/osganimbugfix
...
add osg::Program::BindUniformBlockList serialization
2017-10-16 10:16:49 +01:00
Robert Osfield
ea379e64e7
Fixed build error
2017-10-16 10:12:19 +01:00
Robert Osfield
5067db39f8
Moved bracket to be consistent with the rest of the OSG
2017-10-16 10:08:18 +01:00
OpenSceneGraph git repository
bfca9998ea
Merge pull request #366 from LaurensVoerman/rotateDXT
...
add support for dxt compressed images to createImageWithOrientationConversion
2017-10-16 10:00:49 +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
0a5c6d3fd6
Improved the formating of GLSL source that is passed to OpenGL to make debugging shaders easier.
2017-10-14 09:03:08 +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
Julien Valentin
b540ed70ba
add osg::Program::BindUniformBlock serialization
2017-10-12 20:09:55 +02: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
f07bf5be2a
Merge branch 'master' into text_improvements
2017-10-12 16:44:40 +01:00
Laurens Voerman
0fedfd2ff9
add support for dxt compressed images to createImageWithOrientationConversion
2017-10-12 17:38:16 +02:00
Laurens Voerman
63f12986b4
added dxtc support in Image::getColor, enhanced Image::isImageTranslucent to test opacity of dxt3 and dxt5 images
2017-10-12 13:49:57 +02: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
d6af00d9bd
Merge branch 'master' into text_improvements
2017-10-10 09:21:34 +01:00
Robert Osfield
4906844ea7
Added explictly unbinding of VBO for setInterleavedArrays().
2017-10-06 18:03:36 +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
Robert Osfield
7868b42ef2
Improved the readability of recent changes by adding spaces, {} and moving { onto separate lines to keep things consistent with the rest of the OSG.
2017-10-05 16:56:30 +01:00
OpenSceneGraph git repository
11352bbdbb
Merge pull request #354 from eligovision/OpenSceneGraph_intersection
...
LineSegmentIntersector fixed: intersection ratio remaped to the range…
2017-10-05 16:31:45 +01:00
