Merge pull request #346 from mqg734/MaterialsUI

UI support for preview, edit, duplicate and delete of WebGL Materials.

3 files changed, 134 insertions, 28 deletions

diff --git a/js/lib/rdge/materials/linear-gradient-material.js b/js/lib/rdge/materials/linear-gradient-material.js
index 981bf9fd..50ef56f0 100755
--- a/js/lib/rdge/materials/linear-gradient-material.js
+++ b/js/lib/rdge/materials/linear-gradient-material.js
@@ -103,6 +103,56 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
         this.setShaderValues();
                 this.update( 0 );
     };
+
+    // Only Linear Gradient and Radial Gradients support gradients;
+    this.gradientType = "linear";
+
+    this.getGradientData = function() {
+        var angle = Math.round(this._angle*180/Math.PI),
+            color,
+            colorStr,
+            css = "-webkit-gradient(linear, " + angle + "deg";
+
+        // TODO - Angle is not supported in -webkit-gradient syntax, so just default to across:
+        css = '-webkit-gradient(linear, left top, right top';
+
+        // TODO - Also, Color Model requires from and to in the gradient string
+        color = this.getProperty('u_color1');
+        colorStr = Math.round(color[0] * 255) + ', ' + Math.round(color[1] * 255) + ', ' + Math.round(color[2] * 255) + ', ' + Math.round(color[3] * 100);
+        css += ', from(rgba(' + colorStr + '))';
+
+        for (var i=2; i < 4; i++) {
+            color = this.getProperty('u_color'+i);
+            colorStr = Math.round(color[0] * 255) + ', ' + Math.round(color[1] * 255) + ', ' + Math.round(color[2] * 255) + ', ' + Math.round(color[3] * 100);
+            css += ', color-stop(' + this.getProperty('u_colorStop'+i) + ', rgba(' + colorStr + '))';
+        }
+
+        color = this.getProperty('u_color4');
+        colorStr = Math.round(color[0] * 255) + ', ' + Math.round(color[1] * 255) + ', ' + Math.round(color[2] * 255) + ', ' + Math.round(color[3] * 100);
+        css += ', to(rgba(' + colorStr + '))';
+
+        css += ')';
+
+        return css;
+    };
+
+    // Only Linear Gradient and Radial Gradient have gradient data.
+    this.setGradientData = function(colors) {
+        var len = colors.length;
+        // TODO - Current shaders only support 4 color stops
+        if (len > 4) {
+            len = 4;
+        }
+
+        for (var n = 0; n < len; n++) {
+            var position = colors[n].position/100;
+            var cs = colors[n].value;
+            var stop = [cs.r/255, cs.g/255, cs.b/255, cs.a];
+
+            this.setProperty("u_color" + (n + 1), stop.slice(0));
+            this.setProperty("u_colorStop" + (n + 1), position);
+        }
+    };
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js
index 34d3aa1f..e1d17aa8 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/material.js
@@ -201,6 +201,8 @@ var Material = function GLMaterial( world ) {
     };
 
         this.validateProperty = function( prop, value ) {
+        if(prop === "gradient") return true;
+
                 var rtnVal = false;
                 try
                 {
@@ -264,33 +266,37 @@ var Material = function GLMaterial( world ) {
                 var material = this._materialNode;
                 if (material)  technique = material.shaderProgram[this.getTechniqueName()];
 
-                switch (this.getPropertyType(prop))
-                {
-                        case "angle":
-                        case "float":
-                                this._propValues[prop] = value;
-                                if (technique)  technique[prop].set( [value] );
-                                break;
-
-                        case "file":
-                                this._propValues[prop] = value.slice();
-                                if (technique)
-                                {
-                                        var glTex = new Texture( this.getWorld(),  value );
-                                        this._glTextures[prop] = glTex;
-                                        glTex.render();
-                                        var tex = glTex.getTexture();
-                                        if (tex)  technique[prop].set( tex );
-                                }
-                                break;
-
-                        case "color":
-                        case "vector2d":
-                        case "vector3d":
-                                this._propValues[prop] = value.slice();
-                                if (technique)  technique[prop].set( value );
-                                break;
-                }
+        if(prop === "gradient") {
+            this.setGradientData(value);
+        } else {
+            switch (this.getPropertyType(prop))
+            {
+                case "angle":
+                case "float":
+                    this._propValues[prop] = value;
+                    if (technique)  technique[prop].set( [value] );
+                    break;
+
+                case "file":
+                    this._propValues[prop] = value.slice();
+                    if (technique)
+                    {
+                        var glTex = new Texture( this.getWorld(),  value );
+                        this._glTextures[prop] = glTex;
+                        glTex.render();
+                        var tex = glTex.getTexture();
+                        if (tex)  technique[prop].set( tex );
+                    }
+                    break;
+
+                case "color":
+                case "vector2d":
+                case "vector3d":
+                    this._propValues[prop] = value.slice();
+                    if (technique)  technique[prop].set( value );
+                    break;
+            }
+        }
         };
 
         this.setShaderValues = function()
@@ -422,6 +428,15 @@ var Material = function GLMaterial( world ) {
                 return tex;
         };
 
+    this.gradientType = null;
+
+    this.getGradientData = function() {
+        return null;
+    };
+
+    this.setGradientData = function() {
+        // override in linear-gradient-material and radial-gradient-material
+    };
 };
 
 if (typeof exports === "object") {
diff --git a/js/lib/rdge/materials/radial-gradient-material.js b/js/lib/rdge/materials/radial-gradient-material.js
index 6a5a9e9a..ffca1686 100755
--- a/js/lib/rdge/materials/radial-gradient-material.js
+++ b/js/lib/rdge/materials/radial-gradient-material.js
@@ -137,7 +137,48 @@ var RadialGradientMaterial = function RadialGradientMaterial() {
         {
                 jObj.u_texTransform = this._textureTransform.slice();
                 return jObj;
-        }
+        };
+
+    // Only Linear Gradient and Radial Gradient have gradient data.
+    this.gradientType = "radial";
+
+    this.getGradientData = function() {
+        var angle = Math.round(this._angle*180/Math.PI),
+            color,
+            colorStr,
+            css = "-webkit-gradient(linear, " + angle + "deg";
+
+        // TODO - Angle is not supported in -webkit-gradient syntax, so just default to across:
+        css = '-webkit-radial-gradient(50% 50%, ellipse cover';
+
+        // TODO - Also, Color Model requires from and to in the gradient string
+        for (var i=1; i < 5; i++) {
+            color = this.getProperty('u_color'+i);
+            colorStr = Math.round(color[0] * 255) + ', ' + Math.round(color[1] * 255) + ', ' + Math.round(color[2] * 255) + ', ' + Math.round(color[3] * 100);
+            css += ', rgba(' + colorStr + ') ' + Math.round(this.getProperty('u_colorStop'+i)*100) + '%';
+        }
+
+        css += ')';
+
+        return css;
+    };
+
+    this.setGradientData = function(colors) {
+        var len = colors.length;
+        // TODO - Current shaders only support 4 color stops
+        if (len > 4) {
+            len = 4;
+        }
+
+        for (var n = 0; n < len; n++) {
+            var position = colors[n].position/100;
+            var cs = colors[n].value;
+            var stop = [cs.r/255, cs.g/255, cs.b/255, cs.a];
+
+            this.setProperty("u_color" + (n + 1), stop.slice(0));
+            this.setProperty("u_colorStop" + (n + 1), position);
+        }
+    };
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////