mp3butcher
912f9e18cb
few fixes for Matrix support..
...
but getElements still fails..
2017-04-05 17:57:08 +02:00
OpenSceneGraph git repository
a30e5df6f2
Merge pull request #238 from filnet/silence_thread_logging
...
openthread: silence some log output
2017-03-30 15:23:17 +01:00
Robert Osfield
a6baf00956
Reordered command line parsing and replace throw with cout.
2017-03-30 13:21:05 +01:00
Robert Osfield
c2684ca1f5
Improved the error warning message
2017-03-30 12:18:16 +01:00
Philippe Renon
b843fb19fc
openthread: silence some log output
2017-03-30 11:29:53 +02:00
Robert Osfield
1f0515ceff
Fix for GL3
2017-03-29 11:38:29 +01:00
Robert Osfield
cb7140aa04
Fixed windings
2017-03-29 10:02:03 +01:00
OpenSceneGraph git repository
373204ef7f
Merge pull request #236 from mp3butcher/ScriptBranch
...
add ScriptNodeCallback serializer
2017-03-29 09:27:58 +01:00
mp3butcher
9d490bbf1c
add ScriptNodeCallback serializer
2017-03-28 22:37:34 +02:00
mp3butcher
3142b682f2
remove spaces in the previsouly added macro
2017-03-28 22:19:32 +02:00
mp3butcher
fc3afbe449
oups forgot an associaterevisions
2017-03-28 22:14:44 +02:00
mp3butcher
0555bc4bc7
add BufferData associate as well as revisionassociate in PrimitiveSet Seriliazer
2017-03-28 20:48:35 +02:00
Robert Osfield
eb59590d77
Added handling of large shapes
2017-03-28 18:29:26 +01:00
Robert Osfield
10d87c40db
Quiten down debug messages
2017-03-28 11:45:55 +01:00
Robert Osfield
76afbc9bcf
Fixed ac plugin's handling of rot primitive in .ac files
2017-03-27 20:30:14 +01:00
Robert Osfield
70e7cb886b
Added serializers for BufferObject and BufferData
2017-03-27 20:02:33 +01:00
OpenSceneGraph git repository
11b3424984
Merge pull request #230 from mp3butcher/commitMaster
...
add new serializers
2017-03-27 15:05:59 +01:00
Robert Osfield
6308b497f2
Replaced macro based selection of which shaders to use by default with DisplaySettings::setShaderHint() and OSG_SHADER=HINT=GL2|GL3|GLES2|GLES3|NONE controls
2017-03-27 11:44:41 +01:00
mp3butcher
96db8033f2
add an include to osg/geometry
2017-03-26 16:26:43 +02:00
mp3butcher
46a37618ef
add new serializers
2017-03-26 15:59:36 +02:00
Robert Osfield
ec5cbe18d5
Restructed the marco to resolve Windows build issues
2017-03-25 16:05:57 +00:00
Robert Osfield
b4152d9634
Added simple fallback from osg::Material::apply() when fixed function pipeline is disabled
2017-03-23 14:53:08 +00:00
Robert Osfield
7ccd25a4d5
Fixed missing initializer for _color and assignment of color to ShapeDrawable
2017-03-23 14:40:44 +00:00
Robert Osfield
9848c1d264
First pass at default shader for GLES2,GLES3 and GL3.
2017-03-23 11:09:49 +00:00
Robert Osfield
d70d00607f
Removed no longer relevant line
2017-03-23 10:25:25 +00:00
Robert Osfield
717cb182ce
Removed hardwaring to online write inine when writing to binary files to allow inline images in asci and binary files
2017-03-23 09:52:21 +00:00
Robert Osfield
e74f8f4bbe
Added TextureBuffer serializer
2017-03-22 14:20:03 +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
Robert Osfield
48aa852f42
Replaced GL_QUADS and GL_QUAD_STRIP usage with indexed GL_TRIANGLES
2017-03-22 09:43:19 +00:00
OpenSceneGraph git repository
429aef3b08
Merge pull request #221 from tomhog/topic-gles3-ios
...
GLES3 support improvements on iOS
2017-03-21 17:56:39 +00:00
Robert Osfield
1778a2a6fb
Made VAO the default for GL3 builds.
...
Improved the handling of DisplaySettings::getVertexBufferHint() values.
2017-03-21 15:38:52 +00: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
630af80635
Adusted Font shaders to use gl3 path on gles3, iphone example using inbuilt shaders
2017-03-20 19:35:01 +00:00
Thomas Hogarth
7ba2e728cd
GLES3 now working on iOS, tried to maintain support for have bother gles2 and gles3, allowed avfoundation to be added on iOS, improved iOS example cmake generation
2017-03-20 18:39:56 +00:00
Thomas Hogarth
3a6e28da9c
More gles3 tweaks
2017-03-20 18:39:56 +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
6670a6e070
Improved support for stats, fonts and shadergen for GLES2, GLES3 and GL3
2017-03-20 14:07:14 +00:00
Robert Osfield
e0592b6d11
Added shader for GL3/GLES/GL2/GL2
2017-03-20 10:31:58 +00:00
Robert Osfield
4498945b98
Quited debug messages
2017-03-20 09:25:49 +00:00
Robert Osfield
c7711fd2d4
Added support for GL3/GLES3, GL2,GLE2 shaders to osgText::Font/Text.
2017-03-18 18:08:12 +00:00
Robert Osfield
279cc82a01
Improved readability of code
2017-03-18 11:48:55 +00:00
Robert Osfield
943beb220d
Improved handling of osgText::Text with and wihout shaders
2017-03-18 11:48:55 +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
OpenSceneGraph git repository
2cefcc8bfc
Merge pull request #220 from rickyviking/addPenInputWin32
...
Added PEN input support to GraphicsWindowWin32 with the WM_POINTER*
2017-03-18 11:17:03 +00:00
Robert Osfield
44e303ad90
Added explict call to state.applyModelViewAndProjectionUniformsIfRequired() when required for better GL3/GlES2 support.
2017-03-16 15:46:51 +00:00
Riccardo Corsi
b3ccf02e06
Added PEN input support to GraphicsWindowWin32 with the WM_POINTER* framework available since Windows 8.
...
Fallback on existing WM_TOUCH implementation for actual touch inputs.
2017-03-16 15:32:05 +01:00
Robert Osfield
2c2097ce24
Replaced GL_QUADS usage with GL_TRIANGLES to aid portability.
2017-03-13 17:46:51 +00:00
OpenSceneGraph git repository
ce0fbabb4e
Merge pull request #207 from LaurensVoerman/submitOpenCascade
...
fix OpenCascade library list for use with shared libs; added list and…
2017-03-13 15:01:08 +00:00
OpenSceneGraph git repository
c364bbb19b
Merge pull request #215 from LaurensVoerman/submit-SerializerParticle
...
Submit serializer particle
2017-03-13 14:25:33 +00:00
Laurens Voerman
75e6889366
fix OpenCascade library list for use with shared libs; added list and options for static lib
2017-03-13 12:54:02 +01:00
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
1d8efb1a3a
Merge pull request #203 from scrawl/optimizer
...
MergeGeometryVisitor fix
2017-03-11 11:34:16 +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
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
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
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
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
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
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
blobfish
d3a925e675
osgManipulator: Constraint: snap_point_to_grid wants Vec3d instead of Vec3
2017-02-16 10:37:03 -05: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
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
9403a4c949
Fix unused parameter warning
2017-02-03 17:45:22 +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
09ca132102
Remove redundant handling of Geode in SharedStateManager
2017-02-03 17:35:40 +01:00
Laurens Voerman
7b67ef0c6f
split travis-ci apple build into two jobs to avoid job time limit.
2017-02-03 10:01:15 +01:00
Kjell Andersson
f5483b0ad6
Bug fix to not crash when using shared context and adding / removing windowed views dynamically.
...
The GLExtension object is now reused instead of creating a new when allocating a state on the same ContextID. The static map that stores the GLExtensions is only reset when all references to the extension object are released.
2017-02-02 11:46:16 +01:00
OpenSceneGraph git repository
2a7d72c203
Merge pull request #191 from LaurensVoerman/glExtentions
...
GLExtensions.cpp: Fixed a few typo's in old function names.
2017-01-27 15:15:39 +00:00
Laurens Voerman
9183f275f5
Fixed a few old function names.
...
Check extensions trough extermination string - not by function pointer value.
Added a few validContext tests to ensure no functions or isExterntionSupported bool is set for an non valid context.
Remove duplicates / merge some lines.
Removed "GL_APPLE_texture_2D_limited_npot" form isNonPowerOfTwoTextureMipMappedSupported.
2017-01-25 17:05:56 +01:00
Robert Osfield
23da167c27
Fixed linking bug caused by repeated Program::addShader()/removeShader() operations invalidating the internal attach/dettech lists.
2017-01-24 17:36:36 +00:00
OpenSceneGraph git repository
d1e162a61f
Merge pull request #190 from scrawl/optimizer
...
Optimizer fixes
2017-01-24 09:27:07 +00:00
OpenSceneGraph git repository
00984d0e77
Merge pull request #189 from marchelbling/master
...
osgjs/gles updates
2017-01-24 09:15:26 +00: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
scrawl
f229b19496
TessellateVisitor: fix handling of Geometries that are directly in the scene graph not attached to a Geode
2017-01-20 22:47:51 +01:00
scrawl
41cbf9a45e
FlattenStaticTransformsVisitor: fix handling of Drawables that are directly in the scene graph not attached to a Geode
2017-01-20 22:43:58 +01:00
scrawl
ff1a9a195a
StaticObjectDetectionVisitor: make use of apply(Drawable) visitor function
2017-01-20 21:48:45 +01:00
scrawl
764b2f60c6
TextureAtlasVisitor: fix handling of Drawables that are directly in the scene graph not attached to a Geode
2017-01-20 21:47:21 +01:00
scrawl
dc2689f779
TextureVisitor: remove redundant code for Geode handling
2017-01-20 21:47:13 +01:00
scrawl
4457df9a8a
RemoveEmptyNodesVisitor: add missing isOperationPermissible check
2017-01-20 21:46:46 +01:00
scrawl
7611f95078
RemoveEmptyNodesVisitor: remove redundant code for Geode handling
2017-01-20 21:46:03 +01:00
Robert Osfield
33f7500a59
Quitened down verbose debug messages
2017-01-20 17:31:09 +00:00
Robert Osfield
e5b493289d
Quitened down debug messages
2017-01-20 17:24:49 +00:00
Robert Osfield
ed596c3335
Quietened down some verbose debug messages
2017-01-20 17:07:55 +00:00
Marc Helbling
c84b667fa5
Updates osgjs from sketchfab
...
* updates uservalue serialization (avoid creating multie UserDataContainer for a same object)
* removes vec4ubarray specific serialization (serialization should not enforce the previous color transformation)
2017-01-20 15:17:16 +01:00
