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

16304 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
OpenSceneGraph git repository
ba2a6f7339
Merge pull request #958 from calumr/text-prop-return-early 
Return early in osgText::Text property setters
 2020-05-29 11:11:10 +01:00
Calum Robinson
6985f45882 Return early in osgText::Text property setters 
Matches what the rest of the properties are doing & avoids unnecessary
computation.
 2020-05-29 11:03:56 +01:00
Daniel Trstenjak
3fc3dcbb56 OcclusionQueryNode: don't override existing callbacks in camera 2020-05-26 19:05:42 +02:00
Daniel Trstenjak
048ece358a Camera: convenience methods to find nested callback by type 2020-05-26 19:05:34 +02:00
Tim Moore
97f955b2d4 Fix GLExtensions static order of deletion bug 
The s_glExtensionSetList could be deleted while pointers to
GLExtension objects were still held e.g., by
VertexArrayStateManager, causing a segfault. This patch uses an
observer pointer to not access already-deleted data.
 2020-05-20 18:21:49 +02:00
OpenSceneGraph git repository
3547b9853d
Merge pull request #953 from mnaehrig/master 
Fixed creation of multisample textures
 2020-05-18 09:31:51 +01:00
OpenSceneGraph git repository
f04a5103ef
Merge pull request #951 from poelmanc/patch-2 
Remove register keyword (deprecated in C++17/20)
 2020-05-18 09:31:25 +01:00
Mathias Nährig
94bc1a9b94 Update GLExtensions.cpp 
GLExtensions::glTexStorage2DMultisample in fact called glTextureStorage2DMultisample which expects texture object instead of texture target
 2020-05-18 10:01:16 +02:00
Conrad Poelman
e085a7d68a
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-15 19:21:01 -04:00
Robert Osfield
8437550c25 Added ZLIB as a build depdency to PNG plugin build 2020-05-07 11:26:54 +01:00
Julien Valentin
b8416a7aa2 prevent immutability resetting when textureobject is taken from orphans 2020-05-03 10:14:11 +01:00
Robert Osfield
c29e2e4f40 Fixed handling of non Texture texture attributes. 2020-05-03 09:27:20 +01:00
Robert Osfield
d40ab36416 Updated shaders from OpenSceneGraph-Data. 2020-04-29 12:04:13 +01:00
Robert Osfield
695b836ac6 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2020-04-29 10:51:50 +01:00
OpenSceneGraph git repository
f089d2e3e0
Merge pull request #944 from remoe/patch-1 
[macosx 10.15] Fix GC resize issue #926 from @PetrBo and @tkittel
 2020-04-29 10:51:22 +01:00
Robert Osfield
4a27b7a0a8 Merged from 3.6 branch "Add option to treat all TGA files as TGA 1.0" 2020-04-29 10:50:22 +01:00
Robert Osfield
3590e4c057 Added missing initializer 2020-04-29 10:04:46 +01:00
OpenSceneGraph git repository
a752a16331
Merge pull request #941 from poelmanc/patch-1 
Name unnamed typedef struct {...} to fix MSVC error
 2020-04-29 09:35:00 +01:00
OpenSceneGraph git repository
7856b30003
Merge pull request #937 from jasonbeverage/closezip 
Closing ZipArchive in destructor
 2020-04-29 09:19:55 +01:00
OpenSceneGraph git repository
c5df31f44d
Merge pull request #931 from scttgs0/topic-example-typo 
osgsimplegl3: fix minor typo
 2020-04-29 09:18:21 +01:00
Robert Osfield
daf4237232 Fixed crash during compile traversal 2020-04-29 09:14:56 +01:00
Remo E
3994378a20
[macosx 10.15] Fix for https://github.com/openscenegraph/OpenSceneGraph/issues/926 from @PetrBo and @tikittel 2020-04-18 10:58:57 +02:00
Conrad Poelman
3e7bdc07ab
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-09 03:19:28 -04:00
Jason Beverage
ea3e4d2b5b Closing ZipArchive in destructor 2020-03-26 14:08:31 -04:00
Scott Giese
a149f08de8 osgsimplegl3: fix minor typo 2020-03-23 19:01:54 -05:00
OpenSceneGraph git repository
f2f22df811
Merge pull request #930 from scttgs0/topic-pkgconfig-findpackage 
Improve PkgConfig usage
 2020-03-23 17:28:55 +00:00
