FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 9dc6c454f4 Cleaned up getEnvVar usage Robert Osfield 2017-11-02 11:42:25 +00:00
  • ce69f18ec7 Replaced getenv usage with safer osg::getEnvVar Robert Osfield 2017-11-02 10:43:41 +00:00
  • aa744edacc Fixed warning Robert Osfield 2017-11-02 10:02:34 +00:00
  • 239b0faa4c Replaced getenv calls with safer osg::getEnvVar usage Robert Osfield 2017-11-02 10:00:28 +00:00
  • 338b0e2b7b Moved getenv usage across to safer osg::getEnvVar() usage Robert Osfield 2017-11-01 17:38:33 +00:00
  • 0e7e06349e Added safety check for getenv parsing to prevent overflow attacks via getenv. Robert Osfield 2017-11-01 16:43:32 +00:00
  • 3b85aa35df Moved from getenv to osg::getEnvVar usage Robert Osfield 2017-11-01 14:45:27 +00:00
  • e59ad87044 Made template function inline to avoid multiple declaration issues Robert Osfield 2017-11-01 14:16:54 +00:00
  • fbb7270e55 Replaced getenv(..) usage with osg::getEnvVar(..) Robert Osfield 2017-11-01 13:54:15 +00:00
  • 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. Robert Osfield 2017-11-01 13:32:47 +00:00
  • fb175eed14 Fixed Coverity Scane reported issue. Robert Osfield 2017-11-01 11:35:05 +00:00
  • cca35390ad Merge pull request #378 from mp3butcher/osganimation OpenSceneGraph git repository 2017-10-31 17:59:13 +00:00
  • c242ad4497 Fixed unititialized memory variables and improved readability by adding spacing where appropriate Robert Osfield 2017-10-31 17:55:59 +00:00
  • 6a2bd1f898 Added missing initializers Robert Osfield 2017-10-31 17:43:39 +00:00
  • 14f50ab31c Fixed CovertiScan reported uninitialized member variable Robert Osfield 2017-10-31 17:39:34 +00:00
  • 061e52b89f Fixed Coverity Scan reported issue Robert Osfield 2017-10-31 17:02:31 +00:00
  • 47c4ef510d update example to use a common program Julien Valentin 2017-10-31 18:00:06 +01:00
  • 95eb5e2ad6 Replace c char array with std::string to address Coverity scan reported issue Robert Osfield 2017-10-31 16:46:42 +00:00
  • 3459e8f4fd Fixed Coverity Scan reported memory leaks Robert Osfield 2017-10-31 15:55:24 +00:00
  • 42c7d7ece1 Fixed Coverity reported memory leak Robert Osfield 2017-10-31 15:47:49 +00:00
  • 6a8fe45543 Reinstated two stage OSX build, and disabled part of the coverity_scan build to attempt to get it running without timeout. Robert Osfield 2017-10-31 14:55:41 +00:00
  • 89708ae277 Upped the number of threads used in build to try and improve build speed Robert Osfield 2017-10-31 12:32:45 +00:00
  • 17380a7191 Simplified build for OSX now that trais builds are running faster. Robert Osfield 2017-10-31 10:01:52 +00:00
  • 7e86438871 Merge branch 'master' into osganimation Robert Osfield 2017-10-30 15:53:56 +00:00
  • e196b23723 From Raymond de Vires, added support for 2018 and 2016 versions of FBX. Robert Osfield 2017-10-30 14:36:41 +00:00
  • 4f2328bc09 From Raymond de Vires, added support for 2018 and 2016 versions of FBX. Robert Osfield 2017-10-30 14:36:41 +00:00
  • bd3262e07f From Raymond de Vires, Windows build fix Robert Osfield 2017-10-30 14:22:10 +00:00
  • 45f1f23064 Updated ChangeLog and AUTHORS Robert Osfield 2017-10-30 14:05:45 +00:00
  • 45e520663d Quitened down the DisplaySettings::setShaderHint() output for NONE. Robert Osfield 2017-10-30 13:40:50 +00:00
  • 053ba83be6 Merged support for StateSet::DefineList from shader_pipeline branch Robert Osfield 2017-10-30 09:32:04 +00:00
  • af3a0bd7d1 Merge pull request #375 from mp3butcher/osganimation OpenSceneGraph git repository 2017-10-30 08:37:19 +00:00
  • 6e79ce348d reformat with the help of AStyle reformat tool (codeblocks) Julien Valentin 2017-10-27 21:02:43 +02:00
  • 6530b16fc7 Fixed build error when building wiht OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION=OFF Robert Osfield 2017-10-27 18:14:04 +01:00
  • d664c09a79 Merge pull request #374 from mp3butcher/osganimation OpenSceneGraph git repository 2017-10-27 17:15:38 +01:00
  • faa254dd61 Merge branch 'osganimation' into osganimation OpenSceneGraph git repository 2017-10-27 17:14:43 +01:00
  • 671847387f Fixed build errors when compiling with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION set to OFF Robert Osfield 2017-10-27 14:19:13 +01:00
  • c61e4fb15c fix InfluenceMap "remove useless bones" method Julien Valentin 2017-10-27 14:41:29 +02:00
  • 2b6ffad99a Build fix for when compiling with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION set to OFF Robert Osfield 2017-10-27 13:48:52 +01:00
  • b3515d0e09 Build fix for when compiling with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION set to OFF Robert Osfield 2017-10-27 13:48:52 +01:00
  • 1f913ec130 Fixed warning Robert Osfield 2017-10-27 13:19:52 +01:00
  • 5d9dcfccbf From Farshid Lashkari, "fix for the Collada loader to check for some NULL attributes." Robert Osfield 2017-10-27 13:17:47 +01:00
  • 11f9bbf6ea Merge branch 'master' into osganimation Robert Osfield 2017-10-27 12:54:10 +01:00
  • c2520a8533 Merge pull request #373 from LaurensVoerman/noStdMax OpenSceneGraph git repository 2017-10-27 09:33:24 +01:00
  • 93ef9d1dc9 use osg::maximum, not std::max Laurens Voerman 2017-10-27 09:41:28 +02:00
  • 1126812f8f Merge pull request #372 from openscenegraph/text_improvements OpenSceneGraph git repository 2017-10-26 14:26:01 +01:00
  • 1e896777d1 Updated from OpenSceneGraph-Data/shader/text.frag to add fixes to handling of vertexColor's alpha values Robert Osfield 2017-10-26 12:08:00 +01:00
  • 5918735ebc Added update of glyph representation to ensure all the glyphs are assigned to the required GlyphTextures Robert Osfield 2017-10-26 12:03:56 +01:00
  • 671ea7ae74 Added command line parsing to aid with testing of osgText by allowing osgText::FadeText to be created with various options Robert Osfield 2017-10-26 12:02:56 +01:00
  • fa58d01644 Added optimization for text where the colour alpha value is 0.0, returning early to aovid any GL calls. Robert Osfield 2017-10-25 16:29:25 +01:00
  • 248805fedd Fixed pre compilation osg::Program state leaking into the main scene graph rendering Robert Osfield 2017-10-25 16:13:26 +01:00
  • c8bd6fd100 Added stats handler Robert Osfield 2017-10-24 16:04:14 +01:00
  • 8f658fbc32 Updated from OpenSceneGraph-Data/shaders/text.frag to address GLSL int to float conversion warning Robert Osfield 2017-10-24 15:14:23 +01:00
  • 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 Robert Osfield 2017-10-24 14:46:13 +01:00
  • 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. Robert Osfield 2017-10-24 12:34:48 +01:00
  • c162a091fe Quitened down debug info Robert Osfield 2017-10-24 12:07:13 +01:00
  • 1cd0a5fe03 Fixed Glyph::TextureInfo assignment bug Robert Osfield 2017-10-24 11:36:00 +01:00
  • 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. Robert Osfield 2017-10-23 16:07:24 +01:00
  • 4b295c46d1 Restructed the way that GlyphTexture is set up to better support control of osgText::ShaderTechnique from osgText::Text Robert Osfield 2017-10-23 14:50:35 +01:00
  • cfca536583 Merge pull request #371 from hwiesmann/master OpenSceneGraph git repository 2017-10-23 09:06:55 +01:00
  • 8347027e17 Merge pull request #370 from siu/master-travisCcache OpenSceneGraph git repository 2017-10-23 09:05:34 +01:00
  • 2fc3387429 BUG FIX - Addition of missing #endif directive Hartwig 2017-10-22 22:13:46 +02:00
  • 41e9cd3157 Replacement of commas with semicolons Hartwig 2017-10-22 15:04:33 +02:00
  • abb7f46371 Removal of compiler warning for Cocoa builds Hartwig 2017-10-22 13:47:51 +02:00
  • 727653695d Install ccache on MacOs David Siñuela Pastor 2017-10-20 14:09:11 +02:00
  • ade97dcd95 Fix ccache configuration in travis David Siñuela Pastor 2017-10-18 12:20:35 +02:00
  • 817b6601d2 Added Text::s/getShaderTechnique() Robert Osfield 2017-10-21 10:08:41 +01:00
  • 97aeb16551 Moved osgText::GlyphTechnique::Features enum to osgText::ShaderTechinque enum to make it's roll clearer Robert Osfield 2017-10-20 17:03:25 +01:00
  • 6b75439ae4 Merge branch 'master' into text_improvements Robert Osfield 2017-10-20 14:14:14 +01:00
  • 38e5fdadf0 From Ralf Habacker, patch refactoring struct ObjOptionsStruct in obj plugin into a real class, which is a preparation for further obj related patches. Robert Osfield 2017-10-20 11:52:48 +01:00
  • a2ad1c9606 Added built-in support for lighting.vert Robert Osfield 2017-10-20 11:37:41 +01:00
  • 4645cc789e Updated shaders from OpenSceneGraph-Data/shaders Robert Osfield 2017-10-20 10:18:21 +01:00
  • 24c2a0ca60 Moved the assignment of the ModifiedCount to before GL texture calls. Robert Osfield 2017-10-19 20:57:25 +01:00
  • 8965c9369e Implemented --single command line option that creates a single osg::DrawElementsUInt primitive set instead of using MultiDrawIndirect. Robert Osfield 2017-10-19 12:39:22 +01:00
  • 4791e5f6b5 Improved spacing to make code more readable Robert Osfield 2017-10-19 12:06:59 +01:00
  • 068f47d91f Build fixes with ref_ptr<> autoconversion disabled Robert Osfield 2017-10-19 11:57:53 +01:00
  • 3c6f569360 Fixed placement of { and spacing to make the code more readable and consistent with the rest of the OSG Robert Osfield 2017-10-19 11:06:23 +01:00
  • 6496c304f9 Implemented inplace replacement Robert Osfield 2017-10-18 10:11:43 +01:00
  • cc8a34cd14 Do not break systems with cr as line endings David Siñuela Pastor 2017-10-17 17:11:12 +02:00
  • ad45bf1d61 Fixed warning Robert Osfield 2017-10-16 11:52:54 +01:00
  • 879b54f6e9 Fixed GLX EGL build Robert Osfield 2017-10-16 10:47:47 +01:00
  • 639ced08fc Removed inappropriate tabs&spaces Robert Osfield 2017-10-16 10:38:33 +01:00
  • 7b9f44cb17 Merge pull request #364 from mp3butcher/osganimbugfix OpenSceneGraph git repository 2017-10-16 10:16:49 +01:00
  • ea379e64e7 Fixed build error Robert Osfield 2017-10-16 10:12:19 +01:00
  • 5067db39f8 Moved bracket to be consistent with the rest of the OSG Robert Osfield 2017-10-16 10:08:18 +01:00
  • bfca9998ea Merge pull request #366 from LaurensVoerman/rotateDXT OpenSceneGraph git repository 2017-10-16 10:00:49 +01:00
  • 1604b81919 Merge pull request #367 from LaurensVoerman/compression_astc OpenSceneGraph git repository 2017-10-16 09:58:29 +01:00
  • a9ef5a90eb Fixed indentation Robert Osfield 2017-10-16 09:49:47 +01:00
  • bd28b48be1 Merge pull request #365 from LaurensVoerman/login2 OpenSceneGraph git repository 2017-10-16 09:45:37 +01:00
  • 0e39c129b7 Changed the precision setting of #pargma(tic) shader composition define setup to address GLES compatibility issues Robert Osfield 2017-10-14 09:06:37 +01:00
  • 0a5c6d3fd6 Improved the formating of GLSL source that is passed to OpenGL to make debugging shaders easier. Robert Osfield 2017-10-14 09:03:08 +01:00
  • 2303d6afc4 Cleaned up support for GL3 build Robert Osfield 2017-10-13 17:03:31 +01:00
  • 274cea19bf copySubImage support for block compressed images, added support for astc compressed type. Laurens Voerman 2017-10-13 16:54:04 +02:00
  • 24bec09b9e Removed the glyph image outline support as it's no longer required. Robert Osfield 2017-10-13 13:01:57 +01:00
  • 8b12d2d71a Deprecated Text:BackdropImplementation, removing the backend as it no longer required when using shaders for backdrop effects Robert Osfield 2017-10-13 11:42:25 +01:00
  • 28561b2b77 Removed old multipass implemenmtations of backdrops as effect is now fully implememted in shaders Robert Osfield 2017-10-13 08:40:58 +01:00
  • b540ed70ba add osg::Program::BindUniformBlock serialization Julien Valentin 2017-10-12 17:19:24 +02:00
  • 846204ed9e Updated from OpenSceneGraph-Data/shaders/text_sdf.frag to add support for SHADOW Robert Osfield 2017-10-12 18:45:38 +01:00
  • f07bf5be2a Merge branch 'master' into text_improvements Robert Osfield 2017-10-12 16:44:40 +01:00
  • 0fedfd2ff9 add support for dxt compressed images to createImageWithOrientationConversion Laurens Voerman 2017-10-12 17:38:16 +02:00
  • 99491e46ec modified present3D to allow multiple --login arguments like osgViewer, added --login option to osgvnc example Laurens Voerman 2017-10-12 17:21:10 +02:00