wrapping up first implementation, this all works

This commit is contained in:
Adam S. Kirschner 2011-05-15 17:57:03 -04:00
parent c2a0b0fc12
commit c978215749
5 changed files with 19 additions and 23 deletions

View File

@ -1,4 +1,4 @@
function FizzyText(message) { function FizzyText(message, font) {
var that = this; var that = this;
@ -6,6 +6,7 @@ function FizzyText(message) {
// Notice they're all defined with "this". That makes them public. // Notice they're all defined with "this". That makes them public.
// Otherwise, gui-dat can't see them. // Otherwise, gui-dat can't see them.
this.growthSpeed = 0.2; // how fast do particles change size? this.growthSpeed = 0.2; // how fast do particles change size?
this.maxSize = 5.59; // how big can they get? this.maxSize = 5.59; // how big can they get?
this.noiseStrength = 10; // how turbulent is the flow? this.noiseStrength = 10; // how turbulent is the flow?
@ -25,7 +26,16 @@ function FizzyText(message) {
this.__defineSetter__("message", function (m) { this.__defineSetter__("message", function (m) {
message = m; message = m;
createBitmap(message); createBitmap(message, font);
});
this.__defineGetter__("font", function () {
return font;
});
this.__defineSetter__("font", function (f) {
font = f;
createBitmap(message, font);
}); });
// We can even add functions to the DAT.GUI! As long as they have // We can even add functions to the DAT.GUI! As long as they have
@ -87,9 +97,8 @@ function FizzyText(message) {
// This function creates a bitmap of pixels based on your message // This function creates a bitmap of pixels based on your message
// It's called every time we change the message property. // It's called every time we change the message property.
var createBitmap = function (msg) { var createBitmap = function (msg, font) {
s.font = g.font = "800 82px " + that.allFonts[ that.font ]; s.font = g.font = "800 82px " + that.allFonts[ font ];
console.log('createBitmap: ', s.font);
s.fillStyle = "#fff"; s.fillStyle = "#fff";
s.fillRect(0, 0, width, height); s.fillRect(0, 0, width, height);
@ -107,7 +116,6 @@ function FizzyText(message) {
that.framesRendered ++; that.framesRendered ++;
s.font = g.font = "800 82px " + that.allFonts[ that.font ]; s.font = g.font = "800 82px " + that.allFonts[ that.font ];
console.log('render: ', s.font);
g.clearRect(0, 0, width, height); g.clearRect(0, 0, width, height);

View File

@ -37,22 +37,18 @@
prettyPrint(); prettyPrint();
window.fizzyText = new FizzyText('dat.gui'); window.fizzyText = new FizzyText('dat.gui', 0);
var gui = new DAT.GUI(); var gui = new DAT.GUI();
// Text field // Text field
gui.add(fizzyText, 'message') gui.add(fizzyText, 'message');
// Sliders with min + max // Sliders with min + max
gui.add(fizzyText, 'maxSize').min(0.5).max(7); gui.add(fizzyText, 'maxSize').min(0.5).max(7);
gui.add(fizzyText, 'growthSpeed').min(0.01).max(1).step(0.05); 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 gui.add(fizzyText, 'speed', 0.1, 2, 0.05); // shorthand for min/max/step
gui.add(fizzyText, 'font', fizzyText.allFonts ) // Font toggle gui.add(fizzyText, 'font', fizzyText.allFonts ); // Font toggle
.onChange(function(newValue) {
fizzyText.message = fizzyText.message;
});
// Sliders with min, max and increment. // Sliders with min, max and increment.
gui.add(fizzyText, 'noiseStrength', 10, 100, 5); gui.add(fizzyText, 'noiseStrength', 10, 100, 5);

View File

@ -20,15 +20,8 @@ DAT.GUI.ControllerObject = function( gui, object, propertyName, options ) {
_this.setValue(select.value); _this.setValue(select.value);
}, false); }, false);
this.domElement.style.cursor = "pointer";
this.propertyNameElement.style.cursor = "pointer";
this.domElement.appendChild(select); this.domElement.appendChild(select);
this.updateDisplay = function() {
};
this.setValue = function(val) { this.setValue = function(val) {
val = select.value; val = select.value;
return DAT.GUI.Controller.prototype.setValue.call(this, val); return DAT.GUI.Controller.prototype.setValue.call(this, val);

View File

@ -51,7 +51,6 @@ DAT.GUI.ControllerString = function() {
}; };
this.domElement.appendChild(input); this.domElement.appendChild(input);
}; };
DAT.GUI.extendController(DAT.GUI.ControllerString); DAT.GUI.extendController(DAT.GUI.ControllerString);

View File

@ -116,7 +116,7 @@ a.guidat-toggle:hover {
} }
.guidat-controller.object { .guidat-controller.object {
border-left: 5px solid #f00; border-left: 5px solid #ffff00;
} }
.guidat-controller.number input[type=text] { .guidat-controller.number input[type=text] {