teleport crosshair now supports sbcamerascroll zoom

woutkolkman · Jan 13, 2024 · 9b7408f · 9b7408f
1 parent 5b56afe
commit 9b7408f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/MouseDrag/Tools/Teleport.cs b/MouseDrag/Tools/Teleport.cs
@@ -1,4 +1,5 @@
 using UnityEngine;
+using System;
 
 namespace MouseDrag
 {
@@ -92,9 +93,19 @@ public void DrawSprites(RoomCamera.SpriteLeaser sLeaser, RoomCamera rCam, float
                     sLeaser?.CleanSpritesAndRemove();
                     return;
                 }
-                Vector2 tsPos = Vector2.Lerp(prevPos, curPos, timeStacker);
-                sLeaser.sprites[0].x = tsPos.x - camPos.x;
-                sLeaser.sprites[0].y = tsPos.y - camPos.y;
+                Vector2 tsPos = Vector2.Lerp(prevPos, curPos, timeStacker) - camPos;
+
+                if (Integration.sBCameraScrollEnabled) {
+                    try {
+                        tsPos -= Integration.SBCameraScrollExtraOffset(rCam, tsPos, out float scale) / (1f / scale);
+                    } catch (Exception ex) {
+                        Plugin.Logger.LogError("Teleport.DrawSprites exception while reading SBCameraScroll, integration is now disabled - " + ex.ToString());
+                        Integration.sBCameraScrollEnabled = false;
+                    }
+                }
+
+                sLeaser.sprites[0].x = tsPos.x;
+                sLeaser.sprites[0].y = tsPos.y;
             }
 
 

diff --git a/MouseDrag/bin/mousedrag/plugins/MouseDrag.dll b/MouseDrag/bin/mousedrag/plugins/MouseDrag.dll