Commit Graph

3698 Commits

Author SHA1 Message Date
Robert Osfield
694b1c3d32 Merge branch 'OpenSceneGraph-3.6' of https://github.com/openscenegraph/OpenSceneGraph into OpenSceneGraph-3.6 2019-08-17 20:04:38 +01:00
Björn Blissing
64d9b51f91 Fixed spelling error in warning message 2019-08-17 19:50:59 +01:00
capostrophic
a3b507bb01 Fix memory leaks 2019-08-17 15:28:09 +03:00
capostrophic
cbac09902d Add support for DDPF_PALETTEINDEXED8 pixel format reading 2019-08-17 04:15:23 +03:00
Robert Osfield
e6f6de640a Added readObject() implementations 2019-07-25 12:48:21 +01:00
Robert Osfield
00679c7631 Added ReaderWriterOBJ::readObject(..) implementations to address issue with using osgconv 2019-07-25 10:39:34 +01:00
Robert Osfield
8dea265a91 Fixed indentation 2019-07-18 14:08:41 +01:00
Long Huan
7ec8b65ec4 Add OutputTextureFiles Option
Add OutputTextureFiles Option support Write out the texture images to file
2019-07-18 14:00:11 +01:00
Long Huan
c6c49c3745 Update OBJWriterNodeVisitor.cpp 2019-07-18 13:51:10 +01:00
Long Huan
acac960227 fix obj-Plugin export texture file
Fix obj-plugin to support export texture file
2019-07-18 13:50:56 +01:00
Robert Osfield
7f370bdfc6 Removed references OpenVRML plugin 2019-07-18 11:16:49 +01:00
Robert Osfield
587fd6a022 Removed vrml plugin from build as OpenVRML plugin relies on no longer supported functionality 2019-07-18 11:16:49 +01:00
Robert Osfield
730e6ad8f5 Added calls to curl_global_init and curl_global_cleanup to improve the robustness of threaded curl plugin usage 2019-07-18 10:34:53 +01:00
Ralf Habacker
cbf5b14f61 obj plugin: Fix bug not adding first vertex index on writing GL_LINExxx array types 2019-07-15 14:39:02 +02:00
Ralf Habacker
2e33cf0abc obj plugin: Fix not writing material shininess 2019-07-15 14:39:02 +02:00
Ralf Habacker
361ea5d15d obj plugin: add option "NsIfNotPresent=" for setting the specular exponent of a material if not present 2019-07-15 14:39:02 +02:00
Ralf Habacker
a3b2ac63b3 obj plugin: Fix bug not using specular color (Ks) for illumination mode > 2
See paragraph "Illumination models" at http://paulbourke.net/dataformats/mtl/ for details.
2019-07-15 14:26:31 +02:00
Robert Osfield
e5c951f5a3 Removed stray tab 2019-07-01 15:50:20 +01:00
jimcamel
9566fb7acf Fixed bug where FFmpeg Image Stream would stop if paused for more than 10 seconds
The FFmpeg image stream class uses a 10 second timeout between frames to determine if the stream is dead and if so closes it. However, the timeout is determined using the variable lastUpdateTS which stores the last time the publishNewFrame function was called, and if the video has been playing and then is paused for longer than 10 seconds, when it is unpaused this timeout will fire and the stream will be closed, stopping the video playing beyond what has been buffered.

To stop this timeout from happening before the video starts playing, the timeout checks to see if the lastUpdateTS > 0 (at initialization it is set to 0). In this fix, we simply set the value of lastUpdateTS to 0 when the video is unpaused, this will force the check to skip on unpause, and from then on lastUpdateTS will have the correct value again.

