kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

给XY100添加第二个碰撞箱

Browse source
This commit is contained in:
Atsuishio 2025-06-16 00:12:58 +08:00 • committed by Light_Quanta
parent 50eb2a4078
commit ffbd2e81a2
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/com/atsuishio/superbwarfare/client/renderer/special/OBBRenderer.java
View file

@ -2,7 +2,6 @@ package com.atsuishio.superbwarfare.client.renderer.special;
import com.atsuishio.superbwarfare.entity.vehicle.base.VehicleEntity; import com.atsuishio.superbwarfare.entity.vehicle.base.VehicleEntity;
import com.atsuishio.superbwarfare.tools.OBB; import com.atsuishio.superbwarfare.tools.OBB;
import com.atsuishio.superbwarfare.tools.VectorTool;
import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.blaze3d.vertex.VertexConsumer;
import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.LevelRenderer;
@ -21,7 +20,7 @@ public class OBBRenderer {
Vec3 position = entity.position(); Vec3 position = entity.position();
Vector3f center = obb.center(); Vector3f center = obb.center();
Vector3f halfExtents = obb.extents(); Vector3f halfExtents = obb.extents();
Quaternionf rotation = VectorTool.combineRotations(pPartialTicks, entity); Quaternionf rotation = obb.rotation();
renderOBB( renderOBB(
poseStack, buffer, poseStack, buffer,
(float) (center.x() - position.x()), (float) (center.y() - position.y()), (float) (center.z() - position.z()), (float) (center.x() - position.x()), (float) (center.y() - position.y()), (float) (center.z() - position.z()),

9
src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Yx100Entity.java
View file

@ -89,10 +89,12 @@ public class Yx100Entity extends ContainerMobileVehicleEntity implements GeoEnti
public int droneReloadCoolDown; public int droneReloadCoolDown;
public OBB obb; public OBB obb;
public OBB obbTurret;
public Yx100Entity(EntityType<Yx100Entity> type, Level world) { public Yx100Entity(EntityType<Yx100Entity> type, Level world) {
super(type, world); super(type, world);
this.obb = new OBB(this.position().toVector3f(), new Vector3f(2.53125f, 1.0625f, 4.75f), new Quaternionf()); this.obb = new OBB(this.position().toVector3f(), new Vector3f(2.53125f, 1.0625f, 4.75f), new Quaternionf());
this.obbTurret = new OBB(this.position().toVector3f(), new Vector3f(2, 1, 2), new Quaternionf());
} }
@Override @Override
@ -1302,6 +1304,11 @@ public class Yx100Entity extends ContainerMobileVehicleEntity implements GeoEnti
Matrix4f transform = getVehicleTransform(1); Matrix4f transform = getVehicleTransform(1);
Vector4f worldPosition = transformPosition(transform, 0, 1.125f, 0.25f); Vector4f worldPosition = transformPosition(transform, 0, 1.125f, 0.25f);
this.obb.center().set(new Vector3f(worldPosition.x, worldPosition.y, worldPosition.z)); this.obb.center().set(new Vector3f(worldPosition.x, worldPosition.y, worldPosition.z));
this.obb.setRotation(VectorTool.combineRotations(1, this)); this.obb.setRotation(VectorTool.combineRotationsTurret(1, this));
Matrix4f transformT = getTurretTransform(1);
Vector4f worldPositionT = transformPosition(transformT, 0, 1, 0);
this.obbTurret.center().set(new Vector3f(worldPositionT.x, worldPositionT.y, worldPositionT.z));
this.obbTurret.setRotation(VectorTool.combineRotationsTurret(1, this));
} }
} }

8
src/main/java/com/atsuishio/superbwarfare/tools/VectorTool.java
View file

@ -41,4 +41,12 @@ public class VectorTool {
return combined; return combined;
} }
public static Quaternionf combineRotationsTurret(float partialTicks, VehicleEntity entity) {
Quaternionf turretYawRot = Axis.YP.rotationDegrees(Mth.lerp(partialTicks, entity.turretYRotO, entity.getTurretYRot()));
Quaternionf combined = combineRotations(partialTicks, entity);
combined.mul(turretYawRot);
return combined;
}
} }