Commit Graph

15048 Commits

Author SHA1 Message Date
Robert Osfield
ffbc1167de Added lazy state updating for vertex array object binding/unbinding 2017-03-13 11:44:34 +00:00
Laurens Voerman
a2ce0a0e0f bugfix: read endbracket for fileversion 145 (introduced 25/8/2016) 2017-03-13 09:27:08 +01:00
OpenSceneGraph git repository
a6453ad877 Merge pull request #198 from scrawl/buildswitch
Add cmake options for disabling plugins from the build
2017-03-11 17:31:27 +00:00
OpenSceneGraph git repository
f1f6d23eeb Merge pull request #213 from marchelbling/bug/osg-fixes
Bug/osg fixes
2017-03-11 15:08:57 +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
8dd22d9178 Merge pull request #208 from LaurensVoerman/submitRWlas
rewrote las plugin to read in a single pass: more speed, better precision
2017-03-11 11:37:33 +00:00
OpenSceneGraph git repository
58b9f5208f Merge pull request #206 from LaurensVoerman/submitLAScmake
allow library names liblas.lib and liblas_c.lib;fix include dirs typo…
2017-03-11 11:36:31 +00:00
OpenSceneGraph git repository
fea86426ed Merge pull request #205 from LaurensVoerman/submitGTAcmake
GTA: use normal cmake search if PKG_CHECK_MODULES fails; fix win32 debug lnk
2017-03-11 11:35:36 +00:00
OpenSceneGraph git repository
36e0fd8f5a Merge pull request #204 from LaurensVoerman/submitFBX2017
added FBX SDK 2017.1 and try to add apple (clang) support.
2017-03-11 11:34:56 +00:00
OpenSceneGraph git repository
1d8efb1a3a Merge pull request #203 from scrawl/optimizer
MergeGeometryVisitor fix
2017-03-11 11:34:16 +00:00
OpenSceneGraph git repository
50649fb2a2 Merge pull request #202 from nicokruithof/master
Fixed typo
2017-03-10 17:47:02 +00:00
Robert Osfield
a4b1a4ce29 Fixed handling of VAO's Text with backdrop and per vertex colours 2017-03-10 17:06:04 +00:00
Robert Osfield
0eb0656d52 Improved handling of backdrops 2017-03-10 12:08:22 +00:00
Robert Osfield
5b78e334a9 Improved the management of the unbinding of VBO's and EBO's 2017-03-09 18:17:53 +00:00
Robert Osfield
445f2bfe21 Reordered operations to make code easier to follow 2017-03-09 18:16:04 +00:00
Robert Osfield
91564e36b0 Cleaned up VertexArrayState handling 2017-03-09 17:48:06 +00:00
Robert Osfield
7f3f995c56 Improved handling of VBO/VAO's in Text3D 2017-03-09 17:47:27 +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
854dac5340 Improved the checks against VBO+VAO usage and cleaned up setup. 2017-03-08 18:12:37 +00:00
Robert Osfield
9b32395772 Added --counter test 2017-03-07 13:35:03 +00:00
Robert Osfield
fee826412c Added --plain test to simply basic text testing 2017-03-07 09:13:29 +00:00
Laurens Voerman
15a90f63b8 fix bug in osgb/osgt/osgx readerwriter causing the osgParticle-SizeInterpolator and -ColorInterpolator to dissapear 2017-03-06 15:43:32 +01:00
Robert Osfield
26878fa7ab Fixed text background tessellation 2017-03-06 14:37:21 +00:00
Laurens Voerman
8743c18c5a rewrote las plugin to read in a single pass: more speed, compressed file (.laz) support and better precision. 2017-03-06 14:23:17 +01:00
Marc Helbling
e906465dcb Fix commented variable assertions in inventor writer 2017-03-06 14:08:27 +01:00
Marc Helbling
18826a9ebc Fix implicit ref_ptr conversions 2017-03-06 14:08:27 +01:00
Marc Helbling
4627821e79 Revert bad change in 3ds reader 2017-03-06 12:29:19 +01:00
Marc Helbling
a97cdebe11 Remove unused offset attribute in MergeArrayVisitor 2017-03-06 12:25:48 +01:00
Marc Helbling
c765b0b62d Add missing type for attribute merge 2017-03-06 12:25:23 +01:00
Robert Osfield
bb754b6f0a Moved all vertex array set up to start of Text/Text3D::drawImplementation(). 2017-03-04 17:20:54 +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
1e36a12a17 Updated Attribute and PrimitiveFunctor implementations 2017-03-02 16:33:09 +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
cfaf72bc56 removed some of the hard coded options in the main funct. 2017-03-01 18:12:46 -06:00
d-a-heitbrink
7b3fc0925c Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2017-03-01 16:12:49 -06:00
D-A-Heitbrink
69b8d01de6 Add files via upload 2017-03-01 15:33:19 -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
scrawl
23cad1eedd Update travis-ci to use the new more flexible BUILD_OSG_PLUGINS_BY_DEFAULT 2017-02-28 22:56:42 +01:00
scrawl
c1dd0eb348 Add CMake options to control which osgPlugins/ are built 2017-02-28 22:56:42 +01: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