Commit Graph

  • 4d67c80350 Merge pull request #363 from LaurensVoerman/dxtcGetcolor OpenSceneGraph git repository 2017-10-12 15:52:42 +01:00
  • 63f12986b4 added dxtc support in Image::getColor, enhanced Image::isImageTranslucent to test opacity of dxt3 and dxt5 images Laurens Voerman 2017-10-12 13:49:57 +02:00
  • eebb679754 Updated text_sdf_frag.cpp from OpenSceneGraph-Data changes that add outline generation for non SIGNED_DISTANCE_FIELD text. Robert Osfield 2017-10-12 11:12:47 +01:00
  • d6af00d9bd Merge branch 'master' into text_improvements Robert Osfield 2017-10-10 09:21:34 +01:00
  • adb6ae849d Updated ChangeLog Robert Osfield 2017-10-09 12:33:06 +01:00
  • b2603d6c93 Updated version number Robert Osfield 2017-10-09 12:25:40 +01:00
  • d649334662 Updated AUTHORS Robert Osfield 2017-10-09 12:23:45 +01:00
  • d74e340f32 Merge pull request #359 from eligovision/OpenSceneGraph_gles OpenSceneGraph git repository 2017-10-09 10:03:21 +01:00
  • 5f985a36a2 Merge pull request #358 from eligovision/OpenSceneGraph_optimizer OpenSceneGraph git repository 2017-10-09 10:02:51 +01:00
  • 4906844ea7 Added explictly unbinding of VBO for setInterleavedArrays(). Robert Osfield 2017-10-06 18:03:36 +01:00
  • 9ac2b2eb7b Added VertexArrayState::ArrayDispatch::className() method and implementation for each ArrayDispatch subclass to help with debugging Robert Osfield 2017-10-06 17:47:19 +01:00
  • 1e1f69febc Added defines: GL_ALPHA4/8/12/16 in osg/Image, this will fix compilation error while building for GLES2 Konstantin S. Matveyev 2017-10-06 17:37:50 +03:00
  • a87e57e946 VertexAttribDivisor compare function fix: index must be compared Konstantin S. Matveyev 2017-10-06 14:33:07 +03:00
  • 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. Robert Osfield 2017-10-05 16:56:30 +01:00
  • eb5f46d8dd Merge pull request #357 from mp3butcher/osganimation OpenSceneGraph git repository 2017-10-05 16:43:54 +01:00
  • 11352bbdbb Merge pull request #354 from eligovision/OpenSceneGraph_intersection OpenSceneGraph git repository 2017-10-05 16:31:45 +01:00
  • 1a1fe43347 Merge pull request #353 from eligovision/OpenSceneGraph_io OpenSceneGraph git repository 2017-10-05 16:30:21 +01:00
  • bc9f481c2b Merge pull request #355 from denyskoch/patch-1 OpenSceneGraph git repository 2017-10-05 16:29:37 +01:00
  • 042a357278 Fixed spacing to make it consistent with the rest of the OSG and make it easier to read. Robert Osfield 2017-10-05 15:59:26 +01:00
  • 19a48951b7 Merge pull request #351 from LaurensVoerman/vncHostPw OpenSceneGraph git repository 2017-10-05 15:57:02 +01:00
  • ddf8c68d26 Added support for multiple --login url username password entries to osgviewer Robert Osfield 2017-10-05 15:37:03 +01:00
  • d75564c7e3 Merge pull request #348 from eligovision/OpenSceneGraph_serializers OpenSceneGraph git repository 2017-10-05 15:02:17 +01:00
  • c918916bcb Steamlined the handling of osg::Geometry Robert Osfield 2017-10-05 12:45:47 +01:00
  • 95de3a460e Merge pull request #346 from LaurensVoerman/FindLIBLAS OpenSceneGraph git repository 2017-10-05 12:15:23 +01:00
  • 7fb37016fd Merge branch 'master' into text_improvements Robert Osfield 2017-10-05 12:14:03 +01:00
  • 2f19cd4b87 Improvements to the Signed Distance Field implementation. Robert Osfield 2017-10-04 18:06:42 +01:00
  • d2162717b8 fix normalization bug (happen too early ) Julien Valentin 2017-10-04 05:42:33 +02:00
  • d2fa7c4317 Simplified and improved the glyph margin computation and usage Robert Osfield 2017-09-29 20:21:13 +01:00
  • beb5801eee Improved SDF generation Robert Osfield 2017-09-29 10:39:02 +01:00
  • 1f36f5bd8d Added setting of the FontResolution of the DefaultFont Robert Osfield 2017-09-29 10:25:04 +01:00
  • 468d6d8eea Added command line support for specifying "default" for osgText::DefaultFont Robert Osfield 2017-09-29 10:20:59 +01:00
  • 726bb13e9a Improved the setup of the --counter test Robert Osfield 2017-09-29 09:54:43 +01:00
  • b3c08a8ad6 Fix loading of 16bit PNG images Denys Koch 2017-09-28 11:09:18 +02:00
  • 75d23b2c10 Fixed update of GlyphTexture Image when copying new Glyph image's to it. Robert Osfield 2017-09-27 11:09:22 +01:00
  • 8c575c0cea UPdated from OpenSceneGraph-Data with handling of non textured text decoration Robert Osfield 2017-09-26 15:32:41 +01:00
  • 6ec9f0a3d3 Updated shader from OpenSceneGraph-Data/shaders to add fade out for SDF and non SDF pathways Robert Osfield 2017-09-26 12:51:03 +01:00
  • ca5a8a81a2 Updated wiht OpenSceneGraph-Data/shader version that introduced use of textureLOD to reduce aliasing artifacts with SDF Robert Osfield 2017-09-26 10:57:09 +01:00
  • 845e1d4463 Updated shaders using latest OpenSceneGraph-Data/shader versions Robert Osfield 2017-09-26 10:44:14 +01:00
  • 6d4128324b Improvements to SDF and outline generation Robert Osfield 2017-09-26 10:42:47 +01:00
  • 708ae1c076 Fixed rendering old sytel outline Robert Osfield 2017-09-22 12:22:58 +01:00
  • 941ec1e451 LineSegmentIntersector fixed: intersection ratio remaped to the range of LineSegment => correct order in multiset of intersections Konstantin S. Matveyev 2017-09-22 11:38:43 +03:00
  • cf2b5d030c tellg call removed from StreamOperator's checkStream function, because reading of files (readNodeFile etc.) with tellg on 'every iter' is approximately 100 times slower on Emscripten platform konstantin.matveyev 2017-09-17 18:48:32 +03:00
  • 8d8035a173 LineSegmentIntersector fixed: intersection ratio remaped to the range of LineSegment => correct order in multiset of intersections Konstantin S. Matveyev 2017-09-22 11:34:28 +03:00
  • e2d20a337d Merge pull request #352 from remoe/patch-3 OpenSceneGraph git repository 2017-09-22 07:56:30 +01:00
  • 49c336e514 addShader fix Remo E 2017-09-22 08:39:38 +02:00
  • b6bb0caf8d Removed debug output Robert Osfield 2017-09-21 16:04:10 +01:00
  • 4b6722ab44 Added assignStateSet() to Text::setBackgroundColor() Robert Osfield 2017-09-21 16:01:27 +01:00
  • 12904105f8 Added support for toggling on use of the new SignedDistanceFunction function now built into osgText, just use --sdf to enable. Robert Osfield 2017-09-21 15:52:07 +01:00
  • a1f519cbec Removed debug info Robert Osfield 2017-09-21 15:41:21 +01:00
  • 292b892478 VNC: try to find password for host if no password for host:port is found Laurens Voerman 2017-09-21 16:33:14 +02:00
  • 957a7d4e92 Moved enabling/disabling of SDF so it's done regardless of whether a backdrop is used. Robert Osfield 2017-09-21 14:35:31 +01:00
  • e72a38c8b6 Umproved SDF computation. Robert Osfield 2017-09-21 14:32:17 +01:00
  • e565a5e1c3 Removed no longer used code paths Robert Osfield 2017-09-20 16:51:30 +01:00
  • 78811462f1 Added support for only enabling SignedDistanceField shader path when font resolution is greater than 16. Robert Osfield 2017-09-20 15:51:03 +01:00
  • fb0a995d7b cleaned up exmple Robert Osfield 2017-09-20 14:30:23 +01:00
  • e8eb1ee0c7 Added Text::assignStateSet() and usage to make sure the correct StateSet is setup for each combination of backdrop settings Robert Osfield 2017-09-20 14:29:05 +01:00
  • b0829cc352 Updated text_sdf.frag shader to handle GLES2+ versions Robert Osfield 2017-09-20 11:02:06 +01:00
  • 420094174e Added commented out debug output to make it easier to test in future Robert Osfield 2017-09-20 11:01:04 +01:00
  • fafa468fea Fixed OSG_PRECISION_FLOAT usage Robert Osfield 2017-09-19 17:07:59 +01:00
  • 370ca2b8a3 Fixed X11 GLES2 build Robert Osfield 2017-09-19 17:01:58 +01:00
  • 72cf6734a1 Added osgText/shaders to support greyscale and Signed Distance Field based text Robert Osfield 2017-09-19 16:35:28 +01:00
  • cc7cf54353 Added support for subsititing $VAR_NAME entries in shaders to enable writing shaders that work across GLSL versions. Robert Osfield 2017-09-18 18:09:15 +01:00
  • 5ade852172 Added constant sizeing vs changing label size relatve to font resolution, controlled by --constant-size and --scale-size command line options. Robert Osfield 2017-09-15 15:14:19 +01:00
  • 8055ec9156 osg serializers fixed for static build, ShaderAttribute wrapper added Konstantin S. Matveyev 2017-09-15 12:14:37 +03:00
  • a12a43d352 Impprovide the computation of the Signed Distance Field Robert Osfield 2017-09-14 15:58:38 +01:00
  • 70b3a3a442 Fixed of shadow Robert Osfield 2017-09-13 11:09:56 +01:00
  • 1e11b89d04 Added --shadow-* command line variants to provide full control over the position of the text shadow Robert Osfield 2017-09-13 11:08:51 +01:00
  • 0d5a42f635 Added setting of the Text::BackdropImplementation type to USE_SHADERS when setting up shaders Robert Osfield 2017-09-12 19:13:01 +01:00
  • 7a50bdafe3 Changed the margin computation to properly account of the Signed Distance Function data Robert Osfield 2017-09-12 16:03:35 +01:00
  • 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 Robert Osfield 2017-09-12 11:50:47 +01:00
  • 985b3a7206 removed las_c library from FindLIBLAS.cmake, it's not used by the osg plugin. Laurens Voerman 2017-09-12 09:19:33 +02:00
  • 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. Robert Osfield 2017-09-08 17:03:15 +01:00
  • 2b010f019f Added setting of the original font reoslution to the created Glyph Robert Osfield 2017-09-08 17:02:38 +01:00
  • de47eb3666 Add support for generating outline and signed distance field channels in a RGBA packed GlyphTexture Image. Robert Osfield 2017-09-08 16:59:43 +01:00
  • 77d4705182 Added KeyHandler for toggling "SIGNED_DISTANCE_FIELD" and "OUTLINE" #pragma(tic) shader defines to control the different shader paths. Robert Osfield 2017-09-06 16:53:54 +01:00
  • 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 Robert Osfield 2017-09-06 10:40:05 +01:00
  • cf14587b5c Merge pull request #340 from mp3butcher/osganimation OpenSceneGraph git repository 2017-09-04 15:35:01 +01:00
  • 4bc1320709 Merge pull request #344 from eligovision/OpenSceneGraph_text3d OpenSceneGraph git repository 2017-09-04 15:21:26 +01:00
  • ce8fa14d41 Merge pull request #345 from eligovision/OpenSceneGraph_example_text3d OpenSceneGraph git repository 2017-09-04 15:20:54 +01:00
  • 0a93569b9e add DSO scope in modified XXXTransformHardware serializers Julien Valentin 2017-09-04 12:04:37 +02:00
  • ca42523cd0 example_osgtext3d: more options for testing Konstantin S. Matveyev 2017-09-04 11:44:30 +03:00
  • 3503a0fefb Text3D dynamic changing fix Konstantin S. Matveyev 2017-09-04 11:29:50 +03:00
  • ff6e77c874 Merge pull request #341 from scrawl/cullingactive_fix OpenSceneGraph git repository 2017-09-04 08:36:49 +01:00
  • 7da072b433 cleanup Julien Valentin 2017-09-04 02:27:54 +02:00
  • 041a2a6e72 make preparedata skeleton independant (as it was with the Rig::buildInfluenceSet) no more divergence with master i think Julien Valentin 2017-09-03 17:37:06 +02:00
  • 6048c1fbdc LineSegmentIntersector: respect the 'cullingActive' flag when testing drawable bounding box scrawl 2017-09-03 14:15:36 +00:00
  • 381c2150d4 Merge remote-tracking branch 'upstream/master' into osganimation Julien Valentin 2017-09-01 20:03:05 +02:00
  • a73c20d7f5 update serializer with new properties Julien Valentin 2017-09-01 19:13:01 +02:00
  • 9560548722 add MorphTransformHardware serializer Julien Valentin 2017-09-01 18:08:37 +02:00
  • a2b29c1afd Merge remote-tracking branch 'upstream/osganimation' into osganimation Julien Valentin 2017-09-01 18:04:32 +02:00
  • 78dd81a8b4 add void InfluenceMap::removeUnexpressedBones(Skeleton &skel) const; a bit experimental but work well without further process on my test set Julien Valentin 2017-09-01 17:48:28 +02:00
  • 0e5acda26e Merge pull request #338 from mp3butcher/osganimation OpenSceneGraph git repository 2017-09-01 16:46:38 +01:00
  • 7aeb455597 Merge pull request #337 from mp3butcher/osganimbugfix OpenSceneGraph git repository 2017-09-01 15:50:47 +01:00
  • 0d02dfbbbd remove utility classes BoneWeight and IndexWeight in order to avoid unnecessary symbols (but decrease a bit clarity of the code) Julien Valentin 2017-09-01 16:23:49 +02:00
  • 8b74b04de0 cleanup Julien Valentin 2017-09-01 15:12:10 +02:00
  • dee9dc2164 a functional cleanup Julien Valentin 2017-09-01 01:43:00 +02:00
  • 5aa96727e9 clean and bugfixes Julien Valentin 2017-08-31 16:35:05 +02:00
  • 34270cdcaa Merge pull request #333 from mp3butcher/osganimation OpenSceneGraph git repository 2017-08-31 14:32:39 +01:00
  • b790986f37 few cleanup Julien Valentin 2017-08-31 13:49:27 +02:00
  • 068a032dac revert s/VertexIndexWeight/IndexWeight/ Julien Valentin 2017-08-31 13:30:24 +02:00