mirror of
https://github.com/dataarts/dat.gui.git
synced 2024-12-12 04:08:27 +00:00
Merge branch 'master' of https://github.com/jonobr1/gui-dat
This commit is contained in:
commit
6ae9309712
@ -33,12 +33,11 @@
|
||||
var fizzyText = new FizzyText("dat.gui");
|
||||
var gui = new DAT.GUI();
|
||||
|
||||
|
||||
// Text field
|
||||
gui.add(fizzyText, "message");
|
||||
|
||||
// Sliders with min + max
|
||||
gui.add(fizzyText, "maxSize").min(0.5).max(7);
|
||||
gui.add(fizzyText, "maxSize");
|
||||
gui.add(fizzyText, "growthSpeed").min(0.01).max(1).step(0.05);
|
||||
gui.add(fizzyText, "speed", 0.1, 2, 0.05); // shorthand for min/max/step
|
||||
|
||||
|
@ -275,6 +275,14 @@ DAT.GUI = function(parameters) {
|
||||
|
||||
this.add = function() {
|
||||
|
||||
if (arguments.length == 1) {
|
||||
var toReturn = [];
|
||||
for (var i in arguments[0]) {
|
||||
toReturn.push(_this.add(arguments[0], i));
|
||||
}
|
||||
return toReturn;
|
||||
}
|
||||
|
||||
var object = arguments[0];
|
||||
var propertyName = arguments[1];
|
||||
|
||||
@ -692,6 +700,4 @@ DAT.GUI.removeClass = function(domElement, className) {
|
||||
|
||||
if (DAT.GUI.getVarFromURL('saveString') != null) {
|
||||
DAT.GUI.load(DAT.GUI.getVarFromURL('saveString'));
|
||||
}
|
||||
|
||||
window['DAT'] = DAT;
|
||||
}
|
Loading…
Reference in New Issue
Block a user