Shade.parameter supported by json() and Shade.Debug.from_json()

Author: Carlos Scheidegger

lux.js

@@ -5988,6 +5988,8 @@ Shade.Debug.from_json = function(json)
             return Shade.constant.apply(undefined, json_node.values);
         case "struct":
             return Shade.struct(_.build(_.zip(json_node.fields, json_node.parents)));
+        case "parameter":
+            return Shade.parameter(json_node.parameter_type);
         };
 
         // swizzle
@@ -8621,7 +8623,15 @@ Shade.parameter = function(type, v)
             this.watchers.splice(this.watchers.indexOf(callback), 1);
         },
         uniform_call: call,
-        uniform_name: uniform_name
+        uniform_name: uniform_name,
+
+        //////////////////////////////////////////////////////////////////////
+        // debugging
+
+        _json_helper: Shade.Debug._json_builder("parameter", function(obj) {
+            obj.parameter_type = type.repr();
+            return obj;
+        })
     });
     result._uniforms = [result];
     result.set(v);

lux.min.js

@@ -18,6 +18,8 @@ Shade.Debug.from_json = function(json)
             return Shade.constant.apply(undefined, json_node.values);
         case "struct":
             return Shade.struct(_.build(_.zip(json_node.fields, json_node.parents)));
+        case "parameter":
+            return Shade.parameter(json_node.parameter_type);
         };
 
         // swizzle

src/shade/debug/from_json.js

@@ -84,7 +84,15 @@ Shade.parameter = function(type, v)
             this.watchers.splice(this.watchers.indexOf(callback), 1);
         },
         uniform_call: call,
-        uniform_name: uniform_name
+        uniform_name: uniform_name,
+
+        //////////////////////////////////////////////////////////////////////
+        // debugging
+
+        _json_helper: Shade.Debug._json_builder("parameter", function(obj) {
+            obj.parameter_type = type.repr();
+            return obj;
+        })
     });
     result._uniforms = [result];
     result.set(v);

src/shade/parameter.js

@@ -122,7 +122,7 @@ test("Shade expressions", function() {
         return e.message === "discard_if expects two parameters";
     }, "discard_if requires two parameters");
 
-    ok(Shade.Debug.from_json(Shade.vec(1,Shade.add(3, 4), Shade.ifelse(Shade.lt(3, 5), Shade.mul(3, 5), 3)).json()),
+    ok(Shade.Debug.from_json(Shade.vec(Shade.parameter("float", 1),Shade.add(3, 4), Shade.ifelse(Shade.lt(3, 5), Shade.mul(3, 5), 3)).json()),
        "calling json() and from_json() on basic expressions");
 });