Skip to content

Commit

Permalink
Merge pull request #151 from KitCat962/new-vector-parsing
Browse files Browse the repository at this point in the history 
Raycast vector arguments are now at the beginning of the function
  • Loading branch information
@UnlikePaladin
UnlikePaladin committed Jan 21, 2024
2 parents ca008a7 + bf604ef commit 2331b61
Show file tree
Hide file tree
Showing 5 changed files with 312 additions and 66 deletions.
187 changes: 161 additions & 26 deletions common/src/main/java/org/figuramc/figura/lua/api/RaycastAPI.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package org.figuramc.figura.lua.api;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.Optional;
import java.util.function.Predicate;

import org.figuramc.figura.avatar.Avatar;
Expand All @@ -10,13 +13,17 @@
import org.figuramc.figura.lua.docs.LuaMethodOverload;
import org.figuramc.figura.lua.docs.LuaTypeDoc;
import org.figuramc.figura.math.vector.FiguraVec3;
import org.figuramc.figura.mixin.AABBInvoker;
import org.figuramc.figura.utils.LuaUtils;
import org.luaj.vm2.LuaError;
import org.luaj.vm2.LuaFunction;
import org.luaj.vm2.LuaTable;
import org.luaj.vm2.LuaValue;

import com.mojang.datafixers.util.Pair;

import kroppeb.stareval.function.Type.Int;
import net.minecraft.core.Direction;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.Marker;
Expand All @@ -25,6 +32,7 @@
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.EntityHitResult;
import net.minecraft.world.phys.Vec3;

