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

16105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Osfield
87597a7fff Added osg::Node associated limited to SO version 200 and higher 2019-07-15 12:22:11 +01:00
Ralf Habacker
4902fdfbd6 Fix 'Incorrect default location for true type fonts on openSUSE' 
https://github.com/openscenegraph/OpenSceneGraph/issues/778
 2019-07-15 11:48:25 +01:00
Robert Osfield
d562587858 Added check against any empty _segments to avoid undefined behaviour 2019-07-12 17:01:26 +01:00
Robert Osfield
e327fc16df Removed debug info for constructor and destructors 2019-07-12 16:28:45 +01:00
Robert Osfield
edd0d3e35f Added FrameBufferAttachment::resizeGLObjectBuffers(..) and releaseGLObjects(..) methods 2019-07-12 16:11:45 +01:00
StefanBruens
f21f269302
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-02 20:37:02 +02:00
Colin McDonald
0f8be27e82 Trivial change to src/osgSim/LineOfSight.cpp to quieten down an info message in DatabaseCacheReadCallback::readNodeFile. 2019-07-01 16:16:18 +01:00
Robert Osfield
2691a37946 Removed stray tab 2019-07-01 15:48:29 +01:00
Robert Osfield
3783ca77c6 Merge branch 'patch-1' of https://github.com/jimcamel/OpenSceneGraph into patch-1 2019-07-01 15:41:36 +01:00
Robert Osfield
7363069725 Merge branch 'fbxMultiTexCoords' of https://github.com/rickyviking/OpenSceneGraph into fbxMultiTexCoords 2019-07-01 15:01:01 +01:00
Robert Osfield
cc92ef8191 Fixed layout 2019-07-01 14:56:30 +01:00
Julien Valentin
84983020be update traversedebug preventing traversal to disable OQN 2019-07-01 14:56:21 +01:00
Robert Osfield
73dfe77d09 Merge branch 'check-numlock-state-when-remap-keys-win32' of https://github.com/Tordan/OpenSceneGraph into check-numlock-state-when-remap-keys-win32 2019-07-01 13:37:18 +01:00
Robert Osfield
8306ce5ca6 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 13:02:28 +01:00
Konstantin S. Matveyev
32834f7e5c typo fix 2019-07-01 13:01:33 +01:00
Robert Osfield
af38ed707a Couldn't resolve warnings coming from the FBX headers so had to suppress warnings. 2019-07-01 12:19:21 +01:00
jimcamel
ae250a0d16
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-06-25 17:09:46 +12:00
OpenSceneGraph git repository
817b999d1f
Merge pull request #766 from LaurensVoerman/vwrAnimPath 
replaced "if (apm || !apm->valid())"
 2019-06-14 15:44:00 +01:00
OpenSceneGraph git repository
94e5a4f07c
Merge pull request #765 from LaurensVoerman/hdrGuard 
fix typo in header guard.
 2019-06-14 15:38:12 +01:00
OpenSceneGraph git repository
bf2f675a58
Merge pull request #762 from LaurensVoerman/fbx_writObject 
fix typo in ReaderWriterFBX: writObject -> writeObject
 2019-06-14 15:35:34 +01:00
OpenSceneGraph git repository
86fe895bd2
Merge pull request #761 from LaurensVoerman/readObject_master 
implement readObject for all relevant readerWriters
 2019-06-14 15:30:07 +01:00