The lastUpdateTS variable is private and only used for this one function, so there should be no side effects from the change.
2019-07-01 15:50:14 +01:00
Riccardo Corsi
511f7be394 Bugfix due to copy-paste typo which prevented multi uv channel mesh to be imported correctly. 2019-07-01 15:11:23 +01:00
Robert Osfield
fe9c235806 Restructed the setting of the default osgDB::Options so it doesn't override the ObjectCacheHint setting when a user specified osgDB::Options object is passed in. 2019-07-01 12:56:36 +01:00
Robert Osfield
b6cb11b655 Couldn't resolve warnings coming from the FBX headers so had to suppress warnings. 2019-07-01 12:18:21 +01:00
Laurens Voerman
b41c5bde96 fix typo in header guard. 2019-06-14 15:38:38 +01:00
Laurens Voerman
2ac97b5ece fix typo in ReaderWriterFBX: writObject -> writeObject 2019-06-14 15:36:18 +01:00
OpenSceneGraph git repository
21c0affe66 Merge pull request #760 from LaurensVoerman/readObject
implement readObject for all relevant readerWriters
2019-06-14 15:28:46 +01:00
OpenSceneGraph git repository
68fc6ca610 Merge pull request #759 from AnyOldName3/more-tga
Various TGA improvements
2019-06-14 15:01:15 +01:00
Laurens Voerman
38727ed4b4 implement readObject for all relevant readerWriters 2019-05-14 14:25:30 +02:00
AnyOldName3
8491fd780d Add support for Targa type 3 and 11 images (greyscale) 2019-05-13 21:56:07 +01:00
AnyOldName3
7b6135f0f7 Avoid wasting memory loading optional TGA fields as RLE image data 2019-05-11 00:00:41 +01:00
AnyOldName3
05e896af7e Add support for type 9 (colour mapped, compressed) TGA images. 2019-05-10 00:04:49 +01:00
AnyOldName3
33bf30cd8c Check TGA footer if present to see if attribute channel contains alpha data 2019-05-10 00:04:08 +01:00
AnyOldName3
c9fc6e0f79 Consistently check for failed memory allocation 2019-05-08 00:59:40 +01:00
AnyOldName3
348fbfe410 Switch to using safe buffers (fixing a memory leak) 2019-05-08 00:56:42 +01:00
AnyOldName3
47ec2c7951 Cleanup TGA header interpretation
* Read the colour map `First Entry Index` field. If non-zero, error out as the format specification is vague as to what it does and different readers interpret it differently.
* Rename the variable that holds the colour map entry size as the existing name could be misinterpreted as the size of the pointer, not the thing pointed to.
* Handle images reporting themselves as 15 bits per pixel in the same way as Truevision's example code.
2019-05-04 01:19:31 +01:00
Robert Osfield
6ea8ebf25a Fixed indentation 2019-04-26 10:46:04 +01:00
Wei Lisi
2b65555d5f remove tabs 2019-04-26 10:44:04 +01:00
flashk
2439679b0c Update fbxRMesh.cpp 2019-04-26 10:43:04 +01:00
Wei Lisi
0cbf839425 clean up 2019-04-26 10:41:05 +01:00
Wei Lisi
82cae6daf4 fix fbx hierarchy issue 2019-04-26 10:41:05 +01:00
Derek Quam
6767ff540b 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.
2019-04-26 10:30:24 +01:00
Derek Quam
69ebfecfcc 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.
2019-04-26 10:30:15 +01:00
Robert Osfield
37eae8c719 Removed the optional code path hack 2019-03-14 10:46:59 +00:00
Capostrophic
12b298130a Add OSG_USE_FLOAT_QUAT build option to use single precision quaternions 2019-03-14 10:46:42 +00:00
Björn Blissing
9905b90a18 Add search location for textures in FBX plugin
The FBX plugin may fail texture lookup even if the texture is located in
the same folder as the model file. This change tries, as a last resort,
to check if the texture filename is available in the same folder as the
model.
2019-02-20 17:19:04 +00:00
Robert Osfield
46b07141e8 Added read/writeObject() entry point to FBX plugin. 2019-01-10 09:45:32 +00:00
Robert Osfield
8103da6ef1 Replaced use of heap with use of stack created ifstream to avoid potential memory leak 2019-01-09 09:51:21 +00:00
Robert Osfield
bd83044c08 Introduced use of ref_ptr<> and private destructor to tighen up memory management and avoid users attempting to inappropriately delete TexCoordRange. 2019-01-09 09:51:21 +00:00
OpenSceneGraph git repository
da7bf3ff81 Fixed indentation 2018-12-13 14:10:26 +00:00
Thomas Hogarth
e8ba57b22f Improved iOS cmake support for xcode 9.4 and cmake 3.11 2018-12-10 08:22:36 -07:00
flashk
dc2aa77d98 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-23 12:36:45 +00:00