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
