From a11ef2eed7049835c8bdfa50a2b893632c46eaa0 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Wed, 4 Apr 2012 11:11:58 -0700 Subject: Squashed commit of Preparing for the montage undo-manager: Architecture changes Reworked the add and remove elements into 1 function which can take 1 or more elements. Removed the _element from the selection array Many other changes related to those 2 changes Undo/Redo shortcuts are now using montage undo/redo manager. Signed-off-by: Valerio Virgillito <valerio@motorola.com> --- js/lib/drawing/world.js | 13 ++++++------- js/lib/nj-base.js | 13 ------------- 2 files changed, 6 insertions(+), 20 deletions(-) delete mode 100755 js/lib/nj-base.js (limited to 'js/lib') diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js index 5a054224..e348f5e8 100755 --- a/js/lib/drawing/world.js +++ b/js/lib/drawing/world.js @@ -527,7 +527,7 @@ World.prototype.clearTree = function() { if (this._useWebGL) { var root = this._rootNode; root.children = new Array(); - g_Engine.unregisterCanvas( this._canvas.rdgeid ) + g_Engine.unregisterCanvas( this._canvas.rdgeid ); this.update( 0 ); this.draw(); @@ -540,8 +540,9 @@ World.prototype.updateMaterials = function( obj, time ) { var matArray = obj.getMaterialArray(); if (matArray) { var n = matArray.length; - for (var i=0; i<n; i++) + for (var i=0; i<n; i++) { matArray[i].update( time ); + } } this.updateMaterials( obj.getNext(), time ); @@ -553,9 +554,8 @@ World.prototype.getNDCOrigin = function() { var pt = MathUtils.transformPoint( [0,0,0], this.getCameraMatInverse() ); var projMat = Matrix.makePerspective( this.getFOV(), this.getAspect(), this.getZNear(), this.getZFar()); var ndcPt = MathUtils.transformHomogeneousPoint( pt, projMat ); - var ndcOrigin = MathUtils.applyHomogeneousCoordinate( ndcPt ); - return ndcOrigin; + return MathUtils.applyHomogeneousCoordinate( ndcPt ); }; World.prototype.worldToScreen = function(v) { @@ -570,9 +570,8 @@ World.prototype.worldToScreen = function(v) { var x = v2[0], y = v2[1], z = v2[2]; var h = this.getGLContext().viewportHeight/2.0, w = this.getGLContext().viewportWidth/2.0; - var x2 = w*(1 + x), y2 = h*( 1 - y ), z2 = z; - - return [x2, y2, z2, 1]; + var x2 = w * (1 + x), y2 = h * ( 1 - y ); + return [x2, y2, z, 1]; }; World.prototype.screenToView = function( x, y ) { diff --git a/js/lib/nj-base.js b/js/lib/nj-base.js deleted file mode 100755 index d1e1ff5b..00000000 --- a/js/lib/nj-base.js +++ /dev/null @@ -1,13 +0,0 @@ -/* <copyright> -This file contains proprietary software owned by Motorola Mobility, Inc.<br/> -No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> -(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. -</copyright> */ - -//nj-base: Contains base class definitions to use as Ninja building blocks. -var Montage = require("montage/core/core").Montage, - Component = require("montage/ui/component").Component; - -exports.NJComponent = Montage.create( Component, { - -}); \ No newline at end of file -- cgit v1.2.3