aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-24 12:03:51 -0800
committerPushkar Joshi2012-02-24 12:03:51 -0800
commit053fc63a2950c7a5ee4ebf98033b64d474a3c46e (patch)
tree8cfd5c51f72624ff1da50f3a2fbed05644ffd8e2 /js/helper-classes
parenta5ba66ecefa9c9c17e0f5e1725e2141f7a3540a2 (diff)
parent23a22195f42f8d7025cd4c70eab9ec26a19c1dc1 (diff)
downloadninja-053fc63a2950c7a5ee4ebf98033b64d474a3c46e.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/helper-classes')
-rwxr-xr-xjs/helper-classes/3D/LinePlaneIntersectRec.js3
-rwxr-xr-xjs/helper-classes/3D/hit-record.js6
2 files changed, 2 insertions, 7 deletions
diff --git a/js/helper-classes/3D/LinePlaneIntersectRec.js b/js/helper-classes/3D/LinePlaneIntersectRec.js
index e075dd3d..cb172bf7 100755
--- a/js/helper-classes/3D/LinePlaneIntersectRec.js
+++ b/js/helper-classes/3D/LinePlaneIntersectRec.js
@@ -42,9 +42,6 @@ var LinePlaneIntersectRec = exports.LinePlaneIntersectRec = Object.create(Object
42 setDeltaVis: { value: function(d) { this._deltaVis = d; } }, 42 setDeltaVis: { value: function(d) { this._deltaVis = d; } },
43 getDeltaVis: { value: function() { return this._deltaVis; } }, 43 getDeltaVis: { value: function() { return this._deltaVis; } },
44 44
45 getElementPlanes: { value: function() { return this._deltaVis; } },
46 setElementPlanes: { value: function(p) { this._elementPlanes = p; } },
47
48 setNext: { value: function(n) { this._next = n; } }, 45 setNext: { value: function(n) { this._next = n; } },
49 getNext: { value: function() { return this._next; } }, 46 getNext: { value: function() { return this._next; } },
50 47
diff --git a/js/helper-classes/3D/hit-record.js b/js/helper-classes/3D/hit-record.js
index 5546cc5a..2c60adc6 100755
--- a/js/helper-classes/3D/hit-record.js
+++ b/js/helper-classes/3D/hit-record.js
@@ -139,12 +139,10 @@ var HitRecord = exports.HitRecord = Object.create(Object.prototype,
139 139
140 isSomeGridTypeSnap : { 140 isSomeGridTypeSnap : {
141 value: function() { 141 value: function() {
142 return 142 return ((this._type == this.SNAP_TYPE_GRID_VERTEX) ||
143 (
144 (this._type == this.SNAP_TYPE_GRID_VERTEX) ||
145 (this._type == this.SNAP_TYPE_GRID_HORIZONTAL) || 143 (this._type == this.SNAP_TYPE_GRID_HORIZONTAL) ||
146 (this._type == this.SNAP_TYPE_GRID_VERTICAL) 144 (this._type == this.SNAP_TYPE_GRID_VERTICAL)
147 ) 145 );
148 } 146 }
149 }, 147 },
150 148