Improve Lua error message verbosity, document DrawEllipse failure

Mupen64-Rewrite · Oct 24, 2023 · cae6c91 · cae6c91
1 parent 40eafd9
commit cae6c91
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/M64RPFW.ViewModels/Scripting/Extensions/LuaExtensions.cs b/M64RPFW.ViewModels/Scripting/Extensions/LuaExtensions.cs
@@ -177,7 +177,7 @@ public static void GuardedCall(this LuaFunction function, Lua lua)
         catch (LuaScriptException e)
         {
             // trying to call lua.State.Error here throws another exception lol
-            lua.DoString($"print('{Escape(e.Message)}')");
+            lua.DoString($"print('{Escape($"{e.Source} {e.Message}")}')");
         }
     }
 

diff --git a/M64RPFW.ViewModels/Scripting/LuaEnvironment_D2D.cs b/M64RPFW.ViewModels/Scripting/LuaEnvironment_D2D.cs
@@ -57,13 +57,17 @@ private void FillEllipse(float x, float y, float radiusX, float radiusY, float r
     private void DrawEllipse(float x, float y, float radiusX, float radiusY, float red, float green, float blue,
         float alpha, float thickness)
     {
+        // FIXME: this needs a workaround, as stroke-only ovals are seemingly not supported?
+        // maybe use a path
+        #if false
         using var paint = new SKPaint
         {
             Color = SkiaExtensions.ColorFromFloats(red, green, blue, alpha),
             Style = SKPaintStyle.Stroke,
             StrokeWidth = thickness
         };
         _skCanvas?.DrawOval(x, y, radiusX, radiusY, paint);
+        #endif
     }
 
     [LibFunction("d2d.draw_line")]