Julien Valentin
739303b3d9
override compile and createVAS in order to do nothing
2017-11-28 20:38:54 +01:00
Julien Valentin
195df4f811
numgroup removed but introduce a reto compatibility bug in Program serializer
...
hope nobody use it
2017-11-28 17:39:32 +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
34336931fa
Deprecated the osg::Shader::reaDShaderFile() and osg::Shader::loadShaderSourceFromFile() methods.
...
Programmers should use osgDB::readRefShaderFile()/readShaderFile() instead.
2017-11-27 18:28:15 +00:00
Robert Osfield
cb2c48d015
Added template addShader() method to make it easier to pass ref_ptr<osg::Shader>
2017-11-27 15:40:21 +00:00
Robert Osfield
13c593ce0e
Fixed typo
2017-11-21 13:59:51 +00:00
Robert Osfield
7f97b9f999
Added Text::getCharacterCorners(...) method to help applications that want to find out the positions of characters being rendered.
2017-11-21 13:41:57 +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
a5f6e4b0c4
Small readability improvements
2017-11-11 12:45:55 +00:00
OpenSceneGraph git repository
ca5ce00783
coding style/readability fixes
2017-11-11 12:29:45 +00:00
Robert Osfield
338b0e2b7b
Moved getenv usage across to safer osg::getEnvVar() usage
2017-11-01 17:38:33 +00:00
Robert Osfield
0e7e06349e
Added safety check for getenv parsing to prevent overflow attacks via getenv.
2017-11-01 16:43:32 +00:00
Robert Osfield
e59ad87044
Made template function inline to avoid multiple declaration issues
2017-11-01 14:16:54 +00:00
Robert Osfield
51a9c66856
Added OSG_ENVVAR_SUPPORTED cmake control and bool osg::getEnvVar(const char* name, T& value, ...) conviniece funcions to make it easier to implement optinal getenv reading code.
2017-11-01 13:32:47 +00:00
Robert Osfield
c242ad4497
Fixed unititialized memory variables and improved readability by adding spacing where appropriate
2017-10-31 17:55:59 +00:00
Julien Valentin
6e79ce348d
reformat with the help of AStyle reformat tool (codeblocks)
2017-10-28 14:46:14 +02:00
Robert Osfield
671847387f
Fixed build errors when compiling with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION set to OFF
2017-10-27 14:19:13 +01:00
Robert Osfield
11f9bbf6ea
Merge branch 'master' into osganimation
2017-10-27 12:54:10 +01:00
OpenSceneGraph git repository
1126812f8f
Merge pull request #372 from openscenegraph/text_improvements
...
Text improvements, introducing implementation of Signed Distance Function texture generation and new shaders for outlines and shadows replacing old multi-pass approach
2017-10-26 14:26:01 +01:00
Robert Osfield
248805fedd
Fixed pre compilation osg::Program state leaking into the main scene graph rendering
2017-10-25 16:13:26 +01:00
Robert Osfield
9c9439ef73
Added DisplaySettings:s/getgTextShaderTechnique() and OSG_TEXT_SHADER_TECHNIQUE env var support to DisplaySettings.
...
Added using of DisplaySettings:getgTextShaderTechnique() to Text default constructor.
Added better debug output control in Text.cpp
2017-10-24 14:46:13 +01:00
Robert Osfield
1cd0a5fe03
Fixed Glyph::TextureInfo assignment bug
2017-10-24 11:36:00 +01:00
Robert Osfield
55a1764712
Renamed text_sdf.frag to text.frag and removed text_greyscale_frag.
...
Cleaned up setup of osgText::ShaderTechnique adding a NO_SHADER_TECHNIQUE option.
2017-10-23 16:07:24 +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
Hartwig
41e9cd3157
Replacement of commas with semicolons
2017-10-22 15:04:33 +02:00
Robert Osfield
817b6601d2
Added Text::s/getShaderTechnique()
2017-10-21 10:08:41 +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
068f47d91f
Build fixes with ref_ptr<> autoconversion disabled
2017-10-19 11:57:53 +01:00
Robert Osfield
879b54f6e9
Fixed GLX EGL build
2017-10-16 10:47:47 +01:00
Robert Osfield
639ced08fc
Removed inappropriate tabs&spaces
2017-10-16 10:38:33 +01:00
Robert Osfield
2303d6afc4
Cleaned up support for GL3 build
2017-10-13 17:03:31 +01:00
Laurens Voerman
274cea19bf
copySubImage support for block compressed images, added support for astc compressed type.
2017-10-13 16:54:04 +02: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
Robert Osfield
28561b2b77
Removed old multipass implemenmtations of backdrops as effect is now fully implememted in shaders
2017-10-13 08:40:58 +01:00
Robert Osfield
d6af00d9bd
Merge branch 'master' into text_improvements
2017-10-10 09:21:34 +01:00
OpenSceneGraph git repository
d74e340f32
Merge pull request #359 from eligovision/OpenSceneGraph_gles
...
Added defines: GL_ALPHA4/8/12/16 in osg/Image, this will fix compilat…
2017-10-09 10:03:21 +01:00
OpenSceneGraph git repository
5f985a36a2
Merge pull request #358 from eligovision/OpenSceneGraph_optimizer
...
VertexAttribDivisor compare function fix: index must be compared
2017-10-09 10:02:51 +01:00
Robert Osfield
9ac2b2eb7b
Added VertexArrayState::ArrayDispatch::className() method and implementation for each ArrayDispatch subclass to help with debugging
2017-10-06 17:47:19 +01:00
Konstantin S. Matveyev
1e1f69febc
Added defines: GL_ALPHA4/8/12/16 in osg/Image, this will fix compilation error while building for GLES2
2017-10-06 18:16:48 +03:00
Konstantin S. Matveyev
a87e57e946
VertexAttribDivisor compare function fix: index must be compared
2017-10-06 18:14:47 +03:00
Robert Osfield
ddf8c68d26
Added support for multiple --login url username password entries to osgviewer
2017-10-05 15:37:03 +01:00
Julien Valentin
d2162717b8
fix normalization bug (happen too early )
...
minor bug
bla
2017-10-04 07:23:46 +02:00
Robert Osfield
d2fa7c4317
Simplified and improved the glyph margin computation and usage
2017-09-29 20:21:13 +01:00
Robert Osfield
a1f519cbec
Removed debug info
2017-09-21 15:41:21 +01:00
Robert Osfield
78811462f1
Added support for only enabling SignedDistanceField shader path when font resolution is greater than 16.
2017-09-20 15:51:03 +01:00
Robert Osfield
e8eb1ee0c7
Added Text::assignStateSet() and usage to make sure the correct StateSet is setup for each combination of backdrop settings
2017-09-20 14:29:05 +01:00
Robert Osfield
370ca2b8a3
Fixed X11 GLES2 build
2017-09-19 17:01:58 +01:00
Robert Osfield
cc7cf54353
Added support for subsititing $VAR_NAME entries in shaders to enable writing shaders that work across GLSL versions.
2017-09-18 18:09:15 +01:00
Robert Osfield
722ed6fc5e
Shifted set up of osgText related StateSet from osgText::Font into into osg::TextBase/Text to enable grater control over state required for specific Text implementations
2017-09-12 11:50:47 +01:00
Robert Osfield
de47eb3666
Add support for generating outline and signed distance field channels in a RGBA packed GlyphTexture Image.
2017-09-08 16:59:43 +01:00
Julien Valentin
041a2a6e72
make preparedata skeleton independant (as it was with the Rig::buildInfluenceSet)
...
no more divergence with master i think
2017-09-04 01:56:43 +02:00
Julien Valentin
381c2150d4
Merge remote-tracking branch 'upstream/master' into osganimation
2017-09-01 20:03:05 +02:00
Julien Valentin
a73c20d7f5
update serializer with new properties
2017-09-01 19:13:01 +02:00
Julien Valentin
78dd81a8b4
add void InfluenceMap::removeUnexpressedBones(Skeleton &skel) const;
...
a bit experimental but work well without further process on my test set
2017-09-01 17:48:28 +02:00
Julien Valentin
0d02dfbbbd
remove utility classes BoneWeight and IndexWeight in order to avoid unnecessary symbols
...
(but decrease a bit clarity of the code)
2017-09-01 16:23:49 +02:00
Julien Valentin
dee9dc2164
a functional cleanup
2017-09-01 01:43:00 +02:00
Julien Valentin
5aa96727e9
clean and bugfixes
2017-08-31 20:57:19 +02:00
Julien Valentin
b790986f37
few cleanup
2017-08-31 13:49:27 +02:00
Julien Valentin
068a032dac
revert s/VertexIndexWeight/IndexWeight/
2017-08-31 13:30:24 +02:00
Julien Valentin
1f628235d4
rehabilit an init method to ensure morphing po setted before skinning po in case of rigeom source that are morphgeom
2017-08-30 20:36:34 +02:00
Robert Osfield
1289c4ee41
Added osgText::Font::s/getGlyphInterval(int) and GlyphTexture::s/getGlyphInterval(int) and internal support for clmapping positions of glyph images an defined intervals, defaults to 1.
2017-08-30 16:21:03 +01:00
Julien Valentin
86ad54f671
add parameter to XXXTranformHW to customize reserved texture attribs and vertex attribs
2017-08-30 17:07:11 +02:00
Julien Valentin
8fad310ce1
readd VertexInfluence whenever it's bad named and kinda useless
2017-08-30 15:30:03 +02:00
Julien Valentin
6d1193ee70
readd buildVertexInfluenceSet for backward compat
2017-08-30 14:59:31 +02:00
Julien Valentin
fd9b8f103e
cleanup
2017-08-30 14:26:15 +02:00
Julien Valentin
985d766f05
uncomment normalization in rigtransformxxx
2017-08-30 12:55:45 +02:00
Julien Valentin
fe99b568a0
refactor: remove totally VertexInfluence (renamed BoneInfluenceList) everywhere
2017-08-30 11:12:17 +02:00
Julien Valentin
fae9729560
swap priority in BonePtrWeight comparator< yeild the same VG set
2017-08-29 17:41:38 +02:00
Julien Valentin
ce6a316bde
cleanup
2017-08-29 17:41:26 +02:00
Julien Valentin
186691a9db
remove virtual qualifier for deprecated method
2017-08-29 15:10:05 +02:00
Julien Valentin
059fc70337
set defaut implementation at creation
2017-08-29 14:49:11 +02:00
Julien Valentin
0c9a624026
few refactoring and fixes
2017-08-29 04:08:55 +02:00
Julien Valentin
b3402d9344
readd the 2 methods in InfluenceMap just in case
2017-08-29 00:34:26 +02:00
Julien Valentin
9856cecb71
cleanup
2017-08-29 00:09:38 +02:00
Julien Valentin
350756e738
add 2 method to VertexInfluenceMap:
...
normalize and cullInfluenceCountPerVertex
2017-08-28 18:42:22 +02:00
Julien Valentin
925f1524cf
total removal of the old path
2017-08-28 18:16:30 +02:00
Julien Valentin
28bb88a038
remove default order for BoneWeight and restore old sort func (behaviors differs)
2017-08-28 18:02:52 +02:00
Julien Valentin
ad550acc60
clean unused
2017-08-28 17:13:48 +02:00
Julien Valentin
da1d2b67f7
remove old path and add few fixes
2017-08-28 17:01:03 +02:00
Julien Valentin
6d55d8d341
minor fixes
...
removed unused
2017-08-28 16:08:14 +02:00
Julien Valentin
2aab28149f
reroot to rigtransform::prepareData old path to rig::buildvertexinfluence
2017-08-28 15:59:13 +02:00
Julien Valentin
3efaccb298
add prepareData for RigTransformHW
2017-08-28 15:41:14 +02:00
Julien Valentin
2b5ac5b4db
add default constructor for IndexWeight with invalid indices
2017-08-28 15:27:46 +02:00
Julien Valentin
f899a8dde5
add prepareData for rigttransform software
2017-08-28 14:44:09 +02:00
Denys Koch
1d1bfa1b39
Fix flawed BoundingSphere inequality operator
2017-08-28 14:34:39 +02:00
Julien Valentin
e216833286
few refactoring
2017-08-28 14:23:15 +02:00
Julien Valentin
f995c9187e
Merge remote-tracking branch 'upstream/osganimation' into osganimation
2017-08-28 13:34:06 +02:00
Julien Valentin
66aedbb0b3
fix a bug introduced when readding transformsoftwareMethod
2017-08-28 13:25:04 +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
6dc6bd5b92
fix a bug introduced when readding transformsoftwareMethod
2017-08-28 05:26:20 +02:00
Julien Valentin
f46fdb4d4e
add a new prepareData method to the interface
2017-08-28 05:17:17 +02:00
Julien Valentin
2b2a8f3d2e
MorphTransformHardware using TBO added
2017-08-28 04:51:52 +02:00
Julien Valentin
ed04e2735e
readd virtual void transformSoftwareMethod() for retrocompatibity
2017-08-28 04:42:51 +02:00
OpenSceneGraph git repository
5efdcd5655
Merge pull request #328 from scrawl/group-docs
...
Fix docs for Group::addChild to match implementation
2017-08-27 18:07:21 +01:00
Julien Valentin
ca224c81dd
replace VertexInfluence to BoneInfluenceList
...
and VertexIndexWeight to IndexWeight
fix in example
2017-08-27 05:21:37 +02:00
Julien Valentin
32aaeccee1
refactoring and fixes
...
only change in design: decouplage between MorphGeometry and MorphTransform technique
no real change in behavior (i hope)
2017-08-26 23:06:39 +02:00
scrawl
1cd1ab1c60
Fix docs for Group::addChild to match implementation
...
Checking for duplicates is only done if ENSURE_CHILD_IS_UNIQUE is defined, but this is never defined anywhere.
2017-08-26 11:30:55 +00:00
Daniel Emminizer
2e456eeddc
No longer using OSG_EXPORT on DefaultIndirectCommandDrawArrays and DefaultIndirectCommandDrawElements, fixing compile errors in MSVC 2015.
2017-08-25 08:55:25 -04:00
