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
OpenSceneGraph git repository
8d36049dcd
Merge pull request #382 from openscenegraph/osganimation
...
Osganimation improvements
2017-11-11 14:43:10 +00:00
OpenSceneGraph git repository
252c28d516
coding style/readability fixes
2017-11-11 12:27:56 +00:00
Robert Osfield
74226e5904
Added Pawel's origin commit message into the osggpucull source as it examples a lot about how the example works
2017-11-06 20:49:23 +00:00
Julien Valentin
47c4ef510d
update example to use a common program
2017-10-31 18:00:06 +01:00
Robert Osfield
bf517febfc
Merge branch 'master' into shader_pipeline
2017-10-28 12:58:47 +01:00
Robert Osfield
11f9bbf6ea
Merge branch 'master' into osganimation
2017-10-27 12:54:10 +01:00
Robert Osfield
671ea7ae74
Added command line parsing to aid with testing of osgText by allowing osgText::FadeText to be created with various options
2017-10-26 12:02:56 +01:00
Robert Osfield
c8bd6fd100
Added stats handler
2017-10-24 16:04:14 +01:00
Robert Osfield
4b295c46d1
Restructed the way that GlyphTexture is set up to better support control of osgText::ShaderTechnique from osgText::Text
2017-10-23 14:50:35 +01:00
Robert Osfield
97aeb16551
Moved osgText::GlyphTechnique::Features enum to osgText::ShaderTechinque enum to make it's roll clearer
2017-10-20 17:03:25 +01:00
Robert Osfield
6b75439ae4
Merge branch 'master' into text_improvements
2017-10-20 14:14:14 +01:00
Robert Osfield
8965c9369e
Implemented --single command line option that creates a single osg::DrawElementsUInt primitive set instead of using MultiDrawIndirect.
2017-10-19 12:39:22 +01:00
Robert Osfield
4791e5f6b5
Improved spacing to make code more readable
2017-10-19 12:06:59 +01:00
Robert Osfield
068f47d91f
Build fixes with ref_ptr<> autoconversion disabled
2017-10-19 11:57:53 +01:00
