Commit Graph

10272 Commits

Author SHA1 Message Date
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
2b1477234e Converted to unix line endings 2016-12-09 17:27:17 +00: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
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
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
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
Robert Osfield
2f570ca3a9 Improved the indentation and case to make the code more consistent and readable 2016-11-15 11:16:03 +00:00
Robert Osfield
5aa897b5fd Merge branch 'master' of https://github.com/fredowski/OpenSceneGraph into fredowski-master 2016-11-15 11:13:37 +00:00
Robert Osfield
137b596943 Enabled sharing of main threads processor affinity to the next required thread for CullDrawThreadPerCamera and CullThreadPerCameraDrawThreadPerContext 2016-11-15 11:01:41 +00:00
OpenSceneGraph git repository
5ff6048db0 Merge pull request #156 from LaurensVoerman/Affinity2
unlock cpu's 32-63 on 64 bit windows
2016-11-15 10:41:12 +00:00
Robert Osfield
87a3648e68 To avoid noise in documentation replaced nested namespaced enum with enum with FILE_COPY_ wording prefixed into enum values. 2016-11-15 08:57:24 +00:00
Robert Osfield
36b2ddac2d Added usage of osg::ConfigureBufferObjectsVisitor to correct for incoherent buffer oject set up due to the adhoc way that the OpenFlight plugin sets up osg::Geometry. 2016-11-14 18:01:22 +00:00
Robert Osfield
5b375124cc Added osg::Geometry::configureBufferObjects() and ConfigureBufferObjectsVisitor visitor to help with setting up buffer objects in a coherent fashion. 2016-11-14 17:59:25 +00:00
Robert Osfield
99cb8ebacf Added more flexibility into the State::checkGLErrors() method, allowing calling code to pass in two strings.
Improved the StateSet::compileGLObjects() usage of checkGLErrors() to make the warning reports more meaningful.
2016-11-14 11:59:47 +00:00
Robert Osfield
e6052ef4b4 Added Dragger::applyAppropriateFrontFace(StateSet*) to make it easy to handle inverted matrices by toggling the FrontFace to sure the correct face is visible. 2016-11-11 17:18:13 +00:00
Robert Osfield
d16ca33f38 Fixed handling of Locator's with negative extents 2016-11-11 14:01:40 +00:00
Friedrich Beckmann
e506bb3075 added alternative to middle-mouse button in manipulator
I added CTRL + RIGHT-MOUSE-CLICK to the standard manipulator as
an alternative to MIDDLE-MOUSE-CLICK because a 3 Button Mouse
not always available, e.g. on MacOS. I tested this with the
osgAtlasSimbicon example.
2016-10-24 19:54:43 +02:00
Laurens Voerman
d461149969 re-assign thread affinity at the end of setThreadingModel() 2016-10-17 09:50:48 +02:00
Robert Osfield
e17ad60c2d Added _color copy to the copy constructor 2016-10-14 18:00:40 +01:00
Laurens Voerman
16a282ccea unlock cpu's 32-63 on 64 bit windows 2016-10-14 17:19:50 +02:00
Robert Osfield
afb046a196 Bumped OpenThreads version numbers to reflect changes in ABI 2016-10-13 17:43:29 +01:00
Robert Osfield
1cc53246e9 Changed appending of \n to be to the version line. 2016-10-12 17:24:25 +01:00
Robert Osfield
9072f9653e Added OES variants of vertex array object functions 2016-10-12 16:10:40 +01:00
Robert Osfield
c92de93429 Altered the configureAffinity() scheme so that it places threads preferentially on even based number processors first, which should work better in case the processors available have hyper-threading 2016-10-12 10:08:56 +01:00
Robert Osfield
0314fd593a Added VAO support to osgTerrain::GeometryPool 2016-10-11 20:11:39 +01:00
Robert Osfield
b6afce773a Removed unneccessary includes 2016-10-11 20:11:24 +01:00
Robert Osfield
38ff11f8c5 Renamed ArrayDispatchers to AttributeDispatchers to better reflect it's role 2016-10-11 15:14:14 +01:00
Robert Osfield
e14ee80282 Streamlined the dispatch and activation of attribute dispatchers 2016-10-11 11:29:29 +01:00
Robert Osfield
364c838ea1 Removed unused vertex and texcoord array dispatchers 2016-10-11 11:29:29 +01:00
Fabian Wiesel
1f562c003c Missed rename in VertexAttribArrayDispatch
The variable array is by initialisation a null-pointer, new_array is the new array
2016-10-11 11:29:29 +01:00
Robert Osfield
66873b8c6c Fixed build errors when OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION to OFF 2016-10-11 11:29:29 +01:00
Robert Osfield
007a19a027 Fixed warnings 2016-10-11 11:29:29 +01:00
Robert Osfield
0ee65c9d2f Removed unneccessary parameter 2016-10-11 11:29:29 +01:00
Robert Osfield
e11e45a2e3 Removed GLBeginEndAdapter as it is no longer needed 2016-10-11 11:29:29 +01:00
Robert Osfield
0f3e61146d Refactored osgText so that it no longer uses GLBeginEndAdapter 2016-10-11 11:29:29 +01:00
Robert Osfield
53cdacd926 Refactored Text3D so that it no longer depends upon GLBeginEndAdapter 2016-10-11 11:29:29 +01:00
Robert Osfield
5a4754deef Refactored osgParticle so that it natives support vertex arrays, vertex buffer objects and vertex array objects 2016-10-11 11:29:29 +01:00
Robert Osfield
10f1d84f7e Added explict setup of the stats graphing geometry so that it's VertexBufferObject is intialized to the correct size to prevent any need for later resizing 2016-10-11 11:29:29 +01:00
Robert Osfield
d4d32cbde7 Improved handling of the BufferObject::Profile::_size, utilizing it's intial value when it is non zero and larger than the arrays assigned to it. 2016-10-11 11:29:29 +01:00
Robert Osfield
8febae1546 Fixed VertexArrayState::bind*BufferObject(..) methods so they correctly handle dirtied buffer objects 2016-10-11 11:29:29 +01:00
Robert Osfield
96b0e42c42 Fixed typo in comment 2016-10-11 11:29:29 +01:00
Robert Osfield
ff779e58ab Added check against Array::Binding to decide whether to assign a VertexBufferObject to an array or not, only assigning it when Binding is BIND_PER_VERTEX 2016-10-11 11:29:29 +01:00
Robert Osfield
886b922596 Beginings of refactoring ParticleSystem so that it does uses vertex arrays rather than GLBeginEndAdapter 2016-10-11 11:29:29 +01:00
Robert Osfield
c15f6d3e8c Made ordering of case clearer 2016-10-11 11:29:29 +01:00
Robert Osfield
56ed225f17 Removed Particle::Shape support for QUAD_TRIANGLESTRIP, HEXAGON, USER as these are unlikely to be used as their implementation prevents refactoring to use vertex array code paths 2016-10-11 11:29:29 +01:00
Robert Osfield
c637010c9d Refactored ImpostorSprite so that it no longer uses GLBeginEndAdapter 2016-10-11 11:29:29 +01:00
Robert Osfield
037e8f24c6 Removed commented out debug message 2016-10-11 11:29:29 +01:00
Robert Osfield
7c432fbe11 Refactored osgSim::SphereSegment so that it no longer uses GLBeginEndAdapter 2016-10-11 11:29:29 +01:00
Robert Osfield
e5ab4355be Added osg::convertShapeToGeometry(...) convinience functions for creating osg::Geometry from osg::Shape descriptions. 2016-10-11 11:29:29 +01:00
Robert Osfield
83b5cabac9 Refactored ShapeDrawable so that it is subclassed from osg::Geometry rather than osg::Drawable.
Created a BuildShapeGeometryVisitor visitor that can create osg::Geometry for osg::Shape objects
2016-10-11 11:29:29 +01:00
Robert Osfield
3be951f279 Fixed crash when using vertex attribute arrays 2016-10-11 11:29:29 +01:00
Robert Osfield
b2873132be Added support for interleaved arrays 2016-10-11 11:29:29 +01:00
Robert Osfield
f842750342 Removed no longer used member variables 2016-10-11 11:29:29 +01:00
Robert Osfield
16da432be3 Moved FOG_COORD and SECONDARY_COLOR #define's from State header into VertexArrayState.cpp 2016-10-11 11:29:29 +01:00
Robert Osfield
164981f7a3 Replaced osg::State:set*Pointer() calls with VertexArrayState::set*Array() calls 2016-10-11 11:29:29 +01:00
Robert Osfield
359b136b5e Added check against State::useVertexBufferObjects(..) so that Display Lists are only used when VBO is OFF. 2016-10-11 11:29:29 +01:00
Robert Osfield
94891778c4 Restructred the enabling of vertex array object support to allow one to set enable the default via osg::State.
Added OSG_VERTEX_BUFFER_HINT env var to osg::DisplaySettings with VERTEX_BUFFER_OBJECT/VBO, VERTEX_ARRAY_OBJECT/VAO and NO_PREFERENCE to allow one to foce on VBO or VAO usage.

