Commit Graph

14845 Commits

Author SHA1 Message Date
Robert Osfield
eefeb3bb93 Fixed underflow issue 2017-08-23 15:26:07 +01:00
Robert Osfield
3b69755117 Fixed comparison to properly handle texture coordinates being assigned 2017-08-23 14:51:18 +01:00
OpenSceneGraph git repository
90e27d3b7d Merge pull request #314 from LaurensVoerman/notify2
reduce the need to reallocate the std::ostream buffer behind osg::Notify
2017-08-23 14:48:04 +01:00
Robert Osfield
bb3b69962a Warning fixes 2017-08-23 14:39:35 +01:00
Laurens Voerman
682730fbe4 reduce the need to reallocate the std::ostream buffer behind osg::Notify (causing multitreading issues) by pre-allocating 4095 bytes. 2017-08-23 11:53:16 +02:00
OpenSceneGraph git repository
e4ed8490ac Merge pull request #315 from kornerr/master
Fix stat64 build issue with NDK 15 by definining it as stat for Android
2017-08-23 08:54:10 +01:00
Michael Kapelko
59d3b1ebac Fix stat64 build issue with NDK 15 by definining at stat for Android 2017-08-22 22:49:56 +03:00
Robert Osfield
1b65adeebc Updated ChangeLog 2017-08-22 12:04:18 +01:00
Robert Osfield
674c25fceb Added catch for controbutors list 2017-08-22 11:59:22 +01:00
Robert Osfield
0dbcfff679 Added name typo fix 2017-08-22 11:58:49 +01:00
OpenSceneGraph git repository
ad98bdd165 Merge pull request #311 from eligovision/master
Geometry::compileGLObjects function VAO fix
2017-08-22 09:22:41 +01:00
OpenSceneGraph git repository
6095c4f3d5 Merge pull request #312 from LaurensVoerman/vnc_plugin
ReaderWriterVNC.cpp fix g++ warnings
2017-08-22 09:21:24 +01:00
Laurens Voerman
3a50e2948b ReaderWriterVNC.cpp fix g++ warnings 2017-08-22 09:35:00 +02:00
Konstantin S. Matveyev
d1453a41c2 Geometry::compileGLObjects function VAO fix 2017-08-22 10:12:36 +03:00
OpenSceneGraph git repository
16bb0561ea Merge pull request #309 from mp3butcher/osganimation
add DrawElementTypeSimplifierVisitor constructor because default nodevisitor is TRAVERSE_NONE..
2017-08-22 08:01:40 +01:00
Julien Valentin
f97b1626b3 fix nodevisitor construction 2017-08-21 18:33:56 +02:00
Robert Osfield
af609dfb67 Revert commit 904619e219 as it was causeing build problems 2017-08-21 16:24:34 +01:00
Robert Osfield
50cd8850f8 Added handling of CPACK and automatically generated package files 2017-08-21 15:06:31 +01:00
Robert Osfield
8926f0e9c2 Using a PR from Sando Mani for requestioning a specific GL version as a base, cleaned up formattating, made the new code paths simpler and added clean up of memory 2017-08-21 11:40:45 +01:00
OpenSceneGraph git repository
70135d606e Merge pull request #307 from eligovision/master
[*] createTexturedQuadGeometry: fixed for GL3 spec
2017-08-20 19:53:41 +01:00
OpenSceneGraph git repository
dc005a0719 Merge pull request #308 from OpenMW/collada_valuetype_patch
Use osg::Quat::value_type instead of double in collada plugin
2017-08-20 19:52:31 +01:00
scrawl
fb214b62a1 Use osg::Quat::value_type instead of double in collada plugin
Note that although the value_type is currently always double, using the proper typedef will open the door to implementing a float Quaternion in the future (as I have done so in my own fork)
2017-08-20 15:56:40 +00:00
konstantin.matveyev
6841f37ccc [*] createTexturedQuadGeometry: fixed for GL3 spec: GL_QUADS -> GL_TRIANGLES 2017-08-20 18:01:49 +03:00
OpenSceneGraph git repository
55f5335f18 Merge pull request #306 from AnyOldName3/targa-type-one-support
Add support for type-1 (colour-mapped, uncompressed) targa images to …
2017-08-20 08:32:02 +01:00
AnyOldName3
67a0f815e4 Add support for type-1 (colour-mapped, uncompressed) targa images to the osgTGA plugin 2017-08-19 22:22:20 +01:00
OpenSceneGraph git repository
32f895bc5f Merge pull request #304 from eligovision/master
glClear should not be called with zero-mask in osgUtil::RenderStage::…
2017-08-19 17:20:40 +01:00
Robert Osfield
904619e219 Merged addition of "" around variable from 3.4 branch 2017-08-18 16:13:16 +01:00
Konstantin S. Matveyev
036add8e9e glClear should not be called with zero-mask in osgUtil::RenderStage::drawImplementation 2017-08-18 10:20:26 +03:00
Robert Osfield
bdbff4824b Fixed iterator comparison. 2017-08-18 08:11:57 +01:00
OpenSceneGraph git repository
fa61cca6ea Merge pull request #301 from LaurensVoerman/Submit_linkWithVariables
fix for visual studio trying to link "debug.lib" and "release.lib"
2017-08-17 13:55:13 +01:00
Robert Osfield
34b4e70015 Added version check for boolean, TRUE and FALSE settings 2017-08-17 10:52:59 +01:00
Laurens Voerman
c939f7f0fc fix for visual studio trying to link "debug.lib" and "release.lib" 2017-08-17 11:44:06 +02:00
Robert Osfield
af79ad451e Added remapping of CMAKE_BUILD_TYPE strings that don't have the correct case. 2017-08-16 17:51:58 +01:00
Robert Osfield
f3adcda6b7 Removed the GLclampd declaration and replaced its usage with GLdouble to standardize the OSG extension setup with current GL/GLES headers.
Added a float fallback from osg::DepthDangeIndex to suppprt GLES.
2017-08-16 14:20:00 +01:00
OpenSceneGraph git repository
bfbaecaf49 Merge pull request #300 from eligovision/master
Text3D character/glyph size fix
2017-08-16 11:30:14 +01:00
OpenSceneGraph git repository
2831fc8088 Merge pull request #299 from luzpaz/misc-typo-fixes
misc. typo fixes
2017-08-16 09:04:02 +01:00
konstantin.matveyev
237ab29ff8 Merge remote-tracking branch 'upstream/master' 2017-08-15 22:15:31 +03:00
konstantin.matveyev
b0ef9b0c42 Text3D character/glyph size fixed 2017-08-15 22:11:15 +03:00
luzpaz
2cd31f65e4 misc. typo fixes
mostly non-user-facing but some doxy.
2017-08-15 12:23:49 -04:00
Robert Osfield
7b2dbc603c Fixed warning 2017-08-15 16:35:23 +01:00
Uwe Woessner
f186f6b2d4 Extension to the PLY plugin to read files with textures. 2017-08-15 15:52:35 +01:00
OpenSceneGraph git repository
86d7a903a1 Merge pull request #298 from eligovision/master
Emscripten: EGL instead of SDL2 in GLExtensions.cpp
2017-08-15 06:39:02 +01:00
konstantin.matveyev
7e0a20b4ba Merge remote-tracking branch 'upstream/master' 2017-08-14 14:58:29 +03:00
konstantin.matveyev
8e8d5b2fe0 Emscripten: EGL instead of SDL2 in GLExtensions.cpp 2017-08-14 11:19:04 +03:00
Robert Osfield
c18be2fc41 Replaced local FindZLIB.cmake usage with CMake's own FindZLIB.cmake, and ZLIB_LIBRARY to ZLIB_LIBRARIES 2017-08-09 14:18:35 +01:00
OpenSceneGraph git repository
e606e0b4de Merge pull request #296 from openscenegraph/FullScreen
From Don Burns, add use of Xinerama to ensure full screen goes across all screens.
2017-08-09 14:08:59 +01:00
Robert Osfield
b46ccd0aa5 Disabled the building of deprecated serializations in convertity_scan 2017-08-09 08:58:25 +01:00
Anna Sokol
9d1234e866 In the attached GraphicsWindowWin32.cpp file, I changed order of the "else-if" for the TOUCHEVENTF_UP and TOUCHEVENTF_MOVE, I made it less intrusive then changing them into "if" events. I tested this on Windows 7 64-bit with a touch screen and a Windows 10 64-bit tablet.
Separately in the same file, I also needed to address the fact that the close button would not react on touch so I added to the top of the "handleNativeWindowingEvent" close button handling in case of touch events. Again this was tested on the same 2 devices.
2017-08-08 13:35:35 +01:00
Robert Osfield
0d128c3a1a Added link to ABI tracker 2017-08-07 16:32:44 +01:00
Robert Osfield
fda30b36d1 Merged #pragmatic shader fix from OpenSceneGraph-3.4 branch. 2017-07-31 13:38:18 +01:00