It couldn't have just flown away

- Improve Track Signal and Track Observer Visuals

Author: IThundxr

src/main/java/com/simibubi/create/content/trains/observer/TrackObserverVisual.java

@@ -23,38 +23,21 @@
 
 public class TrackObserverVisual extends AbstractBlockEntityVisual<TrackObserverBlockEntity> implements SimpleTickableVisual {
 	private final TransformedInstance overlay;
-
+	private BlockPos oldTargetPos;
 
 	public TrackObserverVisual(VisualizationContext ctx, TrackObserverBlockEntity blockEntity, float partialTick) {
 		super(ctx, blockEntity, partialTick);
 
 		overlay = ctx.instancerProvider()
 			.instancer(InstanceTypes.TRANSFORMED, Models.partial(AllPartialModels.TRACK_OBSERVER_OVERLAY))
 			.createInstance();
+
+		setupVisual();
 	}
 
 	@Override
 	public void tick(Context context) {
-		TrackTargetingBehaviour<TrackObserver> target = blockEntity.edgePoint;
-		BlockPos targetPosition = target.getGlobalPosition();
-		Level level = blockEntity.getLevel();
-		BlockState trackState = level.getBlockState(targetPosition);
-		Block block = trackState.getBlock();
-
-		if (!(block instanceof ITrackBlock trackBlock)) {
-			overlay.setZeroTransform()
-				.setChanged();
-			return;
-		}
-
-		overlay.setIdentityTransform()
-			.translate(targetPosition);
-
-		RenderedTrackOverlayType type = RenderedTrackOverlayType.OBSERVER;
-		trackBlock.prepareTrackOverlay(overlay, level, targetPosition, trackState, target.getTargetBezier(),
-			target.getTargetDirection(), type);
-
-		overlay.setChanged();
+		setupVisual();
 	}
 
 	@Override
@@ -71,4 +54,31 @@ protected void _delete() {
 	public void collectCrumblingInstances(Consumer<@Nullable Instance> consumer) {
 		consumer.accept(overlay);
 	}
+
+	private void setupVisual() {
+		TrackTargetingBehaviour<TrackObserver> target = blockEntity.edgePoint;
+		BlockPos targetPosition = target.getGlobalPosition();
+		Level level = blockEntity.getLevel();
+		BlockState trackState = level.getBlockState(targetPosition);
+		Block block = trackState.getBlock();
+
+		if (!(block instanceof ITrackBlock trackBlock)) {
+			overlay.setZeroTransform()
+				.setChanged();
+			return;
+		}
+
+		if (!targetPosition.equals(oldTargetPos)) {
+			oldTargetPos = targetPosition;
+
+			overlay.setIdentityTransform()
+				.translate(targetPosition.subtract(renderOrigin()));
+
+			RenderedTrackOverlayType type = RenderedTrackOverlayType.OBSERVER;
+			trackBlock.prepareTrackOverlay(overlay, level, targetPosition, trackState, target.getTargetBezier(),
+				target.getTargetDirection(), type);
+
+			overlay.setChanged();
+		}
+	}
 }

src/main/java/com/simibubi/create/content/trains/signal/SignalVisual.java

@@ -43,10 +43,32 @@ public SignalVisual(VisualizationContext ctx, SignalBlockEntity blockEntity, flo
 		signalOverlay = ctx.instancerProvider()
 			.instancer(InstanceTypes.TRANSFORMED, Models.partial(AllPartialModels.TRACK_SIGNAL_OVERLAY))
 			.createInstance();
+
+		setupVisual();
 	}
 
 	@Override
 	public void tick(Context context) {
+		setupVisual();
+	}
+
+	@Override
+	public void updateLight(float partialTick) {
+		relight(signalLight, signalOverlay);
+	}
+
+	@Override
+	protected void _delete() {
+		signalLight.delete();
+		signalOverlay.delete();
+	}
+
+	@Override
+	public void collectCrumblingInstances(Consumer<@Nullable Instance> consumer) {
+		consumer.accept(signalLight);
+	}
+
+	private void setupVisual() {
 		{
 			SignalState signalState = blockEntity.getState();
 
@@ -81,43 +103,36 @@ public void tick(Context context) {
 			Block block = trackState.getBlock();
 
 			if (!(block instanceof ITrackBlock trackBlock) || overlayState == OverlayState.SKIP) {
+				previousOverlayState = null;
 				signalOverlay.setZeroTransform()
 					.setChanged();
 				return;
 			}
 
-			signalOverlay.setIdentityTransform()
-				.translate(targetPosition);
-
-			RenderedTrackOverlayType type =
-				overlayState == OverlayState.DUAL ? RenderedTrackOverlayType.DUAL_SIGNAL : RenderedTrackOverlayType.SIGNAL;
-			PartialModel partial = trackBlock.prepareTrackOverlay(signalOverlay, level, targetPosition, trackState, target.getTargetBezier(), target.getTargetDirection(), type);
-
 			if (overlayState != previousOverlayState) {
+				previousOverlayState = overlayState;
+
+				PartialModel partial;
+				RenderedTrackOverlayType type;
+				if (overlayState == OverlayState.DUAL) {
+					type = RenderedTrackOverlayType.DUAL_SIGNAL;
+					partial = AllPartialModels.TRACK_SIGNAL_DUAL_OVERLAY;
+				} else {
+					type = RenderedTrackOverlayType.SIGNAL;
+					partial = AllPartialModels.TRACK_SIGNAL_OVERLAY;
+				}
+
 				instancerProvider()
 					.instancer(InstanceTypes.TRANSFORMED, Models.partial(partial))
 					.stealInstance(signalOverlay);
-			}
-
-			signalOverlay.setChanged();
-
-			previousOverlayState = overlayState;
-		}
-	}
 
-	@Override
-	public void updateLight(float partialTick) {
-		relight(signalLight, signalOverlay);
-	}
+				signalOverlay.setIdentityTransform()
+					.translate(targetPosition.subtract(renderOrigin()));
 
-	@Override
-	protected void _delete() {
-		signalLight.delete();
-		signalOverlay.delete();
-	}
+				trackBlock.prepareTrackOverlay(signalOverlay, level, targetPosition, trackState, target.getTargetBezier(), target.getTargetDirection(), type);
 
-	@Override
-	public void collectCrumblingInstances(Consumer<@Nullable Instance> consumer) {
-		consumer.accept(signalLight);
+				signalOverlay.setChanged();
+			}
+		}
 	}
 }