Robert Osfield
77ab7827b5 From Chris Djali, merged from 3.6 branch "Various TGA improvements" 2019-06-14 15:24:50 +01:00
Laurens Voerman
27b295caa4 fix indentation for osgt files for windows dynamic library build. 2019-06-14 14:33:22 +01:00
Laurens Voerman
acddb66240 fix compile error if OSGUTIL_RENDERBACKEND_USE_REF_PTR not defined in include/osgUtil/RenderLeaf 2019-06-14 14:31:01 +01:00
Riccardo Corsi
3b7f933984 Bugfix due to copy-paste typo which prevented multi uv channel mesh to be imported correctly. 2019-06-07 12:45:45 +02:00
Alexey Galitsyn
7a53bc5238 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-05-30 23:10:27 +03:00
Laurens Voerman
6a8f4ad818 replaced "if (apm || !apm->valid())" 2019-05-22 09:52:56 +02:00
Laurens Voerman
b006a7afae fix typo in header guard. 2019-05-22 09:45:58 +02:00
Laurens Voerman
3e78992cce fix typo in ReaderWriterFBX: writObject -> writeObject 2019-05-15 11:49:17 +02:00
Laurens Voerman
7a25132b33 implement readObject for all relevant readerWriters 2019-05-14 14:36:35 +02:00
Robert Osfield
a9590ab80b Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2019-05-08 09:38:15 +01:00
OpenSceneGraph git repository
7e77f0ab66
Merge pull request #751 from LaurensVoerman/ELSIFm 
add missing E to ELSIF
 2019-05-08 09:38:00 +01:00
Laurens Voerman
e1de14c689 add missing E to ELSIF 
# Conflicts:
#	src/osgViewer/CMakeLists.txt
 2019-04-30 11:26:03 +02:00
Robert Osfield
22f4e44fa4 Fixed indentation 2019-04-26 10:47:15 +01:00
OpenSceneGraph git repository
5b688eb99d
Merge pull request #735 from Tlsirius/fix_fbx_hierarchy 
fix fbx redundant node issue
 2019-04-26 10:08:06 +01:00
Robert Osfield
5a6baf3885 Merged CMake: OSG_WINDOWING_SYSTEM fixed from the 3.6 branch 2019-04-26 09:53:49 +01:00
Wei Lisi
a8397b1caf remove tabs 2019-04-19 13:04:35 +08:00
Robert Osfield
971c2c2e90 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2019-04-12 14:26:02 +01:00
Robert Osfield
07689f7b84 Added ability to set which tree rendering techniques to build (via --featuers bitmask command line) and 
output scene to using -o outputfilename.extension command line.
 2019-04-12 14:19:59 +01:00
OpenSceneGraph git repository
3dbba705d9
Merge pull request #744 from zakalawe/master 
macOS support for glVertexAttribDivisor with legacy GL
 2019-04-11 12:44:11 +01:00
OpenSceneGraph git repository
d520fc15fb
Merge pull request #741 from flashk/patch-11 
Support loading FBX meshes with both skinning and morph target data
 2019-04-11 12:43:43 +01:00
James Turner
0081c71cde macOS support for this extension with legacy GL 
In compatibility mode (OpenGL 2.1), glVertexAttribDivisor is available
via glVertexAttribDivisorARB on macOS.
 2019-04-11 09:25:15 +01:00
flashk
c0b046ead9
Update fbxRMesh.cpp 2019-04-05 14:31:21 -07:00
Wei Lisi
249a60c328 clean up 2019-03-26 22:37:50 +08:00
Wei Lisi
97ce560f72 fix fbx hierarchy issue 2019-03-26 21:01:24 +08:00
Robert Osfield
c07d5c07c4 Fixed line ending 2019-03-26 08:06:15 +00:00
OpenSceneGraph git repository
efd8ef9e7e
Merge pull request #733 from eknabe/master 
Collada (DAE) support recognized for VisualStudio 2017
 2019-03-26 08:01:31 +00:00
Jeongseok Lee
36cceb6930
Update CMakeModules/FindCOLLADA.cmake 
Keeping old style operator to align with OSG CMake 2.8.0 support.

Co-Authored-By: eknabe <44489094+eknabe@users.noreply.github.com>
 2019-03-26 06:52:09 +01:00
Robert Osfield
b988e690bb Added basic load and compile stats collection enabled by --stats command line. 2019-03-25 14:10:25 +00:00
Robert Osfield
50d1517833 Added a call to the CullSetting::readCommnadLine(..) to make sure the --NO_CULLING and --VIEW_FRUSTUM, --VIEW_FRUSTUM_SIDES command line parameters are honoured 2019-03-25 14:10:25 +00:00