slifer 0.1.8 → 0.2.0

package/package.json

@@ -1,14 +1,14 @@
 {
-  "name": "slifer",
-  "version": "0.1.8",
-  "description": "A game framework made for bun and typescript",
-  "module": "index.ts",
-  "devDependencies": {
-    "@types/bun": "latest",
-    "typedoc": "^0.26.7"
-  },
-  "peerDependencies": {
-    "typescript": "^5.0.0"
-  },
-  "type": "module"
+    "name": "slifer",
+    "version": "0.2.0",
+    "description": "A game framework made for bun and typescript",
+    "module": "index.ts",
+    "devDependencies": {
+        "@types/bun": "latest",
+        "typedoc": "^0.26.7"
+    },
+    "peerDependencies": {
+        "typescript": "^5.0.0"
+    },
+    "type": "module"
 }

package/src/color.ts

@@ -0,0 +1,15 @@
+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;
+    }
+}
+
+export default Color;

package/src/engine/rectangle.ts

@@ -0,0 +1,25 @@
+import { ptr } from "bun:ffi";
+import Vector2 from "./vector";
+
+class Rectangle {
+    private readonly pointer;
+    public position: Vector2;
+    public size: Vector2;
+
+    constructor(position: Vector2, size: Vector2) {
+        const arr = new Uint32Array(4);
+        arr[0] = position.x;
+        arr[1] = position.y;
+        arr[2] = size.x;
+        arr[3] = size.y;
+        this.pointer = ptr(arr);
+        this.position = position;
+        this.size = size;
+    }
+
+    static empty() {
+        return new Rectangle(new Vector2(0, 0), new Vector2(0, 0));
+    }
+}
+
+export default Rectangle;

package/src/engine/vector.ts

@@ -0,0 +1,49 @@
+class Vector2 {
+    public x;
+    public y;
+
+    constructor(x: number, y: number) {
+        this.x = x;
+        this.y = y;
+    }
+
+    /**
+     * Creates a Vector2 with the components 1,1
+     */
+    static one() {
+        return new Vector2(1, 1);
+    }
+
+    /**
+     * Creates a Vector2 with the components 1,0
+     */
+    static unitX() {
+        return new Vector2(1, 0);
+    }
+
+    /**
+     * Creates a Vector2 with the components 0,1
+     */
+    static unitY() {
+        return new Vector2(0, 1);
+    }
+
+    /**
+     * Creates a vector2 with component 0,0
+     */
+    static zero() {
+        return new Vector2(0, 0);
+    }
+
+    /**
+     * Adds two vectors together
+     *
+     * @param vec1 Vector2 object
+     * @param vec2 Vector2 object
+     */
+    static add(vec1: Vector2, vec2: Vector2) {
+        return new Vector2(vec1.x + vec2.x, vec1.y + vec2.y);
+    }
+}
+
+export default Vector2;

package/src/engine.ts

@@ -0,0 +1,24 @@
+import { libsdl, libimage, libttf } from "./ffi";
+import Global from "./global";
+
+//@ts-expect-error
+const fontFile = await import("./Jost-Bold.ttf");
+
+export function initLibraries(): void {
+    const baseInit = libsdl.symbols.SDL_Init(0x00000020);
+    if (baseInit != 0) throw `SDL failed to initialize`;
+
+    const imageInit = libimage.symbols.IMG_Init(3);
+    if (imageInit != 3) throw `SDL Image failed to initialize`;
+
+    const ttfInit = libttf.symbols.TTF_Init();
+    if (ttfInit != 0) throw `SDL TTF failed to initialize`;
+
+    const tempFont = libttf.symbols.TTF_OpenFont(
+        Buffer.from(fontFile.default),
+        24
+    );
+
+    if (tempFont == null) throw `Default font loading failed`;
+    Global.ptrFont = tempFont;
+}

package/src/modules/graphics.ts

@@ -1,8 +1,9 @@
 import { libimage, libsdl, libttf } from "../ffi";
 import Global from "../global";
