slifer 0.1.9 → 0.2.1

package/src/modules/graphics.ts

@@ -1,176 +1,233 @@
-import { libimage, libsdl, libttf } from "../ffi";
-import Global from "../global";
-import { type Pointer, ptr } from 'bun:ffi';
-import type { Rectangle } from "../slifer";
-
-/** @internal */
-class Graphics {
-    /**
-     * Slifers draw function. Used to draw everything to the screen.
-     */
-    render() {
-        libsdl.symbols.SDL_RenderPresent(Global.ptrRenderer);
-    }
-
-    /**
-     * Create a new color. All values are from 0-255
-     * 
-     * @param r red value 
-     * @param g green value
-     * @param b blue value
-     * @param a alpha value
-     * @returns Color object
-     */
-    makeColor(r: number, g: number, b: number, a: number) {
-        const _color = new Color(r, g, b, a);
-        return _color;
-    }
-
-    /**
-     * Sets the background of the window to a color of choice. 
-     * 
-     * Make sure this is put in the top level of the while loop
-     * as it will clear the renderer.
-     * 
-     * @param color Color object. Make using Slifer.Graphics.makeColor
-     */
-    setBackground(color: Color) {
-        libsdl.symbols.SDL_SetRenderDrawColor(Global.ptrRenderer, color.r, color.g, color.b, color.a);
-        libsdl.symbols.SDL_RenderClear(Global.ptrRenderer);
-    }
-
-    /**
-     * Loads a new image
-     * 
-     * @param path string path to image
-     * @returns Image ready to draw
-     */
-    loadImage(path: string) : Image {
-        const _path = Buffer.from(path + "\x00");
-      //@ts-expect-error Buffer and CString differences
-        const surface = libimage.symbols.IMG_Load(_path);
-        if (surface == null) throw `Image failed to load`;
-        const texture = libsdl.symbols.SDL_CreateTextureFromSurface(Global.ptrRenderer, surface);
-        if (texture == null) throw `Image failed to be created`;
-        return new Image(texture);
-    }
-
-    /**
-     * Method to draw the image to the screen
-     * 
-     * @param image Image object to draw. Made using Slifer.Graphics.loadImage
-     * @param x x position to draw image
-     * @param y y position to draw image
-     * @param rotation (optional) rotation of image
-     * @param xs (optional) scale of x axis
-     * @param ys (optional) scale of y axis
-     * @param flip (optional) horizontal flip
-     */
-    draw(image: Image, positionX: number, positionY: number, clipRectangle?: Rectangle, rotation?: number, xs?: number, ys?: number, flip?: true) {
-        const _dest = new Uint32Array(4);
-        const wArr = new Uint32Array(1);
-        const hArr = new Uint32Array(1);
-        let srcRect: null | Uint32Array = null;
-        
-        if (clipRectangle == undefined) {
-            libsdl.symbols.SDL_QueryTexture((image as any).pointer, null, null, ptr(wArr), ptr(hArr));
-        } else {
-            srcRect = new Uint32Array(4);
-            srcRect[0] = clipRectangle.x;
-            srcRect[1] = clipRectangle.y;
-            srcRect[2] = clipRectangle.width;
-            srcRect[3] = clipRectangle.height;
-            wArr[0] = clipRectangle.width;
-            hArr[0] = clipRectangle.height;
-        }
-
-        
-        _dest[0] = positionX;
-        _dest[1] = positionY;
-        _dest[2] = wArr[0] * (xs ? xs : 1);
-        _dest[3] = hArr[0] * (ys ? ys : 1);
-        const _center = new Uint32Array(2);
-        _center[0] = _dest[2] / 2;
-        _center[1] = _dest[3] / 2;
-        libsdl.symbols.SDL_RenderCopyEx(Global.ptrRenderer, (image as any).pointer, srcRect, ptr(_dest), rotation ? rotation : 0, ptr(_center), flip ? Number(flip) : 0);
-    }
-
-    /**
-     * Method to draw text to the screen
-     * 
-     * @param text the string of text to print
-     * @param x x position
-     * @param y y position
-     * @param color color of text. Made using Slifer.Graphics.makeColor.
-     */
-    print(text: string, x: number, y: number, color: Color) {
-
-        // Create text buffer
-        const textBuffer = Buffer.from(text+"\x00");
-
-        // Get width and height of text        
-        const wArr = new Uint32Array(1);
-        const hArr = new Uint32Array(1);
-      //@ts-expect-error Buffer and CString differences
-        libttf.symbols.TTF_SizeText(Global.ptrFont,textBuffer , ptr(wArr), ptr(hArr));
-
-        // Define color
-        const _col = ((color.r << 0) + (color.g << 8) + (color.b << 16));
-
-        // Create texture
-      //@ts-expect-error Buffer and CString differences
-        const surface = libttf.symbols.TTF_RenderText_Solid(Global.ptrFont, textBuffer, _col);
-        if (surface == null) throw `Surface creation failed on print`;
-        const texture = libsdl.symbols.SDL_CreateTextureFromSurface(Global.ptrRenderer, surface);
-        if (texture == null) throw `Texture creation failed on print`;
-
-        // Create destination
-        const destArr = new Uint32Array(4);
-        destArr[0] = x;
-        destArr[1] = y;
-        destArr[2] = wArr[0];
-        destArr[3] = hArr[0];
-
-        // Draw text
-        libsdl.symbols.SDL_RenderCopy(Global.ptrRenderer, texture, null, ptr(destArr));        
-    }
-
-    /**
-     * Sets the font to a ttf file in your project
-     * 
-     * @param path relative path to font
-     * @param pt size of text
-     */
-    setFont(path: string, pt: number) {
-      //@ts-expect-error Buffer and CString differences
-        const tempFont = libttf.symbols.TTF_OpenFont(Buffer.from(path+"\x00"), pt);
-        if (tempFont == null) throw `Font loading failed`;
-        Global.ptrFont = tempFont;
-    }
-}
-
-class Image {
-
-    private pointer;
-    
-    constructor(texture: Pointer) {
-        this.pointer = texture;
-    }
-}
-
-class Color {
-    readonly r;
-    readonly g;
-    readonly b;
-    readonly a;
-
-    constructor(r: number, g: number, b: number, a: number) {
-        this.r = r;
-        this.g = g;
-        this.b = b;
-        this.a = a;
-    }
-}
-
-/** @internal */
-export default Graphics;
+import { libimage, libsdl, libttf } from "../ffi";
+import Global from "../global";
+import { type Pointer, ptr } from "bun:ffi";
+import Rectangle from "../engine/rectangle";
+import Color from "../color";
+import Vector2 from "../engine/vector";
+
+/** @internal */
+class Graphics {
+    /**
+     * Slifers draw function. Used to draw everything to the screen.
+     */
+    render() {
+        libsdl.symbols.SDL_RenderPresent(Global.ptrRenderer);
+    }
+
+    /**
+     * Create a new color. All values are from 0-255
+     *
+     * @param r red value
+     * @param g green value
+     * @param b blue value
+     * @param a alpha value
+     * @returns Color object
+     */
+    makeColor(r: number, g: number, b: number, a: number) {
+        const _color = new Color(r, g, b, a);
+        return _color;
+    }
+
+    /**
+     * Sets the background of the window to a color of choice.
+     *
+     * Make sure this is put in the top level of the while loop
+     * as it will clear the renderer.
+     *
+     * @param color Color object. Make using Slifer.Graphics.makeColor
+     */
+    setBackground(color: Color) {
+        libsdl.symbols.SDL_SetRenderDrawColor(
+            Global.ptrRenderer,
+            color.r,
+            color.g,
+            color.b,
+            color.a
+        );
+        libsdl.symbols.SDL_RenderClear(Global.ptrRenderer);
+    }
+
+    /**
+     * Loads a new image
+     *
+     * @param path string path to image
+     * @returns Image ready to draw
+     */
+    loadImage(path: string): Image {
+        const _path = Buffer.from(path + "\x00");
+        const surface = libimage.symbols.IMG_Load(_path);
+        if (surface == null) throw `Image failed to load`;
+        const texture = libsdl.symbols.SDL_CreateTextureFromSurface(
+            Global.ptrRenderer,
+            surface
+        );
+        if (texture == null) throw `Image failed to be created`;
+        return new Image(texture);
+    }
+
+    /**
+     * Method to draw to the screen simply
+     * @param image Image object to draw. Made using Slifer.Graphics.loadImage
+     * @param position position to draw the image
+     *
+     */
+    draw(image: Image, position: Vector2) {
+        const dstRect = new Uint32Array(4);
+        dstRect[0] = position.x;
+        dstRect[1] = position.y;
+        dstRect[2] = image.width;
+        dstRect[3] = image.height;
+
+        libsdl.symbols.SDL_RenderCopy(
+            Global.ptrRenderer,
+            (image as any).pointer,
+            null,
+            dstRect
+        );
+    }
+
+    /**
+     * Method to draw the image to the screen with extended arguments
+     *
+     * @param image Image object to draw. Made using Slifer.Graphics.loadImage
+     * @param position position to draw the image
+     * @param y y position to draw image
+     * @param rotation (optional) rotation of image
+     * @param xs (optional) scale of x axis
+     * @param ys (optional) scale of y axis
+     * @param flip (optional) horizontal flip
+     */
+    drawEx(
+        image: Image,
+        position: Vector2,
+        clipRectangle?: Rectangle | null,
+        rotation?: number,
+        xs?: number,
+        ys?: number,
+        flip?: true
+    ) {
+        const _dest = new Uint32Array(4);
+        let srcRect: null | Uint32Array = null;
+
+        if (clipRectangle != null) {
+            srcRect = new Uint32Array(4);
+            srcRect[0] = clipRectangle.position.x;
+            srcRect[1] = clipRectangle.position.y;
+            srcRect[2] = clipRectangle.size.x;
+            srcRect[3] = clipRectangle.size.y;
+        }
+
+        _dest[0] = position.x;
+        _dest[1] = position.y;
+        _dest[2] = image.width * (xs ? xs : 1);
+        _dest[3] = image.height * (ys ? ys : 1);
+        const _center = new Uint32Array(2);
+        _center[0] = _dest[2] / 2;
+        _center[1] = _dest[3] / 2;
+        libsdl.symbols.SDL_RenderCopyEx(
+            Global.ptrRenderer,
+            (image as any).pointer,
+            srcRect,
+            ptr(_dest),
+            rotation ? rotation : 0,
+            ptr(_center),
+            flip ? Number(flip) : 0
+        );
+    }
+
+    /**
+     * Method to draw text to the screen
+     *
+     * @param text the string of text to print
+     * @param x x position
+     * @param y y position
+     * @param color color of text. Made using Slifer.Graphics.makeColor.
+     */
+    print(text: string, x: number, y: number, color: Color) {
+        // Create text buffer
+        const textBuffer = Buffer.from(text + "\x00");
+
+        // Get width and height of text
+        const wArr = new Uint32Array(1);
+        const hArr = new Uint32Array(1);
+        libttf.symbols.TTF_SizeText(
+            Global.ptrFont,
+            textBuffer,
+            ptr(wArr),
+            ptr(hArr)
+        );
+
+        // Define color
+        const _col = (color.r << 0) + (color.g << 8) + (color.b << 16);
+
+        // Create texture
+        const surface = libttf.symbols.TTF_RenderText_Solid(
+            Global.ptrFont,
+            textBuffer,
+            _col
+        );
+        if (surface == null) throw `Surface creation failed on print`;
+        const texture = libsdl.symbols.SDL_CreateTextureFromSurface(
+            Global.ptrRenderer,
+            surface
+        );
+        if (texture == null) throw `Texture creation failed on print`;
+
+        // Create destination
+        const destArr = new Uint32Array(4);
+        destArr[0] = x;
+        destArr[1] = y;
+        destArr[2] = wArr[0];
+        destArr[3] = hArr[0];
+
+        // Draw text
+        libsdl.symbols.SDL_RenderCopy(
+            Global.ptrRenderer,
+            texture,
+            null,
+            ptr(destArr)
+        );
+    }
+
+    /**
+     * Sets the font to a ttf file in your project
+     *
+     * @param path relative path to font
+     * @param pt size of text
+     */
+    setFont(path: string, pt: number) {
+        const tempFont = libttf.symbols.TTF_OpenFont(
+            Buffer.from(path + "\x00"),
+            pt
+        );
+        if (tempFont == null) throw `Font loading failed`;
+        Global.ptrFont = tempFont;
+    }
+}
+
+class Image {
+    private pointer;
+    public readonly width;
+    public readonly height;
+
+    constructor(texture: Pointer) {
+        this.pointer = texture;
+
+        const _wArr = new Uint32Array(1);
+        const _hArr = new Uint32Array(1);
+
+        libsdl.symbols.SDL_QueryTexture(
+            texture,
+            null,
+            null,
+            ptr(_wArr),
+            ptr(_hArr)
+        );
+
+        this.width = _wArr[0];
+        this.height = _hArr[0];
+    }
+}
+
+/** @internal */
+export default Graphics;

