Skip to content

Commit 44da063

Browse files
tparisitparisi
committed
Cleanup
1 parent 82ee8b3 commit 44da063

File tree

2 files changed

+55
-97
lines changed

2 files changed

+55
-97
lines changed

‎Chapter 11/futurgoDashboard.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,13 @@ FuturgoDashboardScript.prototype.realize = function()
5454
// Set up the gauges
5555
var gauge = this._object.findNode("head_light_L1");
5656
var visual = gauge.visuals[0];
57-
var texture = visual.material.map;
58-
57+
58+
// Create a new canvas element for drawing
5959
var canvas = document.createElement("canvas");
6060
canvas.width = 512;
6161
canvas.height = 512;
6262

63+
// Create a new Three.js texture with the canvas
6364
var texture = new THREE.Texture(canvas);
6465
texture.wrapS = texture.wrapT = THREE.RepeatWrapping;
6566
visual.material.map = texture;
@@ -68,6 +69,7 @@ FuturgoDashboardScript.prototype.realize = function()
6869
this.canvas = canvas;
6970
this.context = canvas.getContext("2d");
7071

72+
// Load the textures for the dashboard and dial
7173
this.dashboardImage = null;
7274
this.dialImage = null;
7375

@@ -86,6 +88,7 @@ FuturgoDashboardScript.prototype.realize = function()
8688
}
8789
image2.src = FuturgoDashboardScript.dialURL;
8890

91+
// Force an initial update
8992
this.needsUpdate = true;
9093
}
9194

‎libs/vizi/vizi.js

Lines changed: 50 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -44830,84 +44830,7 @@ if ( !window.requestAnimationFrame ) {
4483044830
} )();
4483144831

4483244832
}
44833-
/*! Copyright (c) 2010 Brandon Aaron (http://brandonaaron.net)
44834-
* Licensed under the MIT License (LICENSE.txt).
44835-
*
44836-
* Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers.
44837-
* Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.
44838-
* Thanks to: Seamus Leahy for adding deltaX and deltaY
44839-
*
44840-
* Version: 3.0.4
44841-
*
44842-
* Requires: 1.2.2+
44843-
*/
44844-
44845-
(function($) {
44846-
44847-
var types = ['DOMMouseScroll', 'mousewheel'];
44848-
44849-
$.event.special.mousewheel = {
44850-
setup: function() {
44851-
if ( this.addEventListener ) {
44852-
for ( var i=types.length; i; ) {
44853-
this.addEventListener( types[--i], handler, false );
44854-
}
44855-
} else {
44856-
this.onmousewheel = handler;
44857-
}
44858-
},
44859-
44860-
teardown: function() {
44861-
if ( this.removeEventListener ) {
44862-
for ( var i=types.length; i; ) {
44863-
this.removeEventListener( types[--i], handler, false );
44864-
}
44865-
} else {
44866-
this.onmousewheel = null;
44867-
}
44868-
}
44869-
};
44870-
44871-
$.fn.extend({
44872-
mousewheel: function(fn) {
44873-
return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel");
44874-
},
44875-
44876-
unmousewheel: function(fn) {
44877-
return this.unbind("mousewheel", fn);
44878-
}
44879-
});
44880-
44881-
44882-
function handler(event) {
44883-
var orgEvent = event || window.event, args = [].slice.call( arguments, 1 ), delta = 0, returnValue = true, deltaX = 0, deltaY = 0;
44884-
event = $.event.fix(orgEvent);
44885-
event.type = "mousewheel";
44886-
44887-
// Old school scrollwheel delta
44888-
if ( event.wheelDelta ) { delta = event.wheelDelta/120; }
44889-
if ( event.detail ) { delta = -event.detail/3; }
44890-
44891-
// New school multidimensional scroll (touchpads) deltas
44892-
deltaY = delta;
44893-
44894-
// Gecko
44895-
if ( orgEvent.axis !== undefined && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
44896-
deltaY = 0;
44897-
deltaX = -1*delta;
44898-
}
44899-
44900-
// Webkit
44901-
if ( orgEvent.wheelDeltaY !== undefined ) { deltaY = orgEvent.wheelDeltaY/120; }
44902-
if ( orgEvent.wheelDeltaX !== undefined ) { deltaX = -1*orgEvent.wheelDeltaX/120; }
44903-
44904-
// Add event and delta to the front of the arguments
44905-
args.unshift(event, delta, deltaX, deltaY);
44906-
44907-
return null; // $.event.handle.apply(this, args);
44908-
}
44909-
44910-
})(jQuery);var CLOSURE_NO_DEPS = true;
44833+
var CLOSURE_NO_DEPS = true;
4491144834
// Copyright 2006 The Closure Library Authors. All Rights Reserved.
4491244835
//
4491344836
// Licensed under the Apache License, Version 2.0 (the "License");
@@ -49100,20 +49023,16 @@ Vizi.GraphicsThreeJS.prototype.initMouse = function()
4910049023
dom.addEventListener( 'mousedown',
4910149024
function(e) { that.onDocumentMouseDown(e); }, false );
4910249025
dom.addEventListener( 'mouseup',
49103-
function(e) { that.onDocumentMouseUp(e); }, false );
49104-
49105-
49026+
function(e) { that.onDocumentMouseUp(e); }, false );
4910649027
dom.addEventListener( 'click',
4910749028
function(e) { that.onDocumentMouseClick(e); }, false );
49108-
4910949029
dom.addEventListener( 'dblclick',
4911049030
function(e) { that.onDocumentMouseDoubleClick(e); }, false );
49111-
49112-
$(dom).mousewheel(
49113-
function(e, delta) {
49114-
that.onDocumentMouseScroll(e, delta);
49115-
}
49116-
);
49031+
49032+
dom.addEventListener( 'mousewheel',
49033+
function(e) { that.onDocumentMouseScroll(e); }, false );
49034+
dom.addEventListener( 'DOMMouseScroll',
49035+
function(e) { that.onDocumentMouseScroll(e); }, false );
4911749036