Restructred BufferObject assigned in osg::Geometry

Added
2016-10-11 11:29:29 +01:00
Robert Osfield
d8fdf33be5 Cleaned up set up of osg::Geometry for stats 2016-10-11 11:29:29 +01:00
Robert Osfield
cf52b2db50 Removed unncessary checks 2016-10-11 11:29:29 +01:00
Robert Osfield
ee31921520 Streamlined State::_is*Supported variables 2016-10-11 11:29:29 +01:00
Robert Osfield
1d75089bf8 Build fixes when compiling wuth CMake options OPENGL_PROFILE set to GLCORE 2016-10-11 11:29:29 +01:00
Mathieu MARACHE
3745b958e5 compilation fixes when no OSG_GL_DISPLAYLISTS_AVAILABLE 2016-10-11 11:29:29 +01:00
Mathieu MARACHE
afe45f66d2 compilation fixes when no OSG_GL_FIXED_FUNCTION_AVAILABLE 2016-10-11 11:29:29 +01:00
Robert Osfield
e3c663bb02 Removed deprecated code paths and moved implementations into headers 2016-10-11 11:29:29 +01:00
Robert Osfield
bf28e2d037 Refactored the VertexArrayState's handling of vertex attribute aliasing 2016-10-11 11:29:29 +01:00
Robert Osfield
1f147f6bc6 Moved implementations from .cpp's to headers as inline methods to improve performance. 2016-10-11 11:29:29 +01:00
Robert Osfield
97df15b205 Improved naming of createVertexArrayState(..) method 2016-10-11 11:29:29 +01:00
Robert Osfield
98344157c0 Removed resetting of the pointer state. 2016-10-11 11:29:29 +01:00
Robert Osfield
83f73df814 Added State::useVertexArrayObject() member to streamline toggling on/off of VAO usage 2016-10-11 11:29:29 +01:00
Robert Osfield
a4e682bb28 Added support for clean up Vertex Array Objects 2016-10-11 11:29:29 +01:00
Robert Osfield
4131d2da34 Added intialization of the VAO in Geometry::compileGLObjects() and refined the invocation of updates to the VAO 2016-10-11 11:29:29 +01:00
Robert Osfield
078598872f Added lazy setting of arrays for osg::Geometry using vertex_array_object 2016-10-11 11:29:29 +01:00
Robert Osfield
4b4cd13d31 Implemented lighter weight setting of the CurrentVertexArrayState and introduced GlobalVertexArrayState. 2016-10-11 11:29:29 +01:00
Robert Osfield
7d83d735ad Implemented a different approach to vertex array object support to enable creation of a single global vertex array object as well as provide individual vertex array objects per Drawable when required. 2016-10-11 11:29:29 +01:00
Robert Osfield
4d8a29b987 Added ability to initializer GL vertex array object id with Geometry::compileGLObjects().
Improved the handling of buffer object state when not using VAO's
2016-10-11 11:29:29 +01:00
Robert Osfield
14d1483b06 Experimental support for OpenGL Vertex Array Object 2016-10-11 11:29:29 +01:00
Robert Osfield
d92a79b876 Fixed crash associated with setting the affinity on a null pointer 2016-10-08 15:58:33 +01:00
OpenSceneGraph git repository
05ed7d1336 Merge pull request #152 from aluaces/spelling2
Some spelling fixes in comments.
2016-10-07 17:05:58 +01:00
Robert Osfield
548c9739ed Restructed how CPU affinity is set to fix build problems when local pthreads doesn't support setting affinity 2016-10-07 15:57:01 +01:00
Robert Osfield
10d8ac7f65 Fixed extension string typo 2016-10-07 12:17:03 +01:00
Robert Osfield
dc6b55a5e9 Added support for checking GL_OES_texture_npot 2016-10-07 12:17:03 +01:00
Robert Osfield
91538d90f8 Added ViewerBase::s/getUseConfigureAffinity(bool flag) to allow users to toggle whether they want the ViewerBase::setUpThreads() method to call ViewerBase::configureAffinity() or not. 2016-10-07 12:17:03 +01:00
Robert Osfield
ee97db3488 Introduced OpenThreads::Affinity support into osg::Camera, osg::GraphicsContext::Traitse, osgDB::DatabasePager and osgViewer::ViewerBase/Viewer/CompositeViewer.
Added ViewerBase::configureAffinity() to help with the setting of the affinity of camera, graphics context and pager threads
2016-10-07 12:17:03 +01:00
Robert Osfield
77c5e96ccb Added DatabasePager::setProcessorAffinity(const OpenThreads::Affinity&) support to allow the database threads to have affinity to user controls sets of CPU cores. 2016-10-07 12:17:03 +01:00
Robert Osfield
171e4f0f29 Implemented setting thread affinity for threads that aren't OpenThreads threads, such as main thread 2016-10-07 12:17:03 +01:00
Robert Osfield
b9869e137d First cut of OpenThrads::Affinity support for Win32. 2016-10-07 12:17:03 +01:00
Robert Osfield
bc44da49e6 Introduced new OpenThreads::Affinity class to wrap up specification of thread affinity.
Simplified the OpenThreads::SetProcessorAffinityOfCurrentThread/Thread::SetProcessorAffinity() to utilize the new Affinity class
2016-10-07 12:17:03 +01:00
Robert Osfield
0f8a5a86e2 Introduced OpenThreads::SetProcessorAffinityMaskOfCurrentThread(unsigned long cpumask) and Threads::setProcessorAffinityMask(unsigned long cpumask) to allow finer grained control over the CPU affinity. 2016-10-07 12:17:03 +01:00
Robert Osfield
cd56639e67 Added CullingActive support for Drawable serializer 2016-10-07 11:13:40 +01:00
Laurens Voerman
6ad0f9badc fix bug in SmoothingVisitor tripped by bunny.ply 2016-10-06 14:23:46 +02:00
Robert Osfield
197b4a0d30 Added GL_OES_geometry_shader and GL_OES_tessellation_shader checks 2016-10-06 10:48:29 +01:00
Alberto Luaces
7f3c92f492 Some spelling fixes in comments. 2016-10-05 18:10:46 +02:00
René Molenaar
48dbd61632 Fixed VisualStudio build 2016-10-05 16:31:23 +01:00
Robert Osfield
0fab759c1b Removed the unused debug header as it was causing building compile problems with the Debug build under Windows 2016-10-05 14:00:46 +01:00
OpenSceneGraph git repository
f705e39eb9 Merge pull request #142 from LaurensVoerman/Submissions12
fix a few minor warnings from Visual Studio 2015
2016-09-27 09:48:38 +01:00
Laurens Voerman
0619fe1cfa src\osgplugins\osgjs\Animation(9): warning C4099: 'WriteVisitor': type name first seen using 'class' now seen using 'struct' 2016-09-26 13:56:38 +02:00
Laurens Voerman
0ee744f7a0 fix Visual studio warning C4138: '*/' found outside of comment 2016-09-26 13:43:51 +02:00
Robert Osfield
1bdd2aceab Removed __sgi blocks as IRIX is no longer available 2016-09-26 10:03:32 +01:00
Robert Osfield
56a7208891 Removed Qt dependency examples, osgQt NodeKit and qfont plugin as these are now provided by the separate osgQt project 2016-09-26 09:31:22 +01:00
Robert Osfield
13fa75fc12 Removed qt threads 2016-09-26 09:22:10 +01:00
Robert Osfield
05f37bec53 Removed IRIX Sproc thead support as IRIX is load dead 2016-09-26 09:08:56 +01:00
Robert Osfield
2c39fa52b8 Removed IRIX Sproc threading support form OpenThreads as IRIX is long dead. 2016-09-26 09:06:28 +01:00
Alberto Luaces
01c712e851 Explicit signed char declarations for portability.
Some platforms (ARM, PowerPC, s390x) have "unsigned char" as the default
char type, and thus the build fails for certain parts of the code where
negative values are assigned to those kind of variables.
2016-09-24 12:33:37 +02:00
Robert Osfield
c6813cf8e2 Replaced local static usage to avoid threading and mulit-context issues 2016-09-22 14:33:03 +01:00
Robert Osfield
7e0c30b884 Refactored texture sharing code so that it modifies the RefAttributePair directly thus honouring the override flags and fixing a bug of loosing these override flags when sharing 2016-09-20 17:23:37 +01:00
Robert Osfield
b0df75e674 Cleaned up the spacing and const of various method parameters.
Added non const versions of StateSet::getAttributePair() and getTextureAttributePair()
2016-09-20 17:01:26 +01:00
Laurens Voerman
cf3c2b18e3 VS2015 fix a few warning C4456: declaration of 'X' hides previous local declaration 2016-09-13 17:07:28 +02:00
Robert Osfield
cb6e6ff2be Fixed warnings, deprecated another out of date method 2016-09-05 15:35:54 +01:00
Robert Osfield
ec344a85b4 Fixed warnings 2016-09-05 13:44:59 +01:00
Robert Osfield
a494cd71e8 Fixed typo 2016-09-05 07:59:15 +01:00
Robert Osfield
4a6fb5a49a Fixed warnings 2016-09-04 19:50:28 +01:00
Robert Osfield
fb4f7a025b Added local deprecated_osg::Geometry implementation from OpenSceneGraph-3.4 to keep build working now that deprecated_osg::Geometry has been removed from the core OSG. 2016-09-04 18:31:13 +01:00
Robert Osfield
19270d0833 Fixed warning 2016-09-02 19:09:13 +01:00
Robert Osfield
79ff8ba273 Merge branch 'Submissions2e' of https://github.com/LaurensVoerman/OpenSceneGraph into LaurensVoerman-Submissions2e 2016-09-02 18:26:11 +01:00
OpenSceneGraph git repository
c19b271586 Merge pull request #119 from LaurensVoerman/Submissions2c
Fixed clone osgVolume::Scalarproperty and osg::TextureBuffer crash
2016-09-02 17:47:37 +01:00
OpenSceneGraph git repository
14bdadaf86 Merge pull request #123 from LaurensVoerman/Submissions2f
Submissions2f
2016-09-02 17:44:57 +01:00
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
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
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
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
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
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
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
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
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
Robert Osfield
8b3944f51c Changed dynamic_cast<> to static_cast<> as type is known based on getType() query.
Added missing break statement.
2016-07-06 20:21:53 +01:00
Robert Osfield
0ef196b84c Added null pointer check 2016-07-06 20:15:49 +01:00
Robert Osfield
b907a6e1a6 Fixed null pointer check 2016-07-06 20:13:36 +01:00
Robert Osfield
84eca67498 Added null pointer check 2016-07-06 20:08:03 +01:00
Robert Osfield
666a5def96 Fixed use of invalidated iterator 2016-07-06 20:04:13 +01:00
Robert Osfield
5c5cdbabf7 Added null pointer check 2016-07-06 19:58:23 +01:00
Robert Osfield
a898f2a7e1 Fixed TabPlaneDragger's handling of pressing the right mouse button whilst holding the left mouse button down, then releasing hte left mouse button. 2016-07-06 19:45:02 +01:00
Robert Osfield
c753a99a38 Added ability to assign callbacks from lua scripts 2016-07-06 11:36:25 +01:00
Robert Osfield
d8bac1d363 Merge branch 'master' of https://github.com/openscenegraph/OpenSceneGraph 2016-07-05 18:11:31 +01:00
Robert Osfield
8066a1da04 Added readObject() implementation. 2016-07-05 18:10:51 +01:00
OpenSceneGraph git repository
bb509879ca Merge pull request #103 from marchelbling/update_stl
Update stl.

    fixes magics color parsing
    adds support for incomplete binary stl files
