From b4f167e5f64dcbab0940aaba9a5896e37fac0aad Mon Sep 17 00:00:00 2001
From: alcoholicgirl <2680813175@qq.com>
Date: Mon, 27 Apr 2026 02:07:01 +0800
Subject: [PATCH] regex fix

---
 konabot/plugins/marchtoy/command.py |  2 +-
 konabot/plugins/marchtoy/obj.py     | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/konabot/plugins/marchtoy/command.py b/konabot/plugins/marchtoy/command.py
index 536f30a..88e8aa9 100644
--- a/konabot/plugins/marchtoy/command.py
+++ b/konabot/plugins/marchtoy/command.py
@@ -29,7 +29,7 @@ class Command:
 
 
 class CommandChainParser:
-    CHAIN_PATTERN = r"^[a-zA-Z]+(\([^(]*\))?(\.[a-zA-Z]+(\([^(]*\))?)+"
+    CHAIN_PATTERN = r"^[a-zA-Z]+(\([^(]*\))?(\.[a-zA-Z]+(\([^(]*\))?)*"
 
     def __init__(self, _command_chain: str) -> None:
         self.command_chain = _command_chain
diff --git a/konabot/plugins/marchtoy/obj.py b/konabot/plugins/marchtoy/obj.py
index 8a12f25..58512d5 100644
--- a/konabot/plugins/marchtoy/obj.py
+++ b/konabot/plugins/marchtoy/obj.py
@@ -126,13 +126,14 @@ class Cylinder(Object):
         self.height = param[1]
 
     def sdf_block(self) -> str:
-        return f"sdCappedCylinder({self.transform.p_expr()}, {self.radius}, {self.height})"
-
+        return (
+            f"sdCappedCylinder({self.transform.p_expr()}, {self.radius}, {self.height})"
+        )
 
 
 @make_obj("torus")
 class Torus(Object):
-    def __init__(self, _r1: float = 0.5, _r2: float = 1.0) -> None:
+    def __init__(self, _r1: float = 1.0, _r2: float = 0.4) -> None:
         super().__init__()
         self.r1 = _r1
         self.r2 = _r2
@@ -145,6 +146,7 @@ class Torus(Object):
     def sdf_block(self) -> str:
         return f"sdTorus({self.transform.p_expr()}, vec2({self.r1}, {self.r2}))"
 
+
 @make_obj("capsule", "pill")
 class Capsule(Object):
     def __init__(self, _h: float = 1.0, _r: float = 0.25) -> None:
@@ -161,12 +163,12 @@ class Capsule(Object):
         return f"sdVerticalCapsule({self.transform.p_expr()}, {self._h}, {self._r})"
 
 
-
 @make_obj("camera", "cam")
 class Camera(Object):
     def __init__(self, _focus: float = 1.0) -> None:
         super().__init__()
         self.focus = _focus
+        self.transform.translate(5.0, 5.0, 5.0).lookat(0.0, 0.0, 0.0)
 
     def parse_args(self, args: list[str]):
         self.focus = ArgParser.as_float(args)