mirror of
https://github.com/RandomityGuy/MBHaxe.git
synced 2026-04-26 12:41:40 +00:00
attempt fix camera
This commit is contained in:
parent
37f84ad259
commit
e4039cc16c
2 changed files with 5 additions and 3 deletions
|
|
@ -626,9 +626,10 @@ class CameraController extends Object {
|
||||||
&& (firstHit == null || (rayCastOrigin.distance(result.point) < firstHitDistance))) {
|
&& (firstHit == null || (rayCastOrigin.distance(result.point) < firstHitDistance))) {
|
||||||
firstHit = result;
|
firstHit = result;
|
||||||
firstHitDistance = rayCastOrigin.distance(result.point);
|
firstHitDistance = rayCastOrigin.distance(result.point);
|
||||||
processedShapes.push(result.object);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (firstHit != null)
|
||||||
|
processedShapes.push(firstHit.object);
|
||||||
|
|
||||||
if (firstHit != null) {
|
if (firstHit != null) {
|
||||||
if (firstHitDistance < CameraDistance) {
|
if (firstHitDistance < CameraDistance) {
|
||||||
|
|
@ -641,7 +642,7 @@ class CameraController extends Object {
|
||||||
var dist = plane.distance(camera.pos.toPoint());
|
var dist = plane.distance(camera.pos.toPoint());
|
||||||
|
|
||||||
if (dist >= closeness)
|
if (dist >= closeness)
|
||||||
break;
|
continue;
|
||||||
|
|
||||||
camera.pos = projected.toVector().add(normal.multiply(-closeness));
|
camera.pos = projected.toVector().add(normal.multiply(-closeness));
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1380,7 +1380,8 @@ class Marble extends GameObject {
|
||||||
|
|
||||||
var currentFinalPos = position.add(relVel.multiply(finalT)); // localpos.add(relLocalVel.multiply(finalT));
|
var currentFinalPos = position.add(relVel.multiply(finalT)); // localpos.add(relLocalVel.multiply(finalT));
|
||||||
surfaceScratch.resize(0);
|
surfaceScratch.resize(0);
|
||||||
@:privateAccess obj.grid.boundingSearch(boundThing, surfaceScratch);
|
if (@:privateAccess obj.grid != null)
|
||||||
|
@:privateAccess obj.grid.boundingSearch(boundThing, surfaceScratch);
|
||||||
var surfaces = surfaceScratch;
|
var surfaces = surfaceScratch;
|
||||||
|
|
||||||
for (surf in surfaces) {
|
for (surf in surfaces) {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue