From 5f4179d1357c75ecce58d446cec638cc19851344 Mon Sep 17 00:00:00 2001
From: Don McCurdy <don.r.mccurdy@gmail.com>
Date: Fri, 9 Feb 2018 23:08:18 -0800
Subject: [PATCH] [text] Add .negate property for msdfgen 1.4.

---
 src/components/text.js        | 5 ++++-
 src/shaders/msdf.js           | 7 ++++++-
 tests/components/text.test.js | 7 +++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/components/text.js b/src/components/text.js
index f708bbc2159..b1fe0f4e356 100644
--- a/src/components/text.js
+++ b/src/components/text.js
@@ -61,6 +61,8 @@ module.exports.Component = registerComponent('text', {
     letterSpacing: {type: 'number', default: 0},
     // `lineHeight` defaults to font's `lineHeight` value.
     lineHeight: {type: 'number'},
+    // `negate` must be true for fonts generated with older versions of msdfgen (white background).
+    negate: {type: 'boolean', default: true},
     opacity: {type: 'number', default: 1.0},
     shader: {default: 'sdf', oneOf: shaders},
     side: {default: 'front', oneOf: ['front', 'back', 'double']},
@@ -160,7 +162,8 @@ module.exports.Component = registerComponent('text', {
       map: this.texture,
       opacity: data.opacity,
       side: parseSide(data.side),
-      transparent: data.transparent
+      transparent: data.transparent,
+      negate: data.negate
     };
 
     // Shader has not changed, do an update.
diff --git a/src/shaders/msdf.js b/src/shaders/msdf.js
index cf640d69984..ecd57cac7f1 100644
--- a/src/shaders/msdf.js
+++ b/src/shaders/msdf.js
@@ -9,6 +9,7 @@ module.exports.Shader = registerShader('msdf', {
     alphaTest: {type: 'number', is: 'uniform', default: 0.5},
     color: {type: 'color', is: 'uniform', default: 'white'},
     map: {type: 'map', is: 'uniform'},
+    negate: {type: 'boolean', is: 'uniform', default: true},
     opacity: {type: 'number', is: 'uniform', default: 1.0}
   },
 
@@ -42,13 +43,17 @@ module.exports.Shader = registerShader('msdf', {
     'uniform vec3 color;',
     'uniform float opacity;',
     'uniform float alphaTest;',
+    'uniform bool negate;',
     'varying vec2 vUV;',
 
     'float median(float r, float g, float b) {',
     '  return max(min(r, g), min(max(r, g), b));',
     '}',
     'void main() {',
-    '  vec3 sample = 1.0 - texture2D(map, vUV).rgb;',
+    '  vec3 sample = texture2D(map, vUV).rgb;',
+    '  if (negate) {',
+    '    sample = 1.0 - sample;',
+    '  }',
     '  float sigDist = median(sample.r, sample.g, sample.b) - 0.5;',
     '  float alpha = clamp(sigDist/fwidth(sigDist) + 0.5, 0.0, 1.0);',
     '  float dscale = 0.353505;',
diff --git a/tests/components/text.test.js b/tests/components/text.test.js
index 06a75967573..de91c009f9f 100644
--- a/tests/components/text.test.js
+++ b/tests/components/text.test.js
@@ -179,6 +179,13 @@ suite('text', function () {
       value = el.getObject3D('text').material.side;
       assert.equal(value, THREE.DoubleSide);
     });
+
+    test('updates material negate', function () {
+      var value;
+      el.setAttribute('text', 'negate', false);
+      value = el.getObject3D('text').material.uniforms.negate.value;
+      assert.equal(value, 0.0);
+    });
   });
 
   suite('updateFont', function () {