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
Thomas Hogarth
74abb99b0e
small compile fix for ios viewer example gles1
2017-03-20 18:39:56 +00:00
Thomas Hogarth
2ec6624816
updated ios build instructions in readme
2017-03-20 18:39:56 +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
Marcel Pursche
1bf303e566
Improved cpack configuration for building debian packages:
...
* Added configurable maintainer
* Added configurable dependencies and conflicts per package
* Added post install script to run ldconfig after package is installed
* Updated name of readme file in cpack configuration
2017-03-20 16:31:09 +01: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
266b57c821
Removed no longer required GL3 shaders as osgText itself now provides shaders
2017-03-18 18:09:12 +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
Thomas Hogarth
4578b32364
Shaders now using vertex colors
2017-03-18 17:35:00 +00:00
Robert Osfield
279cc82a01
Improved readability of code
2017-03-18 11:48:55 +00:00
Robert Osfield
2ef8f00e91
Fixed GL3 core profile and shandard shaders to work with new osgText
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
Thomas Hogarth
896d9a4ee5
small compile fix for ios viewer example gles1
2017-03-18 07:46:14 +00:00
Thomas Hogarth
2841d78653
updated ios build instructions in readme
2017-03-18 07:32:17 +00:00
Thomas Hogarth
c7af72daae
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-18 06:53:32 +00:00
Thomas Hogarth
1deaac7508
More gles3 tweaks
2017-03-17 18:03:18 +00:00
Thomas Hogarth
eea3d559a7
Added conditionals for GLES3, added correct gl headers for GLES3 on iOS and Android to GL.in
2017-03-17 18:03:18 +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
5f407b3cc4
Added experimental --shaders path into osgtext example to test out using shaders for text rendering.
2017-03-14 10:43:52 +00:00
Robert Osfield
2c2097ce24
Replaced GL_QUADS usage with GL_TRIANGLES to aid portability.
2017-03-13 17:46:51 +00:00
