FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,836 Commits 1 Branch 26 Tags 73 MiB
0dbcfff679
Commit Graph

14836 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
36e0fd8f5a Merge pull request #204 from LaurensVoerman/submitFBX2017 
added FBX SDK 2017.1 and try to add apple (clang) support.
 2017-03-11 11:34:56 +00:00
OpenSceneGraph git repository
1d8efb1a3a Merge pull request #203 from scrawl/optimizer 
MergeGeometryVisitor fix
 2017-03-11 11:34:16 +00:00
OpenSceneGraph git repository
50649fb2a2 Merge pull request #202 from nicokruithof/master 
Fixed typo
 2017-03-10 17:47:02 +00:00