FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,119 Commits 1 Branch 26 Tags 73 MiB
219adb7419
Commit Graph

16119 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Conrad Poelman
91cfc02700 Remove register keyword (deprecated in C++17/20) 
The "register" keyword is deprecated as of C++17. (https://en.cppreference.com/w/cpp/keyword/register) Removing it is necessary to build with clang10+.
 2020-05-18 09:44:40 +01:00
Robert Osfield
b29fb0b870 Added ZLIB as a build depdency to PNG plugin build 2020-05-07 11:28:53 +01:00
OpenSceneGraph git repository
6ca2487362
Merge pull request #934 from mp3butcher/orphanalreadyimmutable 
[osg3.6] prevent immutability setting when textureobject is taken from orphans
 2020-05-03 09:37:44 +01:00
Julien Valentin
197fc401b4 prevent immutability resetting when textureobject is taken from orphans 2020-05-02 16:01:16 +02:00
Robert Osfield
16cd192562 Updated shaders from OpenSceneGraph-Data. 2020-04-29 12:02:52 +01:00
Remo E
2f043345c9 [macosx 10.15] Fix for https://github.com/openscenegraph/OpenSceneGraph/issues/926 from @PetrBo and @tikittel 2020-04-29 10:52:27 +01:00
Robert Osfield
24fc34a440 Merge branch 'AnyOldName3-tga-1' into OpenSceneGraph-3.6 2020-04-29 10:28:51 +01:00
Robert Osfield
decf339b74 Merge branch 'tga-1' of https://github.com/AnyOldName3/osg into AnyOldName3-tga-1 2020-04-29 10:17:11 +01:00
Conrad Poelman
889325b496 Name unnamed typedef struct {...} to fix MSVC error 
Compile with latest MSVC 16.6.0 Preview Release, got error message:
> osgPlugins\x\types.h(41,20): error C7626: unnamed class used in typedef name cannot declare members other than non-static data members, member enumerations, or member classes (compiling source file ...3rdparty\OpenSceneGraph\src\osgPlugins\x\mesh.cpp)

The fix was just to give it a name, which will never be used. I picked Vector_struct, feel free to improve.
 2020-04-29 09:45:00 +01:00
Jason Beverage
126623645f Closing ZipArchive in destructor 2020-04-29 09:25:13 +01:00
Scott Giese
6c908e9081 osgsimplegl3: fix minor typo 2020-04-29 09:18:54 +01:00
Robert Osfield
e4373b0143 Fixed crash during compile traversal 2020-04-29 09:14:01 +01:00
Chris Djali
16a5e019c5
Register option 
Also make the capitalisation consistent with more plugins
 2020-04-25 20:07:03 +01:00
AnyOldName3
597441ca33 Add option to treat all TGA files as TGA 1.0 
Some files which are malformed TGA 2.0 files are technically valid TGA 1.0 files. For example, an image that just happened to have pixel data matching the TGA 2.0 footer or files created by buggy TGA 2.0 writers and were only ever fed to TGA 1.0 readers.
 2020-04-13 20:42:57 +01:00
Scott Giese
864b087b1f Ignore Visual Studio Code configuration 2020-03-23 16:39:55 +00:00
Philip Lamb
75d03de844 png and tiff plugins do not depend on C++ exceptions. 2020-03-23 11:39:55 +00:00
OpenSceneGraph git repository
1bd75f464a
Merge pull request #918 from LaurensVoerman/proxy-3.6 
fix bug in ProxyNode with DEFER_LOADING_TO_DATABASE_PAGER
 2020-03-13 08:46:29 +00:00
OpenSceneGraph git repository
d501def836
Merge pull request #914 from LaurensVoerman/las_recenter 
ReaderWriterLAS recenter bug fixed, final batch of points was missed in translating the center point.
 2020-03-13 08:36:19 +00:00
Robert Osfield
cdbec116fa Added arguments to viwer construction to allow better command line control 2020-03-13 08:33:52 +00:00
Laurens Voerman
68c5e6e6ca fix bug in ProxyNode with DEFER_LOADING_TO_DATABASE_PAGER causing crash when children reorder during load. 2020-03-02 10:48:12 +01:00
Laurens Voerman
638069f93b ReaderWriterLAS recenter bug fixed, final batch of points was missed in translating the center point. 2020-02-19 09:49:51 +01:00
Robert Osfield
a827840baf Updated ChangeLog 2020-01-31 11:03:07 +00:00
Robert Osfield
35f3876797 Updates for 3.6.5 release 2020-01-31 11:02:47 +00:00
Robert Osfield
2e0472ba7e Added mutex lock to avoid threading issues when glyphs are added to a Font from multiple threads 2020-01-31 10:37:25 +00:00
Robert Osfield
36e47d31bd Updates for 3.6.5-rc3 2020-01-30 19:25:50 +00:00
OpenSceneGraph git repository
994ea4d203
Merge pull request #911 from LaurensVoerman/FbxSdkFix 
Fix for older versions of fbxsdk without xml or zlib libraries,
 2020-01-30 16:30:41 +00:00
Robert Osfield
54ac72a126 Added explicit clean up removeView 2020-01-30 16:21:32 +00:00
Laurens Voerman
6559295768 Fix for older versions of fbxsdk without xml or zlib libraries, fix cmake multiconfig generators (msvc) with irrelevant CMAKE_BUILD_TYPE. 2020-01-30 17:13:14 +01:00
OpenSceneGraph git repository
9b41f260d9
Merge pull request #907 from DeadParrot/OpenSceneGraph-3.6 
FBX plugin updates / PREFIX-NOTFOUND work-around
 2020-01-27 10:11:23 +00:00
Stuart Mentzer
7a442801cd FBX plugin updates / PREFIX-NOTFOUND work-around 2020-01-26 14:28:56 -05:00
Robert Osfield
f3c615631b Updater rc number for 3.6.5-rc2, and CHangeLog 2020-01-21 10:11:30 +00:00
Robert Osfield
62cd8850e2 Removed stray space 2020-01-21 09:43:08 +00:00
OpenSceneGraph git repository
14e7bc5a17
Merge pull request #902 from mp3butcher/oqn 
3.6 OQN API convergence
 2020-01-21 09:32:57 +00:00
OpenSceneGraph git repository
5ac3a982ae
Merge pull request #903 from dedowsdi/renderstage 
Add getPreRenderList, getPostRenderList to RenderStage.
 2020-01-21 09:16:51 +00:00
dedowsdi
a90a9a0a15 Add getPreRenderList getPostRenderList to RenderStage. 2020-01-21 11:00:25 +08:00
Daniel Trstenjak
995e849e8a OcclusionQueryNode: make all usages of 'updateDefaultQueryGeometry' thread safe 2020-01-20 16:44:58 +01:00
Daniel Trstenjak
ddb72691bc OcclusionQueryNode: fix resetting to default query geometry 
When the query geometry gets reset to its default then its
vertices have to be updated by the bounding box dimensions of
the current children of the OcclusionQueryNode.
 2020-01-20 16:44:48 +01:00
Daniel Trstenjak
817d92b703 OcclusionQueryNode: fix use case of user defined query geometry 
The user defined query geometry handling has been broken in several ways.

The previous way of defining a query geometry was using the non const
`getQueryGeometry` method and overriding its members. But then
`OcclusionQueryNode` wasn't aware of the geometry change and couldn't
internally handle it correctly.

The `computeBound` method never considered a user defined query geometry and
always just overrode the vertices of the geometry.

The member `_validQueryGeometry` wasn't correctly set.

This change should fix all this issues by introducing a small backward
compatibility break. The non const `getQueryGeometry` method is removed
forcing the user to use the `setQueryGeometry` method. But then `OcclusionQueryNode`
is aware of the user defined query geometry and can handle it correctly.
 2020-01-20 16:42:38 +01:00
Daniel Trstenjak
8fb5ba4a3f OcclusionQueryNode: reset the test result of the invalid geometry 
There're cases that the occlusion test result has been retrieved
after the query geometry has been changed, it's the result of the
geometry before the change.
 2020-01-20 16:24:24 +01:00
Daniel Trstenjak
3ef5d2b331 OcclusionQueryNode: ensure a valid query geometry 
If the query geometry is invalid then don't do any occlusion queries and
never traverse the subgraphs.
 2020-01-20 16:24:08 +01:00
Daniel Trstenjak
c64b94da2e OcclusionQueryNode: ensure a consistent value for '_passed' 2020-01-20 16:21:34 +01:00
Robert Osfield
19cf8b46c3 Introduced a QueryGeometry::getQueryResult(const osg::Camera*) method as a more informative replacedment for QueryGeometry::getNumPixels(). 2020-01-20 16:15:18 +01:00
OpenSceneGraph git repository
2568d1ac79
Merge pull request #900 from dedowsdi/fix_particle_rotation 
Fix particle rotation.
 2020-01-20 10:37:12 +00:00
dedowsdi
84ee98d9c4 Fix particle rotation. 2020-01-17 18:52:55 +08:00
Robert Osfield
49921bf300 Updated ChangeLog 2020-01-17 09:28:09 +00:00
Robert Osfield
b063f510c1 Moved setting of isftream locale to Model::readOBJ(..) and Model::readMTL(..). 2020-01-17 09:13:27 +00:00
Robert Osfield
396cfca1ae Added explict setting of local to classic to avoid local platform settings affecting parsing 2020-01-17 08:54:52 +00:00
Robert Osfield
aebc71a113 Updated README.md for 3.6.5-rc1 2020-01-14 16:32:29 +00:00
Robert Osfield
d8896f4bcb Updated ChangeLog and set rc candidate 1 for 3.6.5-rc1 2020-01-14 16:30:14 +00:00
Robert Osfield
b2b6ee952b Fixed warnings 2020-01-14 16:29:07 +00:00