2016-07-05 18:04:50 +01:00
Robert Osfield
ca4355974f Fixed warnings 2016-07-05 17:57:28 +01:00
Marc Helbling
e4c31cdcbf Adds support for incomplete stl binary files
The logic is
* if a file is not ascii
* if its sizeis less than the expected binary size
then we can assume that the data is incomplete but still try to load it.
2016-07-05 17:09:45 +02:00
Marc Helbling
f4d0131967 Fixes magics color parsing
`fread` returns the number of objects read, not a byte-size.
2016-07-05 17:09:41 +02:00
Marc Helbling
67c301c236 Adds specific flag for compressed animation buffers 2016-07-05 16:52:17 +02:00
Marc Helbling
67b17fa801 Updates osgjs plugin for animation serialization 2016-07-05 16:48:53 +02:00
Marc Helbling
6fd972fa42 Fixes gles coverity defects 2016-07-05 16:32:00 +02:00
Robert Osfield
ab69edb506 Fixed typo 2016-07-05 12:57:41 +01:00
Robert Osfield
dce1473a53 Seperated out the scene->requiresRedraw() method into a osgViewer::Viewer::requiresRedraw() method to make the functionality clearer and easier to override. 2016-07-05 11:54:31 +01:00
Robert Osfield
16d497ef80 Simplified DatabasePager::requires*() methods 2016-07-05 11:42:03 +01:00
OpenSceneGraph git repository
076503f247 Merge pull request #100 from filnet/checkneedtodoframe
streamline DatabasePager::requiresUpdateSceneGraph()
2016-07-05 11:27:44 +01:00
Robert Osfield
7635f1774f Added missing Plane and Quat handling 2016-07-05 07:41:23 +01:00
Philippe Renon
22d53357d3 split requiresUpdateSceneGraph() into requires update and requires redraw (wip) 2016-07-04 23:19:20 +02:00
Philippe Renon
e23a30652d streamline DatabasePager::requiresUpdateSceneGraph()
would trigger unnecessary redraws when there were pending file requests or active database threads

