Merge pull request #214 from felixmariotto/fix-210

make sure no uniform get unset value

Author: felixmariotto

src/components/core/MaterialManager.js

@@ -25,25 +25,25 @@ export default function MaterialManager( Base ) {
 			super( options );
 
 			this.textUniforms = {
-				u_texture: { value: null },
-				u_color: { value: null },
-				u_opacity: { value: null },
-				u_pxRange: { value: null },
-				u_useRGSS: { value: null },
+				u_texture: { value: this.getFontTexture() },
+				u_color: { value: this.getFontColor() },
+				u_opacity: { value: this.getFontOpacity() },
+				u_pxRange: { value: this.getFontPXRange() },
+				u_useRGSS: { value: this.getFontSupersampling() },
 			};
 
 			this.backgroundUniforms = {
-				u_texture: { value: null },
-				u_color: { value: null },
-				u_opacity: { value: null },
-				u_backgroundMapping: { value: null },
-				u_borderWidth: { value: null },
-				u_borderColor: { value: null },
-				u_borderRadiusTopLeft: { value: null },
-				u_borderRadiusTopRight: { value: null },
-				u_borderRadiusBottomRight: { value: null },
-				u_borderRadiusBottomLeft: { value: null },
-				u_borderOpacity: { value: null },
+				u_texture: { value: this.getBackgroundTexture() },
+				u_color: { value: this.getBackgroundColor() },
+				u_opacity: { value: this.getBackgroundOpacity() },
+				u_backgroundMapping: { value: this.getBackgroundSize() },
+				u_borderWidth: { value: this.getBorderWidth() },
+				u_borderColor: { value: this.getBorderColor() },
+				u_borderRadiusTopLeft: { value: this.getBorderRadius() },
+				u_borderRadiusTopRight: { value: this.getBorderRadius() },
+				u_borderRadiusBottomRight: { value: this.getBorderRadius() },
+				u_borderRadiusBottomLeft: { value: this.getBorderRadius() },
+				u_borderOpacity: { value: this.getBorderOpacity() },
 				u_size: { value: new Vector2( 1, 1 ) },
 				u_tSize: { value: new Vector2( 1, 1 ) }
 			};

src/components/core/MeshUIComponent.js

@@ -144,7 +144,17 @@ export default function MeshUIComponent( Base ) {
 
 		getFontTexture() {
 
-			return this._getProperty( 'fontTexture' );
+			if ( this[ 'fontTexture' ] === undefined && this.parentUI ) {
+
+				return this.parent._getProperty( 'fontTexture' );
+
+			} else if ( this[ 'fontTexture' ] !== undefined ) {
+
+				return this[ 'fontTexture' ];
+
+			}
+
+			return DEFAULTS.getDefaultTexture();
 
 		}
 
@@ -281,7 +291,7 @@ export default function MeshUIComponent( Base ) {
 
 		getBackgroundTexture() {
 
-			return this.backgroundTexture || DEFAULTS.backgroundTexture();
+			return this.backgroundTexture || DEFAULTS.getDefaultTexture();
 
 		}
 

src/utils/Defaults.js

@@ -21,7 +21,6 @@ export default {
 	contentDirection,
 	alignItems,
 	justifyContent,
-	fontTexture: null,
 	textAlign,
 	textType: 'MSDF',
 	fontColor: new Color( 0xffffff ),
@@ -38,28 +37,29 @@ export default {
 	backgroundOpacity: 0.8,
 	backgroundOpaqueOpacity: 1.0,
 	// this default value is a function to avoid initialization issues (see issue #126)
-	backgroundTexture: makeBackgroundTexture,
+	getDefaultTexture,
 	hiddenOverflow: false,
 	letterSpacing: 0
 };
 
 //
-let defaultBgTexture;
 
-function makeBackgroundTexture() {
+let defaultTexture;
 
-	if ( !defaultBgTexture ) {
+function getDefaultTexture() {
+
+	if ( !defaultTexture ) {
 
 		const ctx = document.createElement( 'canvas' ).getContext( '2d' );
 		ctx.canvas.width = 1;
 		ctx.canvas.height = 1;
 		ctx.fillStyle = '#ffffff';
 		ctx.fillRect( 0, 0, 1, 1 );
-		defaultBgTexture = new CanvasTexture( ctx.canvas );
-		defaultBgTexture.isDefault = true;
+		defaultTexture = new CanvasTexture( ctx.canvas );
+		defaultTexture.isDefault = true;
 
 	}
 
-	return defaultBgTexture;
+	return defaultTexture;
 
 }