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

10852 Commits

Author SHA1 Message Date
Robert Osfield
a855faeff3 As the author of all the files in osgPresentation and present3D have rectified the license notices to reflect their intended license rather than histoical license they had prior to being merged into the OpenSceneGraph project. OSGPL was always intended but missed during merge. 
Replaced the GPL notices with OSGPL usge in present3D and include/osgPresentation as this was intended when Present3D was merged back into OpenSceneGraph but missed.
 2018-05-31 14:48:54 +01:00
Philippe Renon
c0848a56bc Notify: silence warning about unused argument 2018-05-27 14:21:57 +02:00
Robert Osfield
6da45d6a73 Updated REMOVE_SERIALIZER( ImageAttachment ); block to use 154 version to retain compatibility with binaries made with 153 SOVERSION prior to the Imageattachement change 2018-05-23 17:03:51 +01:00
Robert Osfield
6eb6634997 Implemented StateGraph reuse in in scene graph Canera's RenderStage. 2018-05-23 14:52:24 +01:00
Robert Osfield
e5ff90e455 Fixed warning of RenderLeaf's having multiple references in CullVisitor::createOrReuseRenderLeaf() but forcing a clean up of the StateGraph at the end of RenderStage::draw() 2018-05-23 14:42:28 +01:00
Robert Osfield
f8dcb20437 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2018-05-23 14:38:54 +01:00
Robert Osfield
ed683678c0 Added check to make sure that glEnablei and glDisablei are only called when the capability is non zero to fix GL invalid value error. 2018-05-23 07:49:00 +01:00
gwaldron
633e0aa20b Fix for compiling with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION=OFF 2018-05-22 12:13:37 -04:00
Robert Osfield
1b56fc1c00 Moved the rotation to before the scale 2018-05-22 09:07:06 +01:00
gwaldron
a2447c8dc0 osgText: perform pixel size computation in double-precision to prevent coordinate jitter 2018-05-21 13:26:04 -04:00
Robert Osfield
2c7d97266d Fixed typos 2018-05-21 13:19:06 +01:00
Robert Osfield
0bca415d5a Restored the REGISTER_WINDOWINGSYSTEMINTERFACE macro to the include/osg/GraphicsContext header and removed the OSGVIEWER_EXPORT as this was causing compatibility issues with osgQt. 
In GraphicsWindowWin32 replaced REGISTER_WINDOWINGSYSTEMINTERFACE usage with locally implemented equivilant with the required OSGVIEWER_EXPORT.
 2018-05-21 13:19:06 +01:00
Robert Osfield
76d1b85778 Restructed SCREEN auto scaling so that it's removes the rotation of the modelview matrix so that the XY coords of the text map directly to window xy coords for all text alignment types 2018-05-20 13:26:36 +01:00
Robert Osfield
0df03b09f9 Added GL_RED and GL_RG support to _readColor()/Image::getColor(); 2018-05-18 14:25:30 +01:00
Robert Osfield
ba766b88a8 Cleaned up the WindowingSystemInterface registration 2018-05-18 14:25:30 +01:00
Robert Osfield
ea9be189e8 Quitened down unsupport compression output when passing in a file with a non rgb extension 2018-05-18 14:25:30 +01:00
Robert Osfield
a4c8804b1b Introduced a local StateGraph hierarchy into CullVisitor::apply(osg::Camera&) and RenderBin to fixed RTT Camera bug where multiple RTT Camera end up with the rendering back end results assigned to them which occured when RTT Camera's share the same StateSet or null StateSet. 2018-05-18 10:05:29 +01:00
Robert Osfield
41f7efbab6 Imoroved backwards compatibility with 3.6 2018-05-14 10:47:50 +01:00
Robert Osfield
4fbaca7878 Fixed support for update and event callbacks on StateSet/Uniform/StateAttributes on View(er) Cameras. 2018-05-14 09:57:37 +01:00
Robert Osfield
71f3bad57a Renamed the counter used to enable traversal order sorting 2018-05-14 08:44:47 +01:00
Robert Osfield
75b576bf83 Improved the handling of precision 2018-05-14 08:44:47 +01:00
Robert Osfield
bc600bc9f7 Fixed crash when using ShapeDrawable with a TriangleMesh or ConvexHull shape due to missing texture coords 2018-05-13 11:53:21 +01:00
Robert Osfield
d3da2f0cd5 Build fixes for OSG_USE_REF_PTR_IMPLICIT_OUTPUT set to OFF 2018-05-13 09:34:46 +01:00
Robert Osfield
7c67059e12 Removed _traverseNumber variable that was duplicating the one in NodeVisitor base class 2018-05-13 09:29:27 +01:00
Robert Osfield
46560bd6d2 Rewrote TextBase::computeMatrix(..) computation of the scaling factor with slower but easier to understand and more robust code 2018-05-12 11:41:56 +01:00
Robert Osfield
b70ffc9b8a Moved constructors and destructors to .cpp 2018-05-11 11:15:45 +01:00
Robert Osfield
5e6b081bb0 Revert "Moved the Options constructors and destructor implementaions into the cpp to make it easier to do debugging" 
This reverts commit 479a4eefc5.
 2018-05-11 11:13:19 +01:00