tested ok with and without IncrementalCompileOperation
2016-07-04 21:42:19 +02:00
Robert Osfield
935a5c4e22 Added version guard around new parameter serializer 2016-07-04 20:26:28 +01:00
Julien Valentin
36930dcd18 Added serializer support for RigTransforms 2016-07-04 20:19:58 +01:00
Robert Osfield
1fe2d6d31f Added templte methods and implementations for Vec2,3,4 for b,ub,s,us,i and ui. 2016-07-04 13:37:29 +01:00
Robert Osfield
2ebe4813d6 Replaced seperate implementations with template implementations 2016-07-04 11:02:58 +01:00
Robert Osfield
6870c195d0 Replaced seperate getValue(Vec*) implementations with template based implementation 2016-07-04 10:53:06 +01:00
Robert Osfield
55e4d567c4 Added ValueObject pushValue handling for Vec2*, Vec3*, Vec4 for b,ub,s,us,i and ui. 2016-07-04 10:34:03 +01:00
Robert Osfield
9e0c46d55f Added Vec*b, Vec*s, Vec*i getValue(..) implementations 2016-07-04 10:14:47 +01:00
Robert Osfield
bc7bd7da9d Replaced pushVec(Vec2f etc.) implementations with template implementations. 2016-07-04 10:11:34 +01:00
Robert Osfield
0f95ad5f9f Added initializers 2016-07-02 12:54:48 +01:00
Robert Osfield
e698ddb719 Introduced ref_ptr<> usage to avoid potential memory leaks 2016-07-02 12:52:20 +01:00
Robert Osfield
143d423d1f Added handling of return type 2016-07-02 12:39:06 +01:00
Robert Osfield
5beb15fa77 Added handling of return type 2016-07-02 12:37:22 +01:00
Robert Osfield
922c860814 Fixed types 2016-07-02 12:33:31 +01:00
Robert Osfield
39d439cea4 Added handling of return type 2016-07-02 12:31:08 +01:00
Robert Osfield
5128461c67 Added initializer 2016-07-02 12:29:07 +01:00
Robert Osfield
8250bdce15 Added initializer 2016-07-02 12:27:48 +01:00
Robert Osfield
5bfc7b9908 Fixed warning and quitened ones caused by 3rd party headers. 2016-07-02 12:13:08 +01:00
Robert Osfield
40d5d1712d Changed to an int comparison 2016-07-02 11:09:12 +01:00
Robert Osfield
2122980d0a Fixed number of processors setting 2016-07-02 10:14:06 +01:00
OpenSceneGraph git repository
9ae4a4fc27 Merge pull request #95 from marchelbling/tristripvisitor_index_option
Adds an indexMesh option to disable mesh reindexation
2016-07-01 18:07:16 +01:00
OpenSceneGraph git repository
d0b755e6cc Merge pull request #94 from marchelbling/gles_plugin_update
Updates gles plugin.

