saltpaper 0.0.5a0__py3-none-any.whl → 0.0.6a0__py3-none-any.whl

saltpaper/__init__.py

@@ -2,5 +2,5 @@ from saltpaper.services import *
 from saltpaper.functions import *
 from saltpaper.worldsystem.world import World
 
-SALTPAPER_VER = "0.0.5 (pre-alpha)"
+SALTPAPER_VER = "0.0.6 (pre-alpha)"
 print(f"saltPAPER {SALTPAPER_VER}")

saltpaper/functions/__init__.py

@@ -1,3 +1,2 @@
 from .test import make_test_entity
-from .spawn import *
 from .vectortools import VectorTools

saltpaper/functions/spawn.py

@@ -1,6 +1,11 @@
 from saltpaper.worldsystem.entity import Entity
 from saltpaper.worldsystem.components import Position, Sprite
 
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from saltpaper import Event, Layer, World, AssetService
+
 def make_display_entity(world, layer, position, asset_id) -> Entity:
     
     ent = Entity(world)
@@ -8,4 +13,26 @@ def make_display_entity(world, layer, position, asset_id) -> Entity:
     sprite = Sprite(asset_id)
     ent.add_many(position, sprite)
 
-    return ent
+    return ent
+
+def make_button(
+        world: 'World',
+        assetservice:'AssetService',
+        layer:'Layer',
+        position:tuple[int,int],
+        asset_id:str,
+        event:'Event',
+        eat_trigger:bool=True
+) -> tuple[Entity, 'Event']:
+    from saltpaper.worldsystem.components import Clickable
+    
+    ent = Entity(world)
+    asset_dims = assetservice.get_asset(asset_id).get_size()
+    position_obj = Position(layer, position, *asset_dims)
+    bounds = (*position, *asset_dims)
+    sprite = Sprite(asset_id)
+    event.eat_trigger = eat_trigger
+    clickable = Clickable(event, layer, bounds)
+
+    ent.add_many(position_obj, sprite, clickable)
+    return ent, event

saltpaper/functions/vectortools.py

@@ -25,4 +25,10 @@ class VectorTools:
         return (
             ax + (bx - ax) * progress,
             ay + (by - ay) * progress
-        )
+        )
+    
+    @staticmethod
+    def is_point_inside(point:tuple[int,int], x:int, y:int, width:int, height:int) -> bool:
+        px, py = point
+        return (x <= px < x + width) and (y <= py < y + height)
+        

saltpaper/services/__init__.py

@@ -2,7 +2,7 @@ from .assetservice import AssetService
 from .displayservice import DisplayService
 from .layer import Layer
 from .inputservice import InputService
-from .inputservice import Event
-from .inputservice import Criteria
+from .event import Criteria
 from .renderservice import RenderService
-from .stateservice import StateService
+from .stateservice import StateService
+from .event import Event

saltpaper/services/event.py

@@ -0,0 +1,45 @@
+from typing import Callable
+
+class Event():
+    def __init__(
+            self,
+            triggers: str | list,
+            criteria: Callable,
+            callback: Callable,
+            args: list = None,
+            priority: int = 0,
+            eat_trigger: bool = False
+    ):
+        self.triggers = triggers if isinstance(triggers, list) else [triggers]
+        self.criteria = criteria
+        self.callback = callback
+        self.args = args if args else []
+        self.priority = priority
+        self.eat_trigger = eat_trigger
+
+class Criteria():
+    @staticmethod
+    def on_press(f):
+        return True if f==1 else False
+    
+    @staticmethod
+    def on_held(f):
+        return True if f>0 else False
+    
+    @staticmethod
+    def on_release(f):
+        return True if f==-1 else False
+    
+    @staticmethod
+    def make_on_held_interval(x):
+        def on_held_interval(f):
+            return True if f % x == 0 else False
+        return on_held_interval
+    
+    @staticmethod
+    def make_combined_criteria(func_a, func_b) -> bool:
+        def combined_criteria(f):
+            truth = func_a(f) and func_b(f)
+            return truth
+        return combined_criteria
+

saltpaper/services/inputservice.py

@@ -1,19 +1,11 @@
-
-# input mapping service
-# initialises with a mapping dict of
-# key trigger -> "event" (arbitrary string)
-# i.e. K_up
 import sys
 from pathlib import Path
 from typing import Callable
-
-if __name__ == "__main__":
-    sys.path.insert(0, str(Path(__file__).parent.parent.parent))
-
 import pygame
 import pygame.locals as pl
 import pygame._sdl2.controller as ctrl
