Merge pull request #39 from OmbreMoon/beam_raycast

Beam Emitter Raycast (Thanks @OmbreMoon)

Author: Yefancy

src/main/java/com/lowdragmc/photon/client/gameobject/emitter/beam/BeamConfig.java

@@ -29,6 +29,7 @@
 import org.joml.Vector3f;
 
 import javax.annotation.Nonnull;
+import java.util.List;
 import java.util.Optional;
 
 /**
@@ -67,6 +68,10 @@ public class BeamConfig implements IConfigurable, IPersistedSerializable {
     protected NumberFunction emitRate = NumberFunction.constant(0);
     @Setter
     @Getter
+    @Configurable(name = "BeamConfig.raycast", tips = "photon.emitter.beam.config.raycast")
+    protected boolean raycast = false;
+    @Setter
+    @Getter
     @Configurable(name = "BeamConfig.color", tips = "photon.emitter.beam.config.color")
     @NumberFunctionConfig(types = {Color.class, RandomColor.class, Gradient.class, RandomGradient.class}, defaultValue = -1)
     protected NumberFunction color = new Color();

src/main/java/com/lowdragmc/photon/client/gameobject/particle/BeamParticle.java

@@ -2,17 +2,22 @@
 
 import com.lowdragmc.lowdraglib2.utils.ColorUtils;
 import com.lowdragmc.photon.client.gameobject.emitter.IParticleEmitter;
-import com.lowdragmc.photon.client.gameobject.emitter.renderpipeline.PhotonFXRenderPass;
 import com.lowdragmc.photon.client.gameobject.emitter.beam.BeamConfig;
+import com.lowdragmc.photon.client.gameobject.emitter.renderpipeline.PhotonFXRenderPass;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import lombok.Getter;
 import lombok.Setter;
-import net.neoforged.api.distmarker.Dist;
-import net.neoforged.api.distmarker.OnlyIn;
 import net.minecraft.client.Camera;
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.Mth;
 import net.minecraft.util.RandomSource;
+import net.minecraft.world.level.ClipContext;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.HitResult;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.phys.shapes.CollisionContext;
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.api.distmarker.OnlyIn;
 import org.joml.Vector3f;
 import org.joml.Vector4f;
 
@@ -146,11 +151,25 @@ protected float getRealEmit(float pPartialTicks) {
         return config.getEmitRate().get(getT(pPartialTicks), () -> getMemRandom("emit")).floatValue();
     }
 
+    protected Vector3f getRealEnd(@Nonnull Camera camera, Vector3f from) {
+        var end = new Vector3f(from).add(emitter.transform().localToWorldMatrix().transformDirection(config.getEnd(), new Vector3f()));
+        if (config.isRaycast()) {
+            Level level = camera.getEntity().level();
+            HitResult result = level.clip(
+                    new ClipContext(new Vec3(from.x, from.y, from.z), new Vec3(end.x, end.y, end.z), ClipContext.Block.VISUAL, ClipContext.Fluid.NONE, CollisionContext.empty()));
+            if (result.getType() != HitResult.Type.MISS) {
+                return result.getLocation().toVector3f();
+            }
+        }
+
+        return end;
+    }
+
     public void render(@Nonnull VertexConsumer pBuffer, @Nonnull Camera camera, float partialTicks) {
         if (delay <= 0) {
             var cameraPos = camera.getPosition().toVector3f();
             var from = getWorldPos();
-            var end = new Vector3f(from).add(emitter.transform().localToWorldMatrix().transformDirection(config.getEnd(), new Vector3f()));
+            var end = getRealEnd(camera, from);
 
             var offset = - getRealEmit(partialTicks);
             var uvs = getRealUVs(partialTicks);

src/main/java/com/lowdragmc/photon/gui/editor/view/scene/FXObjectAnimationView.java

@@ -8,13 +8,11 @@
 import com.lowdragmc.lowdraglib2.gui.ui.elements.Button;
 import com.lowdragmc.lowdraglib2.gui.ui.event.UIEvents;
 import com.lowdragmc.lowdraglib2.math.Transform;
-import com.lowdragmc.photon.client.gameobject.emitter.beam.BeamConfig;
 import lombok.Getter;
 import lombok.Setter;
 import net.minecraft.network.chat.Component;
 import org.appliedenergistics.yoga.YogaEdge;
 import org.appliedenergistics.yoga.YogaGutter;
-import org.joml.Quaternionf;
 import org.joml.Vector3f;
 
 import java.util.ArrayList;

src/main/resources/assets/photon/lang/en_us.json

@@ -175,6 +175,7 @@
   "photon.emitter.beam.config.end": "Beam end offset.",
   "photon.emitter.beam.config.width": "Controls the width during its lifetime.",
   "photon.emitter.beam.config.emitRate": "Controls the emit rate during its lifetime.",
+  "photon.emitter.beam.config.raycast": "If true, the beam's length will be reduced upon hitting an object",
   "photon.emitter.beam.config.color": "Controls the color during its lifetime.",
   "photon.export_fx": "Export FX",
   "photon.gui.editor.fx_info.restart": "Restart",
@@ -345,6 +346,7 @@
   "TrailConfig.colorOverTrail": "Color Over Trail",
   "BeamConfig.color": "Color",
   "BeamConfig.emitRate": "Emit Rate",
+  "BeamConfig.raycast": "Raycast",
   "BeamConfig.width": "Width",
   "BeamConfig.end": "End",
   "FXObject.transform": "Transform",