fab6bff310Fixed 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
Curtis Rubel
2016-12-01 16:36:20 -05:00
43b051b984Teaking FindOpenCascade to help with linking of iges plugin
Robert Osfield
2016-11-30 20:10:22 +00:00
a9bc508dc4From Abhishek Bansal, with ammendemts by Robet Osfield to get working with recent OpenCascade and usng CMake.
Robert Osfield
2016-11-30 19:11:15 +00:00
d4a4993285Added GL_EXT_texture_border_clamp support for GLES
Robert Osfield
2016-11-30 17:15:06 +00:00
b59c46c3cfAdded GL_EXT_texture_border_clamp support for GLES
Robert Osfield
2016-11-30 17:15:06 +00:00
29049ea238Fix typo in StateSet::compileGLObjects, causing compilation of attributes to not be executed unless checkForGLErrors is true.
scrawl
2016-11-26 01:09:13 +01:00
1fffafb13aFix typo in StateSet::compileGLObjects, causing compilation of attributes to not be executed unless checkForGLErrors is true.
scrawl
2016-11-26 01:09:13 +01:00
46df1fd141Fixed crash in handling of osg::Callback attached as Drawable update callback. Added handling of osg::Callback as a Drawable cull callback
Robert Osfield
2016-11-23 19:18:14 +00:00
b04271f93eFixed 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.
Robert Osfield
2016-11-23 18:19:59 +00:00
e89885a076Added guards against division by zero
Robert Osfield
2016-11-15 17:36:21 +00:00
55f4778731Added usage of GLExtensions::debugObjectLabel() to GLBufferObject::compile()
Robert Osfield
2016-11-15 14:52:59 +00:00
1abd99f084Added support for glObjectLabel debugging
Robert Osfield
2016-11-15 14:35:47 +00:00
4ecf541cb6Merge branch 'fredowski-master'
Robert Osfield
2016-11-15 11:16:53 +00:00
2f570ca3a9Improved the indentation and case to make the code more consistent and readable
Robert Osfield
2016-11-15 11:16:03 +00:00
137b596943Enabled sharing of main threads processor affinity to the next required thread for CullDrawThreadPerCamera and CullThreadPerCameraDrawThreadPerContext
Robert Osfield
2016-11-15 11:01:41 +00:00
87a3648e68To avoid noise in documentation replaced nested namespaced enum with enum with FILE_COPY_ wording prefixed into enum values.
Robert Osfield
2016-11-15 08:57:24 +00:00
80f75bcbddFixed doxygen warnings
Robert Osfield
2016-11-15 08:37:05 +00:00
36b2ddac2dAdded 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.
Robert Osfield
2016-11-14 18:01:22 +00:00
5b375124ccAdded osg::Geometry::configureBufferObjects() and ConfigureBufferObjectsVisitor visitor to help with setting up buffer objects in a coherent fashion.
Robert Osfield
2016-11-14 17:59:25 +00:00
99cb8ebacfAdded 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.
Robert Osfield
2016-11-14 11:59:47 +00:00
e6052ef4b4Added Dragger::applyAppropriateFrontFace(StateSet*) to make it easy to handle inverted matrices by toggling the FrontFace to sure the correct face is visible.
Robert Osfield
2016-11-11 17:16:40 +00:00
8af48d369cAdded Dragger::applyAppropriateFrontFace(StateSet*) to make it easy to handle inverted matrices by toggling the FrontFace to sure the correct face is visible.
Robert Osfield
2016-11-11 17:16:40 +00:00
d16ca33f38Fixed handling of Locator's with negative extents
Robert Osfield
2016-11-11 13:54:15 +00:00
b58048e43bFixed handling of Locator's with negative extents
Robert Osfield
2016-11-11 13:54:15 +00:00
1f1c21772aAdded check against binding type of array to decide whether it's appropriate to assign array to VBO.
Robert Osfield
2016-11-03 11:31:07 +00:00
1234619a48Use CodeDocs for Doxygen documentation
Paul Novotny
2016-11-02 20:56:04 -04:00
e506bb3075added alternative to middle-mouse button in manipulator
Friedrich Beckmann
2016-10-24 19:54:43 +02:00
b5c071eed9Moved shader file loading to a help function
Robert Osfield
2016-10-20 09:59:26 +01:00
c32e6c01edFixed shader filename
Robert Osfield
2016-10-20 09:46:47 +01:00
fda7c838a1Added osgshaderpipeline example that will server as a testbed for automatically mapping fixed function pipeline to shaders
Robert Osfield
2016-10-19 20:26:26 +01:00
1a664b19deadd #define GL_TEXTURE0 for windows users previously provided by GLBeginEndAdapter
Laurens Voerman
2016-10-12 13:29:58 +02:00
c92de93429Altered 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
Robert Osfield
2016-10-12 10:08:56 +01:00
dbdd25742dUpdated version number to 3.5.6 and SO version to 146 after VAO merge
Robert Osfield
2016-10-12 09:09:37 +01:00
0314fd593aAdded VAO support to osgTerrain::GeometryPool
Robert Osfield
2016-10-11 20:11:39 +01:00
b6afce773aRemoved unneccessary includes
Robert Osfield
2016-10-11 20:11:24 +01:00
38ff11f8c5Renamed ArrayDispatchers to AttributeDispatchers to better reflect it's role
Robert Osfield
2016-10-11 15:14:14 +01:00
e14ee80282Streamlined the dispatch and activation of attribute dispatchers
Robert Osfield
2016-10-10 20:49:19 +01:00
364c838ea1Removed unused vertex and texcoord array dispatchers
Robert Osfield
2016-10-10 16:29:21 +01:00
b13bbe3bdbVAO id is a GLuint
Fabian Wiesel
2016-09-24 17:57:58 +02:00
1f562c003cMissed rename in VertexAttribArrayDispatch
Fabian Wiesel
2016-09-23 21:00:40 +02:00
66873b8c6cFixed build errors when OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION to OFF
Robert Osfield
2016-09-05 16:06:52 +01:00
007a19a027Fixed warnings
Robert Osfield
2016-09-05 14:17:40 +01:00
0ee65c9d2fRemoved unneccessary parameter
Robert Osfield
2016-09-02 19:26:20 +01:00
e11e45a2e3Removed GLBeginEndAdapter as it is no longer needed
Robert Osfield
2016-09-02 17:15:14 +01:00
0f3e61146dRefactored osgText so that it no longer uses GLBeginEndAdapter
Robert Osfield
2016-09-02 17:01:25 +01:00
987513d309Added --simple command line option and accompanying code to create a very simple text object for basic testing of osgText
Robert Osfield
2016-09-02 17:00:44 +01:00
aa0c8fdefdAdded ApplyTextureModeProxy for temporarily applying a texture mode
Robert Osfield
2016-09-02 17:00:00 +01:00
53cdacd926Refactored Text3D so that it no longer depends upon GLBeginEndAdapter
Robert Osfield
2016-09-02 14:22:47 +01:00
1914eb435bAdded State::ApplyModeProxy to help with temporarily applying a mode
Robert Osfield
2016-09-02 14:20:17 +01:00
cfadbbda2bRemoved no longer relevant comment
Robert Osfield
2016-09-01 17:26:35 +01:00
a471973eabAdded missing export
Robert Osfield
2016-09-01 17:26:26 +01:00
5a4754deefRefactored osgParticle so that it natives support vertex arrays, vertex buffer objects and vertex array objects
Robert Osfield
2016-09-01 17:14:03 +01:00
cd3a5f8097Added osg::convertToRGBA8(Vec4f) convenience function
Robert Osfield
2016-09-01 17:01:58 +01:00
10f1d84f7eAdded 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
Robert Osfield
2016-09-01 14:42:58 +01:00
d4d32cbde7Improved handling of the BufferObject::Profile::_size, utilizing it's intial value when it is non zero and larger than the arrays assigned to it.
Robert Osfield
2016-09-01 14:41:17 +01:00
8febae1546Fixed VertexArrayState::bind*BufferObject(..) methods so they correctly handle dirtied buffer objects
Robert Osfield
2016-09-01 14:38:16 +01:00
a5e0398a29Fixed typo in comment
Robert Osfield
2016-09-01 14:36:24 +01:00
96b0e42c42Fixed typo in comment
Robert Osfield
2016-09-01 14:35:13 +01:00
ff779e58abAdded 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
Robert Osfield
2016-09-01 14:34:00 +01:00
886b922596Beginings of refactoring ParticleSystem so that it does uses vertex arrays rather than GLBeginEndAdapter
Robert Osfield
2016-08-26 19:48:32 +01:00
611b7afb07Added OSG_EXPORT
Robert Osfield
2016-08-26 15:09:46 +01:00
93b2a24b0eAdded command line parser to osgparticle examples viewer setup to make it easier to position window
Robert Osfield
2016-08-25 17:04:21 +01:00
663024a215Removed redundent use of Geode to decorate the ParticleSystem
Robert Osfield
2016-08-25 16:14:53 +01:00
9800e1c201Fixed line endings
Robert Osfield
2016-08-25 16:14:06 +01:00
c15f6d3e8cMade ordering of case clearer
Robert Osfield
2016-08-25 15:27:16 +01:00
56ed225f17Removed 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
Robert Osfield
2016-08-25 15:13:36 +01:00
c637010c9dRefactored ImpostorSprite so that it no longer uses GLBeginEndAdapter
Robert Osfield
2016-08-25 11:32:00 +01:00
35e19b4f30Added back in the osgimpostor example, cleaning up so that it no longer has any deprecated paths and adds stats and file output for debug purposes
Robert Osfield
2016-08-25 11:05:30 +01:00
037e8f24c6Removed commented out debug message
Robert Osfield
2016-08-25 10:35:01 +01:00
7c432fbe11Refactored osgSim::SphereSegment so that it no longer uses GLBeginEndAdapter
Robert Osfield
2016-08-25 10:28:37 +01:00
a1ab1a0eccAdded AdjustSphereSegmentCallback to provide '<' and '>' key controls over the azim and elev range of the sphere segment
Robert Osfield
2016-08-25 10:25:49 +01:00
a87a6f0851Added StatsHandler to check performance
Robert Osfield
2016-08-24 20:09:52 +01:00
3d0f6d5d78Removed unused header
Robert Osfield
2016-08-23 11:21:49 +01:00
1df27e4edbReplaced old Shape to Geometry conversion code as new convinience methods in include/osg/Shape provide these features
Robert Osfield
2016-08-23 11:09:24 +01:00
e5ab4355beAdded osg::convertShapeToGeometry(...) convinience functions for creating osg::Geometry from osg::Shape descriptions.
Robert Osfield
2016-08-23 11:08:25 +01:00
83b5cabac9Refactored ShapeDrawable so that it is subclassed from osg::Geometry rather than osg::Drawable.
Robert Osfield
2016-08-17 21:34:32 +01:00
3be951f279Fixed crash when using vertex attribute arrays
Robert Osfield
2016-08-16 16:51:41 +01:00
b2873132beAdded support for interleaved arrays
Robert Osfield
2016-08-16 15:33:54 +01:00
f842750342Removed no longer used member variables
Robert Osfield
2016-08-16 11:23:29 +01:00
65884f296bRemoved no longer used data structures
Robert Osfield
2016-08-16 11:11:24 +01:00
16da432be3Moved FOG_COORD and SECONDARY_COLOR #define's from State header into VertexArrayState.cpp
Robert Osfield
2016-08-16 10:51:56 +01:00
164981f7a3Replaced osg::State:set*Pointer() calls with VertexArrayState::set*Array() calls
Robert Osfield
2016-08-16 10:01:38 +01:00