Commit Graph

15380 Commits

Author SHA1 Message Date
Robert Osfield
6496c304f9 Implemented inplace replacement 2017-10-18 10:32:18 +01:00
David Siñuela Pastor
cc8a34cd14 Do not break systems with cr as line endings 2017-10-18 10:30:57 +01:00
Robert Osfield
ad45bf1d61 Fixed warning 2017-10-16 11:52:54 +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
OpenSceneGraph git repository
7b9f44cb17 Merge pull request #364 from mp3butcher/osganimbugfix
add osg::Program::BindUniformBlockList serialization
2017-10-16 10:16:49 +01:00
Robert Osfield
ea379e64e7 Fixed build error 2017-10-16 10:12:19 +01:00
Robert Osfield
5067db39f8 Moved bracket to be consistent with the rest of the OSG 2017-10-16 10:08:18 +01:00
OpenSceneGraph git repository
bfca9998ea Merge pull request #366 from LaurensVoerman/rotateDXT
add support for dxt compressed images to createImageWithOrientationConversion
2017-10-16 10:00:49 +01:00
OpenSceneGraph git repository
1604b81919 Merge pull request #367 from LaurensVoerman/compression_astc
copySubImage support for block compressed images, added support for astc compressed type.
2017-10-16 09:58:29 +01:00
Robert Osfield
a9ef5a90eb Fixed indentation 2017-10-16 09:49:47 +01:00
OpenSceneGraph git repository
bd28b48be1 Merge pull request #365 from LaurensVoerman/login2
modified present3D and osgvnc to allow multiple --login arguments like osgViewer.
2017-10-16 09:45:37 +01:00
Robert Osfield
0e39c129b7 Changed the precision setting of #pargma(tic) shader composition define setup to address GLES compatibility issues 2017-10-14 09:06:37 +01:00
Robert Osfield
0a5c6d3fd6 Improved the formating of GLSL source that is passed to OpenGL to make debugging shaders easier. 2017-10-14 09:03:08 +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
Julien Valentin
b540ed70ba add osg::Program::BindUniformBlock serialization 2017-10-12 20:09:55 +02:00
Robert Osfield
846204ed9e Updated from OpenSceneGraph-Data/shaders/text_sdf.frag to add support for SHADOW 2017-10-12 18:45:38 +01:00
Robert Osfield
f07bf5be2a Merge branch 'master' into text_improvements 2017-10-12 16:44:40 +01:00
Laurens Voerman
0fedfd2ff9 add support for dxt compressed images to createImageWithOrientationConversion 2017-10-12 17:38:16 +02: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
OpenSceneGraph git repository
4d67c80350 Merge pull request #363 from LaurensVoerman/dxtcGetcolor
added dxtc support in Image::getColor, Image::isImageTranscent testdxt3 and dxt5
2017-10-12 15:52:42 +01:00
Laurens Voerman
63f12986b4 added dxtc support in Image::getColor, enhanced Image::isImageTranslucent to test opacity of dxt3 and dxt5 images 2017-10-12 13:49:57 +02:00
Robert Osfield
eebb679754 Updated text_sdf_frag.cpp from OpenSceneGraph-Data changes that add outline generation for non SIGNED_DISTANCE_FIELD text. 2017-10-12 11:12:47 +01:00
Robert Osfield
d6af00d9bd Merge branch 'master' into text_improvements 2017-10-10 09:21:34 +01:00
Robert Osfield
adb6ae849d Updated ChangeLog 2017-10-09 12:33:06 +01:00
Robert Osfield
b2603d6c93 Updated version number 2017-10-09 12:25:40 +01:00
Robert Osfield
d649334662 Updated AUTHORS 2017-10-09 12:23:45 +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
4906844ea7 Added explictly unbinding of VBO for setInterleavedArrays(). 2017-10-06 18:03:36 +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
7868b42ef2 Improved the readability of recent changes by adding spaces, {} and moving { onto separate lines to keep things consistent with the rest of the OSG. 2017-10-05 16:56:30 +01:00
OpenSceneGraph git repository
eb5f46d8dd Merge pull request #357 from mp3butcher/osganimation
fix normalization bug (happen too early )
2017-10-05 16:43:54 +01:00
OpenSceneGraph git repository
11352bbdbb Merge pull request #354 from eligovision/OpenSceneGraph_intersection
LineSegmentIntersector fixed: intersection ratio remaped to the range…
2017-10-05 16:31:45 +01:00
OpenSceneGraph git repository
1a1fe43347 Merge pull request #353 from eligovision/OpenSceneGraph_io
tellg call removed from StreamOperator's checkStream function, becaus…
2017-10-05 16:30:21 +01:00
OpenSceneGraph git repository
bc9f481c2b Merge pull request #355 from denyskoch/patch-1
Fix loading of 16bit PNG images
2017-10-05 16:29:37 +01:00
Robert Osfield
042a357278 Fixed spacing to make it consistent with the rest of the OSG and make it easier to read. 2017-10-05 15:59:26 +01:00
OpenSceneGraph git repository
19a48951b7 Merge pull request #351 from LaurensVoerman/vncHostPw
VNC: try to find password for host if no password for host:port is found
2017-10-05 15:57:02 +01:00
Robert Osfield
ddf8c68d26 Added support for multiple --login url username password entries to osgviewer 2017-10-05 15:37:03 +01:00
OpenSceneGraph git repository
d75564c7e3 Merge pull request #348 from eligovision/OpenSceneGraph_serializers
osg serializers fixed for static build, ShaderAttribute wrapper added
2017-10-05 15:02:17 +01:00
Robert Osfield
c918916bcb Steamlined the handling of osg::Geometry 2017-10-05 12:45:47 +01:00
OpenSceneGraph git repository
95de3a460e Merge pull request #346 from LaurensVoerman/FindLIBLAS
removed las_c library from FindLIBLAS.cmake, it's not used by the osgplugin.
2017-10-05 12:15:23 +01:00
Robert Osfield
7fb37016fd Merge branch 'master' into text_improvements 2017-10-05 12:14:03 +01:00
Robert Osfield
2f19cd4b87 Improvements to the Signed Distance Field implementation. 2017-10-04 18:06:42 +01:00