FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,110 Commits 1 Branch 26 Tags 73 MiB
644251db98
Commit Graph

16110 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Osfield
be363ef8d4 Fixed build when OSG_ENVVAR_SUPPORTED is disabled and quietened down warnings using OSG_UNUSED* macros 2018-05-10 18:58:29 +01:00
Robert Osfield
b1daa6a693 Changed the ordering of the build include directory and the source include directory to avoid build issues on systems where a different version of the OSG has been built in-source then another built out-of-source resulting in conflicts 2018-05-10 18:50:17 +01:00
Robert Osfield
05793cb104 Fixed typo 2018-05-10 16:59:56 +01:00
Robert Osfield
a5c421863e Updates for 3.6.1-rc3 2018-05-06 07:47:23 +01:00
Robert Osfield
e79edabf98 Restructed the handling of SCREEN_COORD scaling to better handle window resizing 2018-05-05 15:47:28 +01:00
Robert Osfield
d95993554e Added C++ specific path for calling std::map<>::erase() to avoid issues with std::map<>::erase implementation that invalidates iterators 2018-05-05 12:31:00 +01:00
Robert Osfield
f49e1d32c9 Replaced std::auto_ptr<> usage as it's deprecated in C++11 and will be removed in C++17 2018-05-05 12:28:45 +01:00
OpenSceneGraph git repository
a15d4532fa
Merge pull request #545 from emminizer/fix-gl3-text-bad-mode 
Text only applies GL_TEXTURE_2D modes when fixed function is availabl…
 2018-05-04 16:11:31 +01:00
Daniel Emminizer
27955ae8e9 Text only applies GL_TEXTURE_2D modes when fixed function is available. Prevents GL3 Core Profile console spam. 2018-05-04 06:44:13 -04:00
Robert Osfield
c078968f66 Added non const version of State::getActiveDisplaySettings() 2018-05-04 10:54:02 +01:00
Robert Osfield
f90edd0d9f Added check for null to prevent null entries getting into the cache 2018-05-04 09:44:43 +01:00
Robert Osfield
62a9f87f45 Added osg::MakeString class to make it easier to create std::string's using std::ostream style << usage. 2018-05-04 09:31:57 +01:00
Robert Osfield
f510613d55 Fixed null pointer warning 2018-05-04 09:22:54 +01:00
Björn Blissing
645704dfd3 Check existence of path before reading image 
When loading texture images inside the FBX plugin check that the path
exists before trying to read the image. This is done to avoid
unnecessary warnings inside the readRefImageFile function.
 2018-05-03 16:13:24 +01:00
Robert Osfield
13d56b8b37 Updated ChangeLog 2018-05-02 09:14:04 +01:00
Robert Osfield
c5990c4f65 Updates for the 3.6.1-rc2 2018-05-02 09:10:54 +01:00
Robert Osfield
94c4baccad Updated SO version to reflect change in ABI 2018-04-30 11:55:17 +01:00
OpenSceneGraph git repository
bb1e208d30
Merge pull request #542 from psyinf/fix_particle_system_header 
FIX: <osgParticle> removed unimplemented functions from header
 2018-04-30 11:44:02 +01:00
Sebastian Messerschmidt
fce55993bc FIX: <osgParticle> removed unimplemented functions from header 2018-04-30 11:16:02 +02:00
Robert Osfield
31c9dbc881 Fixed particle update bug where a ParticleSystem wouldn't start when loaded during the frame loop due to the _last_frame value not being set. 2018-04-27 11:25:46 +01:00
Robert Osfield
c9b0fcaa32 Updated ChangeLog, README.md and rc number for 3.6.1-rc1 2018-04-26 10:21:53 +01:00
Robert Osfield
37a63d37e2 Split up #pragma so that there only three parameters per line to aovid Intel driver bug crash 2018-04-26 09:52:32 +01:00
Robert Osfield
1daacced5a Renamed text.vert and text.frag to osgText_Text.vert and .frag to avoid name overlapping with user shaders. 2018-04-26 09:52:32 +01:00
Julien Valentin
cea33e40df add wrapper for osg::DrawIndirectBufferObject 2018-04-25 09:49:56 +01:00
Robert Osfield
2b3ac015bb Renamed CMake variable + C++ #define to OSG_GL_CONTEXT_VERSION 2018-04-24 17:06:07 +01:00
Robert Osfield
1aa0a80de7 Added OSG_GL_CONTEXT_STRING cmake variable to set include/osg/GL headers that sets Traits::glContextVersion. 2018-04-24 16:22:13 +01:00
OpenSceneGraph git repository
4dd1156444
Merge pull request #537 from openscenegraph/revert-536-default-gl3-context 
Revert "When GL3 build is enabled, default context requested is version 3.3, …"
 2018-04-24 15:38:02 +01:00