Robert Osfield
747162e5b6 Fixed crash the occurred when passing in a osgDB::Options to the ObjectCache that doesn't have any references to it. 2018-05-11 09:01:50 +01:00
Robert Osfield
479a4eefc5 Moved the Options constructors and destructor implementaions into the cpp to make it easier to do debugging 2018-05-11 09:01:50 +01:00
Robert Osfield
ac6eaee583 Fixed build when OSG_ENVVAR_SUPPORTED is disabled and quietened down warnings using OSG_UNUSED* macros 2018-05-10 19:00:13 +01:00
Robert Osfield
35682fd814 Fixed typo 2018-05-10 17:01:05 +01:00
Robert Osfield
8edc862962 Restructed the handling of SCREEN_COORD scaling to better handle window resizing 2018-05-05 15:48:18 +01:00
Robert Osfield
d572d78214 Added C++ specific path for calling std::map<>::erase() to avoid issues with std::map<>::erase implementation that invalidates iterators 2018-05-05 12:35:51 +01:00
Robert Osfield
863dee52e2 Replaced std::auto_ptr<> usage as it's deprecated in C++11 and will be removed in C++17 2018-05-05 12:35:51 +01:00
Daniel Emminizer
a1c8a3e8dd Text only applies GL_TEXTURE_2D modes when fixed function is available. Prevents GL3 Core Profile console spam. 2018-05-04 16:12:05 +01:00
Robert Osfield
202d893dc2 Added check for null to prevent null entries getting into the cache 2018-05-04 09:48:07 +01:00
Robert Osfield
c279aa26fb Fixed null pointer warning 2018-05-04 09:47:55 +01:00
Björn Blissing
2761bca496 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 13:15:08 +02:00
Jason Beverage
d53a74b1bb Quiet down shader compilation messages 2018-05-01 11:04:35 -04:00
Robert Osfield
b9d5e8f505 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:23:07 +01:00
Robert Osfield
52763cee76 Split up #pragma so that there only three parameters per line to aovid Intel driver bug crash 2018-04-26 09:49:35 +01:00
Robert Osfield
02f247bfa9 Renamed text.vert and text.frag to osgText_Text.vert and .frag to avoid name overlapping with user shaders. 2018-04-26 09:36:52 +01:00
Julien Valentin
ae24be56f3 add wrapper for osg::DrawIndirectBufferObject 2018-04-25 09:48:02 +01:00
Robert Osfield
e2e8e779e9 Renamed CMake variable + C++ #define to OSG_GL_CONTEXT_VERSION 2018-04-24 17:05:03 +01:00
Robert Osfield
ef3d672f8c Added OSG_GL_CONTEXT_STRING cmake variable to set include/osg/GL headers that sets Traits::glContextVersion. 2018-04-24 16:30:48 +01:00
Robert Osfield
05af4340e1 Refactored the handling of glyph and shadow alpha values to make the text and shadow clearer for fonts with narrow glyphs 2018-04-24 16:30:48 +01:00
Robert Osfield
1d431fcb3d Refactored the handling of text bounding box to provide more stable bounding box computation 2018-04-24 16:30:07 +01:00
Alberto Luaces
bc4f181d41 Fix typos and spelling. 2018-04-20 18:18:22 +02:00
Robert Osfield
0dd5230d82 Cleaned up inbludes and unused code 2018-04-20 14:01:21 +01:00
Robert Osfield
13e02d1af5 Removed osgUtil::TriStripVisitor as it is nolonger appropriate for modern OpenGL/OSG usage and bloats the osgUtil lib size by several hundred Kb. 2018-04-20 13:06:28 +01:00