-import { type Pointer, ptr } from 'bun:ffi';
-import path from 'path';
-import type { Rectangle, Vector2 } from "../slifer";
+import { type Pointer, ptr } from "bun:ffi";
+import Rectangle from "../engine/rectangle";
+import Color from "../color";
+import Vector2 from "../engine/vector";
 
 /** @internal */
 class Graphics {
@@ -15,8 +16,8 @@ class Graphics {
 
     /**
      * Create a new color. All values are from 0-255
-     * 
-     * @param r red value 
+     *
+     * @param r red value
      * @param g green value
      * @param b blue value
      * @param a alpha value
@@ -28,37 +29,47 @@ class Graphics {
     }
 
     /**
-     * Sets the background of the window to a color of choice. 
-     * 
+     * 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_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 {
+    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);
+        const texture = libsdl.symbols.SDL_CreateTextureFromSurface(
+            Global.ptrRenderer,
+            surface
+        );
         if (texture == null) throw `Image failed to be created`;
         return new Image(texture);
     }
 
+    draw(image: Image, position: Vector2) {}
+
     /**
      * 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
@@ -67,14 +78,28 @@ class Graphics {
      * @param ys (optional) scale of y axis
      * @param flip (optional) horizontal flip
      */
-    draw(image: Image, position: Vector2, clipRectangle?: Rectangle, rotation?: number, xs?: number, ys?: number, flip?: true) {
+    drawEx(
+        image: Image,
+        position: Vector2,
+        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));
+            libsdl.symbols.SDL_QueryTexture(
+                (image as any).pointer,
+                null,
+                null,
+                ptr(wArr),
+                ptr(hArr)
+            );
         } else {
             srcRect = new Uint32Array(4);
             srcRect[0] = clipRectangle.x;
@@ -85,7 +110,6 @@ class Graphics {
             hArr[0] = clipRectangle.height;
         }
 
-        
         _dest[0] = position.x;
         _dest[1] = position.y;
         _dest[2] = wArr[0] * (xs ? xs : 1);
@@ -93,36 +117,53 @@ class Graphics {
         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);
+        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");
+        const textBuffer = Buffer.from(text + "\x00");
 
-        // Get width and height of text        
+        // 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));
+        libttf.symbols.TTF_SizeText(
+            Global.ptrFont,
+            textBuffer,
+            ptr(wArr),
+            ptr(hArr)
+        );
 
         // Define color
-        const _col = ((color.r << 0) + (color.g << 8) + (color.b << 16));
+        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);
+        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);
+        const texture = libsdl.symbols.SDL_CreateTextureFromSurface(
+            Global.ptrRenderer,
+            surface
+        );
         if (texture == null) throw `Texture creation failed on print`;
 
         // Create destination
@@ -133,45 +174,37 @@ class Graphics {
         destArr[3] = hArr[0];
 
         // Draw text
-        libsdl.symbols.SDL_RenderCopy(Global.ptrRenderer, texture, null, ptr(destArr));        
+        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);
+        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;
+export default Graphics;

package/src/slifer.test.ts

@@ -0,0 +1,8 @@
+import { describe, expect, it } from "bun:test";
+import { initLibraries } from "./engine";
+
+describe("Initializing ", () => {
+    it("Should initialize without error ", () => {
+        expect(() => initLibraries()).not.toThrow(Error);
+    });
+});

package/src/slifer.ts

@@ -1,4 +1,5 @@
 import { libimage, libsdl, libttf } from "./ffi";
+import { initLibraries } from "./engine";
 import Global from "./global";
 import { ptr } from "bun:ffi";
 import Graphics from "./modules/graphics";
@@ -6,229 +7,169 @@ import Keyboard from "./modules/keyboard";
 import Mouse from "./modules/mouse";
 import { version } from "../package.json";
 