-import pygame._sdl2.video as sdl_video
+
+from saltpaper.services.event import Event
 
 KEY_VALUE_TO_NAME = {
     value: name
@@ -57,43 +49,6 @@ if __name__ == "__main__":
         for item in MOUSE_VALUE_TO_NAME.values():
             f.write(f"{item}\n")
 
-class Criteria():
-    @staticmethod
-    def on_press(f):
-        return True if f==1 else False
-    
-    @staticmethod
-    def on_held(f):
-        return True if f>0 else False
-    
-    @staticmethod
-    def on_release(f):
-        return True if f==-1 else False
-    
-    @staticmethod
-    def make_on_held_interval(x):
-        def on_held_interval(f):
-            return True if f % x == 0 else False
-        return on_held_interval
-
-class Event():
-    def __init__(
-            self,
-            triggers: str | list,
-            criteria: Callable,
-            callback: Callable,
-            args: list = None,
-            priority: int = 0,
-            eat_trigger: bool = False
-    ):
-        self.triggers = triggers if isinstance(triggers, list) else [triggers]
-        self.criteria = criteria
-        self.callback = callback
-        self.args = args if args else []
-        self.priority = priority
-        self.eat_trigger = eat_trigger
-
-
 class InputService():
     def __init__(self):
         self.gamepad = None

saltpaper/worldsystem/components/__init__.py

@@ -1,2 +1,3 @@
 from .position import Position
-from .sprite import Sprite
+from .sprite import Sprite
+from .clickable import Clickable

saltpaper/worldsystem/components/clickable.py

@@ -0,0 +1,27 @@
+from typing import TYPE_CHECKING
+
+import pygame.mouse as mouse
+from saltpaper.services.event import Criteria
+from saltpaper.functions.vectortools import VectorTools
+
+if TYPE_CHECKING:
+    from saltpaper import Event, Layer
+
+class Clickable:
+    """format bounds as x, y, width, height"""
+    def __init__(
+            self,
+            event:'Event',
+            layer:'Layer',
+            bounds:list[int,int,int,int]
+    ):
+        self.event = event
+        self.layer = layer
+        self.bounds = bounds
+
+        main_criteria = Criteria.make_combined_criteria(event.criteria, self.is_mouse_inside)
+        event.criteria = main_criteria
+
+    def is_mouse_inside(self, f):
+        rel_pos = self.layer.relative_coords(mouse.get_pos())
+        return VectorTools.is_point_inside(rel_pos, *self.bounds)

saltpaper/worldsystem/components/position.py

@@ -3,13 +3,13 @@ class Position():
             self,
             layer:int=0,
             position:tuple[int,int]=(0,0),
+            width:int=0,
             height:int=0,
-            width:int=0
     ):
         self.layer = layer
         self.position = position
-        self.height = height
         self.width = width
+        self.height = height
 
     @property
     def x(self):

