Skip to content

Commit

Permalink
Merge pull request mansoor-s#15 from rimina/master
Browse files Browse the repository at this point in the history
Mouse position calculations
  • Loading branch information
mansoor-s committed Apr 4, 2012
2 parents 157e11f + 515b126 commit e0deaef
Showing 1 changed file with 18 additions and 5 deletions.
23 changes: 18 additions & 5 deletions js/app/stage.starsystem.js
Expand Up @@ -88,7 +88,6 @@


StarSystem.prototype.loadSystem = function(data) {



//adding solar objects
Expand Down Expand Up @@ -168,11 +167,25 @@


StarSystem.prototype.onMouseMove = function(event){

var x = 0;
var y = 0;
var totalOffsetLeft = 0;
var totalOffsetTop = 0 ;

var element = event.target;

while (element.offsetParent)
{
totalOffsetLeft += element.offsetLeft;
totalOffsetTop += element.offsetTop;
element = element.offsetParent;
}
x = event.pageX - totalOffsetLeft;
y = event.pageY - totalOffsetTop;

var $viewport = this._controller.$viewport;
this.mouse.x = ( event.offsetX / $viewport.width()) * 2 - 1;
this.mouse.y = - ( event.offsetY / $viewport.height()) * 2 + 1;
this.mouse.x = ( x / $viewport.width()) * 2 - 1;
this.mouse.y = - ( y / $viewport.height()) * 2 + 1;
this.hoverOnOneShip();
};

Expand Down Expand Up @@ -391,7 +404,7 @@


StarSystem.prototype.onEvent = function(event, delta){

for (var type in this.events){
if (event.type === type){
this[this.events[type]](event,delta);
Expand Down

0 comments on commit e0deaef

Please sign in to comment.