Ulrich Hertlein
e723c6d63b
Fixes compiler warning regarding logic vs bitwise AND
2017-04-23 11:52:05 +02:00
Robert Osfield
6308b497f2
Replaced macro based selection of which shaders to use by default with DisplaySettings::setShaderHint() and OSG_SHADER=HINT=GL2|GL3|GLES2|GLES3|NONE controls
2017-03-27 11:44:41 +01:00
Thomas Hogarth
7ba2e728cd
GLES3 now working on iOS, tried to maintain support for have bother gles2 and gles3, allowed avfoundation to be added on iOS, improved iOS example cmake generation
2017-03-20 18:39:56 +00:00
Thomas Hogarth
3a6e28da9c
More gles3 tweaks
2017-03-20 18:39:56 +00:00
Robert Osfield
6670a6e070
Improved support for stats, fonts and shadergen for GLES2, GLES3 and GL3
2017-03-20 14:07:14 +00:00
Robert Osfield
e0592b6d11
Added shader for GL3/GLES/GL2/GL2
2017-03-20 10:31:58 +00:00
Riccardo Corsi
b3ccf02e06
Added PEN input support to GraphicsWindowWin32 with the WM_POINTER* framework available since Windows 8.
...
Fallback on existing WM_TOUCH implementation for actual touch inputs.
2017-03-16 15:32:05 +01:00
Robert Osfield
2c2097ce24
Replaced GL_QUADS usage with GL_TRIANGLES to aid portability.
2017-03-13 17:46:51 +00:00
Robert Osfield
96760970ed
Added setDataVariance(DYNAMIC) to stats text labels that are dyanmically updated.
2017-03-09 17:01:33 +00:00
Hartwig
192dcec5f9
Blending out of local functions
...
Some local functions are only needed for OS X compatibility. Define these functions only for OS X versions older than 10.6.
2017-01-01 16:33:37 +01:00
Robert Osfield
28799b1ff6
Refactored the minimum width of bars.
2016-12-21 16:11:39 +00:00
OpenSceneGraph git repository
2b8bcf5475
Merge pull request #180 from LaurensVoerman/stats_bars
...
improve stats display
2016-12-21 16:04:24 +00:00
Laurens Voerman
a9657bf5e8
DEBUG FPS counter in red and named "DEBUG Frame Rate:"
2016-12-21 15:58:09 +01:00
Laurens Voerman
f567d4702d
improve stats display
2016-12-21 15:47:04 +01:00
Robert Osfield
ff8b5536a5
Added StateSet::setGlobalDefaults() to fix bug when osgViewer has stats on but no scene graph assigned
2016-12-21 09:10:50 +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
Laurens Voerman
d461149969
re-assign thread affinity at the end of setThreadingModel()
2016-10-17 09:50:48 +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
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
d8fdf33be5
Cleaned up set up of osg::Geometry for stats
2016-10-11 11:29:29 +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
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
Alberto Luaces
7f3c92f492
Some spelling fixes in comments.
2016-10-05 18:10:46 +02:00
Robert Osfield
79ff8ba273
Merge branch 'Submissions2e' of https://github.com/LaurensVoerman/OpenSceneGraph into LaurensVoerman-Submissions2e
2016-09-02 18:26:11 +01: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
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
Ravi Mathur
e9d6737ec4
Updates to the CMake build system for Mac OSX
2016-08-10 14:30:28 +01:00
Mathieu MARACHE
a54dc34752
Added CoreProfile selection if OSG_GL3_AVAILABLE defined
2016-08-05 07:49:22 +02: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
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
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
2122980d0a
Fixed number of processors setting
2016-07-02 10:14:06 +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
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
295da33cdf
Fixed compute of numProcessors
2016-06-24 16:05:07 +01:00
Robert Osfield
e9faa8890d
Removed dead code
2016-06-23 17:04:30 +01:00
Robert Osfield
39860cfb71
Added minimum of 1 to make sure numProcessors is always valid
2016-06-23 16:53:12 +01:00
Robert Osfield
b8d1e4d2f6
Added minimum of 1 to make sure numProcessors is always valid
2016-06-23 16:52:16 +01:00
Robert Osfield
148d5e799e
Added minimum usage to make sure that numProcessers is always 1 or greater
2016-06-23 16:50:35 +01:00
Robert Osfield
97c95ab491
Added check for null
2016-06-23 16:48:00 +01:00
Robert Osfield
130c02eb2e
Restructed use of frameNumber to avoid multiple queries
2016-06-23 16:45:22 +01:00
Robert Osfield
72a4bc6394
Restructed check against null
2016-06-23 16:42:54 +01:00
Robert Osfield
79554fedf8
Added check for valid pointer
2016-06-23 16:40:58 +01:00
Robert Osfield
4c38068eb8
Added check before using pointer
2016-06-23 16:39:36 +01:00
Robert Osfield
09df93813d
Added missing check against null
2016-06-17 09:40:35 +01:00
