fixes
@@ -12,7 +12,7 @@ class Ray
12
12
var hw = scene.activeObjects[i].transform.size.x / 2;
13
13
var hh = scene.activeObjects[i].transform.size.y / 2;
14
14
15
let pointsUnsort =
15
let points =
16
16
[
17
17
new vector(scene.activeObjects[i].transform.position.x - hw, scene.activeObjects[i].transform.position.y - hh),
18
18
new vector(scene.activeObjects[i].transform.position.x + hw, scene.activeObjects[i].transform.position.y - hh),
@@ -20,7 +20,7 @@ class Ray
20
20
new vector(scene.activeObjects[i].transform.position.x + hw, scene.activeObjects[i].transform.position.y + hh)
21
21
]
22
22
23
let points = pointsUnsort.sort((p1,p2) => p1.subtract(origin).length - p2.subtract(origin).length).pop();
23
points.sort((p1,p2) => p1.subtract(origin).length - p2.subtract(origin).length).pop();
24
24
25
25
for(let p = 0; p < points.length; p++)
26
26
{
@@ -36,12 +36,12 @@ class Ray
36
36
//determine in between which vector angles ray is
37
37
//todo: toAngle offset if required
38
38
var angles = points.map(p => Ray.mapPointToPointAndAngle(p, origin)).sort();
39
var betweenAngles = castAngle < angles[1].angle ? angles.pop() : angles.shift();
39
castAngle < angles[1].angle ? angles.pop() : angles.shift();
40
40
41
41
//calc % of angle in relation to the angles it is between
42
let percent = castAngle / (betweenAngles[1].angle - betweenAngles[0].angle);
42
let percent = castAngle / (angles[1].angle - angles[0].angle);
43
43
44
hits.push({hitObj: scene.activeObjects[i], hitPoint: betweenAngles[0].point.lerpTo(betweenAngles[1].point, percent)})
44
hits.push({hitObj: scene.activeObjects[i], hitPoint: angles[0].point.lerpTo(angles[1].point, percent)})
45
45
46
46
break;
47
47
}
@@ -57,7 +57,7 @@ class Ray
57
57
{
58
58
return {
59
59
point: point,
60
angle: p.subtract(origin).toAngle()
60
angle: point.subtract(origin).toAngle()
61
61
};
62
62
}
63
63
}
@@ -12,7 +12,7 @@ class Ray12
var hw = scene.activeObjects[i].transform.size.x / 2;12
var hw = scene.activeObjects[i].transform.size.x / 2;13
var hh = scene.activeObjects[i].transform.size.y / 2;13
var hh = scene.activeObjects[i].transform.size.y / 2;14
14
15
let pointsUnsort = 15
let points = 16
[16
[17
new vector(scene.activeObjects[i].transform.position.x - hw, scene.activeObjects[i].transform.position.y - hh),17
new vector(scene.activeObjects[i].transform.position.x - hw, scene.activeObjects[i].transform.position.y - hh),18
new vector(scene.activeObjects[i].transform.position.x + hw, scene.activeObjects[i].transform.position.y - hh),18
new vector(scene.activeObjects[i].transform.position.x + hw, scene.activeObjects[i].transform.position.y - hh),@@ -20,7 +20,7 @@ class Ray20
new vector(scene.activeObjects[i].transform.position.x + hw, scene.activeObjects[i].transform.position.y + hh)20
new vector(scene.activeObjects[i].transform.position.x + hw, scene.activeObjects[i].transform.position.y + hh)21
]21
]22
22
23
let points = pointsUnsort.sort((p1,p2) => p1.subtract(origin).length - p2.subtract(origin).length).pop();23
points.sort((p1,p2) => p1.subtract(origin).length - p2.subtract(origin).length).pop();24
24
25
for(let p = 0; p < points.length; p++)25
for(let p = 0; p < points.length; p++)26
{26
{@@ -36,12 +36,12 @@ class Ray36
//determine in between which vector angles ray is36
//determine in between which vector angles ray is37
//todo: toAngle offset if required37
//todo: toAngle offset if required38
var angles = points.map(p => Ray.mapPointToPointAndAngle(p, origin)).sort();38
var angles = points.map(p => Ray.mapPointToPointAndAngle(p, origin)).sort();39
var betweenAngles = castAngle < angles[1].angle ? angles.pop() : angles.shift();39
castAngle < angles[1].angle ? angles.pop() : angles.shift();40
40
41
//calc % of angle in relation to the angles it is between41
//calc % of angle in relation to the angles it is between42
let percent = castAngle / (betweenAngles[1].angle - betweenAngles[0].angle);42
let percent = castAngle / (angles[1].angle - angles[0].angle);43
43
44
hits.push({hitObj: scene.activeObjects[i], hitPoint: betweenAngles[0].point.lerpTo(betweenAngles[1].point, percent)})44
hits.push({hitObj: scene.activeObjects[i], hitPoint: angles[0].point.lerpTo(angles[1].point, percent)})45
45
46
break;46
break;47
}47
}@@ -57,7 +57,7 @@ class Ray57
{57
{58
return {58
return {59
point: point,59
point: point,60
angle: p.subtract(origin).toAngle()60
angle: point.subtract(origin).toAngle()61
};61
};62
}62
}63
}63
}