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

10831 Commits

Author SHA1 Message Date
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
Robert Osfield
6863cdee9a 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:42:31 +01:00
Robert Osfield
f1593c38d9 Removed TriStripVisitor for default set of Optimizer passes as it doesn't generate efficient scene graphs 2018-04-20 10:24:17 +01:00
Robert Osfield
37e3c428b6 Fixed the set*Binding() methods so that they assign BufferObjects when required 2018-04-19 19:46:20 +01:00
Robert Osfield
1e32282806 Fixed messages 2018-04-19 19:45:53 +01:00
Robert Osfield
0836fa602a Fixed the GLBufferObject size computation so that it takes into account padding. 2018-04-19 19:45:29 +01:00
Robert Osfield
71583b825f 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:45:21 +01:00
Robert Osfield
c9b1c234a6 Fixed the handle of boundary equalization 2018-04-18 10:02:43 +01:00
Robert Osfield
1d4f6c2543 Cleaned up includes 2018-04-17 09:20:23 +01:00
Robert Osfield
8a2e6b1eaa Removed long deprecated IntersectVisitor. 2018-04-16 19:41:53 +01:00
Robert Osfield
675702d258 Fixed Geometry::drawImplmentation() handling of VBO's to prevent them from being used when display lists are used. 2018-04-16 15:05:11 +01:00
Robert Osfield
a58f6c68d6 Replaced osgViewer::GraphicsWindow dynamic_cast as it's not neccessary. 2018-04-15 08:30:16 +01:00
Robert Osfield
e884df59c7 Pulled in latest changes from 3.6 branch 2018-04-07 18:14:57 +01:00
Robert Osfield
159f0fd584 Refactored the way that margin is applied to the text buounding box to prevent growth of the bounding box each time Text::setPosition() is called. 2018-04-06 20:05:26 +01:00
Robert Osfield
72054e6f6b Fixed warning 2018-04-06 14:49:32 +01:00
Robert Osfield
45fb5ae1aa Changed TextBase::setAlignment() to use computeGlyphRepresentation(); rather than computePositions(); to address issues seen with calling Text::setAlignment() after calls to Text::setText() 2018-04-06 14:07:58 +01:00
Robert Osfield
decaf57fef Quietened down debug message output for osgText shader setup and Drawable::createVertexArrayStateImplementation 2018-04-05 14:14:49 +01:00
Robert Osfield
b92158ed33 Changed DisplaySettings::setShaderHint(..) messages to INFO 2018-04-05 12:36:24 +01:00
Philippe Renon
4672a8672c mingw: fix compile error in GraphicsWindowWin32.cpp 
compilation error was introduced by msvc specific change
see bb169979a1
 2018-04-05 11:21:55 +02:00
Ralf Habacker
40c24a7a49 Remove duplicated and incorrect fetching of 'map_bump' attributes in obj plugin 
Parsing the key 'map_bump' was processed in the block, where the attributes
for 'bump' are extracted and results into having parts of the key in the
extracted filename, generating an invalid filename.

The mentioned string compare could be removed without loosing any features,
because the key 'map_bump' is parsed correctly some lines below.
 2018-04-04 19:04:27 +02:00
Robert Osfield
146fe3e294 Fixed threading crash in osgFX that occurred when an osgFX node is added to the scene being rendered in multiple threaded windows. 2018-04-04 15:09:43 +01:00
Robert Osfield
1f56d4905f Added focus classifiction of handling of keyboard events 2018-04-04 13:40:51 +01:00