Robert Osfield
5c2ea3ad1f
Intial work on providing mapping from OpenGL modes to #pragma(tic) shader composition defines.
...
Shader usage:
#pragma import_modes ( GL_LIGHTING, GL_TEXGTURE_2D )
Will provide #define in shaders for GL_LIGHTING and GL_TEXTURE_2D if these Modes are enabled via StateSet::setMode(..);
2017-03-23 17:42:33 +00:00
OpenSceneGraph git repository
602a6beda8
Merge pull request #225 from MPursche/add_texture2dmultisample_serializer
...
Added serializer for Texture2DMultisample
2017-03-22 10:31:45 +00:00
Marcel Pursche
422587a285
Added serializer for Texture2DMultisample
2017-03-22 10:47:58 +01:00
tomhog
423e14f92f
Merge branch 'master' into topic-gles3-ios
2017-03-21 15:33:13 +00:00
Robert Osfield
a74872c6bf
Refactored GlyphTexture so that it utlizes standard osg::Texture2D/osg::Image combinations rather than locally implemented per glyph subloading.
2017-03-21 13:10:45 +00:00
Thomas Hogarth
76fe572934
Added conditionals for GLES3, added correct gl headers for GLES3 on iOS and Android to GL.in
2017-03-20 18:33:08 +00:00
Robert Osfield
e6703e3cb0
Removed no longer supported code paths
2017-03-18 11:48:55 +00:00
Robert Osfield
feb0214ddc
Introduced streamlined text rendering dispatch code.
2017-03-18 11:48:55 +00:00
Robert Osfield
ffbc1167de
Added lazy state updating for vertex array object binding/unbinding
2017-03-13 11:44:34 +00:00
Robert Osfield
61782d8f29
Build fixes
2017-03-11 12:31:19 +00:00
OpenSceneGraph git repository
75e4d85681
Merge pull request #211 from D-A-Heitbrink/master
...
Added support for unsigned 64 bit ints + some code for bindless textures
2017-03-11 11:58:20 +00:00
OpenSceneGraph git repository
1d8efb1a3a
Merge pull request #203 from scrawl/optimizer
...
MergeGeometryVisitor fix
2017-03-11 11:34:16 +00:00
Robert Osfield
2cad221d80
Cleaned out old code paths
2017-03-09 17:33:38 +00:00
Robert Osfield
96760970ed
Added setDataVariance(DYNAMIC) to stats text labels that are dyanmically updated.
2017-03-09 17:01:33 +00:00
Robert Osfield
7868909f43
Improved the handling of array updates and support for VBO and VAO's.
2017-03-08 18:15:06 +00:00
Robert Osfield
b88be0fbda
Implemented better handling of VertexBufferObjects and ElementBufferObjects in osgText
2017-03-03 18:31:51 +00:00
Robert Osfield
59931d1591
Removed unneccessary mutable usage
2017-03-02 17:05:24 +00:00
Robert Osfield
a69216a79d
Refactored osgText::Tex3D to use a single vertex and normal arrays and a combined set of primitive sets. Deprecated Text3D::RenderMode as it's no longer used.
2017-03-02 16:11:10 +00:00
Robert Osfield
4721651dbe
Added NEW_APPROACH code path that merges the separate GlyphGeometry arrays and primitives into a single set of arrays and primitives
2017-03-02 11:12:55 +00:00
d-a-heitbrink
7b3fc0925c
Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph
2017-03-01 16:12:49 -06:00
Robert Osfield
f233005988
Merged the decoration vertices with the same vertex arrays used for text glyphs
2017-03-01 16:43:05 +00:00
Robert Osfield
f4966a96d4
Replaced hardwired glDrawArrays calls with use of osg::DrawElementsUshort.
2017-03-01 11:51:27 +00:00
Robert Osfield
256441906f
Removed unused member variable
2017-02-28 17:12:58 +00:00
Robert Osfield
1290f1584a
Removed old Text::GlyphQuads array code paths
2017-02-28 17:02:02 +00:00
Robert Osfield
138af70bd8
Merged the Text::GlyphQuads cooordinate arrays
2017-02-28 16:34:33 +00:00
Robert Osfield
e5685dfca5
Removed old code paths
2017-02-27 15:15:37 +00:00
Robert Osfield
80c96cd54f
Added option for combining the GlyphQuad::backdropcoords into the GlyphQuad::coords.
2017-02-27 11:53:42 +00:00
Robert Osfield
8adbf322a0
Scaled back the primitives sets set up so they match the requirements of the osgText::Text accordinging to the BackdropType
2017-02-24 18:25:16 +00:00
Robert Osfield
a84a6bd309
Moved glyph quad setup into dedicated method
2017-02-24 17:08:48 +00:00
Robert Osfield
cefecaec10
Removed unused lineNumber
2017-02-24 11:17:22 +00:00
Robert Osfield
93f28d4eee
Moved to use of single vector of DrawElementsUShort for backdrops and foreground text quads
2017-02-24 10:07:01 +00:00
scrawl
e0f7d3241a
Fix MergeGeometryVisitor to work with a Group instead of Geode
2017-02-24 01:05:57 +01:00
Robert Osfield
b5048d3b74
Cleaned up types
2017-02-23 18:14:36 +00:00
Robert Osfield
8ff17ddf52
Restructed and unified the position computation
2017-02-23 15:45:43 +00:00
Robert Osfield
7b3ecefcfc
Removed the old code paths
2017-02-22 14:14:03 +00:00
Robert Osfield
f816436771
Removed the unncessary array.
2017-02-22 12:41:45 +00:00
Robert Osfield
04d23659b3
Added the option for changing the type of the GlyphQuads::Coords
2017-02-22 12:07:43 +00:00
Robert Osfield
cd991eaa97
Refactored the computation of the transforms for the osgText::Text
2017-02-21 17:07:53 +00:00
scrawl
6deefe0646
Remove seemingly redundant handling of Geode in GLObjectsVisitor
2017-02-03 18:10:37 +01:00
scrawl
e38c3d0303
Fix handling of in-scenegraph Drawables in SmoothingVisitor, TriStripVisitor and GraphicsCostEstimator
2017-02-03 17:55:55 +01:00
scrawl
4e1a2d3246
Fix handling of in-scenegraph Drawables in ShaderGenVisitor
2017-02-03 17:51:03 +01:00
scrawl
e48aa118b6
Fix handling of in-scenegraph Drawables in MeshOptimizers
2017-02-03 17:48:18 +01:00
scrawl
c901694290
Fix handling of in-scenegraph Drawables in DrawElementTypeSimplifier
2017-02-03 17:43:42 +01:00
scrawl
853418db94
Remove redundant handling of Geode in DisplayRequirementsVisitor
2017-02-03 17:42:21 +01:00
scrawl
a858b2a2cd
Add a comment explaining some confusing code in UpdateVisitor and EventVisitor
2017-02-03 17:39:56 +01:00
scrawl
09ca132102
Remove redundant handling of Geode in SharedStateManager
2017-02-03 17:35:40 +01:00
scrawl
a13b66135f
Fix handling of in-scenegraph drawables in osgUtil::Simplifier
2017-02-03 17:35:40 +01:00
scrawl
f13fbff251
Remove CheckGeometryVisitor which was a no-op
2017-01-20 23:02:15 +01:00
scrawl
4a05caf4f7
MakeFastGeometryVisitor: fix handling of Geometries that are directly in the scene graph not attached to a Geode
2017-01-20 23:01:04 +01:00
scrawl
833f37ea57
StateVisitor: remove redundant code for Geode handling
2017-01-20 22:49:17 +01:00
