Parcourir la source

Merge branch 'master' of https://github.com/BabylonJS/Babylon.js

Julian il y a 8 ans
Parent
commit
bd7a27a700

+ 1 - 0
canvas2D/src/Engine/babylon.prim2dBase.ts

@@ -3638,6 +3638,7 @@
             }
             let length = this._children.push(child);
             this._firstZDirtyIndex = Math.min(this._firstZDirtyIndex, length - 1);
+            child._setFlags(SmartPropertyPrim.flagActualOpacityDirty);
         }
 
         /**

+ 1 - 1
canvas2D/src/shaders/text2d.fragment.fx

@@ -26,7 +26,7 @@ void main(void) {
 		discard;
 	}
 #ifdef FontTexture
-	gl_FragColor = vec4(color.xxxx)*vColor;
+	gl_FragColor = vec4(color.xxx*vColor*vColor.a, vColor.a);
 #else
 	gl_FragColor = color*vColor;
 #endif

Fichier diff supprimé car celui-ci est trop grand
+ 2 - 1
dist/preview release/canvas2D/babylon.canvas2d.js


Fichier diff supprimé car celui-ci est trop grand
+ 9 - 9
dist/preview release/canvas2D/babylon.canvas2d.min.js