Commit Graph

9335 Commits

Author SHA1 Message Date
Julien Valentin
71339906c0 Fixed little bug in DrawArraysLength (instancing not supported).
Corrected PrimitiveSet.cpp in order DrawArraysLength can be instanced.
It's the only pr missing code
if (_numInstances>=1)      glDrawXXXInstanced(...,_numInstances);
else glDrawXXX();
2016-06-03 17:57:04 +01:00
Robert Osfield
017ec902e2 Added -Wno-deprecated-register for Clang build to quieten warnings related to lex/yacc generated files 2016-06-03 17:38:32 +01:00
Björn Blissing
6c842a534e Last two files with fixes to the virtual inheritance warnings...
I have also attached the fix to the type shadowing problem in ConvexPolyhedron.cpp
2016-06-03 17:33:45 +01:00
Björn Blissing
abf34d2838 fix for the rest of the VS2015 virtual inheritance warnings. Same as for issues as for the Operation class. 2016-06-03 17:30:12 +01:00
Björn Blissing
66a1e564d7 Fixed VS2015 compiler warnings 2016-06-03 11:30:48 +01:00
Robert Osfield
afe89e8d94 Added float variants of osg::PI etc. in the form osg::PIf
Converted osg::PI usage to osg::PIf in ShapeDrawable.cpp to address Windows build errors
2016-06-03 11:28:10 +01:00
Robert Osfield
728c439e35 Fixed Clang warnings related to external dependencies 2016-06-03 10:18:41 +01:00
Robert Osfield
41ce857c93 Fixed clang warnings 2016-06-03 09:33:47 +01:00
Robert Osfield
b1655dd17b Moved the REGISTER_WINDOWINGSYSTEMINTERFACE macro into the osgViewer namespace 2016-06-02 17:54:24 +01:00
Robert Osfield
9aef7d2954 Removed osgViewer:: prefix to addres build error 2016-06-02 17:50:53 +01:00
Juan Hernando Vieites
42af2d3597 The current implementation of readImageFromCurrentTexture doesn't consider the texture rectangle mode.
Find attached a version of the file that corrects this issue
2016-06-02 16:04:06 +01:00
Robert Osfield
4d2221bdb3 Fixed potential memory leak 2016-06-02 15:43:31 +01:00
Robert Osfield
f10e931f82 Fixed uninitialized variable. 2016-06-02 15:41:15 +01:00
Robert Osfield
700e38ba9d Added handling of failure to create ElementBufferObject. 2016-06-02 15:35:47 +01:00
Robert Osfield
9eb9186200 Removed debugging code 2016-06-02 15:23:38 +01:00
Robert Osfield
f16b805e0d Moved status check to quieten coverity warning 2016-06-02 14:56:43 +01:00
Robert Osfield
66ee7daac3 Added missing break 2016-06-02 14:53:11 +01:00
Robert Osfield
d858195d66 Removed debug message 2016-06-02 14:38:23 +01:00
Robert Osfield
9dee2ecf33 Fixed redundent checks and clean up clone usage 2016-06-02 14:36:38 +01:00
Robert Osfield
d6b6d10611 Added missing break 2016-06-02 14:33:32 +01:00
Robert Osfield
d038866649 Fixed method to match parent class. 2016-06-02 14:31:44 +01:00
Robert Osfield
09bad85522 Fixed method to match parent class. 2016-06-02 14:30:58 +01:00
Robert Osfield
203e5f7ef8 Removed redudent codepaths, standardizing on the most portable Texture2D path. 2016-06-02 14:22:25 +01:00
Robert Osfield
5c7e155a69 Removed redudent code paths 2016-06-02 14:18:12 +01:00
Robert Osfield
26e489f17d Cleaned up the cloning usage 2016-06-02 13:51:46 +01:00
Robert Osfield
2b3ecb4af8 Fixed unitialized variables 2016-06-02 13:23:34 +01:00
Robert Osfield
b1b7d17633 Fixed build issues when OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION is set to OFF 2016-06-02 12:22:51 +01:00
Davide Raccagni
6428c33d30 Fixed version of CMakeLists.txt when you check BUILD_OPENTHREAD_WITH_QT and compile with Visual Studio 2015 2016-06-02 10:06:58 +01:00
Robert Osfield
a58f50e6fd Fixed line endings 2016-06-02 10:04:36 +01:00
Robert Osfield
853fad71ae Changed freetype plugin to utilize CMake's FindFreetype.cmake rather than use a local one. 2016-06-01 15:51:49 +01:00
Robert Osfield
1c78996a09 Added in extra search paths for FBX 2016-06-01 11:26:18 +01:00
OpenSceneGraph git repository
51e3b61555 Merge pull request #74 from susnux/fix-61
Added missing stdexcept header, fixes #61
2016-06-01 10:55:19 +01:00
Andreas Cadhalpun
e85d574334 Replace deprecated FFmpeg API to fix build with ffmpeg-3.0.x 2016-06-01 10:32:35 +01:00
Julien Valentin
5a4a5c3507 Added glDrawArraysIndirect, glMultiDrawArraysIndirect, glDrawElementsIndirect and glMultiDrawElementsIndirect extensions. 2016-06-01 10:01:44 +01:00
Ralf Habacker
fc3e30ef25 Install msvc debug files along with the binaries 2016-05-31 17:02:33 +01:00
Ralf Habacker
c31baa96de Fixed bug not detecting unc pathes in osgDB::isAbsolutePath() 2016-05-31 16:14:51 +01:00
Alberto Luaces
68baf15806 defines for building on Hurd and BSD kernels 2016-05-31 12:58:57 +01:00
Marcin Hajder
37258df59c Fix for nvtt plugin to support RGTC1/RGTC2 pixel format.
Thanks to this simple fix it's possible to compress red/red-green channel of RGB/RGBA image to GL_COMPRESSED_RED_RGTC1_EXT/GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT pixel format.
2016-05-31 12:45:28 +01:00
Nguyen Van Truong
60c3998143 I Use two touch screen in my App. I had a bug touch point in secondary screen ( the touch point not same mouse push point). 2016-05-31 11:05:02 +01:00
Robert Osfield
8336ce121e Fixed indentation 2016-05-31 10:54:38 +01:00
Robert Osfield
3bb8b73b8c Fixed warning message 2016-05-31 10:32:43 +01:00
Robert Osfield
01f1277203 Removed the redudent ive::ReadWrite base class 2016-05-31 10:28:08 +01:00
Robert Osfield
1b4aa2ce51 Removed virtual methods from base class as this was breaking the casting. Ironically this fix was required as the original "fix" for issue raised by Coverity introduced
a crash!
2016-05-31 09:46:03 +01:00
Tony Vasile
759b537250 OpenFlight-plugin with Surface Material Codes. There is one additional field that may be required by an existing application in addition to the IR Code is the IR Material. I have a small fix to include the IR Material as the User Value <UA:IRM> 2016-05-30 12:41:25 +01:00
Alberto Luaces
260cbab518 Typo fixes 2016-05-30 12:30:05 +01:00
Ralf Habacker
307001391f Fix 'unterminated_case: The case for value 7U is not terminated by a 'break' statement' in jpeg plugin.
Reported by Coverity: CID 86499: Missing break in switch (MISSING_BREAK)
2016-05-27 10:34:15 +01:00
Ralf Habacker
8851d548f9 Fix 'bad_override: Method ive::DirectionalSector::read hides
but does not override ive::ReadWrite::read because some type qualifiers do
 not match'.

