Commit Graph

14324 Commits

Author SHA1 Message Date
OpenSceneGraph git repository
0873a69ff5 Merge pull request #124 from LaurensVoerman/Submissions3
RigTransformHardware fix: warn; don't crash if MAX_MATRIX not found
2016-09-02 17:28:40 +01:00
Laurens Voerman
92ca556243 fix the missing ")" in BasicAnimationManager copy constuctor 2016-08-29 17:00:00 +02:00
Laurens Voerman
1da43a5960 added copyconstructor for osgAnimation::BasicAnimationManager 2016-08-29 13:03:36 +02:00
Laurens Voerman
628f8fd9dc added call to copy constructor for virtual base classes in copy constructor of derived classes, removed these for abstract classes 2016-08-29 10:41:40 +02:00
Laurens Voerman
d0020b7dfc bugfix: osg::TextureBuffer::clone() crash 2016-08-29 10:01:48 +02:00
Laurens Voerman
0433d29d11 bugfix: osgVolume::ScalarProperty clone crash 2016-08-29 10:01:48 +02:00
Laurens Voerman
ca877a8424 fix colliding include guards and spurious #define OSGUI_EXPORT 2016-08-29 09:40:21 +02:00
Laurens Voerman
dd223002dd bugfix: wrong class name in META_Object macro for osg::Enablei osg::Disablei 2016-08-29 09:37:14 +02:00
Robert Osfield
2e6f0d7aab Quitened unused parameter warnings 2016-08-26 19:28:36 +01:00
Robert Osfield
0ad09d6dad Fixed unused variable warnings 2016-08-26 19:18:00 +01:00
Robert Osfield
322adc266c Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2016-08-26 18:00:52 +01:00
Robert Osfield
11ddd53eb4 Removed redundent Referenced::s/getThreadSafeReferenceCounting() and associated static and env vars as there are now inapprorpiate and no longer supported 2016-08-26 17:59:30 +01:00
Laurens Voerman
5c66ecfc99 RigTransformHardware fix: warn; don't crash if MAX_MATRIX not found 2016-08-16 14:33:48 +02:00
OpenSceneGraph git repository
2bdf56cb4b Merge pull request #114 from scrawl/const-cast
Remove an unneeded const_cast
2016-08-16 12:40:35 +01:00
OpenSceneGraph git repository
15ec7e2ae7 Merge pull request #115 from zakalawe/master
Attempt to fix broken DLL exports from osgDB
2016-08-16 12:39:57 +01:00
James Turner
ea9f479674 Attempt to fix broken DLL exports from osgDB
Only export the osgDB method implementations, instead of the entire
class, and hence avoid exporting symbols from the base class, which
then conflict with other compilation units when linking.

