Skip to content

Optimize trajectory collision checks #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
I-No-oNe wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Optimize trajectory collision checks #157

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions ...ithub/itzispyder/clickcrystals/modules/modules/rendering/trajectories/ProjectilePath.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
import net.minecraft.world.phys.*;

import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

public class ProjectilePath implements Global {

Expand Down Expand Up @@ -77,11 +79,21 @@ public Result simulate(int maxTicks, float useDelta, float tickDelta, double ren
private HitResult get(ClientLevel world, Vec3 pos, Vec3 prevPos) {
Vec3 dir = pos.subtract(prevPos).normalize();
double dist = prevPos.distanceTo(pos);
Vec3 end = pos.add(dir.scale(dist));
Set<Entity> nearby = new HashSet<>(world.getEntities((Entity)null, new AABB(pos, end).inflate(1.0E-7), entity -> true));
List<Entity> candidates = new ArrayList<>(nearby.size());

for (Entity entity : world.entitiesForRendering())
if (nearby.contains(entity))
candidates.add(entity);

for (double i = 0.0; i <= dist; i += 0.0625) {
Vec3 point = pos.add(dir.scale(i));
for (Entity ent : world.entitiesForRendering())
if (ent.getBoundingBox().contains(point))
double x = pos.x + dir.x * i;
double y = pos.y + dir.y * i;
double z = pos.z + dir.z * i;

for (Entity ent : candidates)
if (ent.getBoundingBox().contains(x, y, z))
return new EntityHitResult(ent, pos);
}

Expand Down Expand Up @@ -114,16 +126,8 @@ public void draw(PoseStack matrices, SubmitNodeCollector submitNodeCollector, Ve

LocalPlayer p = PlayerUtils.player();
Vec3 playerPos = MathUtils.lerpEntityPosVec(p, tickDelta);
Vec3 playerEye = MathUtils.lerpEntityEyeVec(p, tickDelta);
Vec3 offset = playerPos.subtract(p.xOld, p.yOld, p.zOld);

for (int i = 0; i < vertices.size(); i++) {
Vec3 vec = vertices.get(i);
float pitch = (p.getXRot() - p.xRotO) * tickDelta;
float yaw = (p.getYRot() - p.yRotO) * tickDelta;
MathUtils.rotate(vec, playerEye, pitch, yaw);
}

Vec3 last = vertices.get(vertices.size() - 1);

if (vertices.size() >= 2) {
Expand Down