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
Julien Valentin
aac146c7bc
correct a bug and make it more conservative
2017-07-31 02:43:50 +02:00
Julien Valentin
d810d4a4c0
add a very simple example for mdi with basevertex
2017-07-30 10:28:56 +02:00
mp3butcher
a45c4c8f39
set DIBO of the drawcommandarray directly in their interface constructor
...
it makes osggpu use case lighter + drawcommandarray can't exist without a BO
2017-07-27 12:27:55 +02:00
mp3butcher
104b2dfc72
Promote PrimitiveSetIndirect's VBO to a target explicited DIBO (in order to benefit from BOSet queue management)
2017-07-27 12:13:05 +02:00
mp3butcher
f27c379b1e
some renaming and harmonisations with osg metamodel convention
2017-07-26 23:36:55 +02:00
mp3butcher
5be14bc2ba
first commit for Indirect Draw integration in osg
...
users will have to implement interfaces for their custom drawcommandarrays
add a lot of new primitive set + few defines
integration is made in osggpucull
2017-07-26 21:20:28 +02:00
Michael Kapelko
f992ec1440
Add osgemscripten example
2017-06-22 09:44:06 +07:00
blobfish
69e1df6b65
examples: osgkeyboardmouse: add primitive index to LineSegmentIntersector output
2017-06-04 17:29:57 -04:00
Robert Osfield
502acc19c9
Build fix
2017-05-25 09:54:11 +01:00
Robert Osfield
8c54a49319
Replaced deprecated API usage
2017-05-24 19:39:36 +01:00
Robert Osfield
6d46a35900
Aded --dim-mask mask and --dm mask command line option for setting the PolytopeIntersector::setDimensionsMask().
2017-05-24 18:36:31 +01:00
Robert Osfield
9738d19343
Build fix.
2017-05-11 16:27:20 +01:00
Robert Osfield
a74b4b94a9
Fixes/clean up of KdTree/LineSegmentIntersector/PolytopeIntersector
2017-05-11 15:29:31 +01:00
Robert Osfield
6e1866ac18
Added --points and --lines command line options that do a very simplistic conversion of geometry primitives to points or lines respectively, used to aid testing of intersectors
2017-05-11 15:29:31 +01:00
Robert Osfield
03f73d3aad
Added --double and --float command line options to enable toggling between double and float precision in intersectors
2017-05-11 15:29:31 +01:00
Robert Osfield
40ca018e66
Introduced use of TempaltePrimitiveFunctor and TempaltePrimitiveIndexFunctor as a test of these template classes
2017-05-11 15:29:31 +01:00
Robert Osfield
c9545970ac
Removed redudent bool parameter from TriangleFunctor::operator(Vec3, Vec3, Vec3, bool) so it's now simply TriangleFunctor::operator(Vec3, Vec3, Vec3) as the bool was always false in recently OSG versions.
2017-05-11 15:25:10 +01:00
Robert Osfield
a7d98f80dc
Added ability to pass in command line arguments to the osgkeyboardmouse viewer constructor
2017-05-11 15:25:10 +01:00
Robert Osfield
e09dfb93f1
Added group intersection test that covers the window with 10000 tests, activated by pressing 'a'. I have added this to provide a reproducable intersection test for benchmarking.
2017-05-11 15:25:10 +01:00
Robert Osfield
0a651fef7c
Added support for outputting the model, filename defaults to model.osgt, to override this use -o filename on command line, and to write the file press 'o' key.
2017-05-11 15:25:10 +01:00
Robert Osfield
b77301350b
Added --kdtree command line option and associated invocation of KdTreeBuilder to enable benchmarking.
...
Added timing stats code.
2017-05-11 15:25:10 +01:00
Robert Osfield
728a7f2225
Merge branch 'MultiViewAutoTransform'
2017-05-11 14:35:50 +01:00
OpenSceneGraph git repository
78d232edaf
Merge pull request #254 from tomhog/topic-gles3-ios
...
Topic gles3 ios
2017-05-10 11:13:11 +01:00
Chris White
1f05290982
Added clarifying comments in examples/osggeometry
...
Per reviewer feedback
2017-05-09 15:51:24 -04:00
Chris White
6df273a865
Turned off lighting in examples/osggeometry
...
This way you can see the image and the points even if you view them
close to edge-on.
2017-05-09 15:51:24 -04:00
Robert Osfield
8b2f61ec2a
Addeed support for GLES shaders
2017-05-08 12:27:07 +01:00
Thomas Hogarth
2ce5238cf7
Added more plugins to iOS example, Textures now working on GLES3 (missed so if defineds)
2017-05-04 18:17:30 +01:00
Thomas Hogarth
fe0b53d7f5
Added more plugins and texture shader to iOS example, fixed a couple of missed if defines for GLES3
2017-05-04 00:24:46 +01:00
Robert Osfield
c5b22f341a
Added ability to create windows for each view using -w command line hint.
2017-04-26 09:48:08 +01:00
Robert Osfield
3869714005
Added multiple view support to osgautotransform for testing multi-views
2017-04-25 20:26:26 +01:00
jamie robertson
f16167c3e8
osgbindlesstext example fix : needed to add "viewer.realize()" before the line "viewer.getCamera()->getGraphicsContext()" in order to get a valid graphics context, before viewer.run() is called.
2017-04-07 07:15:30 +01:00
Robert Osfield
43891d6cc1
Removed unneccessary EXT usage
2017-04-07 07:11:57 +01:00
Jamie Robertson
0e69fe6bc6
VS build fix
2017-04-07 07:09:24 +01:00
Konstantin Matveyev
0f04d2f032
Added dynamic update of Text3D test
2017-04-06 10:51:47 +01:00
Robert Osfield
b76e031b30
Experiment with transmitting large UDP massages
2017-03-30 18:21:02 +01:00
Robert Osfield
ad0434c415
Added --ifr-name name command line option to enable the broacaster to customize the ifreq.ifr_name
2017-03-30 17:02:37 +01:00
Robert Osfield
a6baf00956
Reordered command line parsing and replace throw with cout.
2017-03-30 13:21:05 +01:00
Robert Osfield
e2d4ebbe55
Build fixes
2017-03-30 12:55:58 +01:00
Robert Osfield
a292d99308
Build fix
2017-03-30 12:45:25 +01:00
Robert Osfield
80a13f1ac7
Added --address and --port command line parameters to osgoscdevice example
2017-03-30 12:20:45 +01:00