This avoids the need for /FORCE:MULTIPLE linker option with MSVC.
2016-08-15 22:21:44 +01:00
Robert Osfield
8f68da89d7 Fixed handling in osgUtil::IncrementalCompileOperation/CompileSet/StateToCompile when the _markerObject is NULL. 2016-08-15 12:59:21 +01:00
Robert Osfield
9d9025a6b4 Changed the default paramter for the osgUtil::StateToCompile to retain the OSG-3.4 ABI and fixed indentation. 2016-08-15 12:13:07 +01:00
Robert Osfield
06cb31a3d2 Added automatic assignment of _markerObject to CompileSet. 2016-08-15 11:46:48 +01:00
scrawl
0b450a5113 Remove an unneeded const_cast 2016-08-14 19:30:55 +02:00
Ravi Mathur
e9d6737ec4 Updates to the CMake build system for Mac OSX 2016-08-10 14:30:28 +01:00
Anish Thomas
2b9dfab1fc GLSL 1.3 support for vertex-attrib aliasing 2016-08-10 14:12:27 +01:00
Konstantin S. Matveyev
e6d4d99edb Fixed filename encoding bug 2016-08-10 12:58:38 +01:00
Robert Osfield
26bce07f2b Fixed handlinge of fgets returning a 0 length string 2016-08-10 12:00:18 +01:00
OpenSceneGraph git repository
f8c090ff7f Merge pull request #111 from hernando/master
Added missing GL enums to Texture::computeInternalFormatType
2016-08-10 11:32:15 +01:00
OpenSceneGraph git repository
0c938cab8a Merge pull request #112 from mathieu/feature/macOS_CoreProfile
macOS CoreProfile, contains requested parts of #92 previous PR concerning the osgsimplegl3 sample and the selection of the correct GL Profile when compiling with GL3 or Core Profile in GraphicsWindowCocoa.mm
2016-08-05 09:07:23 +01:00
Mathieu MARACHE
c77a7ecae9 Added usage of osgUtil::Optimizer to tessellate input geometry 2016-08-05 07:51:33 +02:00
Mathieu MARACHE
a54dc34752 Added CoreProfile selection if OSG_GL3_AVAILABLE defined 2016-08-05 07:49:22 +02:00
Juan Hernando Vieites
b3c242e270 Added missing GL enums to Texture::computeInternalFormatType 2016-08-04 17:03:51 +02:00
Robert Osfield
2550c95c32 Added GL_NORMALIZE usage to handle the case of the FlattenStaticTransform visitor not being applied to the scaled subgraphs causing lighting problems 2016-08-02 17:52:45 +01:00
OpenSceneGraph git repository
02cb58d3d9 Merge pull request #106 from rafagaitan/osgdb_curl
Added OSG_CURL_SSL_VERIFYPEER option to the curl plugin
2016-08-02 15:45:49 +01:00
OpenSceneGraph git repository
46fb6bd299 Merge pull request #109 from scrawl/renderbuffer_fix
Fix RenderBuffer not being attached
2016-08-02 15:27:39 +01:00
scrawl
5b70f208e3 Fix RenderBuffer not being attached (bug introduced with commit 55b3becb7c ) 2016-08-01 17:48:14 +02:00
Robert Osfield
2578fce085 Added FT_LOAD_NO_HINTING 2016-07-31 14:00:30 +01:00
Robert Osfield
1794374c78 Fixed build error reported on gcc 4.6.4/Ubuntu 12.04 32bit, issue #108 2016-07-31 11:06:51 +01:00
OpenSceneGraph git repository
953b150c17 Merge pull request #107 from marchelbling/fix_tangentspacegenerator_regression
OsgUtil::TangentSpaceGenerator, merge tangent space for index array
2016-07-31 10:49:23 +01:00
Cedric Pinson
e1c0b74454 OsgUtil::TangentSpaceGenerator, merge tangent space for index array 2016-07-19 14:48:28 +02:00
Rafael Gaitán
5e4543513b Added OSG_CURL_SSL_VERIFYPEER option to the curl plugin to allow connecting to secure servers without the certificate 2016-07-19 13:44:31 +02:00
Robert Osfield
f9172a000e Fixed bug in setting the ratio value 2016-07-18 20:06:26 +01:00
OpenSceneGraph git repository
0faebbef33 Merge pull request #105 from marchelbling/compiler-friendly-gles
Moves gles visitors implementation in cpp files
2016-07-13 09:46:19 +01:00
Marc Helbling
a44057b0df Moves gles visitors implementation in cpp files 2016-07-12 11:54:51 +02:00
Robert Osfield
fd0af1d9df Added Optimizer::BufferObjectVisitor and associated BUFFER_OBJECT_SETTINGS value to enable it via the OSG_OPTIMZIER env var.
The BufferObjectVisitor enbales vertex buffer objects usage on Drawable in the scene graph.
2016-07-11 09:52:07 +01:00
Robert Osfield
51f85f4c94 Added dirty of the vertex arrays to make sure they are uploaded when using VBO + VAO's 2016-07-11 09:46:50 +01:00
Robert Osfield
483982de3a Fixed coverity issue 2016-07-07 07:31:15 +01:00
Robert Osfield
f62a07beba Removed dead code 2016-07-07 07:27:37 +01:00
Robert Osfield
5ab9a1b420 Fixed potential memory leak 2016-07-07 07:16:56 +01:00
Robert Osfield
6d85404cf0 Added ref_ptr<> to quieten down Coverity 2016-07-06 20:57:53 +01:00
Robert Osfield
c820b611ed Removed dead code 2016-07-06 20:36:50 +01:00
Robert Osfield
f99408f254 Fixed possible memory leak 2016-07-06 20:34:41 +01:00
Robert Osfield
e5e89a3ac9 Added handling of null 2016-07-06 20:23:34 +01:00