{saltpaper-0.0.5a0.dist-info → saltpaper-0.0.6a0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: saltpaper
-Version: 0.0.5a0
+Version: 0.0.6a0
 Summary: A small game-engine/framework built on top of pygame
 Author-email: Lauren Kinder <mail@hermod.uk>
 License-Expression: MIT

{saltpaper-0.0.5a0.dist-info → saltpaper-0.0.6a0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-saltpaper/__init__.py,sha256=LrY78Ej9y8JGqZOdjYKMsydpIYJzZy9AgAMsPG5rTWE,185
+saltpaper/__init__.py,sha256=Om10tKkLEB95vHgzS6Ktl_UOncKDkzoeDzUS5tRREyw,185
 saltpaper/assets/.DS_Store,sha256=7-Z-79uIc0CMx4UUj3sSlYE6KAWyk5qlKRTLRnrq8N8,8196
 saltpaper/assets/talk.wav,sha256=rRmMxGFBFGiU59VqfmhIcwdZfuYdY9fUdkv7Os7S3hU,30624
 saltpaper/assets/fonts/LibertinusMono-Regular.ttf,sha256=q9MJTt9ehi35gD8LH8jgr66CFH2oyxsylV3nqPsIOPA,153120
@@ -7,24 +7,26 @@ saltpaper/assets/music/catacomb.wav,sha256=Rx3u6xe2YnST9c7KKJ6seF9bG6rJyC683Sc6j
 saltpaper/assets/tilemaps/test.aseprite,sha256=ZmWh2Ima2Lha5t4kjgNMsnlCamBNEKUsO547Hhtoa2w,416
 saltpaper/assets/tilemaps/test.png,sha256=Q2LU88aK3DOLHrXBjuT86ZJTP_ckODwo1g5Pe9Jut7g,927
 saltpaper/assets/tilemaps/test.yaml,sha256=8YWZeFfbxKxSK8MnEYxERjJIpSszMzRxp5lzGNl2yYw,220
-saltpaper/functions/__init__.py,sha256=aI9Lkm4SRTeWn40xEh9nfuN-b-jq9ImleO-ky690z8w,92
-saltpaper/functions/spawn.py,sha256=YRvnuEImANzvuB872k5D1VwivG5cfGQEkcbJwmvqHso,330
+saltpaper/functions/__init__.py,sha256=seVutHUkY36p2YR6oMHmh4RA9ofWhpMKjVxCl-YNxVA,71
+saltpaper/functions/spawn.py,sha256=GVqLyglPhrQMPrZd1rka-u3WBLDbBAr1GsgEXnw8Ne4,1115
 saltpaper/functions/test.py,sha256=sNpRCjy1CrMrlHv770RTtN6iDwB3Hq7-rKdKaTi3b8s,323
-saltpaper/functions/vectortools.py,sha256=I2ok4i0kZqGq5YXgY1nLblgA14mnlC53D2BBSHrbsHM,752
-saltpaper/services/__init__.py,sha256=Sseu7zdeaB3InIIcs5DIRFK4hhGBqxwvTQaAQP8ksaw,292
+saltpaper/functions/vectortools.py,sha256=Isr4NdXTxwlxKbzvBdgEzKUAd0dsmN6b6eeYyt-bLiw,963
+saltpaper/services/__init__.py,sha256=MVY4sPLsWzIQGgcxOqot5aCwzgdoZWyuFq1U0gJEsh4,278
 saltpaper/services/assetservice.py,sha256=KqVD9UXnDB8JUH4XjTcdRBQkFeSPEcijXiSQHYnAlxw,2133
 saltpaper/services/displayservice.py,sha256=NzBmzuaVMcygNv2HnEJZDU5AqV3I_9giGGybvcu2sgY,2999
-saltpaper/services/inputservice.py,sha256=MRIbdwspCw4hS1zVy2VI7_n2UY0Vp9H6omKZK3yCBnE,5131
+saltpaper/services/event.py,sha256=F5itHUv1TSOl17raaDcjbMNAtBuFdNwCY6zwc_VN9Qc,1194
+saltpaper/services/inputservice.py,sha256=3Y3WkE4DGyY6zk379C0_DTmqwoyM5lPmBKpAkuzhBZQ,3973
 saltpaper/services/layer.py,sha256=eIDzZmt1CwjbApnzGsGkM-rJQ-TXmBF-6ho_hNSCPGc,3339
 saltpaper/services/renderservice.py,sha256=jwhnWoa1a_mHXkoHnK-wREGR0cIBKkGf-pVythHkU1E,1250
 saltpaper/services/stateservice.py,sha256=KviqdOkEgZyOiwadOz1nn5QB4jdHUwbGYf355NcqkhM,287
 saltpaper/worldsystem/entity.py,sha256=bRyFMfHblzMwzo81YshDkDjvpMXZrEVrvWjgXtdlS5c,987
 saltpaper/worldsystem/world.py,sha256=-8ckweO6pcwaLb42PGKPveuuHNeR_o0cVqUDFcEt93w,442
-saltpaper/worldsystem/components/__init__.py,sha256=ZYfSsWkkqC-Dkl9QwAjPBydca7ifBzxEhG9_OOcMgRs,57
-saltpaper/worldsystem/components/position.py,sha256=QIJHVc8r1i0KhBBJdAN1dnlPky_8AWkpRJWLvBrGKo0,618
+saltpaper/worldsystem/components/__init__.py,sha256=ddkZE-SqWQouHwUdcrJUVj4VJymZAHmUvwVD7OFOq4c,90
+saltpaper/worldsystem/components/clickable.py,sha256=m9hKGqYd7_V3vI-ek_gaYXLXXFA8kVT96hDAcPp3UUk,806
+saltpaper/worldsystem/components/position.py,sha256=pTNQej1TnAuNDQkRtxtGAzSOWelzUw206oISySx4a7E,619
 saltpaper/worldsystem/components/sprite.py,sha256=pQHkyNNKv_iy33LLbqZlOXTU-dqoPzFX7ojjYMOH_BY,102
-saltpaper-0.0.5a0.dist-info/licenses/LICENSE,sha256=Fh0aFC8RSdix3JzjFyLJ3IuzsD1FfsbGFkyqDj5qvXQ,1075
-saltpaper-0.0.5a0.dist-info/METADATA,sha256=6X29jU0N0cGWwRUshm1uhiiVNMDKsK9bAenhvtuv8u0,646
-saltpaper-0.0.5a0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-saltpaper-0.0.5a0.dist-info/top_level.txt,sha256=JACZnZhYYkgmdSz3T1JXacHS4L0UM6NbeReLoNLu6jw,10
-saltpaper-0.0.5a0.dist-info/RECORD,,
+saltpaper-0.0.6a0.dist-info/licenses/LICENSE,sha256=Fh0aFC8RSdix3JzjFyLJ3IuzsD1FfsbGFkyqDj5qvXQ,1075
+saltpaper-0.0.6a0.dist-info/METADATA,sha256=aH--BF8xBPrtCPQQQhXSWgo0Q4_Is_nHZ4dwdbpgWsY,646
+saltpaper-0.0.6a0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+saltpaper-0.0.6a0.dist-info/top_level.txt,sha256=JACZnZhYYkgmdSz3T1JXacHS4L0UM6NbeReLoNLu6jw,10
+saltpaper-0.0.6a0.dist-info/RECORD,,