Commit Graph

14554 Commits

Author SHA1 Message Date
Laurens Voerman
7b67ef0c6f split travis-ci apple build into two jobs to avoid job time limit. 2017-02-03 10:01:15 +01:00
OpenSceneGraph git repository
e6822eb1a5 Merge pull request #193 from kjean667/multi_view_shared_context_fix
Bug fix to not crash when using shared context and adding / removing windowed views dynamically
2017-02-03 08:50:01 +00:00
Kjell Andersson
f5483b0ad6 Bug fix to not crash when using shared context and adding / removing windowed views dynamically.
The GLExtension object is now reused instead of creating a new when allocating a state on the same ContextID. The static map that stores the GLExtensions is only reset when all references to the extension object are released.
2017-02-02 11:46:16 +01:00
OpenSceneGraph git repository
2a7d72c203 Merge pull request #191 from LaurensVoerman/glExtentions
GLExtensions.cpp: Fixed a few typo's in old function names.
2017-01-27 15:15:39 +00:00
Laurens Voerman
9183f275f5 Fixed a few old function names.
Check extensions trough extermination string - not by function pointer value.
Added a few validContext tests to ensure no functions or isExterntionSupported bool is set for an non valid context.
Remove duplicates / merge some lines.
Removed "GL_APPLE_texture_2D_limited_npot" form isNonPowerOfTwoTextureMipMappedSupported.
2017-01-25 17:05:56 +01:00
Robert Osfield
23da167c27 Fixed linking bug caused by repeated Program::addShader()/removeShader() operations invalidating the internal attach/dettech lists. 2017-01-24 17:36:36 +00:00
OpenSceneGraph git repository
d1e162a61f Merge pull request #190 from scrawl/optimizer
Optimizer fixes
2017-01-24 09:27:07 +00:00
OpenSceneGraph git repository
00984d0e77 Merge pull request #189 from marchelbling/master
osgjs/gles updates
2017-01-24 09:15:26 +00:00
scrawl
f13fbff251 Remove CheckGeometryVisitor which was a no-op 2017-01-20 23:02:15 +01:00
scrawl
4a05caf4f7 MakeFastGeometryVisitor: fix handling of Geometries that are directly in the scene graph not attached to a Geode 2017-01-20 23:01:04 +01:00
scrawl
833f37ea57 StateVisitor: remove redundant code for Geode handling 2017-01-20 22:49:17 +01:00
scrawl
f229b19496 TessellateVisitor: fix handling of Geometries that are directly in the scene graph not attached to a Geode 2017-01-20 22:47:51 +01:00
scrawl
41cbf9a45e FlattenStaticTransformsVisitor: fix handling of Drawables that are directly in the scene graph not attached to a Geode 2017-01-20 22:43:58 +01:00
scrawl
ff1a9a195a StaticObjectDetectionVisitor: make use of apply(Drawable) visitor function 2017-01-20 21:48:45 +01:00
scrawl
764b2f60c6 TextureAtlasVisitor: fix handling of Drawables that are directly in the scene graph not attached to a Geode 2017-01-20 21:47:21 +01:00
scrawl
dc2689f779 TextureVisitor: remove redundant code for Geode handling 2017-01-20 21:47:13 +01:00
scrawl
4457df9a8a RemoveEmptyNodesVisitor: add missing isOperationPermissible check 2017-01-20 21:46:46 +01:00
scrawl
7611f95078 RemoveEmptyNodesVisitor: remove redundant code for Geode handling 2017-01-20 21:46:03 +01:00
Robert Osfield
33f7500a59 Quitened down verbose debug messages 2017-01-20 17:31:09 +00:00
Robert Osfield
e5b493289d Quitened down debug messages 2017-01-20 17:24:49 +00:00
Robert Osfield
ed596c3335 Quietened down some verbose debug messages 2017-01-20 17:07:55 +00:00
Marc Helbling
c84b667fa5 Updates osgjs from sketchfab
* updates uservalue serialization (avoid creating multie UserDataContainer for a same object)
* removes vec4ubarray specific serialization (serialization should not enforce the previous color transformation)
2017-01-20 15:17:16 +01:00
Marc Helbling
7cd7618e8c Updates gles from sketchfab
* fixes bbox issue for animated scenes
* fixes geometry split (perf + line/point primitive management)
* removes degenerated faces
2017-01-20 15:15:31 +01:00
Robert Osfield
10b6f7aa47 Fixed indentation of comment 2017-01-19 15:56:57 +00:00
Robert Osfield
255a86cbe2 Added public accessors 2017-01-17 10:52:26 +00:00
Robert Osfield
771efca5c6 Removed unused class 2017-01-16 17:18:58 +00:00
OpenSceneGraph git repository
fee45b7c46 Merge pull request #186 from hwiesmann/master
Addition of documentation for LOD and PagedLOD
2017-01-08 14:41:51 +00:00
Robert Osfield
1af1b4dfda Fixed smallTile test as it was checking against <=2^14 rather than <2^16 which is more conservative than required for a ushort container 2017-01-07 13:03:22 +00:00
Hartwig
5e0b3dacc6 Replaced tabs with spaces 2017-01-07 13:54:21 +01:00
Hartwig
2937268d53 Merge remote-tracking branch 'origin/master' into my_master 2017-01-07 10:39:29 +01:00
Hartwig
7c1098c843 Addition of documentation for LOD and PagedLOD
Documentation has been added for their default constructors. Furthermore, the consequences of different center modes have been explained. A comment regarding the setting of the radius has been fixed.
2017-01-07 09:20:56 +01:00
OpenSceneGraph git repository
3cccdaddab Merge pull request #184 from hwiesmann/master
BUG FIX - Wrong calculation of terrain normals in GeometryTechnique
2017-01-04 13:22:22 +00:00
Robert Osfield
b5c4f461bc Fixed unitialized variable access to premature calling of computeMatrix(). 2017-01-04 12:55:15 +00:00
Hartwig
192dcec5f9 Blending out of local functions
Some local functions are only needed for OS X compatibility. Define these functions only for OS X versions older than 10.6.
2017-01-01 16:33:37 +01:00
Hartwig
3c482467ea BUG FIX - Wrong calculation of terrain normals
The partial derivative for the x-coordinate has been wrongly calculated: only a single sided derivative was calculated.
2016-12-29 21:43:20 +01:00
OpenSceneGraph git repository
d36302cb0c Merge pull request #183 from rickyviking/master
Additional info when fail to load images
2016-12-23 17:23:07 +00:00
Robert Osfield
52fe86dcc9 From Hartwig Wiesmann, "ScalarsToColors returns a wrong color in case a value larger max is passed to getColor" 2016-12-23 17:16:16 +00:00
Riccardo Corsi
a526cab590 InputStream::readImage() : added info about which file failed to load when printing error message 2016-12-23 11:55:08 +01:00
OpenSceneGraph git repository
dc13d4d5dc Merge pull request #182 from LaurensVoerman/fileStats
added some info about dynamic drawables and transparent bin to Statistics
2016-12-21 17:16:30 +00:00
Robert Osfield
0052a650b8 From Torben Dannhauer, build updates for NVTT. 2016-12-21 17:02:05 +00:00
Robert Osfield
45e1523a09 From Torben Dannahauer, updates to track changes to Winddows 3rd party package 2016-12-21 16:29:38 +00:00
Robert Osfield
28799b1ff6 Refactored the minimum width of bars. 2016-12-21 16:11:39 +00:00
OpenSceneGraph git repository
2b8bcf5475 Merge pull request #180 from LaurensVoerman/stats_bars
improve stats display
2016-12-21 16:04:24 +00:00
Laurens Voerman
7a39857ea7 added some info about dynamic drawables and transparent bin to Statistics 2016-12-21 16:58:02 +01:00
OpenSceneGraph git repository
960672d093 Merge pull request #181 from LaurensVoerman/DebugFPS
DEBUG FPS counter in red and named "DEBUG Frame Rate:"
2016-12-21 15:55:50 +00:00
OpenSceneGraph git repository
bf3def9303 Merge pull request #179 from LaurensVoerman/ktx_write_support
ktx write support
2016-12-21 15:54:20 +00:00
Robert Osfield
43e506a843 From Torben Dannhauer, "When compiling OSG with DCMTK on windows, it throws an compiler error due to a missing ws2_32.lib in the linker settings." 2016-12-21 15:33:02 +00:00
Robert Osfield
b950c428a6 From Vladimir Chebaev, "Dynamic linking of fbx plugin and fbx SDK" 2016-12-21 15:13:49 +00:00
Laurens Voerman
a9657bf5e8 DEBUG FPS counter in red and named "DEBUG Frame Rate:" 2016-12-21 15:58:09 +01:00
Laurens Voerman
f567d4702d improve stats display 2016-12-21 15:47:04 +01:00