FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,739 Commits 1 Branch 26 Tags 73 MiB
9ce657f413
Commit Graph

14739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Osfield
9ce657f413 Created TemplatePrimitiveIndexFunctor to enable easier handling of point, lines, triangles and quad index meshes 2017-05-11 15:25:10 +01:00
Robert Osfield
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. 2017-05-11 15:25:10 +01:00
Robert Osfield
48a3fc30f3 Removed old style OpenGL methods from PrimitiveFunctor classes/templates as these are no longer used or required. 2017-05-11 15:25:10 +01:00
Robert Osfield
e7e372bad2 Added support for using new IntersectFunctor for non kdtree as well as kdtree PolytopeIntersector 2017-05-11 15:25:10 +01:00
Robert Osfield
a7d98f80dc Added ability to pass in command line arguments to the osgkeyboardmouse viewer constructor 2017-05-11 15:25:10 +01:00
Robert Osfield
770a52d354 Implemented the setting of all the PolytopeIntersector::Intersection values on hits detected by KdTree/Polytope intersection codes 2017-05-11 15:25:10 +01:00
Robert Osfield
e03d9f84c6 Moved the Polytope::contains(..) triangle test into PolytopeIntersector to enable customization and optimization. 2017-05-11 15:25:10 +01:00
Robert Osfield
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. 2017-05-11 15:25:10 +01:00
Robert Osfield
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. 2017-05-11 15:25:10 +01:00
Robert Osfield
8f5493e573 Implemented Polytope::contains(..) for triangle vertices and added support for using the results mask. 2017-05-11 15:25:10 +01:00
Robert Osfield
265efb85a1 Initial work on adding KdTree support for PolytopeIntersector. 2017-05-11 15:25:10 +01:00
Robert Osfield
b77301350b Added --kdtree command line option and associated invocation of KdTreeBuilder to enable benchmarking. 
Added timing stats code.
 2017-05-11 15:25:10 +01:00
Robert Osfield
728a7f2225 Merge branch 'MultiViewAutoTransform' 2017-05-11 14:35:50 +01:00
OpenSceneGraph git repository
9f9c605422 Merge pull request #252 from remoe/patch-2 
Avoid call of SetupThreads in DatabasePager Constructor
 2017-05-10 11:18:09 +01:00
OpenSceneGraph git repository
78d232edaf Merge pull request #254 from tomhog/topic-gles3-ios 
Topic gles3 ios
 2017-05-10 11:13:11 +01:00
OpenSceneGraph git repository
0cc2e1f848 Merge pull request #250 from cxw42/example-osggeometry 
Added comments to make code easier to understand. Turned off lighting in examples/osggeometry
 2017-05-10 10:54:55 +01:00
Chris White
1f05290982 Added clarifying comments in examples/osggeometry 
Per reviewer feedback
 2017-05-09 15:51:24 -04:00
Chris White
6df273a865 Turned off lighting in examples/osggeometry 
This way you can see the image and the points even if you view them
close to edge-on.
 2017-05-09 15:51:24 -04:00
Robert Osfield
8b2f61ec2a Addeed support for GLES shaders 2017-05-08 12:27:07 +01:00
Thomas Hogarth
2ce5238cf7 Added more plugins to iOS example, Textures now working on GLES3 (missed so if defineds) 2017-05-04 18:17:30 +01:00
Thomas Hogarth
fe0b53d7f5 Added more plugins and texture shader to iOS example, fixed a couple of missed if defines for GLES3 2017-05-04 00:24:46 +01:00
Remo E
36eb0e945f Avoid call of SetupThreads in DatabasePager 
This solves a bug with some shared library configurations. Sometimes the DatabasePager Singleton is initialised before one can call other configuration options like "setNumOfDatabaseThreadsHint". But OSG initialise it here:

https://github.com/openscenegraph/OpenSceneGraph/blob/master/src/osgDB/DatabasePager.cpp#L1555 

So this call is not needed?!
 2017-04-28 16:51:34 +02:00
