BlueGit

blue-star speeltuin

framework

timfa Tim · pushed by timfa

Authored 2022-10-18 · 4 years ago

Hash
eb480ae5b6f4df732ce21b115b4210f1ff9d1ab9
Parent
33f8925f
2 files changed +18 −3
build/framework.js +17 −2
@@ -1617,10 +1617,11 @@ class Ray
1617 1617 static Cast(scene, origin, direction, maxLength = -1)
1618 1618 {
1619 1619 direction = direction.normalize();
1620 let castAngle = direction.toAngle();
1621 1620 let hits = [] // {hitObj, hitPoint}
1622 1621 for(var i = 0; i < scene.activeObjects.length; i++)
1623 1622 {
1623 let castAngle = direction.toAngle();
1624
1624 1625 if(scene.activeObjects[i] != this && scene.activeObjects[i].collider.enabled)
1625 1626 {
1626 1627 var hw = scene.activeObjects[i].transform.size.x / 2;
@@ -1648,8 +1649,22 @@ class Ray
1648 1649 if(scene.activeObjects[i].collider.isInBounds(calcPoint))
1649 1650 {
1650 1651 //determine in between which vector angles ray is
1651 //todo: toAngle offset if required
1652 1652 var angles = points.map(p => Ray.mapPointToPointAndAngle(p, origin))
1653
1654 pointLoop:
1655 for(let pa = 0; pa < angles.length; pa++)
1656 {
1657 for(let pb = 0; pb < angles.length; pb++)
1658 {
1659 if(angles[pa].angle - angles[pb].angle > 270 || angles[pb].angle - angles[pa].angle > 270) {
1660
1661 castAngle = (castAngle + 180) % 360;
1662 angles.forEach(pIn => pIn.angle = (pIn.angle + 180) % 360);
1663 break pointLoop;
1664 }
1665 }
1666 }
1667
1653 1668 angles = angles.sort((a,b) => b.angle - a.angle);
1654 1669
1655 1670 if(angles[1].length > angles[0].length && angles[1].length > angles[2].length)
@@ -1617,10 +1617,11 @@ class Ray
1617 static Cast(scene, origin, direction, maxLength = -1)
1617 static Cast(scene, origin, direction, maxLength = -1)
1618 {
1618 {
1619 direction = direction.normalize();
1619 direction = direction.normalize();
1620 let castAngle = direction.toAngle();
1621 let hits = [] // {hitObj, hitPoint}
1620 let hits = [] // {hitObj, hitPoint}
1622 for(var i = 0; i < scene.activeObjects.length; i++)
1621 for(var i = 0; i < scene.activeObjects.length; i++)
1623 {
1622 {
1623 let castAngle = direction.toAngle();
1624
1624 if(scene.activeObjects[i] != this && scene.activeObjects[i].collider.enabled)
1625 if(scene.activeObjects[i] != this && scene.activeObjects[i].collider.enabled)
1625 {
1626 {
1626 var hw = scene.activeObjects[i].transform.size.x / 2;
1627 var hw = scene.activeObjects[i].transform.size.x / 2;
@@ -1648,8 +1649,22 @@ class Ray
1648 if(scene.activeObjects[i].collider.isInBounds(calcPoint))
1649 if(scene.activeObjects[i].collider.isInBounds(calcPoint))
1649 {
1650 {
1650 //determine in between which vector angles ray is
1651 //determine in between which vector angles ray is
1651 //todo: toAngle offset if required
1652 var angles = points.map(p => Ray.mapPointToPointAndAngle(p, origin))
1652 var angles = points.map(p => Ray.mapPointToPointAndAngle(p, origin))
1653
1654 pointLoop:
1655 for(let pa = 0; pa < angles.length; pa++)
1656 {
1657 for(let pb = 0; pb < angles.length; pb++)
1658 {
1659 if(angles[pa].angle - angles[pb].angle > 270 || angles[pb].angle - angles[pa].angle > 270) {
1660
1661 castAngle = (castAngle + 180) % 360;
1662 angles.forEach(pIn => pIn.angle = (pIn.angle + 180) % 360);
1663 break pointLoop;
1664 }
1665 }
1666 }
1667
1653 angles = angles.sort((a,b) => b.angle - a.angle);
1668 angles = angles.sort((a,b) => b.angle - a.angle);
1654
1669
1655 if(angles[1].length > angles[0].length && angles[1].length > angles[2].length)
1670 if(angles[1].length > angles[0].length && angles[1].length > angles[2].length)
src/objects/chao.js +1 −1
@@ -1,6 +1,6 @@
1 1 class Chao extends GameObject
2 2 {
3 speed = 30;
3 speed = 40;
4 4
5 5 constructor(x, y, sprite, layer)
6 6 {
@@ -1,6 +1,6 @@
1class Chao extends GameObject
1class Chao extends GameObject
2{
2{
3 speed = 30;
3 speed = 40;
4
4
5 constructor(x, y, sprite, layer)
5 constructor(x, y, sprite, layer)
6 {
6 {