Commit Graph

15304 Commits

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
OpenSceneGraph git repository
cca35390ad
Merge pull request #378 from mp3butcher/osganimation
update osganimationhardware example to use a common program
2017-10-31 17:59:13 +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
Julien Valentin
47c4ef510d update example to use a common program 2017-10-31 18:00:06 +01: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
7e86438871 Merge branch 'master' into osganimation 2017-10-30 15:53:56 +00:00
Robert Osfield
e196b23723 From Raymond de Vires, added support for 2018 and 2016 versions of FBX. 2017-10-30 14:38:35 +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
bd3262e07f From Raymond de Vires, Windows build fix 2017-10-30 14:22:10 +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
OpenSceneGraph git repository
af3a0bd7d1
Merge pull request #375 from mp3butcher/osganimation
reformat AStyle (with codeblocks)
2017-10-30 08:37:19 +00:00
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
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
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