Robert Osfield
a95d66a587 Replaced dynamoc_cast<osg::CullStack*> with asCullStack() to improve performance of AutoTransform, screen size based LOD and PagedLOD. 2017-04-26 17:10:58 +01:00
Robert Osfield
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 2017-04-26 11:50:35 +01:00
Robert Osfield
c5b22f341a Added ability to create windows for each view using -w command line hint. 2017-04-26 09:48:08 +01:00
Robert Osfield
3869714005 Added multiple view support to osgautotransform for testing multi-views 2017-04-25 20:26:26 +01:00
Robert Osfield
a4b0dc7426 Added missing Node::asAutoTransform() + NodeVisitor::apply(AutoTransform&). 2017-04-25 18:04:04 +01:00
Alexander Roan
3dc3dd3bd6 GLExtenstions: fix checking of isFrameBufferObjectSupported flag for GLES2 2017-04-24 10:19:58 +01:00
OpenSceneGraph git repository
7c926db2bd Merge pull request #249 from uhertlein/master 
Fixes compiler warning regarding logic vs bitwise AND
 2017-04-23 21:23:14 +01:00
Ulrich Hertlein
c5450394b0 RAII memory management for macOS image loading 
- use std::vector instead of manual memory management
- removes dead/commented code
 2017-04-23 21:38:38 +02:00
Ulrich Hertlein
b26e350e72 Updates the macOS build instructions in README.md. 
- Removes obsolete instructions regarding x86_64 vs i386, Cocoa vs Carbon, etc
- Markdown formatting changes
 2017-04-23 21:38:37 +02:00
Ulrich Hertlein
e723c6d63b Fixes compiler warning regarding logic vs bitwise AND 2017-04-23 11:52:05 +02:00
Farshid Lashkari
9bc93fb18e There 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. 2017-04-18 17:01:26 +01:00
Farshid Lashkari
2523dee7e0 Modified the FBX loader to support bump, specular, and gloss maps. I've attached a zip containing the modified files. 2017-04-18 16:40:56 +01:00
Farshid Lashkari
420d3065f4 When 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: 
c168887e5e

This commit inverted the value of the "fSign" variable, but did not update the previous code that used the variable. I've attached the change that restores the original behavior when not using the "ZUp"
 2017-04-18 16:01:58 +01:00
Robert Osfield
d9b62b39e1 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2017-04-07 17:35:58 +01:00
OpenSceneGraph git repository
a7548794c0 Merge pull request #244 from LaurensVoerman/submit_osgtMissingTextureCrash 
fix a crash when reading an osgt file with multiple references to a missing texture.
 2017-04-07 17:34:22 +01:00
OpenSceneGraph git repository
004cbb4b78 Merge pull request #245 from LaurensVoerman/submit_dupeEnum 
remove info message about GL_LINES_ADJACENCY_EXT / GL_LINES_ADJACENCY
 2017-04-07 17:33:25 +01:00
Laurens Voerman
36fc30d8e7 avoid INFO message about duplicate enums with and without _EXT 2017-04-07 15:56:32 +02:00
Laurens Voerman
4bc855b610 fix a crash when reading an osgt file with multiple references to a missing texture. 2017-04-07 15:27:56 +02:00
jamie robertson
f16167c3e8 osgbindlesstext 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. 2017-04-07 07:15:30 +01:00
Robert Osfield
43891d6cc1 Removed unneccessary EXT usage 2017-04-07 07:11:57 +01:00
Jamie Robertson
0e69fe6bc6 VS build fix 2017-04-07 07:09:24 +01:00
Konstantin Matveyev
0f04d2f032 Added dynamic update of Text3D test 2017-04-06 10:51:47 +01:00
OpenSceneGraph git repository
977bd22e36 Merge pull request #243 from mp3butcher/moreExtensions 
add Extensions
 2017-04-05 17:39:05 +01:00
OpenSceneGraph git repository
4c1634c9d7 Merge pull request #242 from mp3butcher/LuaMatrix 
few fixes for lua Matrix support..
 2017-04-05 17:37:51 +01:00
mp3butcher
8d40323761 add Extensions 2017-04-05 18:11:50 +02:00
mp3butcher
0993edda11 forgot a lua_pop(_lua, 16) 2017-04-05 17:59:06 +02:00
mp3butcher
912f9e18cb few fixes for Matrix support.. 
but getElements still fails..
 2017-04-05 17:57:08 +02:00
Torben Dannhauer
67ef816da0 Update to FindCollada.cmake to handle Visual Studio 2017 binaries 2017-04-05 12:01:55 +01:00