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 |
|
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 |
|
OpenSceneGraph git repository
|
1604b81919
|
Merge pull request #367 from LaurensVoerman/compression_astc
copySubImage support for block compressed images, added support for astc compressed type.
|
2017-10-16 09:58:29 +01:00 |
|
Robert Osfield
|
a9ef5a90eb
|
Fixed indentation
|
2017-10-16 09:49:47 +01:00 |
|
OpenSceneGraph git repository
|
bd28b48be1
|
Merge pull request #365 from LaurensVoerman/login2
modified present3D and osgvnc to allow multiple --login arguments like osgViewer.
|
2017-10-16 09:45:37 +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
|
99491e46ec
|
modified present3D to allow multiple --login arguments like osgViewer, added --login option to osgvnc example
|
2017-10-12 17:21:10 +02:00 |
|
OpenSceneGraph git repository
|
4d67c80350
|
Merge pull request #363 from LaurensVoerman/dxtcGetcolor
added dxtc support in Image::getColor, Image::isImageTranscent testdxt3 and dxt5
|
2017-10-12 15:52:42 +01: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 |
|