mirror of
https://github.com/dataarts/dat.gui.git
synced 2024-12-12 04:08:27 +00:00
Merge branch 'master' into gh-pages
This commit is contained in:
commit
5376bfd13b
@ -2,27 +2,38 @@ var Controller = function() {
|
||||
|
||||
var onChange = null;
|
||||
|
||||
this.setName = function(n) {
|
||||
this.propertyNameElement.innerHTML = n;
|
||||
return this;
|
||||
}
|
||||
this.parent = null;
|
||||
|
||||
this.setValue = function(n) {
|
||||
this.object[this.propertyName] = n;
|
||||
if (onChange != null) {
|
||||
onChange.call(this, n);
|
||||
}
|
||||
return this;
|
||||
}
|
||||
this.name = function(n) {
|
||||
this.propertyNameElement.innerHTML = n;
|
||||
return this;
|
||||
}
|
||||
|
||||
this.getValue = function() {
|
||||
return this.object[this.propertyName];
|
||||
}
|
||||
this.listen = function() {
|
||||
this.parent.watchController(this);
|
||||
return this;
|
||||
}
|
||||
|
||||
this.onChange = function(fnc) {
|
||||
onChange = fnc;
|
||||
return this;
|
||||
}
|
||||
this.getValue = function() {
|
||||
return this.object[this.propertyName];
|
||||
}
|
||||
|
||||
this.setValue = function(n) {
|
||||
this.object[this.propertyName] = n;
|
||||
if (onChange != null) {
|
||||
onChange.call(this, n);
|
||||
}
|
||||
return this;
|
||||
}
|
||||
|
||||
this.watchValue = function() {
|
||||
this.updateValue(this.object[this.propertyName]);
|
||||
}
|
||||
|
||||
this.onChange = function(fnc) {
|
||||
onChange = fnc;
|
||||
return this;
|
||||
}
|
||||
|
||||
this.makeUnselectable = function(elem) {
|
||||
elem.onselectstart = function() { return false; };
|
||||
@ -38,17 +49,17 @@ var Controller = function() {
|
||||
elem.unselectable = "off";
|
||||
}
|
||||
|
||||
this.domElement = document.createElement('div');
|
||||
this.domElement.setAttribute('class', 'guidat-controller ' + this.type);
|
||||
this.domElement = document.createElement('div');
|
||||
this.domElement.setAttribute('class', 'guidat-controller ' + this.type);
|
||||
|
||||
this.object = arguments[0];
|
||||
this.propertyName = arguments[1];
|
||||
this.object = arguments[0];
|
||||
this.propertyName = arguments[1];
|
||||
|
||||
this.propertyNameElement = document.createElement('span');
|
||||
this.propertyNameElement.setAttribute('class', 'guidat-propertyname');
|
||||
this.setName(this.propertyName);
|
||||
this.domElement.appendChild(this.propertyNameElement);
|
||||
this.propertyNameElement = document.createElement('span');
|
||||
this.propertyNameElement.setAttribute('class', 'guidat-propertyname');
|
||||
this.name(this.propertyName);
|
||||
this.domElement.appendChild(this.propertyNameElement);
|
||||
|
||||
this.makeUnselectable(this.domElement);
|
||||
this.makeUnselectable(this.domElement);
|
||||
|
||||
};
|
@ -20,15 +20,9 @@ var NumberController = function() {
|
||||
var step = arguments[4];
|
||||
|
||||
if (!step) {
|
||||
if (min != undefined && max != undefined) {
|
||||
step = (max-min)*0.01;
|
||||
} else {
|
||||
step = 1;
|
||||
}
|
||||
step = min != undefined && max != undefined ? (max-min)*0.01: 1;
|
||||
}
|
||||
|
||||
console.log("step " + step);
|
||||
|
||||
var numberField = document.createElement('input');
|
||||
numberField.setAttribute('id', this.propertyName);
|
||||
|
||||
@ -70,7 +64,7 @@ var NumberController = function() {
|
||||
|
||||
document.addEventListener('mouseup', function(e) {
|
||||
document.removeEventListener('mousemove', dragNumberField, false);
|
||||
_this.makeSelectable(GUI.domElement);
|
||||
_this.makeSelectable(_this.parent.domElement);
|
||||
_this.makeSelectable(numberField);
|
||||
if (clickedNumberField && !draggedNumberField) {
|
||||
numberField.focus();
|
||||
@ -94,7 +88,7 @@ var NumberController = function() {
|
||||
// We don't want to be highlighting this field as we scroll.
|
||||
// Or any other fields in this gui for that matter ...
|
||||
// TODO: Make makeUselectable go through each element and child element.
|
||||
_this.makeUnselectable(GUI.domElement);
|
||||
_this.makeUnselectable(_this.parent.domElement);
|
||||
_this.makeUnselectable(numberField);
|
||||
|
||||
py = y;
|
||||
|
@ -4,24 +4,30 @@ var StringController = function() {
|
||||
|
||||
var _this = this;
|
||||
|
||||
Controller.apply(this, arguments);
|
||||
Controller.apply(this, arguments);
|
||||
|
||||
var input = document.createElement('input');
|
||||
var input = document.createElement('input');
|
||||
|
||||
var initialValue = this.getValue();
|
||||
var initialValue = this.getValue();
|
||||
|
||||
input.setAttribute('value', initialValue);
|
||||
input.setAttribute('spellcheck', 'false');
|
||||
this.domElement.addEventListener('mouseup', function() {
|
||||
input.focus();
|
||||
input.select();
|
||||
}, false);
|
||||
input.setAttribute('value', initialValue);
|
||||
input.setAttribute('spellcheck', 'false');
|
||||
|
||||
input.addEventListener('keyup', function() {
|
||||
_this.setValue(input.value);
|
||||
}, false);
|
||||
this.domElement.addEventListener('mouseup', function() {
|
||||
input.focus();
|
||||
input.select();
|
||||
}, false);
|
||||
|
||||
input.addEventListener('keyup', function() {
|
||||
_this.setValue(input.value);
|
||||
}, false);
|
||||
|
||||
this.domElement.appendChild(input);
|
||||
|
||||
this.updateValue = function(val) {
|
||||
input.setAttribute('value', val);
|
||||
}
|
||||
|
||||
this.domElement.appendChild(input);
|
||||
};
|
||||
StringController.prototype = new Controller();
|
||||
StringController.prototype.constructor = StringController;
|
@ -1,5 +1,7 @@
|
||||
function FizzyText(message) {
|
||||
|
||||
var that = this;
|
||||
|
||||
// These are the variables that we manipulate with gui-dat.
|
||||
// Notice they're all defined with "this". That makes them public.
|
||||
// Otherwise, gui-dat can't see them.
|
||||
@ -9,6 +11,7 @@ function FizzyText(message) {
|
||||
this.noiseStrength = 10; // how turbulent is the flow?
|
||||
this.speed = 0.4; // how fast do particles move?
|
||||
this.displayOutline = false; // should we draw the message as a stroke?
|
||||
this.framesRendered = 0;
|
||||
|
||||
// __defineGetter__ and __defineSetter__ makes JavaScript believe that
|
||||
// we've defined a variable 'this.message'. This way, whenever we
|
||||
@ -98,6 +101,8 @@ function FizzyText(message) {
|
||||
// Called once per frame, updates the animation.
|
||||
var render = function () {
|
||||
|
||||
that.framesRendered ++;
|
||||
|
||||
g.clearRect(0, 0, width, height);
|
||||
|
||||
if (_this.displayOutline) {
|
||||
|
1538
demo/prettify.js
Normal file
1538
demo/prettify.js
Normal file
File diff suppressed because it is too large
Load Diff
6
gui.css
6
gui.css
@ -8,9 +8,6 @@
|
||||
left: 100%;
|
||||
margin-left: -300px;
|
||||
background-color: #fff;
|
||||
-moz-transition: margin-top .2s ease-out;
|
||||
-webkit-transition: margin-top .2s ease-out;
|
||||
transition: margin-top .2s ease-out;
|
||||
-webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);
|
||||
-moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);
|
||||
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.3);
|
||||
@ -26,6 +23,9 @@
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden;
|
||||
background-color: rgba(0,0,0,0.1);
|
||||
-moz-transition: height .2s ease-out;
|
||||
-webkit-transition: height .2s ease-out;
|
||||
transition: height .2s ease-out;
|
||||
}
|
||||
|
||||
#guidat-toggle {
|
||||
|
166
gui.js
166
gui.js
@ -1,60 +1,35 @@
|
||||
var GUI = new function() {
|
||||
var GUI = function () {
|
||||
|
||||
var _this = this;
|
||||
var _this = this, open = false,
|
||||
controllers = [], controllersWatched = [];
|
||||
|
||||
var controllers = [];
|
||||
this.domElement = document.createElement('div');
|
||||
this.domElement.setAttribute('id', 'guidat');
|
||||
|
||||
this.add = function() {
|
||||
controllerContainer = document.createElement('div');
|
||||
controllerContainer.setAttribute('id', 'guidat-controllers');
|
||||
controllerContainer.style.height = '0px';
|
||||
|
||||
// We need to call GUI.start() before .add()
|
||||
if (!started) {
|
||||
error("Make sure to call GUI.start() in the window.onload function");
|
||||
return;
|
||||
toggleButton = document.createElement('a');
|
||||
toggleButton.setAttribute('id', 'guidat-toggle');
|
||||
toggleButton.setAttribute('href', '#');
|
||||
toggleButton.innerHTML = "Show Controls";
|
||||
toggleButton.addEventListener('click', function(e) {
|
||||
_this.toggle();
|
||||
e.preventDefault();
|
||||
}, false);
|
||||
|
||||
this.domElement.appendChild(controllerContainer);
|
||||
this.domElement.appendChild(toggleButton);
|
||||
|
||||
// Controllers Watcher
|
||||
setInterval( function() {
|
||||
for (var c in controllersWatched) {
|
||||
controllersWatched[c].watchValue();
|
||||
}
|
||||
}, 1000 / 60 );
|
||||
|
||||
var object = arguments[0];
|
||||
var propertyName = arguments[1];
|
||||
|
||||
// Have we already added this?
|
||||
if (alreadyControlled(object, propertyName)) {
|
||||
error("Controller for \"" + propertyName+"\" already added.");
|
||||
return;
|
||||
}
|
||||
|
||||
var value = object[propertyName];
|
||||
|
||||
// Does this value exist? Is it accessible?
|
||||
if (value == undefined) {
|
||||
error(object + " either has no property \""+propertyName+"\", or the property is inaccessible.");
|
||||
return;
|
||||
}
|
||||
|
||||
var type = typeof value;
|
||||
var handler = addHandlers[type];
|
||||
|
||||
// Do we know how to deal with this data type?
|
||||
if (handler == undefined) {
|
||||
error("Cannot create controller for data type \""+type+"\"");
|
||||
return;
|
||||
}
|
||||
|
||||
var controllerObject = construct(handler, arguments);
|
||||
|
||||
// Were we able to make the controller?
|
||||
if (!controllerObject) {
|
||||
error("Error creating controller for \""+propertyName+"\".");
|
||||
return;
|
||||
}
|
||||
|
||||
// Success.
|
||||
controllerContainer.appendChild(controllerObject.domElement);
|
||||
controllers.push(controllerObject);
|
||||
|
||||
return controllerObject;
|
||||
|
||||
}
|
||||
|
||||
var addHandlers = {
|
||||
var handlerTypes = {
|
||||
"number": NumberController,
|
||||
"string": StringController,
|
||||
"boolean": BooleanController,
|
||||
@ -78,71 +53,76 @@ var GUI = new function() {
|
||||
};
|
||||
|
||||
var construct = function(constructor, args) {
|
||||
function F() {
|
||||
return constructor.apply(this, args);
|
||||
}
|
||||
F.prototype = constructor.prototype;
|
||||
return new F();
|
||||
};
|
||||
function F() {
|
||||
return constructor.apply(this, args);
|
||||
}
|
||||
F.prototype = constructor.prototype;
|
||||
return new F();
|
||||
};
|
||||
|
||||
this.add = function() {
|
||||
|
||||
var object = arguments[0];
|
||||
var propertyName = arguments[1];
|
||||
|
||||
// GUI ... GUI
|
||||
// Have we already added this?
|
||||
if (alreadyControlled(object, propertyName)) {
|
||||
error("Controller for \"" + propertyName+"\" already added.");
|
||||
return;
|
||||
}
|
||||
|
||||
this.domElement = null;
|
||||
var controllerContainer;
|
||||
var started = false;
|
||||
var open = false;
|
||||
var value = object[propertyName];
|
||||
|
||||
// TODO: obtain this dynamically?
|
||||
var domElementMarginTop = 300;
|
||||
// Does this value exist? Is it accessible?
|
||||
if (value == undefined) {
|
||||
error(object + " either has no property \""+propertyName+"\", or the property is inaccessible.");
|
||||
return;
|
||||
}
|
||||
|
||||
this.start = function() {
|
||||
var type = typeof value;
|
||||
var handler = handlerTypes[type];
|
||||
|
||||
this.domElement = document.createElement('div');
|
||||
this.domElement.setAttribute('id', 'guidat');
|
||||
// Do we know how to deal with this data type?
|
||||
if (handler == undefined) {
|
||||
error("Cannot create controller for data type \""+type+"\"");
|
||||
return;
|
||||
}
|
||||
|
||||
controllerContainer = document.createElement('div');
|
||||
controllerContainer.setAttribute('id', 'guidat-controllers');
|
||||
var controllerObject = construct( handler, arguments);
|
||||
controllerObject.parent = _this;
|
||||
|
||||
toggleButton = document.createElement('a');
|
||||
toggleButton.setAttribute('id', 'guidat-toggle');
|
||||
toggleButton.setAttribute('href', '#');
|
||||
toggleButton.innerHTML = "Show Controls";
|
||||
toggleButton.addEventListener('click', function(e) {
|
||||
_this.toggle();
|
||||
e.preventDefault();
|
||||
}, false);
|
||||
// Were we able to make the controller?
|
||||
if (!controllerObject) {
|
||||
error("Error creating controller for \""+propertyName+"\".");
|
||||
return;
|
||||
}
|
||||
|
||||
this.domElement.appendChild(controllerContainer);
|
||||
this.domElement.appendChild(toggleButton);
|
||||
// Success.
|
||||
controllerContainer.appendChild(controllerObject.domElement);
|
||||
controllers.push(controllerObject);
|
||||
|
||||
this.domElement.style.marginTop = -domElementMarginTop+"px";
|
||||
|
||||
document.body.appendChild(this.domElement);
|
||||
|
||||
started = true;
|
||||
return controllerObject;
|
||||
|
||||
};
|
||||
|
||||
this.watchController = function(c) {
|
||||
|
||||
controllersWatched.push(c);
|
||||
|
||||
}
|
||||
|
||||
this.toggle = function() {
|
||||
|
||||
if (open) {
|
||||
this.hide();
|
||||
} else {
|
||||
this.show();
|
||||
}
|
||||
|
||||
open ? this.hide() : this.show();
|
||||
};
|
||||
|
||||
this.show = function() {
|
||||
this.domElement.style.marginTop = 0+"px";
|
||||
controllerContainer.style.height = '300px';
|
||||
toggleButton.innerHTML = "Hide Controls";
|
||||
open = true;
|
||||
}
|
||||
|
||||
this.hide = function() {
|
||||
this.domElement.style.marginTop = -domElementMarginTop+"px";
|
||||
controllerContainer.style.height = '0px';
|
||||
toggleButton.innerHTML = "Show Controls";
|
||||
open = false;
|
||||
}
|
||||
|
102
index.html
102
index.html
@ -2,54 +2,60 @@
|
||||
<head>
|
||||
<title>gui-dat</title>
|
||||
|
||||
<link rel="icon" type="image/png" href="demo/assets/favicon.png" />
|
||||
<link href="demo/demo.css" media="screen" rel="stylesheet" type="text/css" />
|
||||
<script type="text/javascript" src="http://google-code-prettify.googlecode.com/svn/trunk/src/prettify.js"></script>
|
||||
<script type="text/javascript" src="gui.min.js"></script>
|
||||
<script type="text/javascript" src="demo/improvedNoise.js"></script>
|
||||
<script type="text/javascript" src="demo/demo.js"></script>
|
||||
<script type="text/javascript">
|
||||
window.onload = function() {
|
||||
<link rel="icon" type="image/png" href="demo/assets/favicon.png" />
|
||||
<link href="demo/demo.css" media="screen" rel="stylesheet" type="text/css" />
|
||||
|
||||
prettyPrint();
|
||||
<!-- <script type="text/javascript" src="gui.min.js"></script> -->
|
||||
|
||||
var fizzyText = new FizzyText("gui-dat");
|
||||
<link href="gui.css" media="screen" rel="stylesheet" type="text/css" />
|
||||
|
||||
GUI.start();
|
||||
<script type="text/javascript" src="controllers/slider.js"></script>
|
||||
<script type="text/javascript" src="controllers/controller.js"></script>
|
||||
<script type="text/javascript" src="controllers/controller.boolean.js"></script>
|
||||
<script type="text/javascript" src="controllers/controller.function.js"></script>
|
||||
<script type="text/javascript" src="controllers/controller.number.js"></script>
|
||||
<script type="text/javascript" src="controllers/controller.string.js"></script>
|
||||
<script type="text/javascript" src="gui.js"></script>
|
||||
|
||||
// Text field
|
||||
GUI.add(fizzyText, "message");
|
||||
<script type="text/javascript" src="demo/improvedNoise.js"></script>
|
||||
<script type="text/javascript" src="demo/prettify.js"></script>
|
||||
<script type="text/javascript" src="demo/demo.js"></script>
|
||||
<script type="text/javascript">
|
||||
|
||||
// Sliders with min and max
|
||||
GUI.add(fizzyText, "maxSize", 0.5, 7);
|
||||
GUI.add(fizzyText, "growthSpeed", 0.01, 1);
|
||||
GUI.add(fizzyText, "speed", 0.1, 2);
|
||||
window.onload = function() {
|
||||
|
||||
// Sliders with min, max and increment.
|
||||
GUI.add(fizzyText, "noiseStrength", 10, 100, 5);
|
||||
prettyPrint();
|
||||
|
||||
// Boolean checkbox
|
||||
GUI.add(fizzyText, "displayOutline");
|
||||
var fizzyText = new FizzyText("gui-dat");
|
||||
|
||||
// Fires a function called "explode"
|
||||
GUI.add(fizzyText, "explode")
|
||||
.setName('Explode!'); // Specify a custom name.
|
||||
var gui = new GUI();
|
||||
document.body.appendChild( gui.domElement );
|
||||
|
||||
};
|
||||
// Text field
|
||||
gui.add(fizzyText, "message");
|
||||
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(['_setAccount', 'UA-20996084-1']);
|
||||
_gaq.push(['_trackPageview']);
|
||||
// Sliders with min and max
|
||||
gui.add(fizzyText, "maxSize", 0.5, 7);
|
||||
gui.add(fizzyText, "growthSpeed", 0.01, 1);
|
||||
gui.add(fizzyText, "speed", 0.1, 2);
|
||||
|
||||
// Sliders with min, max and increment.
|
||||
gui.add(fizzyText, "noiseStrength", 10, 100, 5);
|
||||
|
||||
// Boolean checkbox
|
||||
gui.add(fizzyText, "displayOutline");
|
||||
|
||||
// Watches a property
|
||||
gui.add(fizzyText, "framesRendered").listen();
|
||||
|
||||
// Fires a function called "explode"
|
||||
gui.add(fizzyText, "explode").setName("Explode!"); // Specify a custom name.
|
||||
|
||||
};
|
||||
|
||||
(function() {
|
||||
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
|
||||
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
|
||||
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="container">
|
||||
<div id = "helvetica-demo"></div>
|
||||
<div id = "notifier"></div>
|
||||
<h1><a href = "http://twitter.com/guidat"><img src = "demo/assets/profile.png" border = "0" alt = "GUI-DAT flag" /></a></h1>
|
||||
@ -63,31 +69,35 @@
|
||||
</ul>
|
||||
|
||||
<h2>Basic Usage</h2>
|
||||
<pre class="prettyprint"><script type="text/javascript" src="demo/demo.js"></script>
|
||||
<pre id="demo-pre" class="prettyprint"><script type="text/javascript" src="demo/demo.js"></script>
|
||||
<script type="text/javascript">
|
||||
|
||||
window.onload = function() {
|
||||
|
||||
var fizzyText = new <a href="demo/demo.js">FizzyText</a>("gui-dat");
|
||||
|
||||
GUI.start();
|
||||
var gui = new GUI();
|
||||
document.body.appendChild( gui.domElement );
|
||||
|
||||
// Text field
|
||||
GUI.add(fizzyText, "message");
|
||||
gui.add(fizzyText, "message");
|
||||
|
||||
// Sliders with min and max
|
||||
GUI.add(fizzyText, "maxSize", 0.5, 7);
|
||||
GUI.add(fizzyText, "growthSpeed", 0.01, 1);
|
||||
GUI.add(fizzyText, "speed", 0.1, 2);
|
||||
gui.add(fizzyText, "maxSize", 0.5, 7);
|
||||
gui.add(fizzyText, "growthSpeed", 0.01, 1);
|
||||
gui.add(fizzyText, "speed", 0.1, 2);
|
||||
|
||||
// Sliders with min, max and increment
|
||||
GUI.add(fizzyText, "noiseStrength", 10, 100, 5);
|
||||
// Sliders with min, max and increment.
|
||||
gui.add(fizzyText, "noiseStrength", 10, 100, 5);
|
||||
|
||||
// Boolean checkbox
|
||||
GUI.add(fizzyText, "displayOutline");
|
||||
gui.add(fizzyText, "displayOutline");
|
||||
|
||||
// Watches a property
|
||||
gui.add(fizzyText, "framesRendered").listen();
|
||||
|
||||
// Fires a function called "explode"
|
||||
GUI.add(fizzyText, "explode").setName("Explode!"); // Specify a custom name.
|
||||
gui.add(fizzyText, "explode").setName("Explode!"); // Specify a custom name.
|
||||
|
||||
};
|
||||
|
||||
@ -98,7 +108,7 @@ window.onload = function() {
|
||||
<li>The properties must be public, i.e. defined by <code><strong>this</strong>.prop = value</code>.</li>
|
||||
</ul>
|
||||
|
||||
<!-- <hr/>
|
||||
<hr/>
|
||||
<h2>Monitor variable changes <em>outside</em> of the GUI</h2>
|
||||
<p>Let's say you have a variable that changes by itself from time to time. If you'd like the GUI to reflect those changes, use the <code>listen()</code> method.</p>
|
||||
<pre class="prettyprint">GUI.add(obj, "propName").listen();</pre>
|
||||
@ -106,7 +116,7 @@ window.onload = function() {
|
||||
<h2>Fire a function when someone uses a control</h2>
|
||||
<pre class="prettyprint">GUI.add(obj, "propName").onChange(function(n) {
|
||||
alert("You changed me to " + n);
|
||||
});</pre> -->
|
||||
});</pre>
|
||||
|
||||
<footer>
|
||||
Initiated by <a href="http://georgemichaelbrower.com/">George Michael Brower</a> and <a href="http://jonobr1.com/">Jono Brandel</a> of the Data Arts Team, Google Creative Lab.
|
||||
|
Loading…
Reference in New Issue
Block a user