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
Robert Osfield
3c6f569360
Fixed placement of { and spacing to make the code more readable and consistent with the rest of the OSG
2017-10-19 11:06:23 +01:00
Robert Osfield
a9ef5a90eb
Fixed indentation
2017-10-16 09:49:47 +01:00
Robert Osfield
24bec09b9e
Removed the glyph image outline support as it's no longer required.
2017-10-13 13:01:57 +01:00
Robert Osfield
8b12d2d71a
Deprecated Text:BackdropImplementation, removing the backend as it no longer required when using shaders for backdrop effects
2017-10-13 11:42:25 +01:00
Laurens Voerman
99491e46ec
modified present3D to allow multiple --login arguments like osgViewer, added --login option to osgvnc example
2017-10-12 17:21:10 +02:00
Robert Osfield
7fb37016fd
Merge branch 'master' into text_improvements
2017-10-05 12:14:03 +01:00
Robert Osfield
d2fa7c4317
Simplified and improved the glyph margin computation and usage
2017-09-29 20:21:13 +01:00
Robert Osfield
468d6d8eea
Added command line support for specifying "default" for osgText::DefaultFont
2017-09-29 10:20:59 +01:00
Robert Osfield
726bb13e9a
Improved the setup of the --counter test
2017-09-29 09:54:43 +01:00
Robert Osfield
8c575c0cea
UPdated from OpenSceneGraph-Data with handling of non textured text decoration
2017-09-26 15:32:41 +01:00
Robert Osfield
b6bb0caf8d
Removed debug output
2017-09-21 16:04:10 +01:00
Robert Osfield
4b6722ab44
Added assignStateSet() to Text::setBackgroundColor()
2017-09-21 16:01:27 +01:00
Robert Osfield
12904105f8
Added support for toggling on use of the new SignedDistanceFunction function now built into osgText, just use --sdf to enable.
2017-09-21 15:52:07 +01:00
Robert Osfield
a1f519cbec
Removed debug info
2017-09-21 15:41:21 +01:00
Robert Osfield
fb0a995d7b
cleaned up exmple
2017-09-20 14:30:23 +01:00
Robert Osfield
5ade852172
Added constant sizeing vs changing label size relatve to font resolution, controlled by --constant-size and --scale-size command line options.
2017-09-15 15:14:19 +01:00
Robert Osfield
1e11b89d04
Added --shadow-* command line variants to provide full control over the position of the text shadow
2017-09-13 11:08:51 +01:00
Robert Osfield
0d5a42f635
Added setting of the Text::BackdropImplementation type to USE_SHADERS when setting up shaders
2017-09-12 19:13:01 +01:00
Robert Osfield
f98c23d460
Added extra command line paramter and osgText::Font settings to add better control of osgText::GlyphTexture generation to support signed distance field and outline image data.
2017-09-08 17:03:15 +01:00
Robert Osfield
77d4705182
Added KeyHandler for toggling "SIGNED_DISTANCE_FIELD" and "OUTLINE" #pragma(tic) shader defines to control the different shader paths.
...
Keys to press are 'd' for toggle SIGNED_DISTANCE_FIELD and 'o' for OUTLINE.
2017-09-06 16:53:54 +01:00
Robert Osfield
20ee12e986
To control the GlyphTexture Min/MagFilter values Added --min <value> and --mag <value> filter with LINEAR, NEAREST and LINEAR_MIPMAP_LINER options for values
2017-09-06 10:40:05 +01:00
Konstantin S. Matveyev
ca42523cd0
example_osgtext3d: more options for testing
2017-09-04 11:44:30 +03:00
Julien Valentin
dee9dc2164
a functional cleanup
2017-09-01 01:43:00 +02:00
Julien Valentin
068a032dac
revert s/VertexIndexWeight/IndexWeight/
2017-08-31 13:30:24 +02:00
Julien Valentin
0926bb783d
fix example
2017-08-31 13:29:42 +02:00
Robert Osfield
07a8d082e4
Added --shader filename command line parsing and associated set up of osg::Program to allow shaders to be passed into example to customize rendering
2017-08-30 17:43:29 +01:00
Robert Osfield
81f93e34b8
Added --interval value commnad line option for setting the Font::setGlyphInterval() to experimentation of clamping of glyph images to user specified intervals in the glyph texture
2017-08-30 16:22:25 +01:00
Julien Valentin
8fad310ce1
readd VertexInfluence whenever it's bad named and kinda useless
2017-08-30 15:30:03 +02:00
Robert Osfield
7323bb776b
Added --margin texel_width and --margin-ration ratio to control the spacing between glyphs in the font.
2017-08-30 10:50:26 +01:00
Robert Osfield
20ecd5c60d
Added --test command line option that sets up all the sizes and font settings required for a useufl unit test.
2017-08-30 10:16:18 +01:00
Julien Valentin
fe99b568a0
refactor: remove totally VertexInfluence (renamed BoneInfluenceList) everywhere
2017-08-30 11:12:17 +02:00
Robert Osfield
5566a025b5
Added TextSettings struct to manage values used to set up the text. with the addition of following command line parameters:
...
--outline // enable outlne
--shadow // enable shadow
--offset ratio // set the backdrop offset
--text-color r g b a // set the text body color
--bd-color r g b a // set the shadow/outline color
--bg-color r g b a // window background color
-o filename // write create subgraph to disk using specified filename
2017-08-29 17:19:26 +01:00
Julien Valentin
21bcd61c92
add MorphTransformHW for RigGeometry sources that are MorphGeometry
2017-08-29 14:49:19 +02:00
Robert Osfield
37487b0c0b
Added --ortho command line option to toggle use of orthographic camera or default perspective one
2017-08-29 13:48:06 +01:00
Robert Osfield
c36e47188b
Added argument parsing to viewer constructor
2017-08-29 12:21:14 +01:00
Julien Valentin
4a626cea20
remove VertexInfluenceSet
2017-08-29 00:07:07 +02:00
Julien Valentin
8707086914
fix the example
2017-08-28 17:13:23 +02:00
Robert Osfield
5d55ffe6ee
Merge branch 'osganimation' of https://github.com/mp3butcher/OpenSceneGraph into osganimation
2017-08-28 10:28:18 +01:00
Julien Valentin
ca224c81dd
replace VertexInfluence to BoneInfluenceList
...
and VertexIndexWeight to IndexWeight
fix in example
2017-08-27 05:21:37 +02:00
Michael Kapelko
871d8c54ec
Fix Emscripten build errors
2017-08-26 19:25:00 +03:00
Julien Valentin
2d1aaedb9c
fix osggpucull to fit both new BIB and MDI
2017-08-24 14:20:10 +02:00
Julien Valentin
107b7be95b
Merge remote-tracking branch 'upstream/master' into MDI7
2017-08-24 11:26:23 +02:00
Julien Valentin
3de1ce062c
comply with osg::BufferIndexBinding new design (a miss)
2017-08-24 10:29:19 +02:00
Julien Valentin
d49f0d67af
change the design of BufferIndexBinding to work with BufferData instead of BufferObject
...
allow convenient BufferData abstraction + serialization of BufferIndexBinding
2017-08-24 03:28:55 +02:00
OpenSceneGraph git repository
bfbaecaf49
Merge pull request #300 from eligovision/master
...
Text3D character/glyph size fix
2017-08-16 11:30:14 +01:00
konstantin.matveyev
237ab29ff8
Merge remote-tracking branch 'upstream/master'
2017-08-15 22:15:31 +03:00
konstantin.matveyev
b0ef9b0c42
Text3D character/glyph size fixed
2017-08-15 22:11:15 +03:00
luzpaz
2cd31f65e4
misc. typo fixes
...
mostly non-user-facing but some doxy.
2017-08-15 12:23:49 -04:00
Robert Osfield
7b2dbc603c
Fixed warning
2017-08-15 16:35:23 +01:00
Julien Valentin
9e9d3cd249
fix a bug : indices pre incremented should be post
2017-07-31 03:15:03 +02:00
Julien Valentin
3537460b0e
Add arguments, command line usage and use DrawElementsUInt for classic case
2017-07-31 03:10:19 +02:00
