Commit Graph

10963 Commits

Author SHA1 Message Date
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
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
23f680ef4a Export OpenThreads target for win32 2018-11-16 12:16:31 +08:00
Michael X. Grey
ea9d61964d Fix target exporting 2018-11-15 16:38:18 +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
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
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
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
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
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
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
Boris Pek
dbb00f6581 fix builds with case sensitive includes
Tested during cross-compilation for MS Windows using MinGW.
2018-10-10 02:33:47 +03:00
Robert Osfield
81998b0e65 Fixed buld 2018-10-10 13:12:07 +01:00
Antoine Lavenant
e8ceebcf57 fix apply once 2018-10-10 08:31:30 +02:00
Boris Pek
129761ea99 fix build of gta plugin when pkg-config is used
+ update related variable for build without pkg-config

Tested during cross-compilation for MS Windows using MinGW.
2018-10-10 02:06:28 +03:00
Boris Pek
b5fa3653fe osgViewer: fix build with GCC < 6.x
Tested during cross-compilation for MS Windows using MinGW.
2018-10-10 02:00:35 +03:00
Antoine Lavenant
ede5bdbbc7 fix compil 2018-10-09 14:50:20 +02:00
Antoine Lavenant
a8aa7896a4 fix precision numeric for stl writer 2018-10-09 14:02:44 +02:00
OpenSceneGraph git repository
712f468d52
Merge pull request #633 from flashk/patch-5
Fix for HDR DDS images
2018-10-04 08:54:11 +01:00
OpenSceneGraph git repository
dbf63e3fcc
Merge pull request #632 from flashk/patch-4
osgDB::OutputStream write array optimization
2018-10-04 08:53:28 +01:00
OpenSceneGraph git repository
0a6f2be9a9
Merge pull request #631 from flashk/patch-3
Fix for GifImageStream::setReferenceTime
2018-10-04 08:52:33 +01:00
flashk
aba6524ff4
Fix for HDR DDS images
The DDS loader was not applying the correct internal format for certain HDR images (e.g. float/half_float formats)
2018-10-03 14:21:03 -07:00
flashk
0891424610
osgDB::OutputStream write array optimization
I've made a change to osgDB::OutputStream::writeArrayImplementation so that it writes the array data in a single write operation for binary files. This significantly speeds up writing out osgb files for large data sets (e.g. point clouds). osgDB::InputStream already performs a similar optimization when reading array data from binary files.
2018-10-03 14:12:54 -07:00
flashk
0a37744a54
Fix for GifImageStream::setReferenceTime
Setting the reference time greater than the duration of a gif would cause a crash. Also, the current reference time is not immediately updated when manually setting the reference time.
2018-10-03 11:32:10 -07:00
flashk
24a856fa6e
Update ReaderWriterFBX.cpp 2018-10-03 09:59:34 -07:00
flashk
79120eb994
Update fbxRMesh.cpp 2018-10-03 09:52:10 -07:00
flashk
0e2e81273b
Update fbxReader.h 2018-10-03 09:49:37 -07:00
flashk
7bcf9b4bcb
Fix hardware mipmap generation for cube maps
I was getting a black image when enabling hardware mipmap generation on cubemaps. I believe the problem is that the base Texture class is hard coding GL_TEXTURE_2D when enabling mipmap generation, instead of using the target type from the derived class.
2018-10-02 09:04:26 -07:00
Robert Osfield
594e971f6d Removed unused static variables 2018-10-02 12:30:28 +01:00
Robert Osfield
5962d2580f From Andy Skinner, Added ~GLExtensions to clear cached values for context ID 2018-10-02 12:29:30 +01:00
Konstantin S. Matveyev
abd2fa53c4 1px error in GUIEventAdapter, View, Viewer and CompositeViewer major fix 2018-10-02 10:48:26 +01:00
Robert Osfield
1985927333 Standardized the glTexStorage*() calls to use osg::maximum(_numMipmapLevels,1) of rnumber of mipmaps to keep the usage consistent.
Fixed the erronous Texture2DArray glTexStorage call so that it used the _numMipmapLevels as above to resolve bug in allocation.
2018-09-12 19:11:31 +01:00
Robert Osfield
697131a39b Warning fixes 2018-09-11 15:33:55 +01:00
Laurens Voerman
583ecccd75 fix scale problem for osgText with characterSizeMode SCREEN_COORDS and _position set. 2018-09-11 11:56:59 +01:00
OpenSceneGraph git repository
0343ff7eff
Merge pull request #623 from pelicanmapping/implicit-refptr-conversion
Fixed compilation issues for implicit ref_ptr conversion OFF
2018-09-11 09:25:00 +01:00
Robert Osfield
7a4c6a8c55 Cleaned up code 2018-09-11 09:03:01 +01:00
OpenSceneGraph git repository
a9fa3cdfad
Merge pull request #622 from pelicanmapping/osgText-thread-safety-fixes
osgText: fixed thread-safety issues in Glyph and Font
2018-09-11 08:43:55 +01:00
Mathieu MARACHE
1de7b6a73e Added saving of inline Images without having the physical image file.
The can be read from and inlined image file
2018-09-11 08:35:35 +01:00
gwaldron
fac2cc46dc Fixed compilation issues for implicit ref_ptr conversion OFF 2018-09-10 13:19:42 -04:00