Commit Graph

  • fcdd3750c2 Replaced FindOurDCMTK.cmake usage with FindDCMTK.cmake Robert Osfield 2017-07-26 12:54:37 +01:00
  • e4b4d1aa59 Replaced local FindOurDCMTK.cmake with stock Cmake's FindDCMTK.cmake as the later is now feature complete and has full support for debug and release libraries. Robert Osfield 2017-07-26 12:26:38 +01:00
  • f822603446 Replaced State::_glExtensions initialization to be consistent with master, enabling sharing of GLExtension data structure. Robert Osfield 2017-07-26 11:12:11 +01:00
  • f449bd3730 Moved State::initializeExtensionProcs() nearer top of source file to make the position consistent with change in position in master, making it easier to diff between them. Robert Osfield 2017-07-26 11:08:46 +01:00
  • b37b635a7c Merged GLExtension deletion mechanism from master to avoid GLEXtension being deleted when shared contexts are used and osg::State is deleted when a context is deleted. Robert Osfield 2017-07-25 15:58:27 +01:00
  • 9cdeabfbb6 Merged MSVC static build fix from OpenSceneGraph-3.4 Robert Osfield 2017-07-25 14:56:27 +01:00
  • 224f837e0d Merge pull request #272 from psyinf/msvc_static_build OpenSceneGraph git repository 2017-07-25 14:45:20 +01:00
  • 1d7d1dda42 FIX: missing change in ENDIF Sebastian Messerschmidt 2017-07-21 13:12:38 +02:00
  • ac36649ed6 FIX: <CMake> attempting to install pdb-files for static targets caused failing INSTALL Sebastian Messerschmidt 2017-07-21 11:06:22 +02:00
  • 9c7a474032 Since version 2.5.1 freetype has supported the WOFF extension format. In the attached ReaderWriterFreeType.cpp file I added the following line: Anna Sokol 2017-07-17 16:46:16 +01:00
  • c32d3eb926 Since version 2.5.1 freetype has supported the WOFF extension format. In the attached ReaderWriterFreeType.cpp file I added the following line: Anna Sokol 2017-07-17 16:46:16 +01:00
  • f2176a12a7 Merge pull request #270 from caishanli/patch-1 OpenSceneGraph git repository 2017-07-17 07:53:48 +01:00
  • bdd6817cee fix StatsHandler crush on windows Cai Shanli 2017-07-03 16:24:01 +08:00
  • f992ec1440 Add osgemscripten example Michael Kapelko 2017-06-22 09:44:06 +07:00
  • 06a45ef889 Pulled in .gitignore from master Robert Osfield 2017-06-20 09:35:49 +01:00
  • 1e4f6f675b Backported GLES compatible shaders into ShaderGen Robert Osfield 2017-05-16 15:40:10 +01:00
  • e6ab01c7c6 Backported GL2/3, GLES2/3 compatible Text and StatsHandler shaders to OSG-3.4 Robert Osfield 2017-05-16 15:04:59 +01:00
  • 0b5f45289d Updated SO version number to 149 to enable uint64 object length read/writing in the .osgb format Robert Osfield 2017-06-19 15:55:42 +01:00
  • 83d08b18f8 Added version checks for when writing out new 64bit object sizes Robert Osfield 2017-06-19 15:45:35 +01:00
  • 605b3619cd Replaced long long with uint64_t Robert Osfield 2017-06-19 15:33:52 +01:00
  • eab845a4c5 Merge pull request #264 from rickyviking/binaryStreamLargeBlock OpenSceneGraph git repository 2017-06-19 15:25:04 +01:00
  • 9f3533632a Added ability for OSG serializers to get the file version number when writing out via the OutputStream object Robert Osfield 2017-06-19 12:04:03 +01:00
  • da7a0968be Merge pull request #265 from cxw42/array-classname OpenSceneGraph git repository 2017-06-19 08:50:00 +01:00
  • 883567851c Merge pull request #263 from cxw42/build-fix OpenSceneGraph git repository 2017-06-19 08:43:54 +01:00
  • ce7593c799 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph Robert Osfield 2017-06-19 08:26:24 +01:00
  • 9ba59eceaa Merge pull request #260 from blobfish/primitiveIndex OpenSceneGraph git repository 2017-06-19 08:12:47 +01:00
  • eb99df894a Make Array::className() support all Array::Type's Chris White 2017-06-16 09:58:32 -04:00
  • eff73bad76 BinaryStreamOperator: read and write block size as long long integer on 8 bytes, to accommodate arbitrarily large block size. When reading check of file version for backward compatibility. Riccardo Corsi 2017-06-14 16:09:40 +02:00
  • dbff652aed Still build even if CPACK_GENERATOR is undefined cxw 2017-06-10 22:05:19 -04:00
  • ca20eb2cba Merge pull request #261 from cxw42/doxy-osgui OpenSceneGraph git repository 2017-06-08 07:10:32 +01:00
  • 5812c267b1 Added osgUI to Doxygen-generated documentation Chris White 2017-06-07 07:50:55 -04:00
  • f5bd280b51 osg: KdTree: count degenerates to keep original primitive index in sync blobfish 2017-06-02 15:43:54 -04:00
  • bb804c2045 osg: KdTree: encode original primitive index into _vertexIndices blobfish 2017-06-01 15:25:38 -04:00
  • b52bc2bcd1 osgUtil: LineSegmentIntersector: don't increment primitive index until after adding intersection blobfish 2017-05-30 18:46:03 -04:00
  • 47efc55621 osgUtil: PolytopeIntersector: don't increment primitive index until after adding intersection blobfish 2017-05-29 12:19:08 -04:00
  • 69e1df6b65 examples: osgkeyboardmouse: add primitive index to LineSegmentIntersector output blobfish 2017-05-30 18:38:25 -04:00
  • f3c4234f92 Merge pull request #259 from jtorresfabra/fixes_kdtree OpenSceneGraph git repository 2017-06-02 09:29:05 +01:00
  • 8a2f1bc056 Fixes kdtree building Jordi 2017-05-31 13:30:50 +02:00
  • b2cd4b5836 Added TimeMultiplier and LoopingMode to ImageSequence .osg serializer Robert Osfield 2017-05-29 12:20:31 +01:00
  • 8e6a77d216 Added TimeMultiplier and LoopingMode to ImageSequence .osg serializer Robert Osfield 2017-05-29 12:20:31 +01:00
  • 09b37224ff Improved the DrawElements selction Robert Osfield 2017-05-25 13:29:42 +01:00
  • 79e764bd17 Improved support for Text with large numbers of glyphs Robert Osfield 2017-05-25 12:38:54 +01:00
  • 6d4afbbb49 Added handlng of Text with large number of characters Robert Osfield 2017-05-25 10:53:00 +01:00
  • 8b433f8364 Replaced osg::DrawElementeUInt usage for a more flexible DrawElements base class approach with the default set to DrawElementUShort to ensure compatibility with GLES2 implementes that don't support uint for glDrawElements. Robert Osfield 2017-05-25 10:41:12 +01:00
  • 502acc19c9 Build fix Robert Osfield 2017-05-25 09:54:11 +01:00
  • 2fe039e349 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph Robert Osfield 2017-05-25 09:37:30 +01:00
  • ccd79d9db1 Merge pull request #258 from kornerr/master OpenSceneGraph git repository 2017-05-25 09:37:26 +01:00
  • badb914d46 Tidied up spacing Robert Osfield 2017-05-25 08:56:53 +01:00
  • 5f446e0022 Fixed naming of OSG_USE_DEPRECATED_API Robert Osfield 2017-05-25 08:48:45 +01:00
  • 20ac472d1f Moved OSG_USE_DEPRECATED_API from include/osg/Export to Cmake controlled include/osg/Config Robert Osfield 2017-05-24 19:40:08 +01:00
  • 8c54a49319 Replaced deprecated API usage Robert Osfield 2017-05-24 19:39:36 +01:00
  • a60aed70b5 Replaced DimensionMask naming with more appropriate PrimitiveMask nameing. Robert Osfield 2017-05-24 18:34:22 +01:00
  • a201b15648 Added support for PolytopeIntersector::setDimensionsMask. Robert Osfield 2017-05-24 16:02:29 +01:00
  • 6d46a35900 Aded --dim-mask mask and --dm mask command line option for setting the PolytopeIntersector::setDimensionsMask(). Robert Osfield 2017-05-24 16:01:49 +01:00
  • 55d394490a Add x86_64 architecture to iOS simulator Michael Kapelko 2017-05-24 22:29:19 +07:00
  • 47aaca5191 Updated ChangeLog for 3.5.6 dev release Robert Osfield 2017-05-19 17:06:36 +01:00
  • 10c1fedfca Addded a GLES2 compatible osgmovie shader Robert Osfield 2017-05-16 12:32:41 +01:00
  • 90cda8ede2 Refactored COLLADA_BUILDNAME and COLLADA_BOOST_BUILDNAME to resolve case where CMAKE_VS_PLATFORM_TOOLSET is not set. Robert Osfield 2017-05-15 14:53:27 +01:00
  • 17d39e3db2 From Don Burns, add use of Xinerama to ensure full screen goes across all screens. Robert Osfield 2017-05-12 16:26:07 +01:00
  • d02be06df9 Updated AUTHORS file for dev release Robert Osfield 2017-05-11 16:32:13 +01:00
  • 36f04a04ee Updated ChangeLog Robert Osfield 2017-05-11 16:29:45 +01:00
  • 9738d19343 Build fix. Robert Osfield 2017-05-11 16:27:20 +01:00
  • 36bd42b0dd Updated SO_VERSION to reflect API changes to KdTree Robert Osfield 2017-05-11 16:10:47 +01:00
  • a74b4b94a9 Fixes/clean up of KdTree/LineSegmentIntersector/PolytopeIntersector Robert Osfield 2017-05-10 09:19:29 +01:00
  • 6e1866ac18 Added --points and --lines command line options that do a very simplistic conversion of geometry primitives to points or lines respectively, used to aid testing of intersectors Robert Osfield 2017-05-09 11:33:22 +01:00
  • 03f73d3aad Added --double and --float command line options to enable toggling between double and float precision in intersectors Robert Osfield 2017-05-09 10:36:28 +01:00
  • 1196e82587 Added missing header Robert Osfield 2017-04-27 19:12:16 +01:00
  • 40ca018e66 Introduced use of TempaltePrimitiveFunctor and TempaltePrimitiveIndexFunctor as a test of these template classes Robert Osfield 2017-04-27 19:04:54 +01:00
  • bc0a402dac Improved indentation, making it consistent with the rest of the OSG headers Robert Osfield 2017-04-27 19:04:26 +01:00
  • 9ce657f413 Created TemplatePrimitiveIndexFunctor to enable easier handling of point, lines, triangles and quad index meshes Robert Osfield 2017-04-27 19:03:05 +01:00
  • c9545970ac Removed redudent bool parameter from TriangleFunctor::operator(Vec3, Vec3, Vec3, bool) so it's now simply TriangleFunctor::operator(Vec3, Vec3, Vec3) as the bool was always false in recently OSG versions. Robert Osfield 2017-04-27 16:18:27 +01:00
  • 48a3fc30f3 Removed old style OpenGL methods from PrimitiveFunctor classes/templates as these are no longer used or required. Robert Osfield 2017-04-27 15:04:44 +01:00
  • e7e372bad2 Added support for using new IntersectFunctor for non kdtree as well as kdtree PolytopeIntersector Robert Osfield 2017-04-21 19:35:10 +01:00
  • a7d98f80dc Added ability to pass in command line arguments to the osgkeyboardmouse viewer constructor Robert Osfield 2017-04-21 19:34:22 +01:00
  • 770a52d354 Implemented the setting of all the PolytopeIntersector::Intersection values on hits detected by KdTree/Polytope intersection codes Robert Osfield 2017-04-21 16:35:55 +01:00
  • e03d9f84c6 Moved the Polytope::contains(..) triangle test into PolytopeIntersector to enable customization and optimization. Robert Osfield 2017-04-21 11:09:26 +01:00
  • e09dfb93f1 Added group intersection test that covers the window with 10000 tests, activated by pressing 'a'. I have added this to provide a reproducable intersection test for benchmarking. Robert Osfield 2017-04-21 11:07:17 +01:00
  • 0a651fef7c Added support for outputting the model, filename defaults to model.osgt, to override this use -o filename on command line, and to write the file press 'o' key. Robert Osfield 2017-04-21 10:32:26 +01:00
  • 8f5493e573 Implemented Polytope::contains(..) for triangle vertices and added support for using the results mask. Robert Osfield 2017-04-20 19:21:21 +01:00
  • 265efb85a1 Initial work on adding KdTree support for PolytopeIntersector. Robert Osfield 2017-04-19 18:18:46 +01:00
  • b77301350b Added --kdtree command line option and associated invocation of KdTreeBuilder to enable benchmarking. Added timing stats code. Robert Osfield 2017-04-19 10:20:01 +01:00
  • 728a7f2225 Merge branch 'MultiViewAutoTransform' Robert Osfield 2017-05-11 14:35:50 +01:00
  • 9f9c605422 Merge pull request #252 from remoe/patch-2 OpenSceneGraph git repository 2017-05-10 11:18:09 +01:00
  • 78d232edaf Merge pull request #254 from tomhog/topic-gles3-ios OpenSceneGraph git repository 2017-05-10 11:13:11 +01:00
  • 0af180f8b0 Merge pull request #251 from emminizer/OpenSceneGraph-3.4 OpenSceneGraph git repository 2017-05-10 11:08:27 +01:00
  • 0cc2e1f848 Merge pull request #250 from cxw42/example-osggeometry OpenSceneGraph git repository 2017-05-10 10:54:55 +01:00
  • 1f05290982 Added clarifying comments in examples/osggeometry Chris White 2017-04-24 15:55:40 -04:00
  • 6df273a865 Turned off lighting in examples/osggeometry Chris White 2017-04-24 09:44:59 -04:00
  • 8b2f61ec2a Addeed support for GLES shaders Robert Osfield 2017-05-08 12:27:07 +01:00
  • 2ce5238cf7 Added more plugins to iOS example, Textures now working on GLES3 (missed so if defineds) Thomas Hogarth 2017-05-04 18:17:30 +01:00
  • fe0b53d7f5 Added more plugins and texture shader to iOS example, fixed a couple of missed if defines for GLES3 Thomas Hogarth 2017-05-04 00:24:46 +01:00
  • 36eb0e945f Avoid call of SetupThreads in DatabasePager Remo E 2017-04-28 16:51:34 +02:00
  • a95d66a587 Replaced dynamoc_cast<osg::CullStack*> with asCullStack() to improve performance of AutoTransform, screen size based LOD and PagedLOD. Robert Osfield 2017-04-26 17:10:58 +01:00
  • 92092a56ae Refactored AutoTransform so that it dynamically computes the rotation, scale and matrices during the cull traversal to enable usage in multi-view, multi-threaded applications Robert Osfield 2017-04-26 11:50:35 +01:00
  • c5b22f341a Added ability to create windows for each view using -w command line hint. Robert Osfield 2017-04-26 09:48:08 +01:00
  • 3869714005 Added multiple view support to osgautotransform for testing multi-views Robert Osfield 2017-04-25 20:26:26 +01:00
  • a4b0dc7426 Added missing Node::asAutoTransform() + NodeVisitor::apply(AutoTransform&). Robert Osfield 2017-04-25 18:04:04 +01:00
  • b001e8d36d osgText::Glyph: Explicitly set GL_TEXTURE_MIN_FILTER to address disappearing glyphs on some Intel cards. Daniel Emminizer 2017-04-25 07:22:16 -04:00
  • 397ab4aa51 GLExtenstions: fix checking of isFrameBufferObjectSupported flag for GLES2 Alexander Roan 2017-04-24 10:38:02 +01:00
  • 3dc3dd3bd6 GLExtenstions: fix checking of isFrameBufferObjectSupported flag for GLES2 Alexander Roan 2017-04-15 00:04:51 +03:00