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
Robert Osfield
b5c071eed9
Moved shader file loading to a help function
2016-10-20 09:59:26 +01:00
Robert Osfield
c32e6c01ed
Fixed shader filename
2016-10-20 09:46:47 +01:00
Robert Osfield
fda7c838a1
Added osgshaderpipeline example that will server as a testbed for automatically mapping fixed function pipeline to shaders
2016-10-19 20:26:26 +01:00
OpenSceneGraph git repository
26a313d549
Merge pull request #159 from LaurensVoerman/Affinity3b
...
re-assign thread affinity at the end of setThreadingModel()
2016-10-17 16:36:42 +01: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
4e5f0fc3a5
Added a dedicated FindEGL.cmake script to help with locating the EGL.so library and header
2016-10-14 11:06:31 +01:00
Robert Osfield
afb046a196
Bumped OpenThreads version numbers to reflect changes in ABI
2016-10-13 17:43:29 +01:00
Robert Osfield
b10d30242d
Fixed GLES build due to lack of GLclampd
2016-10-12 18:00:05 +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
OpenSceneGraph git repository
953af3d1d9
Merge pull request #155 from LaurensVoerman/Texture0
...
add #define GL_TEXTURE0 for windows users previously provided by GLBeginEndAdapter
2016-10-12 13:41:57 +01:00
Laurens Voerman
1a664b19de
add #define GL_TEXTURE0 for windows users previously provided by GLBeginEndAdapter
2016-10-12 13:29:58 +02: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
dbdd25742d
Updated version number to 3.5.6 and SO version to 146 after VAO merge
2016-10-12 09:09:37 +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
b13bbe3bdb
VAO id is a GLuint
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
987513d309
Added --simple command line option and accompanying code to create a very simple text object for basic testing of osgText
2016-10-11 11:29:29 +01:00
Robert Osfield
aa0c8fdefd
Added ApplyTextureModeProxy for temporarily applying a texture mode
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
1914eb435b
Added State::ApplyModeProxy to help with temporarily applying a mode
2016-10-11 11:29:29 +01:00
Robert Osfield
cfadbbda2b
Removed no longer relevant comment
2016-10-11 11:29:29 +01:00
Robert Osfield
a471973eab
Added missing export
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
cd3a5f8097
Added osg::convertToRGBA8(Vec4f) convenience function
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
a5e0398a29
Fixed typo in comment
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
611b7afb07
Added OSG_EXPORT
2016-10-11 11:29:29 +01:00
Robert Osfield
93b2a24b0e
Added command line parser to osgparticle examples viewer setup to make it easier to position window
2016-10-11 11:29:29 +01:00
Robert Osfield
663024a215
Removed redundent use of Geode to decorate the ParticleSystem
2016-10-11 11:29:29 +01:00
Robert Osfield
9800e1c201
Fixed line endings
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