@LuaWhitelist
@LuaTypeDoc(
Expand All @@ -44,31 +52,38 @@ public RaycastAPI(Avatar owner) {
@LuaMethodDoc(
overloads = {
@LuaMethodOverload(
argumentTypes = {String.class, String.class, FiguraVec3.class, FiguraVec3.class},
argumentNames = {"blockCastType", "fluidCastType", "start", "end"}
argumentTypes = {FiguraVec3.class, FiguraVec3.class, String.class, String.class},
argumentNames = {"start", "end", "blockCastType", "fluidCastType"}
),
@LuaMethodOverload(
argumentTypes = {String.class, String.class, Double.class, Double.class, Double.class, FiguraVec3.class},
argumentNames = {"blockCastType", "fluidCastType", "startX", "startY", "startZ", "end"}
argumentTypes = {Double.class, Double.class, Double.class, FiguraVec3.class, String.class, String.class},
argumentNames = {"startX", "startY", "startZ", "end", "blockCastType", "fluidCastType"}
),
@LuaMethodOverload(
argumentTypes = {String.class, String.class, FiguraVec3.class, Double.class, Double.class, Double.class},
argumentNames = {"blockCastType", "fluidCastType", "start", "endX", "endY", "endZ"}
argumentTypes = {FiguraVec3.class, Double.class, Double.class, Double.class, String.class, String.class},
argumentNames = {"start", "endX", "endY", "endZ", "blockCastType", "fluidCastType"}
),
@LuaMethodOverload(
argumentTypes = {String.class, String.class, Double.class, Double.class, Double.class, Double.class, Double.class, Double.class},
argumentNames = {"blockCastType", "fluidCastType", "startX", "startY", "startZ", "endX", "endY", "endZ"}
argumentTypes = {Double.class, Double.class, Double.class, Double.class, Double.class, Double.class, String.class, String.class},
argumentNames = {"startX", "startY", "startZ", "endX", "endY", "endZ", "blockCastType", "fluidCastType"}
)
}
,
value = "raycast.block"
)
public Object[] block(String blockCastType, String fluidCastType, Object x, Object y, Double z, Object w, Double t, Double h) {
public Object[] block(Object x, Object y, Object z, Object w, Object t, Object h, String blockCastType, String fluidCastType) {
FiguraVec3 start, end;
Pair<Pair<FiguraVec3, FiguraVec3>, Object[]> parseResult = LuaUtils.parse2Vec3(
"block",
new Class<?>[]{String.class, String.class},
x, y, z, w, t, h, blockCastType, fluidCastType
);

Pair<FiguraVec3, FiguraVec3> pair = LuaUtils.parse2Vec3("block", x, y, z, w, t, h,1);
start = pair.getFirst();
end = pair.getSecond();
start = parseResult.getFirst().getFirst();
end = parseResult.getFirst().getSecond();

blockCastType = (String)parseResult.getSecond()[0];
fluidCastType = (String)parseResult.getSecond()[1];

ClipContext.Block blockContext;
try{
Expand All @@ -94,35 +109,41 @@ public Object[] block(String blockCastType, String fluidCastType, Object x, Obje
@LuaMethodDoc(
overloads = {
@LuaMethodOverload(
argumentTypes = {LuaFunction.class, FiguraVec3.class, FiguraVec3.class},
argumentNames = {"predicate", "start", "end"}
argumentTypes = {FiguraVec3.class, FiguraVec3.class, LuaFunction.class},
argumentNames = {"start", "end", "predicate"}
),
@LuaMethodOverload(
argumentTypes = {LuaFunction.class, Double.class, Double.class, Double.class, FiguraVec3.class},
argumentNames = {"predicate", "startX", "startY", "startZ", "end"}
argumentTypes = {Double.class, Double.class, Double.class, FiguraVec3.class, LuaFunction.class},
argumentNames = {"startX", "startY", "startZ", "end", "predicate"}
),
@LuaMethodOverload(
argumentTypes = {LuaFunction.class, FiguraVec3.class, Double.class, Double.class, Double.class},
argumentNames = {"predicate", "start", "endX", "endY", "endZ"}
argumentTypes = {FiguraVec3.class, Double.class, Double.class, Double.class, LuaFunction.class},
argumentNames = {"start", "endX", "endY", "endZ", "predicate"}
),
@LuaMethodOverload(
argumentTypes = {LuaFunction.class, Double.class, Double.class, Double.class, Double.class, Double.class, Double.class},
argumentNames = {"predicate", "startX", "startY", "startZ", "endX", "endY", "endZ"}
argumentTypes = {Double.class, Double.class, Double.class, Double.class, Double.class, Double.class, LuaFunction.class},
argumentNames = {"startX", "startY", "startZ", "endX", "endY", "endZ", "predicate"}
)
}
,
value = "raycast.entity"
)
public Object[] entity(LuaFunction predicate, Object x, Object y, Double z, Object w, Double t, Double h) {
public Object[] entity(Object x, Object y, Object z, Object w, Object t, Double h, LuaFunction predicate) {
FiguraVec3 start, end;

Pair<FiguraVec3, FiguraVec3> pair = LuaUtils.parse2Vec3("entity", x, y, z, w, t, h, 1);
start = pair.getFirst();
end = pair.getSecond();
Pair<Pair<FiguraVec3, FiguraVec3>, Object[]> pair = LuaUtils.parse2Vec3(
"entity",
new Class<?>[]{LuaFunction.class},
x, y, z, w, t, h, predicate);

start = pair.getFirst().getFirst();
end = pair.getFirst().getSecond();

final LuaFunction fn = (LuaFunction)pair.getSecond()[0];

Predicate<Entity> entityPredicate = (entity) -> {
if (predicate == null) return true;
LuaValue result = predicate.invoke(this.owner.luaRuntime.typeManager.javaToLua(EntityAPI.wrap(entity))).arg1();
if (fn == null) return true;
LuaValue result = fn.invoke(this.owner.luaRuntime.typeManager.javaToLua(EntityAPI.wrap(entity))).arg1();
if ((result.isboolean() && result.checkboolean() == false) || result.isnil())
return false;
return true;
Expand All @@ -135,4 +156,118 @@ public Object[] entity(LuaFunction predicate, Object x, Object y, Double z, Obje

return null;
}

@LuaWhitelist
@LuaMethodDoc(
overloads = {
@LuaMethodOverload(
argumentTypes = {FiguraVec3.class, FiguraVec3.class, LuaTable.class},
argumentNames = {"start", "end", "aabbs"}
),
@LuaMethodOverload(
argumentTypes = {Double.class, Double.class, Double.class, FiguraVec3.class, LuaTable.class},
argumentNames = {"startX", "startY", "startZ", "end", "aabbs"}
),
@LuaMethodOverload(
argumentTypes = {FiguraVec3.class, Double.class, Double.class, Double.class, LuaTable.class},
argumentNames = {"start", "endX", "endY", "endZ", "aabbs"}
),
@LuaMethodOverload(
argumentTypes = {Double.class, Double.class, Double.class, Double.class, Double.class, Double.class, LuaTable.class},
argumentNames = {"startX", "startY", "startZ", "endX", "endY", "endZ", "aabbs"}
)
}
,
value = "raycast.aabb"
)
public Object[] aabb(Object x, Object y, Object z, Object w, Object t, Object h, LuaTable aabbs) {
Vec3 start, end;

Pair<Pair<FiguraVec3, FiguraVec3>, Object[]> pair = LuaUtils.parse2Vec3(
"aabb",
new Class<?>[]{LuaTable.class},
x, y, z, w, t, h, aabbs
);

start = pair.getFirst().getFirst().asVec3();
end = pair.getFirst().getSecond().asVec3();

aabbs = (LuaTable)pair.getSecond()[0];
if (aabbs == null)
throw new LuaError("Illegal argument to aabb(): Expected LuaTable, recieved nil");

ArrayList<AABB> aabbList = new ArrayList<AABB>();
for (int i=1;i<=aabbs.length();i++){
LuaValue arg = aabbs.get(i);
if (!arg.istable())
throw new LuaError("Illegal argument at array index " + i + ": Expected table, recieved " + arg.typename() + " ("+arg.toString()+")");

LuaValue min = arg.get(1);
if (!min.isuserdata(FiguraVec3.class))
throw new LuaError("Illegal argument to AABB at array index "+ i +" at index 1: Expected Vector3, recieved " + min.typename() + " ("+min.toString()+")");

LuaValue max = arg.get(2);
if (!max.isuserdata(FiguraVec3.class))
throw new LuaError("Illegal argument to AABB at array index "+ i +" at index 2: Expected Vector3, recieved " + max.typename() + " ("+max.toString()+")");

aabbList.add(new AABB(
((FiguraVec3)min.checkuserdata(FiguraVec3.class)).asVec3(),
((FiguraVec3)max.checkuserdata(FiguraVec3.class)).asVec3()
));
}

// Modified from ProjectileUtil.getEntityHitResult to utilize arbitrary AABBs, and the custom clipAABB function
// I was unable to figure out how the BlockState clipping worked, which would have been better.
{
double d = Double.MAX_VALUE;
int index = -1;
Pair<Vec3, Direction> result = null;

for(int i = 0; i < aabbList.size(); i++) {
AABB box = aabbList.get(i);
Optional<Pair<Vec3, Direction>> optional = clipAABB(box, start, end);
if (box.contains(start)) {
if (d >= 0.0) {
index = i+1;
result = optional.orElse(Pair.of(start, null));
d = 0.0;
}
} else if (optional.isPresent()) {
Vec3 position = optional.get().getFirst();
double e = start.distanceToSqr(position);
if (e < d || d == 0.0) {
index = i+1;
result = optional.get();
d = e;
}
}
}

if (index == -1) {
return null;
}

return new Object[]{
aabbs.get(index),
FiguraVec3.fromVec3(result.getFirst()),
result.getSecond()!=null ? result.getSecond().getName() : null,
index
};
}
}

// Modified from AABB.clip(Vec3 min, Vec3 max) to also return the side hit
public Optional<Pair<Vec3, Direction>> clipAABB(AABB aabb, Vec3 min, Vec3 max) {
double[] ds = new double[]{1.0};
double d = max.x - min.x;
double e = max.y - min.y;
double f = max.z - min.z;
Direction direction = AABBInvoker.getDirection(aabb, min, ds, (Direction)null, d, e, f);
if (direction == null) {
return Optional.empty();
} else {
double g = ds[0];
return Optional.of(Pair.of(min.add(g * d, g * e, g * f), direction));
}
}
}
19 changes: 19 additions & 0 deletions common/src/main/java/org/figuramc/figura/mixin/AABBInvoker.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package org.figuramc.figura.mixin;

import org.jetbrains.annotations.Nullable;
import org.spongepowered.asm.mixin.Intrinsic;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Invoker;

import net.minecraft.core.Direction;
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.Vec3;

@Mixin(AABB.class)
public interface AABBInvoker {
@Intrinsic
@Invoker("getDirection")
public static Direction getDirection(AABB box, Vec3 intersectingVector, double[] traceDistanceResult, @Nullable Direction approachDirection, double deltaX, double deltaY, double deltaZ) {
throw new AssertionError();
}
}
Loading

0 comments on commit 2331b61

Please sign in to comment.