Commit Graph

14521 Commits

Author SHA1 Message Date
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
Laurens Voerman
c06c57e0db ktx write support 2016-12-21 15:21:44 +01:00
Robert Osfield
5b52f8ca67 Removed debug output 2016-12-21 13:46:18 +00:00
Robert Osfield
723849c57c From Andreas Ekstrand, "he attached ESRIShape.cpp contains a small fix in parsing of PointZ features, now correctly comparing with header content length which is defined in 16-bit words.
This should have been fixed in my old submission from 2012 but was probably overlooked due to an alternative way of comparing to a fix number for this feature type.

Without this fix, the plugin will only read one PointZ feature even if multiple features exist."
2016-12-21 11:41:36 +00:00
Robert Osfield
9478d27263 Changed Program::apply() to Program::compileGLObjects() to avoid the Program::apply() setting of setLastAppliedProgramObjects for affect current state. 2016-12-21 11:02:29 +00:00
Robert Osfield
ff8b5536a5 Added StateSet::setGlobalDefaults() to fix bug when osgViewer has stats on but no scene graph assigned 2016-12-21 09:10:50 +00:00
Robert Osfield
38c515a600 Fixed handling of #define's that are used as functions 2016-12-16 16:16:50 +00:00
OpenSceneGraph git repository
ca6578026a Merge pull request #174 from etlapale/obj_plugin_improvements
Improvements for the OBJ writer plugin
2016-12-13 11:42:57 +00:00
Émilien Tlapale
34fb582074 Uncommenting missing argument. 2016-12-13 11:56:06 +01:00
Robert Osfield
d57a67e31c Added header 2016-12-13 10:47:12 +00:00
Émilien Tlapale
d0fb365e25 Adding configurable precision for OBJ output. 2016-12-13 10:58:46 +01:00
Émilien Tlapale
f16853c7bb Support for stateset in groups for OBJ. 2016-12-13 10:57:42 +01:00
Robert Osfield
d6c245a2f3 Added create angle of 20 degrees to SmoothingVisitor to improve visual quality.
Added geometry.setUseVertexBufferObjects(true) to geometry set up for improved performance.
Refactored the color set up so that by default it assigns just a single color to the geometry to improve performance.
2016-12-12 10:23:50 +00:00
Robert Osfield
3432f02d5f Renamed the iges plugin to OpenCASCADE to make it clearer what the plugin is, and added file extension aliases for stp, step, igs and iges to the OpenCASCADE plugin to enable automatic loading. 2016-12-09 17:52:17 +00:00
Robert Osfield
61462dcf97 Added support for reading from STEP (.stp) files. 2016-12-09 17:29:55 +00:00
Robert Osfield
5f0f7b88cf Refined the list of libraries to link 2016-12-09 17:29:20 +00:00
Robert Osfield
2b1477234e Converted to unix line endings 2016-12-09 17:27:17 +00:00
OpenSceneGraph git repository
811ad9c8bc Merge pull request #172 from blobfish/manipSlop
osgManiputor: TranslateInLineCommand wants Vec3d instead of Vec3
2016-12-08 17:52:46 +00:00
blobfish
a41f498e1f osgManiputor: TranslateInLineCommand wants Vec3d instead of Vec3 2016-12-08 10:12:17 -05:00
OpenSceneGraph git repository
bb36fe7d3c Merge pull request #170 from crubel/PThreadPullRequest
Fixed compile time errors that occur when you have ALLOW_PRIORITY_SCHEDULING defined
2016-12-05 10:33:23 +00:00
Curtis Rubel
98827b1d49 Missed the printf define at the top of this file.
Put back this:
#ifdef DEBUG
# define DPRINTF(arg) printf arg
#else
# define DPRINTF(arg)
#endif

I think that should do it now...
2016-12-02 08:07:15 -05:00
Curtis Rubel
c829ecf08f Removed all OSGNOTIFY messages and put back all printf output as requested.
Sorry about this mixup, I was not aware that this particular directory was to be considered a separate project and must not rely on any dependencies from the rest of the OSG project.  All OSGNOTIFY messages have been removed and the previous printf statements have been put back.
2016-12-02 08:05:30 -05:00
OpenSceneGraph git repository
98f6984018 Merge pull request #171 from aluaces/iges_fix
Several tweaks for compiling OpenCascade plugin:
2016-12-02 08:04:10 +00:00
Alberto Luaces
b637d080d5 Several tweaks for compiling OpenCascade plugin:
* Remove unneeded XSDRAW.hxx header inclusion.
* Define WNT only on windows, because it is used for choosing between
  win threads or pthreads.
2016-12-01 23:39:56 +01:00
Curtis Rubel
fab6bff310 Fixed compile time errors that occur when you have ALLOW_PRIORITY_SCHEDULING
defined.  I also replaced all printf's with OSGNOTIFY to get this
more inline with the rest of OSG CGR
2016-12-01 16:36:20 -05:00
Robert Osfield
43b051b984 Teaking FindOpenCascade to help with linking of iges plugin 2016-11-30 20:10:22 +00:00
Robert Osfield
a9bc508dc4 From Abhishek Bansal, with ammendemts by Robet Osfield to get working with recent OpenCascade and usng CMake. 2016-11-30 19:11:15 +00:00
Robert Osfield
d4a4993285 Added GL_EXT_texture_border_clamp support for GLES 2016-11-30 17:18:33 +00:00
OpenSceneGraph git repository
5a96c1313b Merge pull request #169 from scrawl/stateset-fix
Fix flow control issue in StateSet::compileGLObjects
2016-11-26 11:45:07 +00:00
scrawl
1fffafb13a Fix typo in StateSet::compileGLObjects, causing compilation of attributes to not be executed unless checkForGLErrors is true. 2016-11-26 01:09:45 +01:00
Robert Osfield
b04271f93e Fixed crash in handling of an osg::Callback attached to a Drawable as update callback.
Added handling of osg::Callback when attavhed to a Drawable as a cull callback.
2016-11-23 18:19:59 +00:00
Robert Osfield
e89885a076 Added guards against division by zero 2016-11-15 17:36:21 +00:00
Robert Osfield
55f4778731 Added usage of GLExtensions::debugObjectLabel() to GLBufferObject::compile() 2016-11-15 14:52:59 +00:00
Robert Osfield
1abd99f084 Added support for glObjectLabel debugging 2016-11-15 14:35:47 +00:00