4911849037
}
4911949038

@@ -49319,7 +49238,10 @@ Vizi.GraphicsThreeJS.prototype.onDocumentMouseMove = function(event)
4931949238
{
4932049239
event.preventDefault();
4932149240

49322-
var offset = $(this.renderer.domElement).offset();
49241+
var offset = {
49242+
left : this.renderer.domElement.offsetLeft,
49243+
top : this.renderer.domElement.offsetTop,
49244+
};
4932349245

4932449246
var eltx = event.pageX - offset.left;
4932549247
var elty = event.pageY - offset.top;
@@ -49341,7 +49263,10 @@ Vizi.GraphicsThreeJS.prototype.onDocumentMouseDown = function(event)
4934149263
{
4934249264
event.preventDefault();
4934349265

49344-
var offset = $(this.renderer.domElement).offset();
49266+
var offset = {
49267+
left : this.renderer.domElement.offsetLeft,
49268+
top : this.renderer.domElement.offsetTop,
49269+
};
4934549270

4934649271
var eltx = event.pageX - offset.left;
4934749272
var elty = event.pageY - offset.top;
@@ -49363,7 +49288,13 @@ Vizi.GraphicsThreeJS.prototype.onDocumentMouseUp = function(event)
4936349288
{
4936449289
event.preventDefault();
4936549290

49366-
var offset = $(this.renderer.domElement).offset();
49291+
var offset = {
49292+
left : this.renderer.domElement.offsetLeft,
49293+
top : this.renderer.domElement.offsetTop,
49294+
};
49295+
49296+
var eltx = event.pageX - offset.left;
49297+
var elty = event.pageY - offset.top;
4936749298

4936849299
var eltx = event.pageX - offset.left;
4936949300
var elty = event.pageY - offset.top;
@@ -49385,7 +49316,13 @@ Vizi.GraphicsThreeJS.prototype.onDocumentMouseClick = function(event)
4938549316
{
4938649317
event.preventDefault();
4938749318

49388-
var offset = $(this.renderer.domElement).offset();
49319+
var offset = {
49320+
left : this.renderer.domElement.offsetLeft,
49321+
top : this.renderer.domElement.offsetTop,
49322+
};
49323+
49324+
var eltx = event.pageX - offset.left;
49325+
var elty = event.pageY - offset.top;
4938949326

4939049327
var eltx = event.pageX - offset.left;
4939149328
var elty = event.pageY - offset.top;
@@ -49407,7 +49344,13 @@ Vizi.GraphicsThreeJS.prototype.onDocumentMouseDoubleClick = function(event)
4940749344
{
4940849345
event.preventDefault();
4940949346

49410-
var offset = $(this.renderer.domElement).offset();
49347+
var offset = {
49348+
left : this.renderer.domElement.offsetLeft,
49349+
top : this.renderer.domElement.offsetTop,
49350+
};
49351+
49352+
var eltx = event.pageX - offset.left;
49353+
var elty = event.pageY - offset.top;
4941149354

4941249355
var eltx = event.pageX - offset.left;
4941349356
var elty = event.pageY - offset.top;
@@ -49425,11 +49368,23 @@ Vizi.GraphicsThreeJS.prototype.onDocumentMouseDoubleClick = function(event)
4942549368
Vizi.Application.handleMouseDoubleClick(evt);
4942649369
}
4942749370

49428-
Vizi.GraphicsThreeJS.prototype.onDocumentMouseScroll = function(event, delta)
49371+
Vizi.GraphicsThreeJS.prototype.onDocumentMouseScroll = function(event)
4942949372
{
4943049373
event.preventDefault();
4943149374

49432-
var evt = { type : "mousescroll", delta : delta };
49375+
var delta = 0;
49376+
49377+
if ( event.wheelDelta ) { // WebKit / Opera / Explorer 9
49378+
49379+
delta = event.wheelDelta;
49380+
49381+
} else if ( event.detail ) { // Firefox
49382+
49383+
delta = - event.detail;
49384+
49385+
}
49386+
49387+
var evt = { type : "mousescroll", delta : delta };
4943349388

4943449389
Vizi.Mouse.instance.onMouseScroll(evt);
4943549390

0 commit comments

Comments
 (0)