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

15072 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Osfield
aa744edacc Fixed warning 2017-11-02 10:02:34 +00:00
Robert Osfield
239b0faa4c Replaced getenv calls with safer osg::getEnvVar usage 2017-11-02 10:00:28 +00:00
Robert Osfield
338b0e2b7b Moved getenv usage across to safer osg::getEnvVar() usage 2017-11-01 17:38:33 +00:00
Robert Osfield
0e7e06349e Added safety check for getenv parsing to prevent overflow attacks via getenv. 2017-11-01 16:43:32 +00:00
Robert Osfield
3b85aa35df Moved from getenv to osg::getEnvVar usage 2017-11-01 14:45:27 +00:00
Robert Osfield
e59ad87044 Made template function inline to avoid multiple declaration issues 2017-11-01 14:16:54 +00:00
Robert Osfield
fbb7270e55 Replaced getenv(..) usage with osg::getEnvVar(..) 2017-11-01 13:54:15 +00:00
Robert Osfield
51a9c66856 Added OSG_ENVVAR_SUPPORTED cmake control and bool osg::getEnvVar(const char* name, T& value, ...) conviniece funcions to make it easier to implement optinal getenv reading code. 2017-11-01 13:32:47 +00:00
Robert Osfield
fb175eed14 Fixed Coverity Scane reported issue. 2017-11-01 11:35:05 +00:00
Robert Osfield
c242ad4497 Fixed unititialized memory variables and improved readability by adding spacing where appropriate 2017-10-31 17:55:59 +00:00
Robert Osfield
6a2bd1f898 Added missing initializers 2017-10-31 17:43:39 +00:00
Robert Osfield
14f50ab31c Fixed CovertiScan reported uninitialized member variable 2017-10-31 17:39:34 +00:00
Robert Osfield
061e52b89f Fixed Coverity Scan reported issue 2017-10-31 17:02:31 +00:00
Robert Osfield
95eb5e2ad6 Replace c char array with std::string to address Coverity scan reported issue 2017-10-31 16:46:42 +00:00
Robert Osfield
3459e8f4fd Fixed Coverity Scan reported memory leaks 2017-10-31 15:55:24 +00:00
Robert Osfield
42c7d7ece1 Fixed Coverity reported memory leak 2017-10-31 15:47:49 +00:00
Robert Osfield
6a8fe45543 Reinstated two stage OSX build, and disabled part of the coverity_scan build to attempt to get it running without timeout. 2017-10-31 14:55:41 +00:00
Robert Osfield
89708ae277 Upped the number of threads used in build to try and improve build speed 2017-10-31 12:32:45 +00:00
Robert Osfield
17380a7191 Simplified build for OSX now that trais builds are running faster. 2017-10-31 10:01:52 +00:00
Robert Osfield
4f2328bc09 From Raymond de Vires, added support for 2018 and 2016 versions of FBX. 2017-10-30 14:36:41 +00:00
Robert Osfield
45f1f23064 Updated ChangeLog and AUTHORS 2017-10-30 14:05:45 +00:00
Robert Osfield
45e520663d Quitened down the DisplaySettings::setShaderHint() output for NONE. 2017-10-30 13:40:50 +00:00
Robert Osfield
053ba83be6 Merged support for StateSet::DefineList from shader_pipeline branch 2017-10-30 09:32:04 +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
Robert Osfield
1f913ec130 Fixed warning 2017-10-27 13:19:52 +01:00
Robert Osfield
5d9dcfccbf From Farshid Lashkari, "fix for the Collada loader to check for some NULL attributes." 2017-10-27 13:17:47 +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