Julien Valentin
6d55d8d341
minor fixes
...
removed unused
2017-08-28 16:08:14 +02:00
Julien Valentin
2aab28149f
reroot to rigtransform::prepareData old path to rig::buildvertexinfluence
2017-08-28 15:59:13 +02:00
Julien Valentin
7659b23f38
remove unused
2017-08-28 15:44:09 +02:00
Julien Valentin
3efaccb298
add prepareData for RigTransformHW
2017-08-28 15:41:14 +02:00
Julien Valentin
4b56a4d3be
minor changes+fix
2017-08-28 15:40:04 +02:00
Julien Valentin
f899a8dde5
add prepareData for rigttransform software
2017-08-28 14:44:09 +02:00
Julien Valentin
e216833286
few refactoring
2017-08-28 14:23:15 +02:00
Robert Osfield
5d55ffe6ee
Merge branch 'osganimation' of https://github.com/mp3butcher/OpenSceneGraph into osganimation
2017-08-28 10:28:18 +01:00
Mathieu MARACHE
1408c2664e
osg::Program::isFixedFunction() should'nt return true fixed function is unavailable, even if _shaderList.empty() is true
2017-08-28 09:44:10 +02:00
Julien Valentin
2b2a8f3d2e
MorphTransformHardware using TBO added
2017-08-28 04:51:52 +02:00
Julien Valentin
ca224c81dd
replace VertexInfluence to BoneInfluenceList
...
and VertexIndexWeight to IndexWeight
fix in example
2017-08-27 05:21:37 +02:00
Julien Valentin
4f0256bcc3
remove unused code and remove a commented section
2017-08-27 01:36:21 +02:00
Julien Valentin
0729e883d8
update serializers
2017-08-26 23:17:54 +02:00
Julien Valentin
32aaeccee1
refactoring and fixes
...
only change in design: decouplage between MorphGeometry and MorphTransform technique
no real change in behavior (i hope)
2017-08-26 23:06:39 +02:00
Julien Valentin
c89b08ea1f
Add extensions
2017-08-25 00:19:22 +02:00
Robert Osfield
68e0b25d32
Cleaned up warnings and removed assorts.
2017-08-24 15:13:14 +01:00
OpenSceneGraph git repository
cf91bb42f0
Merge pull request #321 from LaurensVoerman/tgaMissingColormap
...
fix gcc/VC compile warnings, reject color mapped tga files with missing colormap.
2017-08-24 11:08:38 +01:00
Laurens Voerman
9ef4859f55
fix gcc/VC compile warnings, reject color mapped tga files with missing colormap.
2017-08-24 11:37:21 +02:00
Julien Valentin
107b7be95b
Merge remote-tracking branch 'upstream/master' into MDI7
2017-08-24 11:26:23 +02:00
OpenSceneGraph git repository
b89384d810
Merge pull request #318 from mp3butcher/osganimation
...
change the design of BufferIndexBinding to work with BufferData instead of BufferObject +matrix transpose
2017-08-24 09:53:32 +01:00
Julien Valentin
d49f0d67af
change the design of BufferIndexBinding to work with BufferData instead of BufferObject
...
allow convenient BufferData abstraction + serialization of BufferIndexBinding
2017-08-24 03:28:55 +02:00
Julien Valentin
3b03699fbc
add a transpose method for 4x4
...
and a transpose3x3 to transpose only orthogonal part of a mat4x4
2017-08-23 23:49:36 +02:00
Robert Osfield
3b69755117
Fixed comparison to properly handle texture coordinates being assigned
2017-08-23 14:51:18 +01:00
OpenSceneGraph git repository
90e27d3b7d
Merge pull request #314 from LaurensVoerman/notify2
...
reduce the need to reallocate the std::ostream buffer behind osg::Notify
2017-08-23 14:48:04 +01:00
Robert Osfield
bb3b69962a
Warning fixes
2017-08-23 14:39:35 +01:00
Laurens Voerman
682730fbe4
reduce the need to reallocate the std::ostream buffer behind osg::Notify (causing multitreading issues) by pre-allocating 4095 bytes.
2017-08-23 11:53:16 +02:00
Michael Kapelko
59d3b1ebac
Fix stat64 build issue with NDK 15 by definining at stat for Android
2017-08-22 22:49:56 +03:00
OpenSceneGraph git repository
ad98bdd165
Merge pull request #311 from eligovision/master
...
Geometry::compileGLObjects function VAO fix
2017-08-22 09:22:41 +01:00
Laurens Voerman
3a50e2948b
ReaderWriterVNC.cpp fix g++ warnings
2017-08-22 09:35:00 +02:00
Konstantin S. Matveyev
d1453a41c2
Geometry::compileGLObjects function VAO fix
2017-08-22 10:12:36 +03:00
Robert Osfield
8926f0e9c2
Using a PR from Sando Mani for requestioning a specific GL version as a base, cleaned up formattating, made the new code paths simpler and added clean up of memory
2017-08-21 11:40:45 +01:00
OpenSceneGraph git repository
70135d606e
Merge pull request #307 from eligovision/master
...
[*] createTexturedQuadGeometry: fixed for GL3 spec
2017-08-20 19:53:41 +01:00
scrawl
fb214b62a1
Use osg::Quat::value_type instead of double in collada plugin
...
Note that although the value_type is currently always double, using the proper typedef will open the door to implementing a float Quaternion in the future (as I have done so in my own fork)
2017-08-20 15:56:40 +00:00
konstantin.matveyev
6841f37ccc
[*] createTexturedQuadGeometry: fixed for GL3 spec: GL_QUADS -> GL_TRIANGLES
2017-08-20 18:01:49 +03:00
AnyOldName3
67a0f815e4
Add support for type-1 (colour-mapped, uncompressed) targa images to the osgTGA plugin
2017-08-19 22:22:20 +01:00
OpenSceneGraph git repository
32f895bc5f
Merge pull request #304 from eligovision/master
...
glClear should not be called with zero-mask in osgUtil::RenderStage::…
2017-08-19 17:20:40 +01:00
Konstantin S. Matveyev
036add8e9e
glClear should not be called with zero-mask in osgUtil::RenderStage::drawImplementation
2017-08-18 10:20:26 +03:00
Robert Osfield
bdbff4824b
Fixed iterator comparison.
2017-08-18 08:11:57 +01:00
Robert Osfield
34b4e70015
Added version check for boolean, TRUE and FALSE settings
2017-08-17 10:52:59 +01:00
Robert Osfield
f3adcda6b7
Removed the GLclampd declaration and replaced its usage with GLdouble to standardize the OSG extension setup with current GL/GLES headers.
...
Added a float fallback from osg::DepthDangeIndex to suppprt GLES.
2017-08-16 14:20:00 +01:00
OpenSceneGraph git repository
bfbaecaf49
Merge pull request #300 from eligovision/master
...
Text3D character/glyph size fix
2017-08-16 11:30:14 +01:00
konstantin.matveyev
237ab29ff8
Merge remote-tracking branch 'upstream/master'
2017-08-15 22:15:31 +03:00
konstantin.matveyev
b0ef9b0c42
Text3D character/glyph size fixed
2017-08-15 22:11:15 +03:00
luzpaz
2cd31f65e4
misc. typo fixes
...
mostly non-user-facing but some doxy.
2017-08-15 12:23:49 -04:00
Uwe Woessner
f186f6b2d4
Extension to the PLY plugin to read files with textures.
2017-08-15 15:52:35 +01:00
OpenSceneGraph git repository
86d7a903a1
Merge pull request #298 from eligovision/master
...
Emscripten: EGL instead of SDL2 in GLExtensions.cpp
2017-08-15 06:39:02 +01:00
konstantin.matveyev
8e8d5b2fe0
Emscripten: EGL instead of SDL2 in GLExtensions.cpp
2017-08-14 11:19:04 +03:00
Robert Osfield
c18be2fc41
Replaced local FindZLIB.cmake usage with CMake's own FindZLIB.cmake, and ZLIB_LIBRARY to ZLIB_LIBRARIES
2017-08-09 14:18:35 +01:00
OpenSceneGraph git repository
e606e0b4de
Merge pull request #296 from openscenegraph/FullScreen
...
From Don Burns, add use of Xinerama to ensure full screen goes across all screens.
2017-08-09 14:08:59 +01:00
Anna Sokol
9d1234e866
In the attached GraphicsWindowWin32.cpp file, I changed order of the "else-if" for the TOUCHEVENTF_UP and TOUCHEVENTF_MOVE, I made it less intrusive then changing them into "if" events. I tested this on Windows 7 64-bit with a touch screen and a Windows 10 64-bit tablet.
...
Separately in the same file, I also needed to address the fact that the close button would not react on touch so I added to the top of the "handleNativeWindowingEvent" close button handling in case of touch events. Again this was tested on the same 2 devices.
2017-08-08 13:35:35 +01:00
Julien Valentin
35eb53cc95
add MDI support
2017-08-02 22:10:02 +02:00
Julien Valentin
3965b4e66e
fix a bug in MDI serializer
2017-08-01 02:18:15 +02:00
Robert Osfield
d1adb9acbc
Added missing break statements
2017-07-28 14:34:59 +01:00
Robert Osfield
3bda71ef15
Improved readability and consistency with the rest OSG by adding/removing spaces and brackets where appropriate.
2017-07-28 14:32:56 +01:00
OpenSceneGraph git repository
3076779a14
Merge pull request #267 from kornerr/master
...
Add osgemscripten example
2017-07-28 10:27:47 +01:00
mp3butcher
104b2dfc72
Promote PrimitiveSetIndirect's VBO to a target explicited DIBO (in order to benefit from BOSet queue management)
2017-07-27 12:13:05 +02:00
mp3butcher
7606159a78
add DrawIndirectBufferObject as State variable in order to minimize call to glBindBuffer(GL_DRAW_INDIRECT_BUFFER,X)
...
TODO: Promote PrimitiveSetIndirect's VBO to target explicited DIBO (in order to benefit from BOSet queue management)
2017-07-27 01:54:25 +02:00
mp3butcher
9b53775840
remove deprecated DrawIndirectBufferBinding
2017-07-27 01:40:04 +02:00
mp3butcher
8742ad8da6
fix some errors during renaming and cleanup code
2017-07-27 01:08:37 +02:00
mp3butcher
b26fa74e7e
add untested serializers for PrimitiveSetIndirect
2017-07-26 23:38:20 +02:00
mp3butcher
f27c379b1e
some renaming and harmonisations with osg metamodel convention
2017-07-26 23:36:55 +02:00
mp3butcher
5be14bc2ba
first commit for Indirect Draw integration in osg
...
users will have to implement interfaces for their custom drawcommandarrays
add a lot of new primitive set + few defines
integration is made in osggpucull
2017-07-26 21:20:28 +02:00
Anna Sokol
c32d3eb926
Since version 2.5.1 freetype has supported the WOFF extension format.
...
In the attached ReaderWriterFreeType.cpp file I added the following line:
supportsExtension("woff","web open font format");
2017-07-17 16:46:16 +01:00
Cai Shanli
bdd6817cee
fix StatsHandler crush on windows
...
change static_cast to dynamic_cast to avoid type cast error
2017-07-03 16:24:01 +08:00
Michael Kapelko
f992ec1440
Add osgemscripten example
2017-06-22 09:44:06 +07:00
Robert Osfield
83d08b18f8
Added version checks for when writing out new 64bit object sizes
2017-06-19 15:45:35 +01:00
Robert Osfield
605b3619cd
Replaced long long with uint64_t
2017-06-19 15:33:52 +01:00
OpenSceneGraph git repository
eab845a4c5
Merge pull request #264 from rickyviking/binaryStreamLargeBlock
...
BinaryStreamOperator: read and write block size as long long integer
2017-06-19 15:25:04 +01:00
Robert Osfield
9f3533632a
Added ability for OSG serializers to get the file version number when writing out via the OutputStream object
2017-06-19 12:04:03 +01:00
OpenSceneGraph git repository
da7a0968be
Merge pull request #265 from cxw42/array-classname
...
Make Array::className() support all Array::Type values
2017-06-19 08:50:00 +01:00
Robert Osfield
ce7593c799
Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph
2017-06-19 08:26:24 +01:00
Chris White
eb99df894a
Make Array::className() support all Array::Type's
...
Array::className() had fallen out of date with respect to Array::Type.
This commit updates it, and adds documentation and a debug message to
serve as a reminder for future additions of values to Array::Type.
2017-06-16 11:02:14 -04:00
Riccardo Corsi
eff73bad76
BinaryStreamOperator: read and write block size as long long integer on 8 bytes, to accommodate arbitrarily large block size.
...
When reading check of file version for backward compatibility.
2017-06-14 16:09:40 +02:00
blobfish
f5bd280b51
osg: KdTree: count degenerates to keep original primitive index in sync
2017-06-04 17:29:57 -04:00
blobfish
bb804c2045
osg: KdTree: encode original primitive index into _vertexIndices
2017-06-04 17:29:57 -04:00
blobfish
b52bc2bcd1
osgUtil: LineSegmentIntersector: don't increment primitive index until after adding intersection
2017-06-04 17:29:57 -04:00
blobfish
47efc55621
osgUtil: PolytopeIntersector: don't increment primitive index until after adding intersection
2017-06-04 17:29:57 -04:00
Jordi
8a2f1bc056
Fixes kdtree building
2017-05-31 13:33:37 +02:00
Robert Osfield
8e6a77d216
Added TimeMultiplier and LoopingMode to ImageSequence .osg serializer
2017-05-29 12:24:01 +01:00
Robert Osfield
79e764bd17
Improved support for Text with large numbers of glyphs
2017-05-25 12:38:54 +01:00
Robert Osfield
20ac472d1f
Moved OSG_USE_DEPRECATED_API from include/osg/Export to Cmake controlled include/osg/Config
2017-05-24 19:40:08 +01:00
Robert Osfield
a60aed70b5
Replaced DimensionMask naming with more appropriate PrimitiveMask nameing.
2017-05-24 18:36:52 +01:00
Robert Osfield
a201b15648
Added support for PolytopeIntersector::setDimensionsMask.
2017-05-24 18:36:52 +01:00
Robert Osfield
17d39e3db2
From Don Burns, add use of Xinerama to ensure full screen goes across all screens.
2017-05-12 16:26:07 +01:00
Robert Osfield
a74b4b94a9
Fixes/clean up of KdTree/LineSegmentIntersector/PolytopeIntersector
2017-05-11 15:29:31 +01:00
Robert Osfield
6e1866ac18
Added --points and --lines command line options that do a very simplistic conversion of geometry primitives to points or lines respectively, used to aid testing of intersectors
2017-05-11 15:29:31 +01:00
Robert Osfield
1196e82587
Added missing header
2017-05-11 15:29:31 +01:00
Robert Osfield
c9545970ac
Removed redudent bool parameter from TriangleFunctor::operator(Vec3, Vec3, Vec3, bool) so it's now simply TriangleFunctor::operator(Vec3, Vec3, Vec3) as the bool was always false in recently OSG versions.
2017-05-11 15:25:10 +01:00
Robert Osfield
e7e372bad2
Added support for using new IntersectFunctor for non kdtree as well as kdtree PolytopeIntersector
2017-05-11 15:25:10 +01:00
Robert Osfield
770a52d354
Implemented the setting of all the PolytopeIntersector::Intersection values on hits detected by KdTree/Polytope intersection codes
2017-05-11 15:25:10 +01:00
Robert Osfield
e03d9f84c6
Moved the Polytope::contains(..) triangle test into PolytopeIntersector to enable customization and optimization.
2017-05-11 15:25:10 +01:00
Robert Osfield
8f5493e573
Implemented Polytope::contains(..) for triangle vertices and added support for using the results mask.
2017-05-11 15:25:10 +01:00
Robert Osfield
265efb85a1
Initial work on adding KdTree support for PolytopeIntersector.
2017-05-11 15:25:10 +01:00
Robert Osfield
728a7f2225
Merge branch 'MultiViewAutoTransform'
2017-05-11 14:35:50 +01:00
OpenSceneGraph git repository
9f9c605422
Merge pull request #252 from remoe/patch-2
...
Avoid call of SetupThreads in DatabasePager Constructor
2017-05-10 11:18:09 +01:00
Thomas Hogarth
2ce5238cf7
Added more plugins to iOS example, Textures now working on GLES3 (missed so if defineds)
2017-05-04 18:17:30 +01:00
Thomas Hogarth
fe0b53d7f5
Added more plugins and texture shader to iOS example, fixed a couple of missed if defines for GLES3
2017-05-04 00:24:46 +01:00
Remo E
36eb0e945f
Avoid call of SetupThreads in DatabasePager
...
This solves a bug with some shared library configurations. Sometimes the DatabasePager Singleton is initialised before one can call other configuration options like "setNumOfDatabaseThreadsHint". But OSG initialise it here:
https://github.com/openscenegraph/OpenSceneGraph/blob/master/src/osgDB/DatabasePager.cpp#L1555
So this call is not needed?!
2017-04-28 16:51:34 +02:00
Robert Osfield
a95d66a587
Replaced dynamoc_cast<osg::CullStack*> with asCullStack() to improve performance of AutoTransform, screen size based LOD and PagedLOD.
2017-04-26 17:10:58 +01:00
Robert Osfield
92092a56ae
Refactored AutoTransform so that it dynamically computes the rotation, scale and matrices during the cull traversal to enable usage in multi-view, multi-threaded applications
2017-04-26 11:50:35 +01:00
Robert Osfield
a4b0dc7426
Added missing Node::asAutoTransform() + NodeVisitor::apply(AutoTransform&).
2017-04-25 18:04:04 +01:00
Alexander Roan
3dc3dd3bd6
GLExtenstions: fix checking of isFrameBufferObjectSupported flag for GLES2
2017-04-24 10:19:58 +01:00
Ulrich Hertlein
c5450394b0
RAII memory management for macOS image loading
...
- use std::vector instead of manual memory management
- removes dead/commented code
2017-04-23 21:38:38 +02:00
Ulrich Hertlein
e723c6d63b
Fixes compiler warning regarding logic vs bitwise AND
2017-04-23 11:52:05 +02:00
Farshid Lashkari
9bc93fb18e
There is a small bug in how the FBX importer computes the rotation matrix for nodes. It applies the "RotationOrder" property to the local, pre, and post rotation values. However, the pre/post rotation values should always use a fixed XYZ order. The "RotationOrder" property should only apply to the local rotation value. I've attached the updated file with the fix.
2017-04-18 17:01:26 +01:00
Farshid Lashkari
2523dee7e0
Modified the FBX loader to support bump, specular, and gloss maps. I've attached a zip containing the modified files.
2017-04-18 16:40:56 +01:00
Farshid Lashkari
420d3065f4
When the "ZUp" option was added to the fbx loader, it broke the previous behavior of converting to the OpenGL axis system. I'm referencing the following commit:
...
c168887e5e
2017-04-18 16:01:58 +01:00
OpenSceneGraph git repository
a7548794c0
Merge pull request #244 from LaurensVoerman/submit_osgtMissingTextureCrash
...
fix a crash when reading an osgt file with multiple references to a missing texture.
2017-04-07 17:34:22 +01:00
Laurens Voerman
36fc30d8e7
avoid INFO message about duplicate enums with and without _EXT
2017-04-07 15:56:32 +02:00
Laurens Voerman
4bc855b610
fix a crash when reading an osgt file with multiple references to a missing texture.
2017-04-07 15:27:56 +02:00
OpenSceneGraph git repository
977bd22e36
Merge pull request #243 from mp3butcher/moreExtensions
...
add Extensions
2017-04-05 17:39:05 +01:00
mp3butcher
8d40323761
add Extensions
2017-04-05 18:11:50 +02:00
mp3butcher
0993edda11
forgot a lua_pop(_lua, 16)
2017-04-05 17:59:06 +02:00
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
