Skip to content

Commit 09cc818

Browse files
committed
Merge "Implement .add( controller ) & its use for custom Controllers" from dataarts#243.
1 parent 36ca84e commit 09cc818

File tree

2 files changed

+57
-11
lines changed

2 files changed

+57
-11
lines changed

example.html

+38
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,44 @@
5858
var f3 = f2.addFolder('Nested Folder');
5959
f3.add(obj, 'growthSpeed');
6060

61+
// alternative StringController add
62+
gui.add(new dat.controllers.StringController(obj, 'message'));
63+
64+
// a custom controller
65+
class KnobController extends dat.controllers.Controller {
66+
constructor(object, property, a, b) {
67+
super(object, property);
68+
const _this = this;
69+
this.__input = document.createElement('input');
70+
this.__input.setAttribute('type', 'number');
71+
this.__input.style.width = '40%';
72+
this.updateDisplay();
73+
this.domElement.appendChild(this.__input);
74+
var button = document.createElement('input');
75+
button.setAttribute('type', 'button');
76+
button.value = 'Set ' + property;
77+
button.style.width = '50%';
78+
button.onclick = function(e) {
79+
object[property] = a + b;
80+
_this.updateDisplay();
81+
};
82+
this.domElement.appendChild(button);
83+
}
84+
updateDisplay() {
85+
this.__input.value = this.getValue();
86+
}
87+
}
88+
89+
const api = {
90+
91+
color: '#ffffff',
92+
value: 0.5,
93+
94+
};
95+
96+
gui.add(new KnobController(api, 'value', 0.5, 25), {
97+
liClass: 'knobby'
98+
});
6199
</script>
62100
</body>
63101
</html>

src/dat/gui/GUI.js

+19-11
Original file line numberDiff line numberDiff line change
@@ -1128,19 +1128,23 @@ function recallSavedValue(gui, controller) {
11281128
}
11291129

11301130
function add(gui, object, property, params) {
1131-
if (object[property] === undefined) {
1132-
throw new Error(`Object "${object}" has no property "${property}"`);
1133-
}
1134-
11351131
let controller;
11361132

1137-
if (params.color) {
1138-
controller = new ColorController(object, property);
1139-
} else if (params.image) {
1140-
controller = new ImageController(object, property, params.factoryArgs[0]);
1141-
} else {
1142-
const factoryArgs = [object, property].concat(params.factoryArgs);
1143-
controller = ControllerFactory.apply(gui, factoryArgs);
1133+
if (object instanceof Controller) {
1134+
controller = object;
1135+
params = property || { };
1136+
} else {
1137+
1138+
if (object[property] === undefined) {
1139+
throw new Error(`Object "${object}" has no property "${property}"`);
1140+
}
1141+
1142+
if (params.color) {
1143+
controller = new ColorController(object, property);
1144+
} else {
1145+
const factoryArgs = [object, property].concat(params.factoryArgs);
1146+
controller = ControllerFactory.apply(gui, factoryArgs);
1147+
}
11441148
}
11451149

11461150
if (params.before instanceof Controller) {
@@ -1164,6 +1168,10 @@ function add(gui, object, property, params) {
11641168
dom.addClass(li, GUI.CLASS_CONTROLLER_ROW);
11651169
if (controller instanceof ColorController) {
11661170
dom.addClass(li, 'color');
1171+
} else if ( params.liClass ) {
1172+
dom.addClass(li, params.liClass);
1173+
} else if ( controller.liClass ) {
1174+
dom.addClass(li, controller.liClass);
11671175
} else if (controller instanceof ImageController) {
11681176
dom.addClass(li, 'image');
11691177
} else {

0 commit comments

Comments
 (0)