Remo E
3f99ce540f
Fix VS2013 build issue
...
Fix this build issue on VS2013:
```
\src\osg\State.cpp(99): fatal error C1017: invalid integer constant expression
```
I hope this works also on other platforms.
2017-03-29 15:28:09 +02:00
Robert Osfield
1f0515ceff
Fix for GL3
2017-03-29 11:38:29 +01:00
Robert Osfield
aeb6005f3b
Removed the build of examples as this may be causing timeout build failures
2017-03-29 11:04:03 +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
OpenSceneGraph git repository
545f561d87
Merge pull request #235 from mp3butcher/PrimSetSerilizer
...
add BufferData associate as well as revisionassociate in PrimitiveSe…
2017-03-29 09:24:12 +01:00
Robert Osfield
1292724a27
Added Texture2D include to resolve VS build issue
2017-03-29 09:12:14 +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
9a786fd8be
build fix
2017-03-28 18:03:16 +01:00
Robert Osfield
1691639d17
Fixed build
2017-03-28 17:45:54 +01:00
Robert Osfield
0b844bc72b
Added StateSetManipulator to assist with QA.
2017-03-28 16:15:57 +01:00
Robert Osfield
58c52a4cd4
Added TextBase::getMatrix() accessor
2017-03-28 14:43:07 +01:00
Robert Osfield
25e6fbb2ff
Fixed typo
2017-03-28 14:42:40 +01:00
Robert Osfield
4f6b6fc5f8
Updated AUTHORS.txt file and Contributors list for 3.5.6 dev release
2017-03-28 11:50:04 +01:00
Robert Osfield
10d87c40db
Quiten down debug messages
2017-03-28 11:45:55 +01:00
Robert Osfield
1668bfb3e8
Improved the contributor filters
2017-03-28 11:45:05 +01:00
Robert Osfield
fba1680d24
Updated ChangeLog
2017-03-28 10:37:35 +01:00
Robert Osfield
27c86a4d85
Updated date
2017-03-28 10:33:02 +01:00
Robert Osfield
e8349b69ca
Fixed warnings
2017-03-28 10:17:44 +01:00
Robert Osfield
13b5d247df
Fixed typo
2017-03-28 09:41:07 +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
1beddd3d29
Fixed file endings
2017-03-23 19:36:01 +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
Torben Dannhauer
53a10a7bd9
as preparation for the upcoming 3rdParty package for Visual Studio 2017, I updated Find3rdPartyDependencies.cmake to find also the newest Freetype 2.7.1 release.
2017-03-22 17:27:05 +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
OpenSceneGraph git repository
5d6322da2b
Merge pull request #224 from MPursche/improved_debian_packages
...
Improved CPack configuration for building debian packages
2017-03-21 14:43:09 +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
bd2d9a7fed
Merged origin
2017-03-20 19:43:07 +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
b493657c47
Shaders now using vertex colors
2017-03-20 18:39:56 +00:00
