@hi-ashleyj/llama 0.3.2 → 0.3.3

package/components/Game.svelte

@@ -24,12 +24,12 @@ $: {
 const layers = new Set();
 const draw = function (delta, time) {
     for (let layer of layers) {
-        layer(delta, time);
+        layer.draw(delta, time);
     }
 };
-const assign = function (layerDraw) {
-    layers.add(layerDraw);
-    return () => layers.delete(layerDraw);
+const assign = function (ctx) {
+    layers.add(ctx);
+    return () => layers.delete(ctx);
 };
 const timing = new Timing();
 const controller = new Controller();

package/components/GameObject.svelte

@@ -12,17 +12,20 @@ export let centered = false;
 $: ax = (centered) ? x - (w / 2) : x;
 $: ay = (centered) ? y - (h / 2) : y;
 const targets = new Set();
-const assign = function (callable) {
-    targets.add(callable);
-    return () => { targets.delete(callable); };
-};
 const draw = function ({ width, height, ctx }) {
-    targets.forEach(f => f({ width, height, ctx }, { x: ax, y: ay, w, h }));
+    targets.forEach(f => f.draw({ width, height, ctx }, { x: ax, y: ay, w, h }));
 };
-let register = setupDrawable({ assign });
+let register = setupDrawable({
+    assign: (ctx) => {
+        targets.add(ctx);
+        return () => {
+            targets.delete(ctx);
+        };
+    },
+});
 onMount(() => {
-    return register(draw);
+    return register({ draw });
 });
 </script>
 
-<slot />
+<slot/>

package/components/Layer.svelte

@@ -8,17 +8,17 @@ const draw = () => {
     if (ctx === null)
         return;
     ctx.clearRect(0, 0, $width, $height);
-    targets.forEach(f => f({ width: $width, height: $height, ctx }));
+    targets.forEach(f => f.draw({ width: $width, height: $height, ctx }));
 };
 let { width, height } = getGame();
 let register = setupLayer({
-    assign: (callable) => {
-        targets.add(callable);
-        return () => { targets.delete(callable); };
+    assign: (ctx) => {
+        targets.add(ctx);
+        return () => { targets.delete(ctx); };
     }
 });
 onMount(() => {
-    return register(draw);
+    return register({ draw });
 });
 </script>
 

package/components/drawables/Arc.svelte

@@ -22,6 +22,6 @@ const draw = function ({ ctx }, { x, y, w, h }) {
 };
 let register = setupDrawable({});
 onMount(() => {
-    return register(draw);
+    return register({ draw });
 });
 </script>

package/components/drawables/Circle.svelte

@@ -18,6 +18,6 @@ const draw = function ({ ctx }, { x, y, w, h }) {
 };
 let register = setupDrawable({});
 onMount(() => {
-    return register(draw);
+    return register({ draw });
 });
 </script>

package/components/drawables/DisplayImage.svelte

@@ -12,6 +12,6 @@ const draw = function ({ ctx }, { x, y, w, h }) {
 };
 let register = setupDrawable({});
 onMount(() => {
-    return register(draw);
+    return register({ draw });
 });
 </script>

package/components/drawables/Rectangle.svelte

@@ -16,6 +16,6 @@ const draw = function ({ ctx }, { x, y, w, h }) {
 };
 let register = setupDrawable({});
 onMount(() => {
-    return register(draw);
+    return register({ draw });
 });
 </script>

package/components/drawables/Text.svelte

@@ -27,6 +27,6 @@ const draw = function ({ ctx }, { x, y }) {
 };
 let register = setupDrawable({});
 onMount(() => {
-    return register(draw);
+    return register({ draw });
 });
 </script>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hi-ashleyj/llama",
   "description": "A (Very Incomplete) 2D Canvas Game Engine powered by Svelte",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "type": "module",
   "repository": {
     "type": "git",

package/setup.d.ts

@@ -1,5 +1,9 @@
 import type { GameContext, LayerContext, DrawableContext, DrawableFunction } from "./types";
 export declare const setupGame: (context: GameContext) => void;
-export declare const setupLayer: (context: LayerContext) => (draw: () => any) => () => any;
-export declare const setupDrawable: ({ assign }: Partial<DrawableContext>) => (draw: DrawableFunction) => () => any;
+export declare const setupLayer: (context: LayerContext) => ({ draw }: {
+    draw: () => any;
+}) => () => any;
+export declare const setupDrawable: ({ assign }: Partial<DrawableContext>) => ({ draw }: {
+    draw: () => DrawableFunction;
+}) => () => any;
 export declare const getGame: () => GameContext;

package/setup.js

@@ -17,8 +17,8 @@ export const setupLayer = function (context) {
         throw new Error("Layers must be inside a Game");
     setContext(LAYER, context);
     setupDrawable({ assign: context.assign });
-    return (draw) => {
-        return game.assign(draw);
+    return (ctx) => {
+        return game.assign(ctx);
     };
 };
 export const setupDrawable = function ({ assign }) {
@@ -26,10 +26,10 @@ export const setupDrawable = function ({ assign }) {
     if (assign) {
         setContext(DRAWABLE, { assign });
     }
-    return (draw) => {
+    return (ctx) => {
         if (!parent)
             return () => { };
-        return parent.assign(draw);
+        return parent.assign(ctx);
     };
 };
 export const getGame = function () {

package/types/contexts.d.ts

@@ -3,7 +3,7 @@ import { Timing } from "../components/motions";
 import { Controller } from "../components/controller";
 
 export type GameContext = { 
-    assign: (draw: Function) => () => any, 
+    assign: (context: { draw: Function }) => () => any,
     width: Writable<number>, 
     height: Writable<number>, 
     background: Writable<string>,
@@ -17,13 +17,12 @@ export type GameContext = {
 
 };
 
-export type LayerContext = { 
-    assign: (draw: Function) => () => any
+export type LayerContext = {
+    assign: (context: { draw: Function }) => () => any
 };
 
 export type DrawableFunction = ({}: { width: number, height: number, ctx: CanvasRenderingContext2D }, ...more: any[] ) => any;
 
-export type DrawableContext = { 
-    assign: (draw: Function) => () => any, 
-    draw: DrawableFunction
+export type DrawableContext = {
+    assign: (context: { draw: Function }) => () => any
 }