mttu-developers/konabot
9
2
Fork 4
Code Issues 13 Pull Requests Actions Packages Releases 79 Activity

regex fix

Browse Source
This commit is contained in:
alcoholicgirl
2026-04-27 02:07:01 +08:00
parent b720504e48
commit b4f167e5f6
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
konabot/plugins/marchtoy/command.py
View File

@ -29,7 +29,7 @@ class Command:
class CommandChainParser: 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: def __init__(self, _command_chain: str) -> None:
self.command_chain = _command_chain self.command_chain = _command_chain

10
konabot/plugins/marchtoy/obj.py
View File

@ -126,13 +126,14 @@ class Cylinder(Object):
self.height = param[1] self.height = param[1]
def sdf_block(self) -> str: 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") @make_obj("torus")
class Torus(Object): 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__() super().__init__()
self.r1 = _r1 self.r1 = _r1
self.r2 = _r2 self.r2 = _r2
@ -145,6 +146,7 @@ class Torus(Object):
def sdf_block(self) -> str: def sdf_block(self) -> str:
return f"sdTorus({self.transform.p_expr()}, vec2({self.r1}, {self.r2}))" return f"sdTorus({self.transform.p_expr()}, vec2({self.r1}, {self.r2}))"
@make_obj("capsule", "pill") @make_obj("capsule", "pill")
class Capsule(Object): class Capsule(Object):
def __init__(self, _h: float = 1.0, _r: float = 0.25) -> None: 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})" return f"sdVerticalCapsule({self.transform.p_expr()}, {self._h}, {self._r})"
@make_obj("camera", "cam") @make_obj("camera", "cam")
class Camera(Object): class Camera(Object):
def __init__(self, _focus: float = 1.0) -> None: def __init__(self, _focus: float = 1.0) -> None:
super().__init__() super().__init__()
self.focus = _focus 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]): def parse_args(self, args: list[str]):
self.focus = ArgParser.as_float(args) self.focus = ArgParser.as_float(args)