OpenSceneGraph git repository
c10f298dc6
Revert "When GL3 build is enabled, default context requested is version 3.3, …" 2018-04-24 15:37:44 +01:00
OpenSceneGraph git repository
e8c0033f5f
Merge pull request #536 from emminizer/default-gl3-context 
When GL3 build is enabled, default context requested is version 3.3, …
 2018-04-24 15:36:11 +01:00
Robert Osfield
31c29f4318 Refactored the handling of glyph and shadow alpha values to make the text and shadow clearer for fonts with narrow glyphs 2018-04-24 15:33:03 +01:00
Robert Osfield
e0be94389e Refactored the handling of text bounding box to provide more stable bounding box computation 2018-04-24 13:52:53 +01:00
Daniel Emminizer
d660b29ef0 When GL3 build is enabled, default context requested is version 3.3, enabling core profile by default. 2018-04-24 06:31:32 -04:00
Alberto Luaces
490d3a8f21 Small fix for uncaught typo. 2018-04-23 11:03:37 +01:00
Alberto Luaces
02c310982e Fix typos and spelling. 2018-04-23 11:03:37 +01:00
OpenSceneGraph git repository
c3008512f1
Merge pull request #534 from emminizer/fix-msvc-includes 
Fix includes for MSVC 2015 build.
 2018-04-23 11:02:03 +01:00
Daniel Emminizer
22d2fae30c Fix includes for MSVC 2015 build. 2018-04-20 13:16:43 -04:00
Robert Osfield
dac9ed17f1 Updated ChangeLog 2018-04-20 15:58:27 +01:00
Robert Osfield
709194c88c Replaced osgUtil::IntersectVisitor usage with osgUtil::InteresectionVisitor 2018-04-20 14:32:34 +01:00
Robert Osfield
8de8af6850 Removed TriStripVisitor for default set of Optimizer passes as it doesn't generate efficient scene graphs 2018-04-20 11:48:46 +01:00
Robert Osfield
7bda8083fb Added osgUtil::optimizeMesh(osg::Node* node) convinience method 2018-04-20 11:48:39 +01:00
Robert Osfield
a082b57c3f Removed usage of the osgUtil::TriStripVisitor is it generates osg::Geometry that perform very poorly when using VBO and VAO's vs GL DisplayLists. 
With DisplayLists being deprecated in GL and VBO and VAO becoming standard it's best to standardize on using the osgUtil::MeshOptimizers instead of TripStrupVisitor
 2018-04-20 11:44:44 +01:00
Robert Osfield
547340659f Fixed the set*Binding() methods so that they assign BufferObjects when required 2018-04-19 19:43:14 +01:00
Robert Osfield
29d12ddcbc Fixed messages 2018-04-19 19:42:51 +01:00
Robert Osfield
f95fdd4d4e Fixed the GLBufferObject size computation so that it takes into account padding. 2018-04-19 19:41:51 +01:00
Robert Osfield
bf6db4eee7 Replaced the use of osgUtil::TriStripVisitor with ogUtil::MeshOptimizer usage to improve performance. 
Fixed set setColorArray assignement to pass in the color binding
 2018-04-19 19:36:19 +01:00
Robert Osfield
fe39589771 Fixed the handle of boundary equalization 2018-04-18 10:15:01 +01:00
Robert Osfield
d88f0c4cd1 Added --equalize-boundaries -e command line option to call terrain->setEqualizeBoundaries(true) 2018-04-18 10:03:52 +01:00
Robert Osfield
a2a026e116 Updated version number in prep for future 3.6.1 release. 2018-04-16 17:53:38 +01:00
Robert Osfield
38ad6ed3b3 Fixed inline Drawable::draw(..) method 2018-04-16 17:18:49 +01:00
Robert Osfield
9d72bf4712 Fixed Geometry::drawImplmentation() handling of VBO's to prevent them from being used when display lists are used. 2018-04-16 17:18:37 +01:00