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

16008 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
OpenSceneGraph git repository
3f9ab5689c
Merge pull request #786 from rhabacker/OpenSceneGraph-3.6 
Fix 'Incorrect default location for true type fonts on openSUSE'
 2019-07-15 11:14:47 +01:00
Ralf Habacker
af5a794a82 Fix 'Incorrect default location for true type fonts on openSUSE' 
https://github.com/openscenegraph/OpenSceneGraph/issues/778
 2019-07-15 11:08:31 +02:00
Robert Osfield
faa2b1d964 Added check against any empty _segments to avoid undefined behaviour 2019-07-12 17:00:20 +01:00
Robert Osfield
ab95a79540 Removed debug info for constructor and destructors 2019-07-12 16:16:43 +01:00
Robert Osfield
079cf6c090 Added FrameBufferAttachment::resizeGLObjectBuffers(..) and releaseGLObjects(..) methods 2019-07-12 16:09:12 +01:00
StefanBruens
7dbcb4b7d3 Fix wxWidgets COMPONENTS specification, deprecated usage broken with CMake 3.14 
Current FindWxWidgets.cmake allows to specify OPTIONAL components, unfortunately
this broke the (deprecated) use of wxWidgets_USE_LIBS.

Fixes: #779
 2019-07-03 07:24:03 +01:00
Robert Osfield
634bd7f12d Updated ChangeLog for rc4 2019-07-02 20:21:45 +01:00
Robert Osfield
384cc25380 Updated SO number to refect change to the Drawable header inline method status 2019-07-02 20:21:05 +01:00
Robert Osfield
b43a59aa5d Updated in prep for 3.6.4-rc4 2019-07-02 20:19:05 +01:00
Colin McDonald
e135a85c1a Trivial change to src/osgSim/LineOfSight.cpp to quieten down an info message in DatabaseCacheReadCallback::readNodeFile. 2019-07-01 16:15:21 +01:00
Robert Osfield
2f914506e9 Updated release candidate number to 4 in prep for 3.6.4-rc4 release. 2019-07-01 16:12:53 +01: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
56e2a03378 Fixed layout 2019-07-01 13:43:29 +01:00
Robert Osfield
5fc917881d Merge branch 'patch-27' of https://github.com/mp3butcher/OpenSceneGraph into patch-27 2019-07-01 13:42:33 +01:00
Alexey Galitsyn
00e2930fb7 Fix not checking num lock state when remapping keypad keys on Windows. 
Num lock state was never checked during remapping keypad keys on Windows.
Now when num lock is active, keypad numeric keys and keypad delimeter key
should work as expected (return KEY_KP_0 to KEY_KP_9 and KEY_KP_Decimal
respectivly).
 2019-07-01 13:39:33 +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
8d505e80a9 Merge branch 'OpenSceneGraph-3.6_vas' of https://github.com/eligovision/OpenSceneGraph into OpenSceneGraph-3.6_vas 2019-07-01 12:33:21 +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
4b6d9287bc replaced "if (apm || !apm->valid())" 2019-06-14 15:46:55 +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
OpenSceneGraph git repository
52edc4af8d
Merge pull request #758 from LaurensVoerman/osgt_indentation 
fix indentation for osgt files for windows dynamic library build.
 2019-06-14 14:32:31 +01:00
OpenSceneGraph git repository
c1757aadb4
Merge pull request #757 from LaurensVoerman/rendererNoRefCount 
fix compile error if OSGUTIL_RENDERBACKEND_USE_REF_PTR not defined in include/osgUtil/RenderLeaf
 2019-06-14 14:29:32 +01:00
Julien Valentin
cfd190a9fa
update traversedebug preventing traversal to disable OQN 2019-06-08 01:17:21 +02:00
Julien Valentin
5311d6fb6b
add enable check in traverseQuery 2019-05-31 15:27:18 +02:00
Konstantin S. Matveyev
e31afbf78a typo fix 2019-05-15 14:35:39 +03:00
valid-ptr
be6bc39016 VertexArrayState's lazy disabling of vertex attributes mechanism major fix: _vertexAttribArrays must be 'shared' 2019-05-15 14:32:09 +03: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
Laurens Voerman
3ccdc66717 fix indentation for osgt files for windows dynamic library build. 2019-05-13 17:25:29 +02:00
Laurens Voerman
2f71c55da9 fix compile error if OSGUTIL_RENDERBACKEND_USE_REF_PTR not defined in include/osgUtil/RenderLeaf 2019-05-13 17:02:53 +02: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
Robert Osfield
fd014e3b52 Merged ELSEIF fix from master 2019-05-08 10:17:06 +01:00
Laurens Voerman
3f0c1daaa2 add missing E to ELSIF 
# Conflicts:
#	src/osgViewer/CMakeLists.txt
 2019-05-08 09:50:17 +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