14667 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Robert Osfield	0ec204f6e4	Added StateSetManipulator to osglogo.	2017-02-27 10:47:14 +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
Laurens Voerman	ef01913b9a	allow library names liblas.lib and liblas_c.lib;fix include dirs typo; link only liblas_c in plugin.	2017-02-24 16:21:20 +01:00
Laurens Voerman	f8ed554ddb	use normal cmake search if PKG_CHECK_MODULES fails; fix win32 debug linking with SET(TARGET_LIBRARIES_VARS GTA_LIBRARY)	2017-02-24 16:09:13 +01:00
Laurens Voerman	0f899a2a1e	added FBX SDK 2017.1 and try to add apple (clang) support (not tested - I have no apple)	2017-02-24 15:54:07 +01:00
Robert Osfield	cefecaec10	Removed unused lineNumber	2017-02-24 11:17:22 +00:00
Robert Osfield	aa621e1a4a	Grouped GlyphQuad setup	2017-02-24 11:08:15 +00:00
Robert Osfield	4c032723ba	Fixed indentation	2017-02-24 10:40:52 +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	c9621ff17a	Add missing copy of callbacks when a Transform is replaced by Group	2017-02-24 07:41:19 +01:00
scrawl	7e2436aba9	Change the order of optimizations to allow for the possibility of merging Geometries that have just become siblings after the removal of redundant nodes	2017-02-24 01:09:09 +01:00
scrawl	ef431eec29	Fix unused parameter warning	2017-02-24 01:07:24 +01:00
scrawl	e0f7d3241a	Fix MergeGeometryVisitor to work with a Group instead of Geode	2017-02-24 01:05:57 +01:00
scrawl	a918306a99	Use asDrawable()/asNode() over dynamic_cast in the Optimizer	2017-02-24 01:00:49 +01:00
Robert Osfield	22b8a5cc0f	Added missing relaseGLObjects()/resizeGLObjects(). ... Reordered calls to make it easier to read and see patterns.	2017-02-23 18:36:35 +00: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
Nico Kruithof	ec2cb81c65	Fixed typo ... osg_ModeViewMatrix -> osg_ModelViewMatrix	2017-02-21 21:55:05 +01:00
Robert Osfield	f8dc5c4988	Fixed FadeText when using NEW_APPROACH	2017-02-21 17:47:54 +00:00
Robert Osfield	cd991eaa97	Refactored the computation of the transforms for the osgText::Text	2017-02-21 17:07:53 +00:00
OpenSceneGraph git repository	ad0e6a0f81	Merge pull request #201 from blobfish/moreManipSlop ... osgManipulator: Constraint: snap_point_to_grid wants Vec3d instead of Vec3	2017-02-18 10:38:31 +00:00
blobfish	d3a925e675	osgManipulator: Constraint: snap_point_to_grid wants Vec3d instead of Vec3	2017-02-16 10:37:03 -05:00
Robert Osfield	378809f3a8	Added osgvolume command line option "--bg r g b a" to enable customization of the window background colour	2017-02-13 16:53:37 +00:00
scrawl	94061aa9fb	Add CMake option to not build deprecated serializers	2017-02-07 20:23:14 +01:00
OpenSceneGraph git repository	71bf79cf6f	Merge pull request #197 from scrawl/geodefix ... More fixes for Geode/Drawable handling in visitors	2017-02-03 18:03:13 +00:00
scrawl	6deefe0646	Remove seemingly redundant handling of Geode in GLObjectsVisitor	2017-02-03 18:10:37 +01:00
scrawl	fdf6d55b9d	Fix handling of in-scenegraph Drawables in osgShadow	2017-02-03 18:08:16 +01:00