Julien Valentin
6e79ce348d
reformat with the help of AStyle reformat tool (codeblocks)
2017-10-28 14:46:14 +02:00
Robert Osfield
6530b16fc7
Fixed build error when building wiht OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION=OFF
2017-10-27 18:14:04 +01:00
OpenSceneGraph git repository
d664c09a79
Merge pull request #374 from mp3butcher/osganimation
...
fix InfluenceMap "remove useless bones" method
2017-10-27 17:15:38 +01:00
OpenSceneGraph git repository
faa254dd61
Merge branch 'osganimation' into osganimation
2017-10-27 17:14:43 +01:00
Robert Osfield
671847387f
Fixed build errors when compiling with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION set to OFF
2017-10-27 14:19:13 +01:00
Julien Valentin
c61e4fb15c
fix InfluenceMap "remove useless bones" method
2017-10-27 15:10:54 +02:00
Robert Osfield
2b6ffad99a
Build fix for when compiling with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION set to OFF
2017-10-27 13:51:08 +01:00
Robert Osfield
11f9bbf6ea
Merge branch 'master' into osganimation
2017-10-27 12:54:10 +01:00
OpenSceneGraph git repository
c2520a8533
Merge pull request #373 from LaurensVoerman/noStdMax
...
use osg::maximum, not std::max
2017-10-27 09:33:24 +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
671ea7ae74
Added command line parsing to aid with testing of osgText by allowing osgText::FadeText to be created with various options
2017-10-26 12:02: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
c8bd6fd100
Added stats handler
2017-10-24 16:04:14 +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
OpenSceneGraph git repository
cfca536583
Merge pull request #371 from hwiesmann/master
...
Removal of compiler warning for Cocoa builds
2017-10-23 09:06:55 +01:00
OpenSceneGraph git repository
8347027e17
Merge pull request #370 from siu/master-travisCcache
...
Fix ccache on travis
2017-10-23 09:05:34 +01:00
Hartwig
2fc3387429
BUG FIX - Addition of missing #endif directive
2017-10-22 22:13:46 +02:00
Hartwig
41e9cd3157
Replacement of commas with semicolons
2017-10-22 15:04:33 +02:00
Hartwig
abb7f46371
Removal of compiler warning for Cocoa builds
2017-10-22 13:47:51 +02:00
David Siñuela Pastor
727653695d
Install ccache on MacOs
...
Note that brew update must be run before any brew install command or
it will fail, see https://github.com/travis-ci/travis-ci/issues/8552 .
2017-10-21 14:26:06 +00:00
David Siñuela Pastor
ade97dcd95
Fix ccache configuration in travis
...
Use ccache as explained in https://docs.travis-ci.com/user/caching/#ccache-cache
2017-10-21 14:04:46 +00: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
8965c9369e
Implemented --single command line option that creates a single osg::DrawElementsUInt primitive set instead of using MultiDrawIndirect.
2017-10-19 12:39:22 +01:00
Robert Osfield
4791e5f6b5
Improved spacing to make code more readable
2017-10-19 12:06:59 +01:00
Robert Osfield
068f47d91f
Build fixes with ref_ptr<> autoconversion disabled
2017-10-19 11:57:53 +01:00
Robert Osfield
3c6f569360
Fixed placement of { and spacing to make the code more readable and consistent with the rest of the OSG
2017-10-19 11:06:23 +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
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
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
