Julien Valentin
4cc06dec4b
use OpenGL 3.0 instead of 3.1 for more compatibility
...
..as there no feature in the example requiring 3.1
2018-09-18 15:20:09 +02:00
Robert Osfield
697131a39b
Warning fixes
2018-09-11 15:33:55 +01:00
Robert Osfield
7c1a967a02
Fixed warning
2018-09-11 12:30:28 +01:00
OpenSceneGraph git repository
0942bf24a1
Merge pull request #621 from mp3butcher/readDisplay
...
fix examples context creation for X11
2018-09-11 08:39:21 +01:00
Robert Osfield
b913367126
Added greater control of how cubemap is set up and controlled
2018-09-11 08:12:36 +01:00
mp3butcher
369a468083
fix examples context creation for X11
...
(when display not :0.0)
2018-09-08 18:28:51 +02:00
Thomas Hogarth
9bed712952
Merge remote-tracking branch 'upstream/master' into topic-gles3-android
...
merging
2018-08-28 14:25:38 +01:00
Alex Burton
cd214245e7
updated osgviewerWX to remove deprecated calls in wxWidgets 3.x
2018-07-27 14:19:14 +02:00
Thomas Hogarth
49e9aadbf5
Improved iOS cmake support for xcode 9.4 and cmake 3.11
2018-07-10 02:09:28 +01:00
Thomas Hogarth
014255bd9e
Merge branch 'master' of git://github.com/openscenegraph/OpenSceneGraph into topic-gles3-android
...
merging with master
2018-06-29 03:08:24 +01:00
弥继平
36aa3a4fc6
Fixed the position of the viewport for the camera
...
The position of viewport doesn't setup properly, some part of viewer is out of CMFC_OSG_MDIView, and not visible.
2018-06-19 00:33:03 +08:00
Thomas Hogarth
b14ecd27f1
fixed error with android sdk packaging
2018-05-23 10:20:13 +01:00
Thomas Hogarth
30f16ff91f
upped default sdk version on android gles3 example
2018-05-23 04:22:35 +01:00
Thomas Hogarth
e34012196d
Updated java side to gles3
2018-05-23 03:10:20 +01:00
Thomas Hogarth
b67a7c5981
compile fix for gles3 on android, copied example folder to create gles3 android example
2018-05-23 02:01:21 +01:00
Robert Osfield
1596058c10
Fixed create of graphics context by explicting adding USE_GRAPHICSWINDOW to force the WindowingSystemInterface to initialize
2018-05-18 14:25:30 +01:00
Alberto Luaces
bc4f181d41
Fix typos and spelling.
2018-04-20 18:18:22 +02:00
Robert Osfield
6863cdee9a
Removed usage of the osgUtil::TriStripVisitor is it generates osg::Geometry that perform very poorly when using VBO and VAO's vs GL DisplayLists.
...
With DisplayLists being deprecated in GL and VBO and VAO becoming standard it's best to standardize on using the osgUtil::MeshOptimizers instead of TripStrupVisitor
2018-04-20 11:42:31 +01:00
Robert Osfield
7efc10d0e6
Added --equalize-boundaries -e command line option to call terrain->setEqualizeBoundaries(true)
2018-04-18 09:33:12 +01:00
Robert Osfield
1d4f6c2543
Cleaned up includes
2018-04-17 09:20:23 +01:00
Robert Osfield
e884df59c7
Pulled in latest changes from 3.6 branch
2018-04-07 18:14:57 +01:00
Robert Osfield
db1ff4c415
Added osgtext --alignment test to look the effect of calling Text::setAlignent() before and after the Text::setText().
2018-04-06 14:06:50 +01:00
Robert Osfield
38534c453a
Added EventHandler to report key and mouse events for debugging purposes
2018-04-04 13:40:06 +01:00
Robert Osfield
fdc7d225a0
Added -4 command line entry that creates two seperate windows within CompositeViewer
2018-04-04 12:26:53 +01:00
Robert Osfield
b920d482c7
Removed osgShadow::ShadowVolume as it functionality isn't functional
2018-04-03 11:35:31 +01:00
Robert Osfield
bd80a1f687
To osgclipe example added --text textstring and --simple command line options to test mixing text and clipping
2018-03-30 15:28:24 +01:00
Robert Osfield
8ae8966177
Fixed read shader to safer ref version
2018-03-24 11:25:19 +00:00
Robert Osfield
88b7526a83
Fixed spotlight colour mixing
2018-03-24 11:00:01 +00:00
Michael Kapelko
1170f6247e
Provide osgemscripten example CMake flags in a more stable way
2018-03-23 18:07:07 +03:00
Robert Osfield
9d21e5de8c
Merge branch 'master' into shader_pipeline
2018-03-19 15:36:32 +00:00
Robert Osfield
b563f1bd78
Fixed build issues when building with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION set to OFF
2018-03-19 14:08:47 +00:00
Robert Osfield
10e1c29d2e
Merge branch 'master' into shader_pipeline
2018-03-19 11:00:07 +00:00
Robert Osfield
b38a37c3bb
Fixed warnings
2018-03-19 10:42:09 +00:00
Robert Osfield
c3af787a3a
Merge branch 'master' into shader_pipeline
2018-03-16 13:35:22 +00:00
Robert Osfield
add6b3edee
Added --shader saderfilename command line option to enable one to manually specify which shaders to use for the uber program.
2018-03-15 16:49:58 +00:00
Robert Osfield
3585ecc28c
Merge branch 'master' into shader_pipeline
2018-03-14 09:20:08 +00:00
Robert Osfield
4447190dd6
Refactored osgUtil::ShaderGen to use #pragma(tic) shader composition.
2018-03-14 08:22:45 +00:00
Robert Osfield
178cba7cf0
Fixed build error
2018-03-07 16:45:58 +00:00
Robert Osfield
98cdeac9f6
Added missing Camera::setDrawBuffer/setReadBuffer()
2018-03-06 16:54:57 +00:00
Robert Osfield
f8eabd38ba
Added missing Camera::setDrawBuffer() & setReadBuffer()
2018-03-06 16:42:11 +00:00
Robert Osfield
731065a32e
Added missing setDrawBufer/setReadBuffer calls
2018-03-06 16:23:20 +00:00
Robert Osfield
97ba981dce
Merge branch 'master' into shader_pipeline
2018-02-08 09:28:40 +00:00
Robert Osfield
f767ab0cc9
Refactored the event handler so that it contains a helper NodeVistor class rather than inherits from inappropriately using multiple inheritance.
2018-02-07 17:23:14 +00:00
Robert Osfield
2f65456dd4
Merge branch 'master' into shader_pipeline
2018-01-21 13:11:51 +00:00
Laurens Voerman
b0b28d21d9
fix bug: potentially uninitialized local variable 'hr' used
2018-01-19 11:38:01 +01:00
Robert Osfield
41e3b723a7
Merge branch 'master' into shader_pipeline
2018-01-15 16:52:10 +00:00
Laurens Voerman
4f7fcb19d5
remove unused variable "newArrays"
2018-01-15 16:04:12 +01:00
Robert Osfield
9fdc713b97
Merge branch 'master' into shader_pipeline
2018-01-14 13:28:45 +00:00
Julien Valentin
480b452e38
improve example to get command arguments
2018-01-13 21:29:02 +01:00
Robert Osfield
6a413da143
Merge branch 'master' into shader_pipeline
2018-01-05 11:35:11 +00:00
