b26e350e72Updates the macOS build instructions in README.md.
Ulrich Hertlein
2017-04-23 21:38:01 +02:00
e723c6d63bFixes compiler warning regarding logic vs bitwise AND
Ulrich Hertlein
2017-04-23 11:52:05 +02:00
9bc93fb18eThere 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.
Farshid Lashkari
2017-04-18 17:01:26 +01:00
2523dee7e0Modified the FBX loader to support bump, specular, and gloss maps. I've attached a zip containing the modified files.
Farshid Lashkari
2017-04-18 16:40:56 +01:00
420d3065f4When 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:
Farshid Lashkari
2017-04-18 16:01:58 +01:00
9eaf03e16eFixes glyphs's MODELVIEW matrices (positions, scales etc.) if state.getUseModelViewAndProjectionUniforms() is true
Konstantin S. Matveyev
2017-04-18 15:53:48 +01:00
36fc30d8e7avoid INFO message about duplicate enums with and without _EXT
Laurens Voerman
2017-04-07 15:56:32 +02:00
4bc855b610fix a crash when reading an osgt file with multiple references to a missing texture.
Laurens Voerman
2017-04-07 15:27:56 +02:00
f16167c3e8osgbindlesstext example fix : needed to add "viewer.realize()" before the line "viewer.getCamera()->getGraphicsContext()" in order to get a valid graphics context, before viewer.run() is called.
jamie robertson
2017-04-07 07:15:30 +01:00
43891d6cc1Removed unneccessary EXT usage
Robert Osfield
2017-04-07 07:11:57 +01:00
6308b497f2Replaced macro based selection of which shaders to use by default with DisplaySettings::setShaderHint() and OSG_SHADER=HINT=GL2|GL3|GLES2|GLES3|NONE controls
Robert Osfield
2017-03-27 11:44:41 +01:00
96db8033f2add an include to osg/geometry
mp3butcher
2017-03-26 16:26:43 +02:00
46a37618efadd new serializers
mp3butcher
2017-03-26 15:59:36 +02:00
ec5cbe18d5Restructed the marco to resolve Windows build issues
Robert Osfield
2017-03-25 16:05:57 +00:00
1beddd3d29Fixed file endings
Robert Osfield
2017-03-23 19:36:01 +00:00
b4152d9634Added simple fallback from osg::Material::apply() when fixed function pipeline is disabled
Robert Osfield
2017-03-23 14:53:08 +00:00
7ccd25a4d5Fixed missing initializer for _color and assignment of color to ShapeDrawable
Robert Osfield
2017-03-23 14:40:44 +00:00
9848c1d264First pass at default shader for GLES2,GLES3 and GL3.
Robert Osfield
2017-03-23 11:09:49 +00:00
d70d00607fRemoved no longer relevant line
Robert Osfield
2017-03-23 10:25:25 +00:00
717cb182ceRemoved hardwaring to online write inine when writing to binary files to allow inline images in asci and binary files
Robert Osfield
2017-03-23 09:52:21 +00:00
53a10a7bd9as preparation for the upcoming 3rdParty package for Visual Studio 2017, I updated Find3rdPartyDependencies.cmake to find also the newest Freetype 2.7.1 release.
Torben Dannhauer
2017-03-22 17:27:05 +00:00
e74f8f4bbeAdded TextureBuffer serializer
Robert Osfield
2017-03-22 14:20:03 +00:00
1778a2a6fbMade VAO the default for GL3 builds. Improved the handling of DisplaySettings::getVertexBufferHint() values.
Robert Osfield
2017-03-21 15:38:52 +00:00
423e14f92fMerge branch 'master' into topic-gles3-ios
tomhog
2017-03-21 15:33:13 +00:00
a74872c6bfRefactored GlyphTexture so that it utlizes standard osg::Texture2D/osg::Image combinations rather than locally implemented per glyph subloading.
Robert Osfield
2017-03-21 13:10:45 +00:00
bd2d9a7fedMerged origin
Thomas Hogarth
2017-03-20 19:43:07 +00:00
630af80635Adusted Font shaders to use gl3 path on gles3, iphone example using inbuilt shaders
Thomas Hogarth
2017-03-20 19:35:01 +00:00
b493657c47Shaders now using vertex colors
Thomas Hogarth
2017-03-18 17:35:00 +00:00
74abb99b0esmall compile fix for ios viewer example gles1
Thomas Hogarth
2017-03-18 07:46:14 +00:00
2ec6624816updated ios build instructions in readme
Thomas Hogarth
2017-03-18 07:32:17 +00:00
7ba2e728cdGLES3 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
Thomas Hogarth
2017-03-18 06:53:32 +00:00
3a6e28da9cMore gles3 tweaks
Thomas Hogarth
2017-03-17 18:01:44 +00:00
76fe572934Added conditionals for GLES3, added correct gl headers for GLES3 on iOS and Android to GL.in
Thomas Hogarth
2017-03-15 01:35:58 +00:00
1bf303e566Improved 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
Marcel Pursche
2017-03-20 16:31:09 +01:00
6670a6e070Improved support for stats, fonts and shadergen for GLES2, GLES3 and GL3
Robert Osfield
2017-03-20 14:07:14 +00:00
e0592b6d11Added shader for GL3/GLES/GL2/GL2
Robert Osfield
2017-03-20 10:31:58 +00:00
4498945b98Quited debug messages
Robert Osfield
2017-03-20 09:25:49 +00:00
266b57c821Removed no longer required GL3 shaders as osgText itself now provides shaders
Robert Osfield
2017-03-18 18:09:12 +00:00
c7711fd2d4Added support for GL3/GLES3, GL2,GLE2 shaders to osgText::Font/Text.
Robert Osfield
2017-03-18 18:08:12 +00:00
4578b32364Shaders now using vertex colors
Thomas Hogarth
2017-03-18 17:35:00 +00:00
279cc82a01Improved readability of code
Robert Osfield
2017-03-17 19:02:54 +00:00
2ef8f00e91Fixed GL3 core profile and shandard shaders to work with new osgText
Robert Osfield
2017-03-17 19:00:33 +00:00
943beb220dImproved handling of osgText::Text with and wihout shaders
Robert Osfield
2017-03-17 14:33:56 +00:00
e6703e3cb0Removed no longer supported code paths
Robert Osfield
2017-03-17 13:11:43 +00:00
OpenSceneGraph git repository