Commit Graph

  • 036bb7b472 CMake: Win32 option added to OSG_WINDOWING_SYSTEM Konstantin S. Matveyev 2019-04-14 00:47:36 +03:00
  • b5dff94107 CMake: OSG_WINDOWING_SYSTEM fixed; FORCE flag removed valid-ptr 2019-04-14 00:04:11 +03:00
  • 1784381dc7 cMerge branch 'OpenSceneGraph-3.6' of https://github.com/openscenegraph/OpenSceneGraph into OpenSceneGraph-3.6 Robert Osfield 2019-04-12 13:57:35 +01:00
  • 9e18a7542b Added ability to set which tree rendering techniques to build (via --featuers bitmask command line) and output scene to using -o outputfilename.extension command line. Robert Osfield 2019-04-12 13:55:39 +01:00
  • 1c6fd4da9b Merge pull request #737 from eligovision/OpenSceneGraph-3.6_android OpenSceneGraph git repository 2019-04-11 12:42:22 +01:00
  • e1b3c78013 osgDB::DynamicLibrary: local lib loading on Android fixed Konstantin S. Matveyev 2019-03-29 16:25:43 +03:00
  • f263ad29db Update CMakeModules/FindCOLLADA.cmake Jeongseok Lee 2019-03-26 06:52:09 +01:00
  • dd32ee2945 Added basic load and compile stats collection enabled by --stats command line. Robert Osfield 2019-03-25 14:09:04 +00:00
  • 0b5cb65cdd Added a call to the CullSetting::readCommnadLine(..) to make sure the --NO_CULLING and --VIEW_FRUSTUM, --VIEW_FRUSTUM_SIDES command line parameters are honoured Robert Osfield 2019-03-25 12:42:28 +00:00
  • a8e78fde99 Added --NO_CULLING, --VIEW_FRSUTUM and --VIEW_FRUSTUM_SIDES/--vfs command line options for setting the Camera CullingMode value Robert Osfield 2019-03-25 12:40:41 +00:00
  • 43b274f65c Update comments and fix cmake version check Jeongseok Lee 2019-03-20 09:09:56 -07:00
  • f97ea3577d Merge pull request #727 from ccochran/OpenSceneGraph-3.6 OpenSceneGraph git repository 2019-03-19 14:33:42 +00:00
  • 9726617b6e Fixes osgViewer CMake build for Android. Colin Cochran 2019-03-18 08:55:05 -06:00
  • 997276d359 Fixes Android build for osgViewer. Colin Cochran 2019-03-16 11:59:28 -06:00
  • dceb353fe6 Replace redundant asCullVisitor usage with a type check Capostrophic 2019-03-15 15:46:58 +03:00
  • d8600411bd Merge pull request #726 from Capostrophic/linearinterpolator OpenSceneGraph git repository 2019-03-16 11:30:21 +00:00
  • 066c272f7a Override default behavior for linear vector interpolations Capostrophic 2019-03-15 21:29:13 +03:00
  • 7ebe56291f Resolve OpenGL error caused by confusion between geometry shader implementations. Chris Djali 2019-02-26 17:19:06 +00:00
  • c89a7fe67c Update StackedTransform.cpp flashk 2019-03-05 09:32:55 -08:00
  • b14bb21801 Avoid unnecessary matrix type conversion in osgParticle Capostrophic 2019-03-10 15:43:48 +03:00
  • 37eae8c719 Removed the optional code path hack Robert Osfield 2019-03-14 10:13:15 +00:00
  • 12b298130a Add OSG_USE_FLOAT_QUAT build option to use single precision quaternions Capostrophic 2019-03-13 20:05:12 +03:00
  • c548289ac1 Merge pull request #724 from AnyOldName3/more-gitignore OpenSceneGraph git repository 2019-03-14 09:39:40 +00:00
  • 2ebde09aff Add Visual Studio cache/options directory to .gitignore AnyOldName3 2019-03-13 23:13:41 +00:00
  • 049f88325a Add missing documentation build files to .gitignore AnyOldName3 2019-03-13 23:13:00 +00:00
  • cc68d7f151 Streamline the animation path completion message Robert Osfield 2019-02-25 15:06:54 +00:00
  • 5770774e00 OcclusionQueryNode: reset the test result of the invalid geometry Daniel Trstenjak 2019-01-29 14:40:16 +01:00
  • 5624a22fe4 OcclusionQueryNode: ensure a valid query geometry Daniel Trstenjak 2019-01-29 11:37:28 +01:00
  • 9905b90a18 Add search location for textures in FBX plugin Björn Blissing 2019-02-04 14:46:42 +01:00
  • 6d5c6ad6cc Merge pull request #704 from mp3butcher/patch-24 OpenSceneGraph git repository 2019-02-20 16:54:23 +00:00
  • 971eba37ad Added override for broken bindings Robert Osfield 2019-02-20 16:31:58 +00:00
  • 43574b52c1 uncomment INLINE_DRAWABLE_DRAW Julien Valentin 2019-01-28 01:40:35 +01:00
  • 625c771641 Updates for 3.6.4-rc3 Robert Osfield 2019-01-26 19:36:30 +00:00
  • 1504a54cd8 Merge pull request #702 from mp3butcher/fix36 OpenSceneGraph git repository 2019-01-26 18:21:47 +00:00
  • 0f2e9e6557 Added missing {} to fix getPassed() bug introducted by previus commit Robert Osfield 2019-01-26 18:10:44 +00:00
  • cd150cbe96 OcclusionQueryNode: ensure a consistent value for '_passed' Daniel Trstenjak 2019-01-25 15:02:45 +01:00
  • 02d7d980a7 Introduced a QueryGeometry::getQueryResult(const osg::Camera*) method as a more informative replacedment for QueryGeometry::getNumPixels(). Robert Osfield 2019-01-26 16:33:23 +00:00
  • c8521068a5 OcclusionQueryNode: add resetting of queries Daniel Trstenjak 2019-01-23 12:10:00 +01:00
  • 832d8d5228 fix variable name mp3butcher 2019-01-23 17:06:04 +01:00
  • bdd0be2f8f Changed member variable name to be consistent with header OpenSceneGraph git repository 2018-08-17 09:22:40 +01:00
  • 968a427e00 Changed the member variable to be consistent with the method name. OpenSceneGraph git repository 2018-08-17 09:21:31 +01:00
  • b8f9249bea add a bool parameter to allow forced reindexation of a mesh mp3butcher 2018-08-16 00:18:24 +02:00
  • e2fb88e187 Commented out the reset of the _vertexArrayObject = 0 as it was break later State::resetCurrentVertexArrayStateOnMatch() calls ability to reset the State::_currentVAO when required. Robert Osfield 2019-01-23 15:40:13 +00:00
  • 749dc86dd3 Fixed typo Robert Osfield 2019-01-23 08:52:11 +00:00
  • 84bae01643 Added separate test and rest of _currentVAO to State::resetCurrentVertexArrayStateOnMatch(..) method Robert Osfield 2019-01-22 20:21:56 +00:00
  • 8a5d1b9f44 Changed resetCurrentVertexArrayStateOnMatch() to reset _vas tp _globalVertexArrayState and currentVAO to 0. Robert Osfield 2019-01-21 18:13:43 +00:00
  • 488b4854b2 Added reset of the State::CurrentVertexArrayState() to prevent the State::_vas becoming a dangling pointer when VertexArrayState objects are deleted. Robert Osfield 2019-01-21 17:36:40 +00:00
  • 6455159757 Added calling of releaseGLObjects() and resizeGLObjects() to the Camera DrawCallback's to enable the draw callbacks to clean up their own GL objects. Robert Osfield 2019-01-19 16:16:53 +00:00
  • 2e68db5b55 Merge pull request #693 from LaurensVoerman/glObj_C4250 OpenSceneGraph git repository 2019-01-17 17:24:22 +00:00
  • 2e29085669 fix MSVC warning C4250: inherits 'X' via dominance (94x) Laurens Voerman 2019-01-17 16:22:51 +01:00
  • f223fec92d Added derpecated and thread unsafe warning message to docs of ObjectCache::getgetFromObjectCache() Robert Osfield 2019-01-14 11:55:24 +00:00
  • cc3cb92ddc Merge pull request #691 from LaurensVoerman/clrObjCache OpenSceneGraph git repository 2019-01-14 10:23:05 +00:00
  • 4dcb2bbf3c Added using to quieten VS warnings Robert Osfield 2019-01-14 09:55:00 +00:00
  • eeb13d1efc clear temp objectCache in databaseRequest Laurens Voerman 2019-01-14 10:19:41 +01:00
  • fe98c3d7f5 Moved resizeGLObjects/releaseGLObjects out of Referenced to avoid multiple inheritance warnings Robert Osfield 2019-01-12 11:27:18 +00:00
  • 46b07141e8 Added read/writeObject() entry point to FBX plugin. Robert Osfield 2019-01-10 09:45:32 +00:00
  • 02bfd05d6f Upated ChangeLog Robert Osfield 2019-01-09 10:22:54 +00:00
  • 035abfdb71 Updated for 3.6.4-rc2 Robert Osfield 2019-01-09 10:19:34 +00:00
  • 0c99326db3 Added cmake package configuration files to gitignore Robert Osfield 2019-01-09 08:51:29 +00:00
  • 8103da6ef1 Replaced use of heap with use of stack created ifstream to avoid potential memory leak Robert Osfield 2019-01-09 08:43:08 +00:00
  • bd83044c08 Introduced use of ref_ptr<> and private destructor to tighen up memory management and avoid users attempting to inappropriately delete TexCoordRange. Robert Osfield 2019-01-09 08:38:16 +00:00
  • f6b64afdfc Fixed for crashes on exit associaciated with VAO usage and vairous niche usage cases Robert Osfield 2019-01-08 19:32:50 +00:00
  • 1c65815f4e Fixed crash on exit issues with osgFX, osgParticle, osgSim and the osgforest example Robert Osfield 2019-01-07 17:46:02 +00:00
  • 5e9be10da6 Merged changes from master Robert Osfield 2019-01-07 10:25:13 +00:00
  • 820532ddff Updated rc number for 3.6.4 release candidate Robert Osfield 2019-01-04 09:22:12 +00:00
  • 6951c44464 Updated ChangeLog and AUTHORS in prep for 3.6.4 work Robert Osfield 2019-01-04 09:10:39 +00:00
  • e12049ed47 Added use of sizeof to make code a bit more flexible Robert Osfield 2019-01-04 08:10:15 +00:00
  • fd47b84bd7 Restructured the clean up of arrays/primitives and GL objects Robert Osfield 2019-01-04 08:08:07 +00:00
  • b7947b13f3 Changed the clean up of the GL objects on destruction so that the destructors of the arrays/primitives themselves do the release rather than have it done explictly in the destructor. This allows arrays/primitives to be shared. Robert Osfield 2018-12-31 11:06:45 +00:00
  • 7a601753e0 Merge pull request #679 from mp3butcher/patch-18 OpenSceneGraph git repository 2018-12-20 08:46:12 +00:00
  • 07e5480b57 setup camera Read/Draw Buffer Julien Valentin 2018-12-19 18:30:26 +01:00
  • ea1e832d4d Removed examples from build as it was causing travis to timeout Robert Osfield 2018-12-14 09:14:26 +00:00
  • da7bf3ff81 Fixed indentation OpenSceneGraph git repository 2018-12-13 14:06:51 +00:00
  • a6fbf73f36 Merge pull request #671 from mp3butcher/patch-16 OpenSceneGraph git repository 2018-12-13 08:31:27 +00:00
  • ef8fd268de Merge pull request #672 from ccochran/OpenSceneGraph-3.6 OpenSceneGraph git repository 2018-12-13 08:01:24 +00:00
  • 064c39a7f3 remove dead code Julien Valentin 2018-12-11 23:56:47 +01:00
  • 5eb9ab1d75 removed ios simulator reference, adjusted readme Thomas Hogarth 2018-07-23 23:52:16 +01:00
  • e8ba57b22f Improved iOS cmake support for xcode 9.4 and cmake 3.11 Thomas Hogarth 2018-07-10 02:09:28 +01:00
  • 47aa320787 Merge pull request #670 from emminizer/four-byte-utf8 OpenSceneGraph git repository 2018-12-07 14:53:52 +00:00
  • 3a3ddfce49 osgText::String:createUTF8EncodedString() now supports 4-byte UTF-8 strings (code points over 0x100000). Daniel Emminizer 2018-12-06 14:07:55 -05:00
  • dc2aa77d98 Prefer FOURCC pixel format in DDS loader flashk 2018-11-20 16:12:21 -08:00
  • aa6cd2d7da Added, currently commented out, alias for .vsga and .vsgb to help with automatic loading a vsg plugin when .vsga and .vsgb files are encountered. Robert Osfield 2018-11-20 14:24:24 +00:00
  • 658fd4d19d Added support for reading and writing images Robert Osfield 2018-11-20 14:19:37 +00:00
  • 8b4359b77e Restructed the setting of the OSG_GL_CONTEXT_VERSION to allow script to set it's default value Robert Osfield 2018-11-11 10:14:50 +00:00
  • c5d00bc223 Added make clobber target, imported in from the VSG project. Robert Osfield 2018-11-09 11:28:57 +00:00
  • 1eedae844e Removed 12 year old workaround that is no longer required and was causing a misleading info message "OpenGL extension '' is not supported." to be reported. Robert Osfield 2018-11-09 11:25:16 +00:00
  • e819ea9c0e Replaced tabs with spaces to fix indentation OpenSceneGraph git repository 2018-11-02 08:34:43 +00:00
  • 15b9a493ed Fix handling of alpha values in animated gifs flashk 2018-11-01 10:49:40 -07:00
  • 0341d6f873 Removed reprecated C++ usage Robert Osfield 2018-11-01 09:13:43 +00:00
  • 3577fd9d90 Added support for FBX 2019 Emil Knabe 2018-10-29 07:22:50 +01:00
  • a47294a580 Merge pull request #649 from LaurensVoerman/3.6-dae OpenSceneGraph git repository 2018-10-23 08:44:55 +01:00
  • 452802b168 Update daeRMaterials.cpp flashk 2018-10-12 13:25:13 -07:00
  • 5a3f2e287c Update daeReader.h flashk 2018-10-12 13:23:23 -07:00
  • bf5a88870f Added check under Windows for a concatinated path that exceeds the MAX_PATH so that it isn't used for file IO operations that could lead to undefined behavior https://github.com/openscenegraph/OpenSceneGraph/issues/634 Robert Osfield 2018-10-17 15:55:10 +01:00
  • 8af46a6e98 Update ReaderWriterDAE.cpp flashk 2018-10-15 11:03:54 -07:00
  • 56617a4bfb Fix crash in Collada loader flashk 2018-10-11 16:13:01 -07:00
  • 7eaceb0baa fix builds with case sensitive includes Boris Pek 2018-10-10 02:33:47 +03:00
  • 8feae585e1 Fixed buld Robert Osfield 2018-10-10 13:10:55 +01:00
  • fa7843d520 fix apply once Antoine Lavenant 2018-10-10 08:31:30 +02:00
  • d48a304569 Fix for HDR DDS images flashk 2018-10-03 14:21:03 -07:00