transitioned imports for THREE in sdf's

atlmtw · Jul 25, 2022 · b2618de · b2618de
1 parent 5e4e436
commit b2618de
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -1,12 +1,11 @@
 {
-  "name": "three-bmfont-text",
+  "name": "three-bmfont-text-es",
   "version": "3.0.0",
-  "description": "renders BMFont files in ThreeJS with word-wrapping",
+  "description": "ES6 Module that enables BMFont files in ThreeJS with word-wrapping. Originally created by Matt DesLauriers (https://github.com/mattdesl/)",
   "license": "MIT",
   "author": {
-    "name": "Matt DesLauriers",
-    "email": "[email protected]",
-    "url": "https://github.com/mattdesl"
+    "name": "Mason Wong",
+    "url": "https://github.com/atlmtw"
   },
   "peerDependencies": {
     "three": ">=0.120.0"

diff --git a/src/shaders/basic.js b/src/shaders/basic.js
@@ -1,3 +1,5 @@
+import { Texture, Color } from 'three';
+
 export function createBasicShader (opt) {
   opt = opt || {}
   var opacity = typeof opt.opacity === 'number' ? opt.opacity : 1
@@ -15,8 +17,8 @@ export function createBasicShader (opt) {
   return Object.assign({
     uniforms: {
       opacity: { type: 'f', value: opacity },
-      map: { type: 't', value: map || new THREE.Texture() },
-      color: { type: 'c', value: new THREE.Color(color) }
+      map: { type: 't', value: map || new Texture() },
+      color: { type: 'c', value: new Color(color) }
     },
     vertexShader: [
       'attribute vec2 uv;',

diff --git a/src/shaders/msdf.js b/src/shaders/msdf.js
@@ -1,3 +1,5 @@
+import { Texture, Color } from 'three';
+
 export function createMSDFShader (opt) {
   opt = opt || {};
   var opacity = typeof opt.opacity === 'number' ? opt.opacity : 1;
@@ -17,8 +19,8 @@ export function createMSDFShader (opt) {
   return Object.assign({
     uniforms: {
       opacity: { type: 'f', value: opacity },
-      map: { type: 't', value: map || new THREE.Texture() },
-      color: { type: 'c', value: new THREE.Color(color) }
+      map: { type: 't', value: map || new Texture() },
+      color: { type: 'c', value: new Color(color) }
     },
     vertexShader: [
       'attribute vec2 uv;',

diff --git a/src/shaders/multipage.js b/src/shaders/multipage.js
@@ -1,3 +1,5 @@
+import { REVISION, Color } from 'three';
+
 export function createMultipageShader (opt) {
   opt = opt || {}
   var opacity = typeof opt.opacity === 'number' ? opt.opacity : 1
@@ -40,15 +42,15 @@ export function createMultipageShader (opt) {
     attributes: { page: { type: 'f', value: 0 } }
   }
 
-  var threeVers = (parseInt(THREE.REVISION, 10) || 0) | 0
+  var threeVers = (parseInt(REVISION, 10) || 0) | 0
   if (threeVers >= 72) {
     attributes = undefined
   }
 
   return Object.assign({
     uniforms: Object.assign({}, baseUniforms, {
       opacity: { type: 'f', value: opacity },
-      color: { type: 'c', value: new THREE.Color(color) }
+      color: { type: 'c', value: new Color(color) }
     }),
     vertexShader: [
       'attribute vec4 position;',

diff --git a/src/shaders/sdf.js b/src/shaders/sdf.js
@@ -1,3 +1,5 @@
+import { Texture, Color } from 'three';
+
 export function createSDFShader (opt) {
   opt = opt || {}
   var opacity = typeof opt.opacity === 'number' ? opt.opacity : 1
@@ -15,8 +17,8 @@ export function createSDFShader (opt) {
   return Object.assign({
     uniforms: {
       opacity: { type: 'f', value: opacity },
-      map: { type: 't', value: map || new THREE.Texture() },
-      color: { type: 'c', value: new THREE.Color(color) }
+      map: { type: 't', value: map || new Texture() },
+      color: { type: 'c', value: new Color(color) }
     },
     vertexShader: [
       'attribute vec2 uv;',