Commit Graph

15944 Commits

Author SHA1 Message Date
Robert Osfield
7efe889537 Added use of sizeof to make code a bit more flexible 2019-01-04 08:10:15 +00:00
Robert Osfield
49cf25718c Restructured the clean up of arrays/primitives and GL objects 2019-01-04 08:08:07 +00:00
Robert Osfield
25c60dc675 Cleaned up Geometry::dirtyGLOjects() and Geometry::releaseGLObjects() 2018-12-31 12:14:26 +00:00
Robert Osfield
337f24051b 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. 2018-12-31 11:09:21 +00:00
Julien Valentin
dd94de3121 setup camera Read/Draw Buffer
fix flickering shadows in SingleThread
2018-12-20 08:49:38 +00:00
Robert Osfield
74462c46b9 Removed examples from build as it was causing travis to timeout 2018-12-14 09:17:05 +00:00
Robert Osfield
ab32dd859b Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2018-12-13 14:08:20 +00:00
OpenSceneGraph git repository
22b1ec8fda
Merge pull request #673 from Dyuzz/patch-1
add Vec3dArray* vertex output to avoid inaccuracy
2018-12-13 14:07:44 +00:00
OpenSceneGraph git repository
d090be7b49
Fixed indentation 2018-12-13 14:06:51 +00:00
OpenSceneGraph git repository
a7623e3b04
Chnaged tabs to four spaces to fix indentation 2018-12-13 14:05:31 +00:00
Dyuzz
00480d0575
add Vec3dArray* vertex output to avoid inaccuracy 2018-12-13 21:15:07 +08:00
Julien Valentin
eb22a0c26e remove dead code 2018-12-13 08:43:50 +00:00
OpenSceneGraph git repository
53b567c9a2
Merge pull request #659 from dquam/fbx_duplicate_fix
Fix duplicate geometries in FBX export.
2018-12-07 15:01:41 +00:00
Daniel Emminizer
a4b6d8afb5 osgText::String:createUTF8EncodedString() now supports 4-byte UTF-8 strings (code points over 0x100000). 2018-12-07 14:57:34 +00:00
Derek Quam
ffd5d20a69 Fix two bugs introduced when removing the Geode visitor from the FBX
exporter.

In the Geometry visitor, use getNodePath to check if the Geometry node
is root instead of getNumParents.

