Adding complex type support in GUI

proceduralTexturesLibrary/proceduralTextures/marble/babylon.marbleProceduralTexture.ts

@@ -5,7 +5,6 @@ module BABYLON {
         private _numberOfTilesHeight: number = 3;
         private _numberOfTilesWidth: number = 3;
         private _amplitude: number = 9.0;
-        private _marbleColor = new Color3(0.77, 0.47, 0.40);
         private _jointColor = new Color3(0.72, 0.72, 0.72);
 
         constructor(name: string, size: number, scene: Scene, fallbackTexture?: Texture, generateMipMaps?: boolean) {
@@ -17,7 +16,6 @@ module BABYLON {
             this.setFloat("numberOfTilesHeight", this._numberOfTilesHeight);
             this.setFloat("numberOfTilesWidth", this._numberOfTilesWidth);
             this.setFloat("amplitude", this._amplitude);
-            this.setColor3("marbleColor", this._marbleColor);
             this.setColor3("jointColor", this._jointColor);
         }
 
@@ -56,14 +54,5 @@ module BABYLON {
             this._jointColor = value;
             this.updateShaderUniforms();
         }
-
-        public get marbleColor(): Color3 {
-            return this._marbleColor;
-        }
-
-        public set marbleColor(value: Color3) {
-            this._marbleColor = value;
-            this.updateShaderUniforms();
-        }
     }
 }

proceduralTexturesLibrary/proceduralTextures/marble/marbleProceduralTexture.fragment.fx

