From 7404cc93613beeef885426a894587ed9ddc95d9d Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Fri, 30 Jan 2015 18:09:16 -0500
Subject: [PATCH] highlight either cell or part
---
js/threeViews/threeView.js | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/js/threeViews/threeView.js b/js/threeViews/threeView.js
index 8c60c103..25f693c4 100644
--- a/js/threeViews/threeView.js
+++ b/js/threeViews/threeView.js
@@ -79,6 +79,10 @@ ThreeView = Backbone.View.extend({
this.controls.enabled = !state;
},
+ ////////////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////MOUSE EVENTS/////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////
+
_mouseOut: function(){
this._setNoCellIntersections();
this._setNoPartIntersections();
@@ -121,10 +125,14 @@ ThreeView = Backbone.View.extend({
this._setNoPartIntersections();
return;
}
- this._handlePartIntersections(partIntersections);
+ this._handlePartIntersections(partIntersections, cellIntersections[0].distance);
}
},
+ ////////////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////INTERSECTIONS////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////
+
_setNoCellIntersections: function(){
this.currentIntersectedCell = null;
this._hideHighlighter();
@@ -138,8 +146,13 @@ ThreeView = Backbone.View.extend({
}
},
- _handlePartIntersections: function(intersections){
+ _handlePartIntersections: function(intersections, distanceToNearestCell){
var part = intersections[0].object.myPart;
+ if (this.highlighter.visible && intersections[0].distance > distanceToNearestCell){
+ this._setNoPartIntersections();
+ return;
+ }
+ this._setNoCellIntersections();
if (part!= this.currentIntersectedPart){
if (this.currentIntersectedPart) this.currentIntersectedPart.unhighlight();
part.highlight();
--
GitLab