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

16083 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Osfield
2b5e659973 Replaced GL_QUADS usage with GL_TRIANGLE_STRIP 2019-07-29 13:02:08 +01:00
Robert Osfield
8fad6bd039 Refactored the mesh setup to use GL_TRIANGLE_STIP instead of GL_QUADS 2019-07-29 12:29:25 +01:00
konstantin.matveyev
9d9273ca12 OSG_TEXT_USE_FONTCONFIG additional check needed 2019-07-26 14:52:56 +01:00
konstantin.matveyev
36a3c5f2b2 OSG_TEXT_USE_FONTCONFIG cmake option added: Set to ON to enable attempt to use FontConfig in osgText; Disabled by default for iOS and Android 2019-07-26 14:13:02 +01:00
Robert Osfield
2716c8a32b Change the DefaultFont so that it's managemed via the ObjectCache to enabl it to be release and cleared in a central manner. 
Added call to Registry::releaseGLObjects() to osgViewer/Renderer.cpp to enable automatic clean up of objects in the ObjectCache.
 2019-07-25 14:18:51 +01:00
Robert Osfield
887ecf255c Added readObject() implementations 2019-07-25 12:50:22 +01:00
Robert Osfield
62a4be7aeb Added ReaderWriterOBJ::readObject(..) implementations to address issue with using osgconv 2019-07-25 10:40:33 +01:00
Robert Osfield
d6af3f7d79 Added handling of iOS and Android to make sure FontConfig is only used for Desktop builds 2019-07-22 18:07:37 +01:00
Linan Wang
d79cad7fd1 fix typo 2019-07-19 09:21:56 +01:00
Linan Wang
4b046c7562 fix u64 and i64 allocation, setArray bug 2019-07-19 09:21:56 +01:00
Ralf Habacker
cae16c5fd7 obj plugin: Fix not writing material shininess 2019-07-18 13:29:55 +01:00
Ralf Habacker
2f71260c5a obj plugin: add option "NsIfNotPresent=" for setting the specular exponent of a material if not present 2019-07-18 13:29:37 +01:00
Ralf Habacker
4c1349c658 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-18 13:20:41 +01:00
Robert Osfield
e1dc169915 Fixed indentation 2019-07-18 12:44:59 +01:00
Robert Osfield
ebde0e0d7b Merge branch 'Fix-obj-export-texturefile' of https://github.com/longhuan2018/OpenSceneGraph into longhuan2018-Fix-obj-export-texturefile 2019-07-18 12:26:39 +01:00
Robert Osfield
772a65f282 Added handling of zero radius models 2019-07-18 12:19:38 +01:00
Robert Osfield
b957581342 Removed references OpenVRML plugin 2019-07-18 11:16:08 +01:00
Robert Osfield
d695ed816b Removed vrml plugin from build as OpenVRML plugin relies on no longer supported functionality 2019-07-18 11:14:10 +01:00
Robert Osfield
6e5ac900ea Added calls to curl_global_init and curl_global_cleanup to improve the robustness of threaded curl plugin usage 2019-07-18 10:38:10 +01:00
Long Huan
05b943a6ba Add OutputTextureFiles Option 
Add OutputTextureFiles Option support Write out the texture images to file
 2019-07-18 09:13:25 +08:00
Long Huan
59e372b05d Update OBJWriterNodeVisitor.cpp 2019-07-17 15:07:38 +08:00
Long Huan
3008b953e9 fix obj-Plugin export texture file 
Fix obj-plugin to support export texture file
 2019-07-17 14:52:10 +08:00
Ralf Habacker
58de37c9ff cmake: Add summary information to get an idea of what dependencies might be missing 2019-07-16 12:16:46 +01:00
Robert Osfield
8607ac24eb Merged Alberto Luaces commit "Avoid that mingw cross-compilation choosing X11 as the windowing system" from the OpenSceneGraph-3.6 branch 2019-07-16 11:49:32 +01:00
Robert Osfield
305210c417 Adopted the matrix transformation code from Text 2019-07-15 16:19:15 +01:00
Robert Osfield
a15ca9c8c4 Added test of picking 2019-07-15 16:19:15 +01:00
Robert Osfield
d24fd451b9 Cuietened down the reporting of failure to find fontconfig 2019-07-15 15:17:41 +01:00
Ralf Habacker
d08dbac902 obj plugin: Fix bug not adding first vertex index on writing GL_LINExxx array types 2019-07-15 14:26:36 +01:00
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