@@ -1,85 +1,85 @@
-precision highp float;
-
-varying vec2 vPosition;
-varying vec2 vUV;
-
-uniform float numberOfTilesHeight;
-uniform float numberOfTilesWidth;
-uniform float amplitude;
-uniform vec3 brickColor;
-uniform vec3 jointColor;
-
-const vec3 tileSize = vec3(1.1, 1.0, 1.1);
-const vec3 tilePct = vec3(0.98, 1.0, 0.98);
-
-float rand(vec2 n) {
-	return fract(cos(dot(n, vec2(12.9898, 4.1414))) * 43758.5453);
-}
-
-float noise(vec2 n) {
-	const vec2 d = vec2(0.0, 1.0);
-	vec2 b = floor(n), f = smoothstep(vec2(0.0), vec2(1.0), fract(n));
-	return mix(mix(rand(b), rand(b + d.yx), f.x), mix(rand(b + d.xy), rand(b + d.yy), f.x), f.y);
-}
-
-float turbulence(vec2 P)
-{
-	float val = 0.0;
-	float freq = 1.0;
-	for (int i = 0; i < 4; i++)
-	{
-		val += abs(noise(P*freq) / freq);
-		freq *= 2.07;
-	}
-	return val;
-}
-
-float round(float number){
-	return sign(number)*floor(abs(number) + 0.5);
-}
-
-vec3 marble_color(float x)
-{
-	vec3 col;
-	x = 0.5*(x + 1.);
-	x = sqrt(x);             
-	x = sqrt(x);
-	x = sqrt(x);
-	col = vec3(.2 + .75*x);  
-	col.b *= 0.95;           
-	return col;
-}
-
-void main()
-{
-	float brickW = 1.0 / numberOfTilesWidth;
-	float brickH = 1.0 / numberOfTilesHeight;
-	float jointWPercentage = 0.01;
-	float jointHPercentage = 0.01;
-	vec3 color = brickColor;
-	float yi = vUV.y / brickH;
-	float nyi = round(yi);
-	float xi = vUV.x / brickW;
-
-	if (mod(floor(yi), 2.0) == 0.0){
-		xi = xi - 0.5;
-	}
-
-	float nxi = round(xi);
-	vec2 brickvUV = vec2((xi - floor(xi)) / brickH, (yi - floor(yi)) / brickW);
-
-	if (yi < nyi + jointHPercentage && yi > nyi - jointHPercentage){
-		color = mix(jointColor, vec3(0.37, 0.25, 0.25), (yi - nyi) / jointHPercentage + 0.2);
-	}
-	else if (xi < nxi + jointWPercentage && xi > nxi - jointWPercentage){
-		color = mix(jointColor, vec3(0.44, 0.44, 0.44), (xi - nxi) / jointWPercentage + 0.2);
-	}
-	else {
-		float t = 6.28 * brickvUV.x / (tileSize.x + noise(vec2(vUV)*6.0));
-		t += amplitude * turbulence(brickvUV.xy);
-		t = sin(t);
-		color = marble_color(t);
-	}
-
-	gl_FragColor = vec4(color, 0.0);
+precision highp float;
+
+varying vec2 vPosition;
+varying vec2 vUV;
+
+uniform float numberOfTilesHeight;
+uniform float numberOfTilesWidth;
+uniform float amplitude;
+uniform vec3 marbleColor;
+uniform vec3 jointColor;
+
+const vec3 tileSize = vec3(1.1, 1.0, 1.1);
+const vec3 tilePct = vec3(0.98, 1.0, 0.98);
+
+float rand(vec2 n) {
+	return fract(cos(dot(n, vec2(12.9898, 4.1414))) * 43758.5453);
+}
+
+float noise(vec2 n) {
+	const vec2 d = vec2(0.0, 1.0);
+	vec2 b = floor(n), f = smoothstep(vec2(0.0), vec2(1.0), fract(n));
+	return mix(mix(rand(b), rand(b + d.yx), f.x), mix(rand(b + d.xy), rand(b + d.yy), f.x), f.y);
+}
+
+float turbulence(vec2 P)
+{
+	float val = 0.0;
+	float freq = 1.0;
+	for (int i = 0; i < 4; i++)
+	{
+		val += abs(noise(P*freq) / freq);
+		freq *= 2.07;
+	}
+	return val;
+}
+
+float round(float number){
+	return sign(number)*floor(abs(number) + 0.5);
+}
+
+vec3 marble_color(float x)
+{
+	vec3 col;
+	x = 0.5*(x + 1.);
+	x = sqrt(x);             
+	x = sqrt(x);
+	x = sqrt(x);
+	col = vec3(.2 + .75*x);  
+	col.b *= 0.95;           
+	return col;
+}
+
+void main()
+{
+	float brickW = 1.0 / numberOfTilesWidth;
+	float brickH = 1.0 / numberOfTilesHeight;
+	float jointWPercentage = 0.01;
+	float jointHPercentage = 0.01;
+	vec3 color = marbleColor;
+	float yi = vUV.y / brickH;
+	float nyi = round(yi);
+	float xi = vUV.x / brickW;
+
+	if (mod(floor(yi), 2.0) == 0.0){
+		xi = xi - 0.5;
+	}
+
+	float nxi = round(xi);
+	vec2 brickvUV = vec2((xi - floor(xi)) / brickH, (yi - floor(yi)) / brickW);
+
+	if (yi < nyi + jointHPercentage && yi > nyi - jointHPercentage){
+		color = mix(jointColor, vec3(0.37, 0.25, 0.25), (yi - nyi) / jointHPercentage + 0.2);
+	}
+	else if (xi < nxi + jointWPercentage && xi > nxi - jointWPercentage){
+		color = mix(jointColor, vec3(0.44, 0.44, 0.44), (xi - nxi) / jointWPercentage + 0.2);
+	}
+	else {
+		float t = 6.28 * brickvUV.x / (tileSize.x + noise(vec2(vUV)*6.0));
+		t += amplitude * turbulence(brickvUV.xy);
+		t = sin(t);
+		color = marble_color(t);
+	}
+
+	gl_FragColor = vec4(color, 0.0);
 }

proceduralTexturesLibrary/test/index.html

@@ -56,16 +56,7 @@
     <script src="add/addStarfieldPT.js"></script>
 	<script>
 		
-		dat.GUI.prototype.removeFolder = function(name) {
-			var folder = this.__folders[name];
-			if (!folder) {
-				return;
-			}
-			folder.close();
-			this.__ul.removeChild(folder.domElement.parentNode);
-			delete this.__folders[name];
-			this.onResize();
-		}
+		
 		
 		if (BABYLON.Engine.isSupported()) {
 			var canvas = document.getElementById("renderCanvas");
@@ -211,50 +202,106 @@
 				//placeholder for current texture options			
 				var currentPTOptions = gui.addFolder('Texture Options');
 				var PTOptions = [];
+				
+				dat.GUI.prototype.removeFolder = function(name) {
+					var folder = this.__folders[name];
+					if (!folder) {
+						return;
+					}
+					folder.close();
+					this.__ul.removeChild(folder.domElement.parentNode);
+					delete this.__folders[name];
+					this.onResize();
+				}
+				
 				var resetPTOptions = function(){
 					//empty options
 					while(PTOptions.length > 0){
-						currentPTOptions.remove(PTOptions.pop());
+						var option = PTOptions.pop()
+						if(option.optionType === "Folder"){
+							currentPTOptions.removeFolder(option.optionValue);
+						}
+						else {
+							currentPTOptions.remove(option.optionValue);
+						}
 					}
 				}
 				
+				var addFloatSubOption = function(guiElement, field, propertyName, proxy, initvalue){
+					proxy[propertyName] = initvalue;
+					guiElement.add(proxy, propertyName).onChange(function () {
+						try {
+							var xvalue = parseFloat(proxy[propertyName]);
+							eval('field.' + propertyName + ' = xvalue');
+						} catch (e) {
+							
+						}
+					});	
+				}
+				
 				var addPToptions = function(pt, fieldNames){
 					for(var fieldid = 0; fieldid < fieldNames.length; fieldid++){
 						var field = fieldNames[fieldid]
-						var added;
+						var added = {};
 						if(typeof pt[field] != 'object' && pt[field] != 'undefined') {
-							added = currentPTOptions.add(pt, fieldNames[fieldid]);
+							added.optionType = "Value";
+							added.optionValue = currentPTOptions.add(pt, fieldNames[fieldid]);
 						}
 						else {
 							var proxy = {};
 							
 							if(pt[field] instanceof BABYLON.Vector2){
-								proxy[field] = 'new BABYLON.Vector2(0.5, 0.5)';								
+								added.optionType = 'Folder';
+								added.optionValue = field + ' ('+  pt[field].constructor.name +')';
+								var folder = currentPTOptions.addFolder(added.optionValue);
+								addFloatSubOption(folder, pt[field], 'x', proxy, pt[field].x);
+								addFloatSubOption(folder, pt[field], 'y', proxy, pt[field].y);
 							}
+							
 							else if(pt[field] instanceof BABYLON.Vector3){
-								proxy[field] = 'new BABYLON.Vector3(0.5, 0.5, 0.5)';								
+								added.optionType = 'Folder';
+								added.optionValue = field + ' ('+  pt[field].constructor.name +')';
+								var folder = currentPTOptions.addFolder(added.optionValue);
+								addFloatSubOption(folder, pt[field], 'x', proxy, pt[field].x);
+								addFloatSubOption(folder, pt[field], 'y', proxy, pt[field].y);								
+								addFloatSubOption(folder, pt[field], 'z', proxy, pt[field].z);								
 							}
 							else if(pt[field] instanceof BABYLON.Vector4){
-								proxy[field] = 'new BABYLON.Vector4(0.5, 0.5, 0.5, 0.5)';								
+								added.optionType = 'Folder';
+								added.optionValue = field + ' ('+  pt[field].constructor.name +')';
+								var folder = currentPTOptions.addFolder(added.optionValue);
+								addFloatSubOption(folder, pt[field], 'x', proxy, pt[field].x);
+								addFloatSubOption(folder, pt[field], 'y', proxy, pt[field].y);								
+								addFloatSubOption(folder, pt[field], 'z', proxy, pt[field].z);									
+								addFloatSubOption(folder, pt[field], 'w', proxy, pt[field].w);									
 							}
 							else if(pt[field] instanceof BABYLON.Color3){
-								proxy[field] = 'new BABYLON.Color3(0.5, 0.5, 0.5)';								
+								added.optionType = 'Folder';
+								added.optionValue = field + ' ('+  pt[field].constructor.name +')';
+								var folder = currentPTOptions.addFolder(added.optionValue);
+								addFloatSubOption(folder, pt[field], 'r', proxy, pt[field].r);
+								addFloatSubOption(folder, pt[field], 'g', proxy, pt[field].g);								
+								addFloatSubOption(folder, pt[field], 'b', proxy, pt[field].b);									
 							}
 							else if(pt[field] instanceof BABYLON.Color4){
-								proxy[field] = 'new BABYLON.Color4(0.5, 0.5, 0.5, 0.5)';								
+								added.optionType = 'Folder';
+								added.optionValue = field + ' ('+  pt[field].constructor.name +')';
+								var folder = currentPTOptions.addFolder(added.optionValue);
+								addFloatSubOption(folder, pt[field], 'r', proxy, pt[field].r);
+								addFloatSubOption(folder, pt[field], 'g', proxy, pt[field].g);								
+								addFloatSubOption(folder, pt[field], 'b', proxy, pt[field].b);									
+								addFloatSubOption(folder, pt[field], 'a', proxy, pt[field].a);									
 							}
 							else {
 								proxy[field] = 'Object (' + pt[field].constructor.name +')';
+								added.optionType = "Value";
+								added.optionValue = currentPTOptions.add(proxy, field).onChange(function () {
+									try {
+										var res = eval(proxy[field]);
+										pt[field] = res; 
+									} catch (e) { }
+								});
 							}
-							
-							added = currentPTOptions.add(proxy, field).onChange(function () {
-								try {
-									var res = eval(proxy[field]);
-									pt[field] = res; 
-								} catch (e) {
-									
-								}
-							});
 						}
 						PTOptions.push(added);
 					}
@@ -289,7 +336,7 @@
 							break;
 						case "marble":
 							currentTexture = marblePT;
-							addPToptions(marblePT, ['numberOfTilesHeight', 'numberOfTilesWidth', 'amplitude', 'marbleColor', 'jointColor']);
+							addPToptions(marblePT, ['numberOfTilesHeight', 'numberOfTilesWidth', 'amplitude', 'jointColor']);
 							break;
 						case "starfield":
 							currentTexture = starfieldPT;