Explorar o código

Merge pull request #1198 from nockawa/GroupTracker

Canvas2D
David Catuhe %!s(int64=9) %!d(string=hai) anos
pai
achega
c136a3e051
Modificáronse 1 ficheiros con 14 adicións e 2 borrados
  1. 14 2
      src/Canvas2d/babylon.canvas2d.ts

+ 14 - 2
src/Canvas2d/babylon.canvas2d.ts

@@ -83,7 +83,11 @@
                 }
                 }
 
 
                 if (settings.backgroundBorder != null) {
                 if (settings.backgroundBorder != null) {
-                    this.backgroundBorder = <IBrush2D>settings.backgroundBorder;        // TOFIX
+                    if (typeof (settings.backgroundBorder) === "string") {
+                        this.backgroundBorder = Canvas2D.GetBrushFromString(<string>settings.backgroundBorder);
+                    } else {
+                        this.backgroundBorder = <IBrush2D>settings.backgroundBorder;
+                    }
                 }
                 }
 
 
                 if (settings.backgroundBorderThickNess != null) {
                 if (settings.backgroundBorderThickNess != null) {
@@ -91,7 +95,11 @@
                 }
                 }
 
 
                 if (settings.backgroundFill != null) {
                 if (settings.backgroundFill != null) {
-                    this.backgroundFill = <IBrush2D>settings.backgroundFill;
+                    if (typeof (settings.backgroundFill) === "string") {
+                        this.backgroundFill = Canvas2D.GetBrushFromString(<string>settings.backgroundFill);
+                    } else {
+                        this.backgroundFill = <IBrush2D>settings.backgroundFill;
+                    }
                 }
                 }
 
 
                 this._background._patchHierarchy(this);
                 this._background._patchHierarchy(this);
@@ -708,6 +716,10 @@
             return this._worldSpaceNode;
             return this._worldSpaceNode;
         }
         }
 
 
+        public set worldSpaceCanvasNode(val: Node) {
+            this._worldSpaceNode = val;
+        }
+
         /**
         /**
          * Check if the WebGL Instanced Array extension is supported or not
          * Check if the WebGL Instanced Array extension is supported or not
          * @returns {} 
          * @returns {}