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
Julien Valentin
662bea239c
add GLSampler as Texture Property
...
and a simple example mixing (add) 2 textures
2018-01-03 21:34:10 +01:00
Robert Osfield
e3d438d80f
Merge branch 'master' into shader_pipeline
2018-01-03 12:34:01 +00:00
Julien Valentin
f9b1c614bc
adapt examples for new BindImageTexture
2018-01-02 18:15:25 +01:00
Robert Osfield
d426513b64
Merge branch 'master' into shader_pipeline
2017-12-19 10:43:44 +00:00
Robert Osfield
d2bfde30f0
Deprecated dirtyDisplayLists(), use established dirtyGLObjects() instead
2017-12-18 13:54:08 +00:00
Robert Osfield
dadfe8ae0b
Merge branch 'master' into shader_pipeline
2017-12-01 09:14:52 +00:00
Robert Osfield
9f6eb74d28
Merge branch 'ComputeDispatch' of https://github.com/mp3butcher/OpenSceneGraph into mp3butcher-ComputeDispatch
2017-11-29 09:30:56 +00:00
Julien Valentin
994c38c0c7
adapt SSBO example for ComputeDispatch
...
but have strange runtime errors:
0(100) : error C7623: implicit narrowing of type from "vec3" to "float"
0(108) : error C7623: implicit narrowing of type from "vec3" to "float"
2017-11-28 20:03:40 +01:00
Philippe Renon
2acddf66b1
replace more read*File() usage to readRef*File()
2017-11-28 19:51:31 +01:00
Julien Valentin
bf1b4ec2bb
add ComputeDispatch class
...
revoke glDispatch in PCProgram::useProgram
update example
2017-11-28 17:30:04 +01:00
Robert Osfield
284f91b3e0
Replaced deprecated osg::Shader::reaDShaderFile()/loadShaderFromSource() usage
2017-11-27 18:38:37 +00:00
Robert Osfield
06302a1082
Replaced read*File() usage to readRef*File()
2017-11-27 15:41:54 +00:00
Robert Osfield
9fc63d7613
Fixes for building with OSG_PROVIDE_READFILE to OFF
2017-11-27 11:10:48 +00:00
Robert Osfield
a72a929d12
Fixed build issues when compiling with OSG_PROVIDE_READFILE to OFF
2017-11-27 11:05:31 +00:00
Robert Osfield
93a5213b99
Build fix
2017-11-27 10:32:02 +00:00