Commit Graph

15916 Commits

Author SHA1 Message Date
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
OpenSceneGraph git repository
4a6d928105
Merge pull request #544 from bjornblissing/fbx_texture_warnings
Check existence of path before reading image
2018-05-03 16:11:00 +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
OpenSceneGraph git repository
5feb9e58f7
Merge pull request #543 from jasonbeverage/quietshaders
Quiet down shader compilation messages
2018-05-01 18:37:23 +01:00
Jason Beverage
d53a74b1bb Quiet down shader compilation messages 2018-05-01 11:04:35 -04:00
Sebastian Messerschmidt
544872f63b FIX: <osgParticle> removed unimplemented functions from header 2018-04-30 11:58:19 +01: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
0af7f3fb13 Updated ChangeLog and README.md 2018-04-26 10:28:06 +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
OpenSceneGraph git repository
9fbc125d47
Merge pull request #533 from aluaces/spelling-3
Fix typos and spelling.
2018-04-23 10:45:19 +01:00
Alberto Luaces
d23b988d00
Small fix for uncaught typo. 2018-04-20 21:16:46 +02: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
c58041cf0b Added osgUtil::optimizeMesh(osg::Node* node) convinience method 2018-04-20 09:57:04 +01:00
Robert Osfield
85c835b902 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2018-04-19 20:11:19 +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
OpenSceneGraph git repository
989c8832c8
Merge pull request #532 from jasonbeverage/remove_getNameID
Removed unimplemented Uniform::getNameID from Uniform header
2018-04-19 08:38:47 +01:00
Jason Beverage
7250cd717c Removed unimplemented Uniform::getNameID from Uniform header as it's defined in UniformBase now. 2018-04-18 14:59:51 -04:00
Robert Osfield
c9b1c234a6 Fixed the handle of boundary equalization 2018-04-18 10:02:43 +01:00
Robert Osfield
7efc10d0e6 Added --equalize-boundaries -e command line option to call terrain->setEqualizeBoundaries(true) 2018-04-18 09:33:12 +01:00
Robert Osfield
1d4f6c2543 Cleaned up includes 2018-04-17 09:20:23 +01:00
OpenSceneGraph git repository
aeeec59f33
Merge pull request #531 from jasonbeverage/fixosgmanipulator
Including osg/Geode to fix osgManipulator build
2018-04-17 09:06:18 +01:00
Jason Beverage
c09d209bd0 Including osg/Geode to fix osgManipulator build 2018-04-16 15:58:12 -04:00
Robert Osfield
8a2e6b1eaa Removed long deprecated IntersectVisitor. 2018-04-16 19:41:53 +01:00
Robert Osfield
724dbac41c Fixed inline Drawable::draw(..) method 2018-04-16 15:08:24 +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
3e2e16c42c Fixed typo 2018-04-07 18:36:23 +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
03879ca19b Updated ChangeLog 2018-04-06 15:34:10 +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
db1ff4c415 Added osgtext --alignment test to look the effect of calling Text::setAlignent() before and after the Text::setText(). 2018-04-06 14:06:50 +01:00
Daniel Emminizer
5063a0b41a osgDB: Added missing extern OSGDB_EXPORT. 2018-04-05 18:01:29 +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