Reported by Coverity: CID 86119 and 269 others
2016-05-27 10:28:26 +01:00
Robert Osfield
31592d206b Changed the RenderStageCache::RenderStageMap to use map<Referenced*, ref_ptr<RenderStage>> in place of map<CullVisitor*, ref_ptr<RenderStage>> to
avoid problems of dynamic_cast<> on an object that is being deleted.
2016-05-27 09:47:07 +01:00
Robert Osfield
110cf56a17 From Wee See, "attached a small submission, which makes the option "readObjectRecordData" of OpenFlight-plugin working like documented in the Knowledge Base of OSG (52-using-the-openflight-plugin).
Actually, if the option "readObjectRecordData" is set, ObjectRecordData will not be read and set.
With this submission, if the option "readObjectRecordData" is set, ObjectRecordData will be read and set."
2016-05-26 18:08:44 +01:00
Robert Osfield
8c7806eab3 From Philippe Renon and Robert Osfield, osgViewer::Viewer::checkNeedToDoFrame should return true when only the root node has an update callback.
Note, from Robert, I took Philippe modifications to Viewer.cpp and reformated them slightly to avoid a double check against getSceneData()!=0 and then rolled
the changes out to CompositeViewer::checkNeedToDoFrame() to ensure that both implementations work the same.
2016-05-26 17:49:06 +01:00