This PR updates the GLES plugin with latest Sketchfab changes:

    improves geometry splitting
    processes/cleans animation (for subsequent osgjs serialization)
    adds (yet another) normal smoother
2016-07-01 18:03:29 +01:00
Marc Helbling
da47f8a156 Adds an indexMesh option to disable mesh reindexation
This mainly breaks gles/osgjs when stripifying a MorphGeometry. It also
usually doesn't make sense to reindex an already indexed mesh.
2016-07-01 18:12:36 +02:00
Marc Helbling
9fbdaaae65 Updates gles plugin 2016-07-01 17:28:01 +02:00
Marc Helbling
43443928d0 Updates osgAnimation
This updates is mainly for the gles plugint to work correctly.

* adds Quaternion array
* reintroduces `KeyframeContainer::linearInterpolationDeduplicate`
* fixes MorphGeometry OSG serialization (target names)
2016-07-01 17:04:15 +02:00
Robert Osfield
7c0c98b504 Addd loop guard to prevent negative bit shift 2016-07-01 11:08:29 +01:00
Robert Osfield
ff50edfc57 Fixed types 2016-07-01 10:57:31 +01:00
Robert Osfield
9007ab7e1d Fixed types 2016-07-01 10:38:58 +01:00
Robert Osfield
96a442f3bc Fixed type 2016-07-01 10:35:18 +01:00
Robert Osfield
3b5dc50e30 Added intializers 2016-07-01 10:21:55 +01:00
Robert Osfield
243420c5d9 Added initializers 2016-07-01 10:13:14 +01:00
Robert Osfield
562619f794 Moved initializers 2016-07-01 09:59:21 +01:00
Robert Osfield
466337c148 Added initializers 2016-07-01 09:56:01 +01:00
Robert Osfield
d9dc8ca3b2 Added initializers 2016-07-01 09:54:58 +01:00
Robert Osfield
ca77f5223e Moved unused member variables to #if 0 blocks.
Added initiliazer
2016-07-01 09:52:35 +01:00
Robert Osfield
2842adeb98 Fixed indentation 2016-07-01 09:15:36 +01:00
Robert Osfield
ddb4a02098 Added initializer 2016-07-01 09:14:59 +01:00
Robert Osfield
7584fe0ba2 Added initializer 2016-07-01 09:13:21 +01:00
Robert Osfield
0f05a4ceaa Added intializer 2016-07-01 09:09:35 +01:00
Robert Osfield
64c4a35e9a Added initializers 2016-07-01 08:52:43 +01:00
Robert Osfield
ff5095e8d1 Added initializer 2016-07-01 08:49:55 +01:00
Robert Osfield
68b69b8021 Added initializer 2016-07-01 08:48:49 +01:00
Robert Osfield
8edbe1dc0d Added initiaizer 2016-07-01 08:43:32 +01:00
Robert Osfield
eff07fe61e Added initializer 2016-07-01 08:41:54 +01:00
Robert Osfield
22cb243bd9 Added initialziers 2016-07-01 08:40:25 +01:00
Robert Osfield
9f259731f8 Added initializer 2016-07-01 08:37:48 +01:00
Robert Osfield
c13ba702ee Added initializer 2016-07-01 08:36:54 +01:00
Robert Osfield
eab111a5f5 Replaced the old c style declaration of enum's as it was confusing Coverity 2016-07-01 08:35:08 +01:00
Robert Osfield
d3362f9a23 Added initializers 2016-07-01 08:19:51 +01:00
Robert Osfield
4668511c93 Added initializer 2016-07-01 08:16:39 +01:00
Robert Osfield
e81c48f974 Added initializers 2016-07-01 08:15:01 +01:00
Robert Osfield
82fabc94f9 Added initializer 2016-07-01 08:08:39 +01:00
Robert Osfield
91d60de028 Removed unused member variable and adding initializer 2016-07-01 08:06:42 +01:00
Robert Osfield
3c70d03d30 Added initializers 2016-07-01 08:03:03 +01:00
Robert Osfield
e9c4cbce5c Addded initializer 2016-07-01 08:00:49 +01:00
Robert Osfield
a7a8284786 Added initializer 2016-07-01 07:58:04 +01:00
OpenSceneGraph git repository
c919d64d25 Merge pull request #91 from bjornblissing/feature/DestructionOperation
CleanUpOperation added to Viewer
2016-07-01 06:40:52 +01:00
Björn Blissing
ed7d49c5d2 CleanUpOperation added to Viewer
Sometimes there is need to do cleanup with valid graphic contexts
before closing these contexts. The added operation runs a graphics
operation on each context before closing them.
2016-06-30 22:09:22 +02:00
Robert Osfield
2ddcd14395 Added initializer 2016-06-30 14:17:51 +01:00
Robert Osfield
4d2bc269d9 Added initializers 2016-06-30 14:16:14 +01:00
Robert Osfield
3ae57e247f Added initializer 2016-06-30 14:12:01 +01:00
Robert Osfield
99458d061d Added initializers 2016-06-30 14:04:52 +01:00
Robert Osfield
ca721a8d05 Added initializer 2016-06-30 13:58:54 +01:00
Robert Osfield
b3765ac3cf Added handling of error condition 2016-06-30 11:31:02 +01:00
Robert Osfield
9e7d361a50 Added handling of error condition 2016-06-30 11:28:59 +01:00
Robert Osfield
6cd944e9c3 Added handling of error return value 2016-06-30 11:26:21 +01:00
Robert Osfield
d2579c0702 Added handling of error value 2016-06-30 11:24:50 +01:00
Robert Osfield
4ed8558178 Fixed handling of return values 2016-06-30 11:19:53 +01:00
Robert Osfield
75183eb3dd Fixed line endings 2016-06-30 11:19:24 +01:00
Robert Osfield
1b409fff8b Added handling of return value 2016-06-30 11:12:45 +01:00
Robert Osfield
cd4a51cf67 Added handling of return value 2016-06-30 11:11:00 +01:00
Robert Osfield
d4475e5b19 Added handling of return value 2016-06-30 11:03:40 +01:00
Robert Osfield
509c0380fa Added handling of return value 2016-06-30 11:00:38 +01:00
Robert Osfield
8f071e055f Added handling of false return 2016-06-30 10:58:17 +01:00
Robert Osfield
e5c0297167 Added handling of false return 2016-06-30 10:55:34 +01:00
Robert Osfield
876c4882a3 Fixed typo 2016-06-30 10:50:11 +01:00
Robert Osfield
72a80ee8cd Added handling of null dynamic_cast 2016-06-30 10:17:23 +01:00
Robert Osfield
ba3eaa83e0 Added handling of null dynamic_cast 2016-06-30 10:08:29 +01:00
Robert Osfield
e2730d0b5c Clean up clone 2016-06-30 10:03:51 +01:00
Robert Osfield
2a5098eacb Added handling of null pointer 2016-06-30 10:01:18 +01:00
Robert Osfield
be26725867 Added handling of null dynamic_cast 2016-06-30 09:59:27 +01:00
Robert Osfield
a469d60ed2 Added handling of null dynamic_cast. 2016-06-30 09:54:13 +01:00
Robert Osfield
576a265095 Added handlng of null dynamic_cast 2016-06-30 09:52:10 +01:00
Robert Osfield
cbba625b07 Added null pointer handling 2016-06-30 09:48:44 +01:00
Robert Osfield
314deedcf5 Added better null pointer handling 2016-06-30 09:46:27 +01:00
Robert Osfield
9e8d09bffc Improved error handling 2016-06-30 09:38:41 +01:00
Robert Osfield
6df325f651 Added handling of error return type 2016-06-30 09:29:32 +01:00
Robert Osfield
05d97aad28 Removed no longer used code 2016-06-30 09:09:54 +01:00
Robert Osfield
9b1107eb64 Improved check against number of bytes read 2016-06-30 08:27:49 +01:00
Robert Osfield
fec64f6d8c Added handling of NULL pointer case 2016-06-30 08:23:51 +01:00
Robert Osfield
7f335fd528 Added handling of possible zero divisor 2016-06-30 08:20:31 +01:00
Robert Osfield
1a10795198 Added handling of possible zero divisor 2016-06-30 08:16:29 +01:00
Robert Osfield
77812b32e0 Added handling of potential zero divisor 2016-06-30 08:14:48 +01:00
Robert Osfield
1c2aeb3138 Added handling of NULL 2016-06-30 08:13:01 +01:00
Robert Osfield
73cdc67367 Addd handling of NULL 2016-06-30 08:02:29 +01:00
Robert Osfield
de6eb1d97e Added handling of NULL 2016-06-30 07:59:51 +01:00
Robert Osfield
ac136d92e7 Added handling of NULL 2016-06-30 07:59:37 +01:00
Robert Osfield
1e0a187613 Added handling of out of memory 2016-06-30 07:50:40 +01:00
Robert Osfield
99a426d47d Added better handling of nulls 2016-06-30 07:50:14 +01:00
Robert Osfield
fa14b5263e Added initializer 2016-06-29 19:59:56 +01:00
Robert Osfield
a24cdb59de Fixed handling of null pointer 2016-06-29 18:01:29 +01:00
Robert Osfield
fb537e089b Cleaned up null pointer handling 2016-06-29 17:58:03 +01:00
Robert Osfield
274a197a82 Moved assignment to within safe block 2016-06-29 17:56:11 +01:00
Robert Osfield
d0bf7e8ce7 Added hanlding of null value 2016-06-29 17:51:32 +01:00
Robert Osfield
467054ba44 Added null pointer handling 2016-06-29 17:47:32 +01:00
Robert Osfield
625c559e8d Added null pointer handling 2016-06-29 17:43:37 +01:00
Robert Osfield
8589d59520 Added handling of null pointer 2016-06-29 17:35:20 +01:00
Robert Osfield
47842987c5 Added null pointer check 2016-06-29 17:33:45 +01:00
Robert Osfield
9fe0c23af4 Added better handling of null istream 2016-06-29 17:31:16 +01:00
Robert Osfield
3c1d3b981c Added null pointer handling 2016-06-29 17:29:28 +01:00
Robert Osfield
e3c48d9f45 Added handling of the possibility of null Options pointers 2016-06-29 17:06:48 +01:00
Robert Osfield
0876677fb2 Removed check against changed flag as check is aleady done outside the method so no need for a duplicate check 2016-06-29 16:07:39 +01:00
Julien Valentin
98b81821fb fix in StateSet.cpp
the State::DefineMap::changed flag is not resetted to false after currentDefines are updated
2016-06-29 16:05:14 +01:00
Robert Osfield
990c04d4b9 Moved the scene related requiresUpdateSceneGraph() implementation details from View into Scene.
Added check against the ImagePager.
2016-06-29 15:34:11 +01:00
OpenSceneGraph git repository
48c1d0e8da Merge pull request #81 from filnet/checkneedtodoframe
refactor common code from CompositeViewer::checkNeedToDoFrame() and Viewer::checkNeedToDoFrame() into View
2016-06-29 15:15:31 +01:00
Robert Osfield
00b1173e70 Added osg::ScissorIndexed that wraps up glScissorIndexed function 2016-06-29 15:11:02 +01:00
Robert Osfield
412e9fc3dd Added osg::DepthRangeIndexed class to wrap up glDepthRangeIndexed functionality. 2016-06-29 12:28:28 +01:00
Robert Osfield
54dbf438cc Fixed cast 2016-06-29 11:36:44 +01:00
Robert Osfield
e932c8e5e8 Added build of new osg::ViewportIndexed 2016-06-29 11:35:56 +01:00
Robert Osfield
e30b570b1f Revert "Fixed incorrect cast" as commit contained more changes than intended.
This reverts commit 2897ab13cb.
2016-06-29 11:34:20 +01:00
Robert Osfield
8d7d5d12a1 Added osg::ViewportIndexed that adds support for glViewportIndexed 2016-06-29 11:26:54 +01:00
Robert Osfield
2897ab13cb Fixed incorrect cast 2016-06-29 11:25:08 +01:00
Laurens Voerman
ec74518868 Added glViewerArray, glSissorArray, glDepthRangeArray etc. GL extension support 2016-06-29 09:53:04 +01:00
Robert Osfield
1df3cb9144 Fixed warnings 2016-06-28 19:49:48 +01:00
Robert Osfield
4223028ec1 Disabled -Wextra compile option for GCC + CLang as FBX headers generate lots of warnings we can't fix 2016-06-28 19:46:14 +01:00
Robert Osfield
b2e5e5b388 Revert "corrected syntax error in src/osgPlugins/fbx/ReaderWriterFBX.cpp"
This reverts commit 7a1324800f.
2016-06-28 18:39:12 +01:00
Robert Osfield
f4eb37ee08 Added initializer 2016-06-28 16:49:08 +01:00
Robert Osfield
418aa45a1b Added initializers 2016-06-28 16:47:11 +01:00
Robert Osfield
049d64dd20 Added initializer 2016-06-28 16:44:24 +01:00
Robert Osfield
56f6376de8 Added initializer 2016-06-28 16:42:33 +01:00
Robert Osfield
c6cd232f77 Added initializer 2016-06-28 16:40:57 +01:00
Robert Osfield
70f47cedc7 Replaced unsafe strcpy 2016-06-28 16:37:58 +01:00
Robert Osfield
847eea5b5d Replaced usage c string usage 2016-06-28 16:34:30 +01:00
Robert Osfield
96d3bd203f Replaced unsafe string usage 2016-06-28 16:33:13 +01:00
Robert Osfield
21354e62d4 Replaced unsafe c string usage with std::stringstream 2016-06-28 16:30:06 +01:00
Robert Osfield
55d6113375 Removed debug message 2016-06-28 16:25:21 +01:00
Robert Osfield
dc3d4cac53 Replaced unsafe c string usage with std::string 2016-06-28 16:11:14 +01:00
Robert Osfield
b5f880ba1d Replaced unsafe c string usage with std::string 2016-06-28 16:03:01 +01:00
Robert Osfield
7f1ba5f7df Replaced unsafe strcpy 2016-06-28 15:56:39 +01:00
Robert Osfield
26da8fc9ce Replaced unsafe c string usage with std::string 2016-06-28 15:52:35 +01:00
Robert Osfield
4f276d9d8e Fixed leak when open returns 0 2016-06-28 15:33:06 +01:00
Robert Osfield
07a0b52e6c Fixed leak when open returns 0 2016-06-28 15:31:55 +01:00
Robert Osfield
9aa8497fbf Removed line space 2016-06-28 13:44:20 +01:00
Robert Osfield
44255995e3 Cleaned up pointer checks 2016-06-28 13:44:00 +01:00
Robert Osfield
4e48fead44 Repplaced fscanf usage with ifstream to avoid safety issues 2016-06-28 13:38:35 +01:00
Robert Osfield
f7bbb4821b Added handling of failure to reclaim file 2016-06-28 09:32:38 +01:00
Robert Osfield
6937a8fcd3 Removed unneccessary close 2016-06-28 09:21:30 +01:00
Robert Osfield
9253ea845b Added better handling of reading of sizes 2016-06-28 09:11:39 +01:00
Robert Osfield
e062ddde20 Added initializers 2016-06-28 08:34:02 +01:00
Robert Osfield
931e3277b9 Fixed initializer 2016-06-28 08:32:35 +01:00
Robert Osfield
89c6fac40a Removed dead code 2016-06-27 17:38:32 +01:00
Robert Osfield
7778894767 Added missing break 2016-06-27 17:37:11 +01:00
Robert Osfield
055ec56068 Added message for unhandled mode types 2016-06-27 17:18:21 +01:00
Robert Osfield
a73b3ceb45 Fixed incorrect value 2016-06-27 17:15:28 +01:00
Robert Osfield
56955eea39 Removed logically dead code 2016-06-27 17:12:43 +01:00
Robert Osfield
aa0523f60a Removed logicaly dead code 2016-06-27 17:09:41 +01:00
Robert Osfield
63cb4b81a8 Replaced fgetc usage with custom handling that handles type and error values 2016-06-27 17:00:12 +01:00
Robert Osfield
194f3ac360 Fixed delete type 2016-06-27 16:31:11 +01:00
Robert Osfield
8e2b3291fb Removed unused local variable and move declaration to make it more readable. 2016-06-27 16:29:14 +01:00
Robert Osfield
207cb1436d Fixed override method inconsistency 2016-06-27 16:25:40 +01:00
Robert Osfield
a5fde3a369 Fixed override method inconsistency 2016-06-27 16:21:48 +01:00
Robert Osfield
9f67436b32 Fixed override method inconsistency 2016-06-27 16:20:56 +01:00
Robert Osfield
ec2d9ce67c Fixed override method inconsistency 2016-06-27 16:18:28 +01:00
Robert Osfield
0c80829bb8 Fixed override method inconsistency 2016-06-27 16:18:01 +01:00