Reset the state inside buildFaces to prevent duplication when a
Group is inside of Group.
2018-11-28 14:21:37 -06:00
OpenSceneGraph git repository
3ea101df66
Merge pull request #660 from mxgrey/modernize_cmake
Create a config-file and export library targets for downstream users
2018-11-26 09:03:20 +00:00
OpenSceneGraph git repository
c8ad06a223
Merge pull request #663 from flashk/patch-9
Prefer FOURCC pixel format in DDS loader
2018-11-23 12:35:37 +00:00
flashk
51f04fcc19
Prefer FOURCC pixel format in DDS loader
I have found that certain image editing programs export DDS images with both the DDPF_FOURCC and DDPF_RGB pixel format flags. The DDS loader will give preference to the DDPF_RGB flag and try to deduce the format from the RGB bit mask values instead of using the more reliable FOURCC flag. This causes some images to not load, even though the FOURCC flag is supported.  I've modified the loader so that it checks for the DDPF_FOURCC flag first, then falls back on deducing the format from the RGB bit masks.
2018-11-20 16:12:21 -08:00
Michael X. Grey
0bad4aabed
Merge pull request #1 from sbrkopac/modernize_cmake
added a new modern example of how to use cmake
2018-11-19 10:22:59 +08:00
Sam Brkopac
49bfdb7ed9 added a new modern example of how to use cmake 2018-11-16 12:42:40 -07:00
Michael X. Grey
23f680ef4a Export OpenThreads target for win32 2018-11-16 12:16:31 +08:00
Michael X. Grey
bb515c4816 Install config files to OSG-specific cmake directory 2018-11-15 16:54:58 +08:00
Michael X. Grey
ea9d61964d Fix target exporting 2018-11-15 16:38:18 +08:00
Michael X. Grey
3a850d8ace Delete unnecessary pkgconfig template files 2018-11-15 14:27:27 +08:00
Michael X. Grey
af1be65012 Automatically generate pkgconfig files instead of using manually maintained templates 2018-11-15 14:26:41 +08:00
Michael X. Grey
b1b34b51e1 Change to CamelCase package name convention 2018-11-15 12:52:11 +08:00
Michael X. Grey
7440d0c3d8 Make openscenegraph-config.cmake lowercase 2018-11-14 18:43:29 +08:00
Michael X. Grey
b65e29badc Create a config-file and export library targets for downstream users 2018-11-14 18:28:21 +08:00
Derek Quam
0c1e938bc9 Fix duplicate geometries in FBX export.
The fix to allow the export of orphaned Geometry nodes accidentally
duplicated those geometry nodes in 'normal' scene trees. This commit
refactors the code to rely on the visitor to traverse the Geometry as
opposed to traversing the Geometry in the Geode visit and the Geometry
visit.
2018-11-13 08:47:06 -06:00
Robert Osfield
85504b45f6 Restructed the setting of the OSG_GL_CONTEXT_VERSION to allow script to set it's default value 2018-11-11 10:17:37 +00:00
Robert Osfield
8636ad8394 Added make clobber target, imported in from the VSG project. 2018-11-09 11:30:57 +00:00
Robert Osfield
c424a2daaa 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. 2018-11-09 11:30:47 +00:00
OpenSceneGraph git repository
252d600a4e
Merge pull request #654 from flashk/patch-8
Fix handling of alpha values in animated gifs
2018-11-03 15:51:31 +00:00
OpenSceneGraph git repository
ba7147dd95
Replaced tabs with spaces to fix indentation 2018-11-02 08:34:43 +00:00
flashk
f4c4905d9e
Fix handling of alpha values in animated gifs
The gif loader was incorrectly setting pixels as transparent in certain animated gifs. It was ignoring the disposal method value in the extension block and always overwriting the alpha value in each frame. It is common for some animated gifs to set the disposal method so that the previous alpha value is retained. This patch modifies the loader to respect the disposal method flag.
2018-11-01 10:49:40 -07:00
Robert Osfield
7729d38b2b Removed reprecated C++ usage 2018-11-01 09:14:35 +00:00
OpenSceneGraph git repository
c934172432
Merge pull request #652 from eknabe/fbx_2019_support
Added support for FBX 2019
2018-10-29 08:14:14 +00:00
Emil Knabe
6b7bd07e33 Added support for FBX 2019 2018-10-29 07:22:50 +01:00
Robert Osfield
9a21a1d1cf Fixed build error when GL_USE_FLOAT_PLANE is used 2018-10-23 09:11:49 +01:00
Robert Osfield
bea8cd6884 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
2018-10-17 15:58:39 +01:00
OpenSceneGraph git repository
c4100174a8
Merge pull request #646 from flashk/patch-7
Use options when loading images in Collada loader
2018-10-17 14:43:13 +01:00
flashk
02e9b9b6a6
Update ReaderWriterDAE.cpp 2018-10-15 11:03:54 -07:00
flashk
3a40d93414
Update ReaderWriterDAE.cpp 2018-10-12 13:27:12 -07:00
flashk
11dfe44fb5
Update daeRMaterials.cpp 2018-10-12 13:25:13 -07:00
flashk
dbd392b8a5
Update daeReader.h 2018-10-12 13:23:23 -07:00
OpenSceneGraph git repository
bee53fc925
Merge pull request #645 from flashk/patch-6
Fix crash in Collada loader
2018-10-12 07:38:26 +01:00
flashk
6455c04198
Fix crash in Collada loader
The collada loader would crash when processing effects that didn't have a technique defined.
2018-10-11 16:13:01 -07:00
OpenSceneGraph git repository
68a9eb237b
Merge pull request #642 from tehnick/fix-build-with-gcc5.x
osgViewer: fix build with GCC < 6.x
2018-10-10 18:29:24 +01:00
OpenSceneGraph git repository
b083eebb95
Merge pull request #641 from tehnick/fix-build-with-pkg-config
Fix build of gta plugin when pkg-config is used
2018-10-10 18:28:26 +01:00
OpenSceneGraph git repository
83e51f1ab4
Merge pull request #640 from tehnick/fix-build-with-case-sensitive-includes
Fix builds with case sensitive includes
2018-10-10 18:26:03 +01:00