BlueGit

timfa frameworkv3

stuff

timfa wsadhelios · pushed by timfa

Authored 2022-10-18 · 4 years ago

Hash
10a790e5fd2f5ab087bc492235dacef7ae60f15b
Parent
6ae3b3c3
1 file changed +26 −3
framework/util/ray.js +26 −3
@@ -2,6 +2,8 @@ class Ray
2 2 {
3 3 static Cast(scene, origin, direction, maxLength = -1)
4 4 {
5 direction = direction.normalize();
6 let castAngle = direction.toAngle();
5 7 let hits = [] // {hitObj, hitPoint}
6 8 for(var i = 0; i < scene.activeObjects.length; i++)
7 9 {
@@ -10,7 +12,7 @@ class Ray
10 12 var hw = scene.activeObjects[i].transform.size.x / 2;
11 13 var hh = scene.activeObjects[i].transform.size.y / 2;
12 14
13 let points =
15 let pointsUnsort =
14 16 [
15 17 new vector(scene.activeObjects[i].transform.position.x - hw, scene.activeObjects[i].transform.position.y - hh),
16 18 new vector(scene.activeObjects[i].transform.position.x + hw, scene.activeObjects[i].transform.position.y - hh),
@@ -18,10 +20,12 @@ class Ray
18 20 new vector(scene.activeObjects[i].transform.position.x + hw, scene.activeObjects[i].transform.position.y + hh)
19 21 ]
20 22
23 //drop longest vector as this will be hidden by other faces
24 let points = pointsUnsort.sort((p1,p2) => p1.subtract(origin).length - p2.subtract(origin).length).pop();
25
21 26 for(let p = 0; o < points.length; p++)
22 27 {
23 28 let point = points[p].subtract(origin);
24 direction = direction.normalize();
25 29
26 30 let stretched = direction.stretch(Math.min(point.length, maxLength >= 0? maxLength : point.length))
27 31
@@ -29,12 +33,31 @@ class Ray
29 33
30 34 if(scene.activeObjects[i].collider.isInBounds(calcPoint))
31 35 {
32 hits.push({hitObj: scene.activeObjects[i], hitPoint: new vector(0, 0)})
36 //determine in between which vector angles ray is
37 //todo: toAngle offset if required
38 var angles = points.map(p => Ray.mapPointToPointAndAngle(p, origin)).sort();
39 var betweenAngles = castAngle < angles[1].angle ? angles.pop() : angles.shift();
40
41 //calc % of angle in relation to the angles it is between
42 let percent = castAngle / (betweenAngles[1].angle - betweenAngles[0].angle);
43
44 hits.push({hitObj: scene.activeObjects[i], hitPoint: betweenAngles[0].point.lerpTo(betweenAngles[1].point, percent)})
45
46 break;
33 47 }
34 48 }
35 49 }
36 50 }
37 51
52 //todo: find shortest distance
38 53 return hits;
39 54 }
55
56 static mapPointToPointAndAngle(point, origin)
57 {
58 return {
59 point: point,
60 angle: p.subtract(origin).toAngle()
61 };
62 }
40 63 }
@@ -2,6 +2,8 @@ class Ray
2{
2{
3 static Cast(scene, origin, direction, maxLength = -1)
3 static Cast(scene, origin, direction, maxLength = -1)
4 {
4 {
5 direction = direction.normalize();
6 let castAngle = direction.toAngle();
5 let hits = [] // {hitObj, hitPoint}
7 let hits = [] // {hitObj, hitPoint}
6 for(var i = 0; i < scene.activeObjects.length; i++)
8 for(var i = 0; i < scene.activeObjects.length; i++)
7 {
9 {
@@ -10,7 +12,7 @@ class Ray
10 var hw = scene.activeObjects[i].transform.size.x / 2;
12 var hw = scene.activeObjects[i].transform.size.x / 2;
11 var hh = scene.activeObjects[i].transform.size.y / 2;
13 var hh = scene.activeObjects[i].transform.size.y / 2;
12
14
13 let points =
15 let pointsUnsort =
14 [
16 [
15 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),
16 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,10 +20,12 @@ class Ray
18 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)
19 ]
21 ]
20
22
23 //drop longest vector as this will be hidden by other faces
24 let points = pointsUnsort.sort((p1,p2) => p1.subtract(origin).length - p2.subtract(origin).length).pop();
25
21 for(let p = 0; o < points.length; p++)
26 for(let p = 0; o < points.length; p++)
22 {
27 {
23 let point = points[p].subtract(origin);
28 let point = points[p].subtract(origin);
24 direction = direction.normalize();
25
29
26 let stretched = direction.stretch(Math.min(point.length, maxLength >= 0? maxLength : point.length))
30 let stretched = direction.stretch(Math.min(point.length, maxLength >= 0? maxLength : point.length))
27
31
@@ -29,12 +33,31 @@ class Ray
29
33
30 if(scene.activeObjects[i].collider.isInBounds(calcPoint))
34 if(scene.activeObjects[i].collider.isInBounds(calcPoint))
31 {
35 {
32 hits.push({hitObj: scene.activeObjects[i], hitPoint: new vector(0, 0)})
36 //determine in between which vector angles ray is
37 //todo: toAngle offset if required
38 var angles = points.map(p => Ray.mapPointToPointAndAngle(p, origin)).sort();
39 var betweenAngles = castAngle < angles[1].angle ? angles.pop() : angles.shift();
40
41 //calc % of angle in relation to the angles it is between
42 let percent = castAngle / (betweenAngles[1].angle - betweenAngles[0].angle);
43
44 hits.push({hitObj: scene.activeObjects[i], hitPoint: betweenAngles[0].point.lerpTo(betweenAngles[1].point, percent)})
45
46 break;
33 }
47 }
34 }
48 }
35 }
49 }
36 }
50 }
37
51
52 //todo: find shortest distance
38 return hits;
53 return hits;
39 }
54 }
55
56 static mapPointToPointAndAngle(point, origin)
57 {
58 return {
59 point: point,
60 angle: p.subtract(origin).toAngle()
61 };
62 }
40}
63}