package/src/modules/keyboard.ts

@@ -1,80 +1,80 @@
-/** @internal */
-class Keyboard {
-
-    static downKeyMap = new Map<string, boolean>();
-    static pressedKeyMap = new Map<string, boolean>();
-    static releasedKeyMap = new Map<string, boolean>();
-    
-    static setKeyDown(key: string) {
-        this.downKeyMap.set(key, true);
-        this.releasedKeyMap.set(key, false);
-    }
-
-    static setKeyUp(key: string) {
-        this.downKeyMap.set(key, false);
-        this.pressedKeyMap.set(key, false);
-    }
-
-    /**
-     * 
-     * @param key string of key
-     * @returns if the key is being held down
-     */
-    isDown(key: keys) {
-        const _state = Keyboard.downKeyMap.get(key);
-        if (_state == undefined) return false
-
-        return _state;
-    }
-
-    /**
-     * 
-     * @param key string of key
-     * @returns if key is pressed. Returns only once
-     */
-    isPressed(key: keys) {
-        const _pressedState = Keyboard.pressedKeyMap.get(key);
-        const _downState = Keyboard.downKeyMap.get(key);
-
-        if (_downState == true) {
-            if (_pressedState == false || _pressedState == undefined) {
-                Keyboard.pressedKeyMap.set(key, true);
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * 
-     * @param key string of key
-     * @returns if key is released. Returns only once
-     */
-    isReleased(key: keys) {
-        const _releasedState = Keyboard.releasedKeyMap.get(key);
-        const _downState = Keyboard.downKeyMap.get(key);
-
-        if (_downState == false) {
-            if (_releasedState == false || undefined) {
-                Keyboard.releasedKeyMap.set(key, true);
-                return true;
-            }
-        }
-
-        return false;
-    }
-}
-
-type keys = 'a' |'b' |'c' |'d' |'e' |'f' |'g' |'h' |'i' |'j' |'k' |'l' |'m' |'n' |'o' |'p' |'q' |'r' |'s' |'t' |'u' |'v' |'w' |'x' |'y' |'z' |
-'1' |'2' |'3' |'4' |'5' |'6' |'7' |'8' |'9' |'0' |
-'space' |
-'caps lock' |
-'tab' |
-'left shift' |
-'right shift' |
-'left ctrl' |
-'escape';
-
-/** @internal */
+/** @internal */
+class Keyboard {
+
+    static downKeyMap = new Map<string, boolean>();
+    static pressedKeyMap = new Map<string, boolean>();
+    static releasedKeyMap = new Map<string, boolean>();
+    
+    static setKeyDown(key: string) {
+        this.downKeyMap.set(key, true);
+        this.releasedKeyMap.set(key, false);
+    }
+
+    static setKeyUp(key: string) {
+        this.downKeyMap.set(key, false);
+        this.pressedKeyMap.set(key, false);
+    }
+
+    /**
+     * 
+     * @param key string of key
+     * @returns if the key is being held down
+     */
+    isDown(key: keys) {
+        const _state = Keyboard.downKeyMap.get(key);
+        if (_state == undefined) return false
+
+        return _state;
+    }
+
+    /**
+     * 
+     * @param key string of key
+     * @returns if key is pressed. Returns only once
+     */
+    isPressed(key: keys) {
+        const _pressedState = Keyboard.pressedKeyMap.get(key);
+        const _downState = Keyboard.downKeyMap.get(key);
+
+        if (_downState == true) {
+            if (_pressedState == false || _pressedState == undefined) {
+                Keyboard.pressedKeyMap.set(key, true);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * 
+     * @param key string of key
+     * @returns if key is released. Returns only once
+     */
+    isReleased(key: keys) {
+        const _releasedState = Keyboard.releasedKeyMap.get(key);
+        const _downState = Keyboard.downKeyMap.get(key);
+
+        if (_downState == false) {
+            if (_releasedState == false || undefined) {
+                Keyboard.releasedKeyMap.set(key, true);
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
+
+type keys = 'a' |'b' |'c' |'d' |'e' |'f' |'g' |'h' |'i' |'j' |'k' |'l' |'m' |'n' |'o' |'p' |'q' |'r' |'s' |'t' |'u' |'v' |'w' |'x' |'y' |'z' |
+'1' |'2' |'3' |'4' |'5' |'6' |'7' |'8' |'9' |'0' |
+'space' |
+'caps lock' |
+'tab' |
+'left shift' |
+'right shift' |
+'left ctrl' |
+'escape';
+
+/** @internal */
 export default Keyboard;