OpenSceneGraph git repository
69d382d439
Merge pull request #929 from scttgs0/topic-vscode-ignore 
Ignore Visual Studio Code configuration
 2020-03-23 16:39:16 +00:00
OpenSceneGraph git repository
387d6a4be6
Merge pull request #925 from MozillaReality/correct-plugin-conditionalbuilds 
png and tiff plugins do not depend on C++ exceptions.
 2020-03-23 11:39:25 +00:00
Scott Giese
89450b7e11 Improve PkgConfig usage 
Including FindPkgConfig directly into scripts is not a recommended practice.
Doing so will cause CMake to complain with a warning.
Replaced with find_package(PkgConfig QUIET)
 2020-03-22 17:46:50 -05:00
Scott Giese
dcc46fe292 Ignore Visual Studio Code configuration 2020-03-22 17:41:27 -05:00
Laurens Voerman
4cce2d75bc fix bug in ProxyNode with DEFER_LOADING_TO_DATABASE_PAGER causing crash when children reorder during load. 2020-03-13 09:02:18 +00:00
Laurens Voerman
76d7ec8e0f ReaderWriterLAS recenter bug fixed, final batch of points was missed in translating the center point. 2020-03-13 08:45:39 +00:00
Robert Osfield
b2f17aa38e Added arguments to viwer construction to allow better command line control 2020-03-13 08:35:35 +00:00
Robert Osfield
9ee206f1c5 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2020-03-13 08:34:59 +00:00
OpenSceneGraph git repository
d43ae0a224
Merge pull request #920 from LaurensVoerman/Win32GWUtils_include 
move Win32GWUtils header from src to include.
 2020-03-13 08:31:31 +00:00
Philip Lamb
caf3167dbe png and tiff plugins do not depend on C++ exceptions. 2020-03-13 20:00:01 +13:00
Laurens Voerman
9eaf257a67 move Win32GWUtils header from src to include. 2020-03-02 14:48:41 +01:00
Robert Osfield
f0e89c41aa Added mutex lock to avoid threading issues when glyphs are added to a Font from multiple threads 2020-01-31 10:40:29 +00:00
Laurens Voerman
274938e3c5 Fix for older versions of fbxsdk without xml or zlib libraries, fix cmake multiconfig generators (msvc) with irrelevant CMAKE_BUILD_TYPE. 2020-01-30 16:37:36 +00:00
Robert Osfield
25868955d2 Added explicit clean up removeView 2020-01-30 16:23:47 +00:00
Stuart Mentzer
8643c0001f FBX plugin updates / PREFIX-NOTFOUND work-around 2020-01-27 10:25:34 +00:00
dedowsdi
ad11fd06be Add getPreRenderList getPostRenderList to RenderStage. 2020-01-21 09:46:35 +00:00
dedowsdi
32566420c9 Fix particle rotation. 2020-01-20 10:39:13 +00:00
Robert Osfield
25afb086ef Moved setting of isftream locale to Model::readOBJ(..) and Model::readMTL(..). 2020-01-17 09:07:58 +00:00
Robert Osfield
8f231c660a Added explict setting of local to classic to avoid local platform settings affecting parsing 2020-01-17 08:56:02 +00:00
OpenSceneGraph git repository
855f226681
Merge pull request #899 from solvingj/patch-1 
Correct condition for copying openthreads PDB
 2020-01-15 20:40:20 +00:00
Jerry
65d01832ce
Correct condition for copying openthreads PDB 
Related to issue: https://github.com/openscenegraph/OpenSceneGraph/issues/898
 2020-01-15 12:46:26 -05:00
Robert Osfield
4b857d9379 Fixed warnings 2020-01-14 16:35:00 +00:00
Robert Osfield
2ca6c55dad Fixed build warning due to auto_ptr<> 2020-01-14 14:57:15 +00:00
Robert Osfield
0405469bf0 Fixed workaround for invalid indices 2020-01-14 14:44:38 +00:00