Commit Graph

  • ea17943a74 Bimped SO version due to changes in Windows exports in osgDB::ifstream + ofstream. Robert Osfield 2017-08-22 14:17:45 +01:00
  • 07d05840e9 Updated RC number to 2 for 3.4.1-rc2 Robert Osfield 2017-08-22 12:19:40 +01:00
  • d108bea9eb Updated ChangeLog Robert Osfield 2017-08-22 12:18:29 +01:00
  • 1b65adeebc Updated ChangeLog Robert Osfield 2017-08-22 12:04:18 +01:00
  • 1bc5ef030f Added name typo fix Robert Osfield 2017-08-22 11:58:49 +01:00
  • 674c25fceb Added catch for controbutors list Robert Osfield 2017-08-22 09:04:49 +01:00
  • 0dbcfff679 Added name typo fix Robert Osfield 2017-08-22 11:58:49 +01:00
  • ad98bdd165 Merge pull request #311 from eligovision/master OpenSceneGraph git repository 2017-08-22 09:22:41 +01:00
  • 6095c4f3d5 Merge pull request #312 from LaurensVoerman/vnc_plugin OpenSceneGraph git repository 2017-08-22 09:21:24 +01:00
  • 15e60acfb5 Updated ChangeLog Robert Osfield 2017-08-22 09:05:27 +01:00
  • 4710b6556d Added catch for controbutors list Robert Osfield 2017-08-22 09:04:49 +01:00
  • 3a50e2948b ReaderWriterVNC.cpp fix g++ warnings Laurens Voerman 2017-08-21 11:15:22 +02:00
  • d1453a41c2 Geometry::compileGLObjects function VAO fix Konstantin S. Matveyev 2017-08-22 10:12:36 +03:00
  • a231483ea6 Merge pull request #310 from OpenMW/merge_internalsizedformats OpenSceneGraph git repository 2017-08-22 08:03:33 +01:00
  • 16bb0561ea Merge pull request #309 from mp3butcher/osganimation OpenSceneGraph git repository 2017-08-22 08:01:40 +01:00
  • 5e48c51bd7 Reversed the order of some sizedInternalFormats enum entries to sync with the change in serach direction that was checked in as an earlier revision. Robert Osfield 2016-03-31 17:12:28 +01:00
  • f97b1626b3 fix nodevisitor construction Julien Valentin 2017-08-21 18:33:56 +02:00
  • af609dfb67 Revert commit 904619e219 as it was causeing build problems Robert Osfield 2017-08-21 16:24:34 +01:00
  • 036c6676c1 Added handling of CPACK and automatically generated package files Robert Osfield 2017-08-21 15:06:31 +01:00
  • 50cd8850f8 Added handling of CPACK and automatically generated package files Robert Osfield 2017-08-21 15:06:31 +01:00
  • 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 Robert Osfield 2017-08-21 11:40:45 +01:00
  • 70135d606e Merge pull request #307 from eligovision/master OpenSceneGraph git repository 2017-08-20 19:53:41 +01:00
  • dc005a0719 Merge pull request #308 from OpenMW/collada_valuetype_patch OpenSceneGraph git repository 2017-08-20 19:52:31 +01:00
  • fb214b62a1 Use osg::Quat::value_type instead of double in collada plugin scrawl 2017-08-20 15:56:40 +00:00
  • 6841f37ccc [*] createTexturedQuadGeometry: fixed for GL3 spec: GL_QUADS -> GL_TRIANGLES konstantin.matveyev 2017-08-20 18:01:49 +03:00
  • 55f5335f18 Merge pull request #306 from AnyOldName3/targa-type-one-support OpenSceneGraph git repository 2017-08-20 08:32:02 +01:00
  • 67a0f815e4 Add support for type-1 (colour-mapped, uncompressed) targa images to the osgTGA plugin AnyOldName3 2017-08-19 22:22:20 +01:00
  • 32f895bc5f Merge pull request #304 from eligovision/master OpenSceneGraph git repository 2017-08-19 17:20:40 +01:00
  • ed9c28b4ec Removed unneccessary DrawArrays->setCount() that was causing a crash. Robert Osfield 2017-08-18 16:26:12 +01:00
  • 904619e219 Merged addition of "" around variable from 3.4 branch Robert Osfield 2017-08-18 16:13:16 +01:00
  • 50e471d900 Merged addition of "" around variablesfrom master. Robert Osfield 2017-08-18 16:11:29 +01:00
  • 5b7ef57ad7 Fix for better picking up 3rd party dependencies Raymond de Vries 2017-08-18 16:01:31 +01:00
  • 036add8e9e glClear should not be called with zero-mask in osgUtil::RenderStage::drawImplementation Konstantin S. Matveyev 2017-08-18 10:20:26 +03:00
  • bdbff4824b Fixed iterator comparison. Robert Osfield 2017-08-18 08:08:28 +01:00
  • a3e11f1d50 Fixed iterator comparison. Robert Osfield 2017-08-18 08:08:28 +01:00
  • fa61cca6ea Merge pull request #301 from LaurensVoerman/Submit_linkWithVariables OpenSceneGraph git repository 2017-08-17 13:55:13 +01:00
  • 34b4e70015 Added version check for boolean, TRUE and FALSE settings Robert Osfield 2017-08-17 10:52:59 +01:00
  • c939f7f0fc fix for visual studio trying to link "debug.lib" and "release.lib" Laurens Voerman 2017-08-17 11:44:06 +02:00
  • 4e67d6deb2 Adopted OSG_GL*_FEATURES usage of 0 and 1 in place of false and true to avoid VisualStudio 2012 build issues Robert Osfield 2017-08-17 08:53:58 +01:00
  • af79ad451e Added remapping of CMAKE_BUILD_TYPE strings that don't have the correct case. Robert Osfield 2017-08-16 17:51:58 +01:00
  • f3adcda6b7 Removed the GLclampd declaration and replaced its usage with GLdouble to standardize the OSG extension setup with current GL/GLES headers. Robert Osfield 2017-08-16 14:20:00 +01:00
  • bfbaecaf49 Merge pull request #300 from eligovision/master OpenSceneGraph git repository 2017-08-16 11:30:14 +01:00
  • 2831fc8088 Merge pull request #299 from luzpaz/misc-typo-fixes OpenSceneGraph git repository 2017-08-16 09:04:02 +01:00
  • 237ab29ff8 Merge remote-tracking branch 'upstream/master' konstantin.matveyev 2017-08-15 22:15:31 +03:00
  • b0ef9b0c42 Text3D character/glyph size fixed konstantin.matveyev 2017-08-15 22:11:15 +03:00
  • 2cd31f65e4 misc. typo fixes luzpaz 2017-08-15 12:23:49 -04:00
  • 7b2dbc603c Fixed warning Robert Osfield 2017-08-15 16:35:23 +01:00
  • f186f6b2d4 Extension to the PLY plugin to read files with textures. Uwe Woessner 2017-08-15 15:42:22 +01:00
  • edee9d0946 Extension to the PLY plugin to read files with textures. Uwe Woessner 2017-08-15 15:42:22 +01:00
  • 86d7a903a1 Merge pull request #298 from eligovision/master OpenSceneGraph git repository 2017-08-15 06:39:02 +01:00
  • 7e0a20b4ba Merge remote-tracking branch 'upstream/master' konstantin.matveyev 2017-08-14 14:58:29 +03:00
  • 8e8d5b2fe0 Emscripten: EGL instead of SDL2 in GLExtensions.cpp konstantin.matveyev 2017-08-14 11:19:04 +03:00
  • c18be2fc41 Replaced local FindZLIB.cmake usage with CMake's own FindZLIB.cmake, and ZLIB_LIBRARY to ZLIB_LIBRARIES Robert Osfield 2017-05-23 16:33:16 +01:00
  • e606e0b4de Merge pull request #296 from openscenegraph/FullScreen OpenSceneGraph git repository 2017-08-09 14:08:59 +01:00
  • b46ccd0aa5 Disabled the building of deprecated serializations in convertity_scan Robert Osfield 2017-08-09 08:58:25 +01:00
  • 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. Anna Sokol 2017-08-08 13:35:35 +01:00
  • 0d128c3a1a Added link to ABI tracker Robert Osfield 2017-08-07 16:32:44 +01:00
  • fbb5dabdd5 Merge pull request #294 from mp3butcher/MDI6 OpenSceneGraph git repository 2017-08-06 15:30:27 +01:00
  • 899a704eb7 update IndirectCommandArrays interfaces and default impl to use DrawElements like semantic Julien Valentin 2017-08-05 18:03:27 +02:00
  • 35eb53cc95 add MDI support Julien Valentin 2017-08-02 22:10:02 +02:00
  • 7f292c3fb5 add resize methods method in CommandArrays (it allows user to work without casting to the concrete class result of MDI.getCommandArray()) move getTotalDataSize in CommandArrays interfaces comply with other DrawElementsXXX removing parameters in mdi constructors and add several method ( allow use of osgUtil::DrawElementTypeSimplifer on these) Julien Valentin 2017-08-02 21:50:25 +02:00
  • d4dda546d0 Merge pull request #293 from mp3butcher/MDI6 OpenSceneGraph git repository 2017-08-01 07:54:37 +01:00
  • 3965b4e66e fix a bug in MDI serializer Julien Valentin 2017-08-01 02:18:15 +02:00
  • e5cccefafe Merge pull request #291 from eligovision/OpenSceneGraph-3.4_animation OpenSceneGraph git repository 2017-07-31 16:47:10 +01:00
  • 2c35b63d38 [*] osgDB::OutputStream fix konstantin.matveyev 2017-07-30 20:00:12 +03:00
  • 700dd2b9a7 [+] Two classes added: osgAnimation::UpdateVec2fUniform, osgAnimation::UpdateVec4fUniform konstantin.matveyev 2017-07-30 19:55:56 +03:00
  • c1585d3c17 Merge pull request #289 from eligovision/OpenSceneGraph-3.4_apple OpenSceneGraph git repository 2017-07-31 15:06:57 +01:00
  • 76a92314cf Merge pull request #290 from eligovision/OpenSceneGraph-3.4_apple_ios OpenSceneGraph git repository 2017-07-31 15:05:26 +01:00
  • fda30b36d1 Merged #pragmatic shader fix from OpenSceneGraph-3.4 branch. Robert Osfield 2017-07-31 13:38:18 +01:00
  • 60eb458c47 [*] imageio changed: more methods of storing image supported; tested on macOS (compatibility profile) and iOS(GLES2/3) konstantin.matveyev 2017-07-30 20:03:56 +03:00
  • 7e5a9582b3 [*] osgViewer::GraphicsWindowIOS fixes konstantin.matveyev 2017-07-30 19:58:56 +03:00
  • 662e76d721 Fixed indectation Robert Osfield 2017-07-31 12:44:47 +01:00
  • 428f4a3804 Merge pull request #288 from eligovision/OpenSceneGraph-3.4_pragmatic OpenSceneGraph git repository 2017-07-31 12:42:15 +01:00
  • 23edfad1fd [**] pragma(tic) fix: 'defineMap.changed flag' condition changed in State::push/popDefineList konstantin.matveyev 2017-07-31 00:53:24 +03:00
  • 0df8e78391 Merge pull request #287 from mp3butcher/MDI6 OpenSceneGraph git repository 2017-07-31 08:09:16 +01:00
  • 9e9d3cd249 fix a bug : indices pre incremented should be post Julien Valentin 2017-07-31 03:15:03 +02:00
  • 3537460b0e Add arguments, command line usage and use DrawElementsUInt for classic case Julien Valentin 2017-07-31 03:08:52 +02:00
  • aac146c7bc correct a bug and make it more conservative Julien Valentin 2017-07-31 02:43:50 +02:00
  • 5b779ad410 Merge pull request #285 from mp3butcher/MDI6 OpenSceneGraph git repository 2017-07-30 15:40:17 +01:00
  • d810d4a4c0 add a very simple example for mdi with basevertex Julien Valentin 2017-07-30 10:15:32 +02:00
  • 0c1fad2c91 Updated AUTHORS and CHangeLog for 3.4.1-rc1 Robert Osfield 2017-07-28 17:57:02 +01:00
  • 1201ac230d Updated 3.4 branch to 3.4.1-rc1 version Robert Osfield 2017-07-28 17:43:34 +01:00
  • fc95045259 Updated version number, ChangeLog and AUTHORS file for 3.5.7 developer release Robert Osfield 2017-07-28 17:17:25 +01:00
  • d1adb9acbc Added missing break statements Robert Osfield 2017-07-28 14:34:59 +01:00
  • 3bda71ef15 Improved readability and consistency with the rest OSG by adding/removing spaces and brackets where appropriate. Robert Osfield 2017-07-28 14:32:56 +01:00
  • 5a946e218f Improved the readability and consistency with the rest of the OSG by inserting/removing spaces and line spacing. Robert Osfield 2017-07-28 13:30:36 +01:00
  • 3076779a14 Merge pull request #267 from kornerr/master OpenSceneGraph git repository 2017-07-28 10:27:47 +01:00
  • af25f14d73 Merge pull request #278 from mp3butcher/MDI2 OpenSceneGraph git repository 2017-07-28 08:46:30 +01:00
  • eabd08ef25 Attempt to fix broken DLL exports from osgDB James Turner 2016-08-05 13:16:07 +01:00
  • a45c4c8f39 set DIBO of the drawcommandarray directly in their interface constructor it makes osggpu use case lighter + drawcommandarray can't exist without a BO mp3butcher 2017-07-27 12:27:55 +02:00
  • 104b2dfc72 Promote PrimitiveSetIndirect's VBO to a target explicited DIBO (in order to benefit from BOSet queue management) mp3butcher 2017-07-27 12:00:41 +02:00
  • a5bcbc1822 Adopted FindFreetype.cmake from master Robert Osfield 2017-07-27 10:43:33 +01:00
  • a38e46a30f Merge pull request #277 from mp3butcher/MDI2 OpenSceneGraph git repository 2017-07-27 10:26:43 +01:00
  • 7606159a78 add DrawIndirectBufferObject as State variable in order to minimize call to glBindBuffer(GL_DRAW_INDIRECT_BUFFER,X) TODO: Promote PrimitiveSetIndirect's VBO to target explicited DIBO (in order to benefit from BOSet queue management) mp3butcher 2017-07-27 01:54:25 +02:00
  • 9b53775840 remove deprecated DrawIndirectBufferBinding mp3butcher 2017-07-27 01:40:04 +02:00
  • 8742ad8da6 fix some errors during renaming and cleanup code mp3butcher 2017-07-27 01:08:37 +02:00
  • b26fa74e7e add untested serializers for PrimitiveSetIndirect mp3butcher 2017-07-26 23:38:20 +02:00
  • f27c379b1e some renaming and harmonisations with osg metamodel convention mp3butcher 2017-07-26 23:36:55 +02:00
  • 8145791e6f Merge branch 'MDI2' of https://github.com/mp3butcher/OpenSceneGraph into MultiDrawIndirect Robert Osfield 2017-07-26 20:46:09 +01:00
  • 5be14bc2ba first commit for Indirect Draw integration in osg users will have to implement interfaces for their custom drawcommandarrays add a lot of new primitive set + few defines integration is made in osggpucull mp3butcher 2017-07-26 20:25:41 +02:00