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
Robert Osfield
15429198b8
Replaced osgViewer::GraphicsWindow dynamic_cast as it's not neccessary.
2018-04-15 08:25:57 +01:00
Robert Osfield
3da4a5e503
Fixed typo
2018-04-07 18:35:19 +01:00
Robert Osfield
7ab1208c65
Renamed osg::ComputeDispatch to osg::DispatchCompute to make sure the nameing between GL and OSG is consistent i.e glDispatchCompute -> osg::DispatchCompute
...
Updated AUTHORS.txt, NEWS.txt and README.txt for CMakeLists.txt for 3.6.0 release
2018-04-07 17:59:55 +01:00
Robert Osfield
7c7a904315
Updated ChangeLog
2018-04-07 07:19:14 +01:00
Robert Osfield
d3c0a90a3c
Updated for rc7
2018-04-07 07:18:41 +01:00
Robert Osfield
6bfca1582e
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:07:57 +01:00
Robert Osfield
ba4624c437
Updated ChangeLog
2018-04-06 15:33:42 +01:00
Robert Osfield
c9cce01868
Update ChangeLog
2018-04-06 14:58:00 +01:00
Robert Osfield
1866b5ca44
Updated for rc6
2018-04-06 14:47:54 +01:00
Robert Osfield
1145b84f8b
Fixed warning
2018-04-06 14:17:35 +01:00
Robert Osfield
36f891c6cd
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:10:51 +01:00
Robert Osfield
d1c54223cb
Added osgtext --alignment test to look the effect of calling Text::setAlignent() before and after the Text::setText().
2018-04-06 14:10:43 +01:00
OpenSceneGraph git repository
0ce3131ffd
Merge pull request #525 from emminizer/fix-windows-export
...
osgDB: Added missing extern OSGDB_EXPORT.
2018-04-05 18:00:30 +01:00
Daniel Emminizer
3d8cc71601
osgDB: Added missing extern OSGDB_EXPORT.
2018-04-05 10:51:24 -04:00
Robert Osfield
914e60a872
Quietened down debug message output for osgText shader setup and Drawable::createVertexArrayStateImplementation
2018-04-05 14:18:30 +01:00
Robert Osfield
4cb697205e
Changed DisplaySettings::setShaderHint(..) messages to INFO
2018-04-05 12:35:36 +01:00
Robert Osfield
5d54697c29
Updated ChangeLOG and news
2018-04-05 12:19:56 +01:00
Philippe Renon
edbca390ed
mingw: fix compile error in GraphicsWindowWin32.cpp
...
compilation error was introduced by msvc specific change
see bb169979a1
2018-04-05 11:15:49 +01:00
Ralf Habacker
d468cae86b
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-05 08:46:33 +01:00
Robert Osfield
4136621e93
Updated ChangeLog for rc5
2018-04-04 15:35:28 +01:00
Robert Osfield
9168b6e5de
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:11:25 +01:00