-//@ts-expect-error
-const fontFile = await import("./Jost-Bold.ttf");
-
 /** @internal */
 class Window {
-  public width: number;
-  public height: number;
-  public title: string;
-
-  constructor(title: string, width: number, height: number) {
-    this.width = width;
-    this.height = height;
-    this.title = title;
-  }
-
-  setSize(width: number, height: number): void {
-    libsdl.symbols.SDL_SetWindowSize(Global.ptrWindow, width, height);
-  }
-
-  setTitle(title: string): void {
-    libsdl.symbols.SDL_SetWindowTitle(
-      Global.ptrWindow,
-      //@ts-expect-error Buffer and CString differences
-      Buffer.from(title + "\x00")
-    );
-  }
-
-  setFullscreen(flag: boolean): void {
-    libsdl.symbols.SDL_SetWindowFullscreen(Global.ptrWindow, Number(flag));
-  }
-
-  centerWindow(): void {
-    libsdl.symbols.SDL_SetWindowPosition(
-      Global.ptrWindow,
-      0x2fff0000,
-      0x2fff0000
-    );
-  }
-
-  setPosition(x: number, y: number): void {
-    libsdl.symbols.SDL_SetWindowPosition(Global.ptrWindow, x, y);
-  }
+    public width: number;
+    public height: number;
+    public title: string;
+
+    constructor(title: string, width: number, height: number) {
+        this.width = width;
+        this.height = height;
+        this.title = title;
+    }
+
+    setSize(width: number, height: number): void {
+        libsdl.symbols.SDL_SetWindowSize(Global.ptrWindow, width, height);
+    }
+
+    setTitle(title: string): void {
+        libsdl.symbols.SDL_SetWindowTitle(
+            Global.ptrWindow,
+            Buffer.from(title + "\x00")
+        );
+    }
+
+    setFullscreen(flag: boolean): void {
+        libsdl.symbols.SDL_SetWindowFullscreen(Global.ptrWindow, Number(flag));
+    }
+
+    centerWindow(): void {
+        libsdl.symbols.SDL_SetWindowPosition(
+            Global.ptrWindow,
+            0x2fff0000,
+            0x2fff0000
+        );
+    }
+
+    setPosition(x: number, y: number): void {
+        libsdl.symbols.SDL_SetWindowPosition(Global.ptrWindow, x, y);
+    }
 }
 
 /** @interal */
 export class SliferClass {
-  private isRunning: boolean = true;
-  private lastFrame: number = 0;
-  private firstFrame: number = 0;
-
-  // Modules
-  Graphics = new Graphics();
-  Keyboard = new Keyboard();
-  Mouse = new Mouse();
-
-  // Public Variables
-  public dt: number = 0;
-
-  constructor() {
-    const baseInit = libsdl.symbols.SDL_Init(0x00000020);
-    if (baseInit != 0) throw `SDL failed to initialize`;
-
-    const imageInit = libimage.symbols.IMG_Init(3);
-    if (imageInit != 3) throw `SDL Image failed to initialize`;
-
-    const ttfInit = libttf.symbols.TTF_Init();
-    if (ttfInit != 0) throw `SDL TTF failed to initialize`;
-
-    /*
-    if (process.platform == "darwin") {
-      const tempFont = libttf.symbols.TTF_OpenFont(
-        Buffer.from("/System/Library/Fonts/SFNSMono.ttf"),
-        12,
-      );
-      if (tempFont == null) throw `Default font loading failed`;
-      Global.ptrFont = tempFont;
-    } else if (process.platform == "linux") {
-      const tempFont = libttf.symbols.TTF_OpenFont(
-        Buffer.from("/usr/share/fonts/truetype/dejavu/DejaVuSansMono.ttf"),
-        12,
-      );
-      if (tempFont == null) throw `Default font loading failed`;
-      Global.ptrFont = tempFont;
+    private isRunning: boolean = true;
+    private lastFrame: number = 0;
+    private firstFrame: number = 0;
+
+    // Modules
+    Graphics = new Graphics();
+    Keyboard = new Keyboard();
+    Mouse = new Mouse();
+
+    // Public Variables
+    public dt: number = 0;
+
+    constructor() {
+        initLibraries();
     }
-    */
-
-    const tempFont = libttf.symbols.TTF_OpenFont(
-      //@ts-expect-error Buffer and CString differences
-      Buffer.from(fontFile.default),
-      24
-    );
-    if (tempFont == null) throw `Default font loading failed`;
-    Global.ptrFont = tempFont;
-  }
-
-  /**
-   * @param title Title of window
-   * @param width Width of window
-   * @param height Height of window
-   */
-  createWindow(title: string, width: number, height: number): Window {
-    // Creating cstring buffer from string
-    const _title = Buffer.from(title + "\x00");
-
-    // Creating window pointer
-    const _win = libsdl.symbols.SDL_CreateWindow(
-      //@ts-expect-error Buffer and CString differences
-      _title,
-      0x2fff0000,
-      0x2fff0000,
-      width,
-      height,
-      0
-    );
-    if (_win == null) throw `Window creation failed`;
-    Global.ptrWindow = _win;
-
-    // Creating renderer pointer
-    const _ren = libsdl.symbols.SDL_CreateRenderer(Global.ptrWindow, -1, 0);
-    if (_ren == null) throw `Renderer Creation failed`;
-    Global.ptrRenderer = _ren;
-
-    this.firstFrame = Number(libsdl.symbols.SDL_GetPerformanceCounter());
-
-    return new Window(title, width, height);
-  }
-
-  /**
-   * @returns if the window should close
-   */
-  shouldClose(): boolean {
-    // Clear the renderer
-    libsdl.symbols.SDL_RenderClear(Global.ptrRenderer);
-
-    // Setup deltatime
-    this.lastFrame = this.firstFrame;
-    this.firstFrame = Number(libsdl.symbols.SDL_GetPerformanceCounter());
-
-    this.dt = ((this.firstFrame - this.lastFrame) * 1000 / Number(libsdl.symbols.SDL_GetPerformanceFrequency()));
-
-
-    // Poll Events
-    const eventArray = new Uint16Array(32);
-    const isEvent = libsdl.symbols.SDL_PollEvent(ptr(eventArray));
-
-    if (isEvent) {
-      switch (eventArray[0]) {
-        // Quit event
-        case 256:
-          this.isRunning = false;
-          break;
-        // Keydown event
-        case 768:
-          const _dscancode = eventArray[8];
-          const _dkey = libsdl.symbols.SDL_GetKeyFromScancode(_dscancode);
-          const _dname = libsdl.symbols.SDL_GetKeyName(_dkey);
-          Keyboard.setKeyDown(_dname.toString().toLowerCase());
-          break;
-        // Keyup event
-        case 769:
-          const _uscancode = eventArray[8];
-          const _ukey = libsdl.symbols.SDL_GetKeyFromScancode(_uscancode);
-          const _uname = libsdl.symbols.SDL_GetKeyName(_ukey);
-          Keyboard.setKeyUp(_uname.toString().toLowerCase());
-          break;
-        // Mouse down event
-        case 1025:
-          const _dbtn = eventArray[8] - 256;
-          Mouse.setButtonDown(_dbtn);
-          break;
-        // Mouse up event
-        case 1026:
-          const _ubtn = eventArray[8];
-          Mouse.setButtonUp(_ubtn);
-          break;
-      }
+
+    /**
+     * @param title Title of window
+     * @param width Width of window
+     * @param height Height of window
+     */
+    createWindow(title: string, width: number, height: number): Window {
+        // Creating cstring buffer from string
+        const _title = Buffer.from(title + "\x00");
+
+        // Creating window pointer
+        const _win = libsdl.symbols.SDL_CreateWindow(
+            _title,
+            0x2fff0000,
+            0x2fff0000,
+            width,
+            height,
+            0
+        );
+        if (_win == null) throw `Window creation failed`;
+        Global.ptrWindow = _win;
+
+        // Creating renderer pointer
+        const vsyncHint = 0x00000004;
+        const _ren = libsdl.symbols.SDL_CreateRenderer(
+            Global.ptrWindow,
+            -1,
+            vsyncHint
+        );
+        if (_ren == null) throw `Renderer Creation failed`;
+        Global.ptrRenderer = _ren;
+
+        this.firstFrame = Number(libsdl.symbols.SDL_GetPerformanceCounter());
+
+        return new Window(title, width, height);
     }
 
-    return !this.isRunning;
-  }
-
-  /**
-   * Slifers quit method
-   */
-  quit() {
-    libttf.symbols.TTF_CloseFont(Global.ptrFont);
-    libsdl.symbols.SDL_DestroyRenderer(Global.ptrRenderer);
-    libsdl.symbols.SDL_DestroyWindow(Global.ptrWindow);
-    libsdl.symbols.SDL_Quit();
-  }
-
-  getVersion() {
-    return version;
-  }
-}
+    /**
+     * @returns if the window should close
+     */
+    shouldClose(): boolean {
+        // Clear the renderer
+        libsdl.symbols.SDL_RenderClear(Global.ptrRenderer);
+
+        // Setup deltatime
+        this.lastFrame = this.firstFrame;
+        this.firstFrame = Number(libsdl.symbols.SDL_GetPerformanceCounter());
+
+        this.dt =
+            ((this.firstFrame - this.lastFrame) * 1000) /
+            Number(libsdl.symbols.SDL_GetPerformanceFrequency());
+
+        // Poll Events
+        const eventArray = new Uint16Array(32);
+        const isEvent = libsdl.symbols.SDL_PollEvent(ptr(eventArray));
+
+        if (isEvent) {
+            switch (eventArray[0]) {
+                // Quit event
+                case 256:
+                    this.isRunning = false;
+                    break;
+                // Keydown event
+                case 768:
+                    const _dscancode = eventArray[8];
+                    const _dkey =
+                        libsdl.symbols.SDL_GetKeyFromScancode(_dscancode);
+                    const _dname = libsdl.symbols.SDL_GetKeyName(_dkey);
+                    Keyboard.setKeyDown(_dname.toString().toLowerCase());
+                    break;
+                // Keyup event
+                case 769:
+                    const _uscancode = eventArray[8];
+                    const _ukey =
+                        libsdl.symbols.SDL_GetKeyFromScancode(_uscancode);
+                    const _uname = libsdl.symbols.SDL_GetKeyName(_ukey);
+                    Keyboard.setKeyUp(_uname.toString().toLowerCase());
+                    break;
+                // Mouse down event
+                case 1025:
+                    const _dbtn = eventArray[8] - 256;
+                    Mouse.setButtonDown(_dbtn);
+                    break;
+                // Mouse up event
+                case 1026:
+                    const _ubtn = eventArray[8];
+                    Mouse.setButtonUp(_ubtn);
+                    break;
+            }
+        }
+
+        return !this.isRunning;
+    }
 
-export class Vector2 {
-  x;
-  y;
+    /**
+     * Slifers quit method
+     */
+    quit() {
+        libttf.symbols.TTF_CloseFont(Global.ptrFont);
+        libsdl.symbols.SDL_DestroyRenderer(Global.ptrRenderer);
+        libsdl.symbols.SDL_DestroyWindow(Global.ptrWindow);
+        libsdl.symbols.SDL_Quit();
+    }
 
-  constructor(x: number, y: number) {
-    this.x = x;
-    this.y = y;
-  }
+    getVersion() {
+        return version;
+    }
 }
 
-export class Rectangle {
-  private readonly pointer;
-  readonly x;
-  readonly y;
-  readonly width;
-  readonly height;
-
-  constructor(x: number, y: number, width: number, height: number) {
-    const arr = new Uint32Array(4);
-    arr[0] = x;
-    arr[1] = y;
-    arr[2] = width;
-    arr[3] = height;
-    this.pointer = ptr(arr);
-    this.x = x;
-    this.y = y;
-    this.width = width;
-    this.height = height;
-  }
-}