From 3f1be9a24c16edb757f9b60ac0e12eebe6884015 Mon Sep 17 00:00:00 2001
From: Pabloader <pabloader@pabloader.ru>
Date: Mon, 4 May 2026 08:47:28 +0000
Subject: [PATCH] Some refactor

---
 .../assets => assets/fonts}/7-segments-display.ttf  | Bin
 .../assets/{ => fonts}/WebPlus_IBM_VGA_8x16.woff    | Bin
 .../{display/assets => assets/fonts}/lcd.font.css   |   0
 src/common/assets/{ => fonts}/vga.font.css          |   0
 src/common/display/brick.tsx                        |   2 +-
 src/common/display/text.ts                          |  12 ++++++------
 src/common/physics/engine.c                         |   7 +++----
 src/common/physics/index.ts                         |   4 ++--
 8 files changed, 12 insertions(+), 13 deletions(-)
 rename src/common/{display/assets => assets/fonts}/7-segments-display.ttf (100%)
 rename src/common/assets/{ => fonts}/WebPlus_IBM_VGA_8x16.woff (100%)
 rename src/common/{display/assets => assets/fonts}/lcd.font.css (100%)
 rename src/common/assets/{ => fonts}/vga.font.css (100%)

diff --git a/src/common/display/assets/7-segments-display.ttf b/src/common/assets/fonts/7-segments-display.ttf
similarity index 100%
rename from src/common/display/assets/7-segments-display.ttf
rename to src/common/assets/fonts/7-segments-display.ttf
diff --git a/src/common/assets/WebPlus_IBM_VGA_8x16.woff b/src/common/assets/fonts/WebPlus_IBM_VGA_8x16.woff
similarity index 100%
rename from src/common/assets/WebPlus_IBM_VGA_8x16.woff
rename to src/common/assets/fonts/WebPlus_IBM_VGA_8x16.woff
diff --git a/src/common/display/assets/lcd.font.css b/src/common/assets/fonts/lcd.font.css
similarity index 100%
rename from src/common/display/assets/lcd.font.css
rename to src/common/assets/fonts/lcd.font.css
diff --git a/src/common/assets/vga.font.css b/src/common/assets/fonts/vga.font.css
similarity index 100%
rename from src/common/assets/vga.font.css
rename to src/common/assets/fonts/vga.font.css
diff --git a/src/common/display/brick.tsx b/src/common/display/brick.tsx
index 3d64bed..9f72fb3 100644
--- a/src/common/display/brick.tsx
+++ b/src/common/display/brick.tsx
@@ -1,9 +1,9 @@
+import "@common/assets/fonts/lcd.font.css";
 import { clamp, range } from "@common/utils";
 import clsx from "clsx";
 import { render, type ComponentChildren } from "preact";
 
 import styles from './assets/brick.module.css';
-import "./assets/lcd.font.css";
 
 const FIELD_WIDTH = 10;
 const FIELD_HEIGHT = 20;
diff --git a/src/common/display/text.ts b/src/common/display/text.ts
index 2cfabae..398a30f 100644
--- a/src/common/display/text.ts
+++ b/src/common/display/text.ts
@@ -1,4 +1,4 @@
-import '@common/assets/vga.font.css';
+import '@common/assets/fonts/vga.font.css';
 import { randInt } from "@common/utils";
 import { createCanvas } from './canvas';
 
@@ -15,11 +15,11 @@ export const randChar = (min = ' ', max = '~') =>
 const generateColors = () => {
     const colors: string[] = [];
     for (let i = 0; i < 16; i++) {
-        const high = ((i & 0b1000) > 0) ? 'ff' : '7f';
-
-        const b = ((i & 0b0001) > 0) ? high : '00';
-        const g = ((i & 0b0010) > 0) ? high : '00';
-        const r = ((i & 0b0100) > 0) ? high : '00';
+        const h = (i & 0b1000) ? 'ff' : '7f';
+        
+        const r = (i & 0b0100) ? h : '00';
+        const g = (i & 0b0010) ? h : '00';
+        const b = (i & 0b0001) ? h : '00';
 
         const color = `#${r}${g}${b}`;
         colors.push(color);
diff --git a/src/common/physics/engine.c b/src/common/physics/engine.c
index d7088ad..7185ce2 100644
--- a/src/common/physics/engine.c
+++ b/src/common/physics/engine.c
@@ -245,15 +245,14 @@ rigid_body_index rigid_body_find_empty() {
             }
         }
         size_t new_cap = rigid_bodies_cap * 2;
-        printf("Reallocate to %zu\n", new_cap);
         rigid_bodies = realloc(rigid_bodies, new_cap * sizeof(rigid_body));
         memset(rigid_bodies + rigid_bodies_cap, 0, rigid_bodies_cap * sizeof(rigid_body));
         rigid_bodies_cap = new_cap;
         return rigid_body_find_empty();
     } else {
-        rigid_bodies_cap = 1;
-        rigid_bodies = malloc(sizeof(rigid_body));
-        memset(rigid_bodies, 0, sizeof(rigid_body));
+        rigid_bodies_cap = 2;
+        rigid_bodies = malloc(rigid_bodies_cap * sizeof(rigid_body));
+        memset(rigid_bodies, 0, rigid_bodies_cap * sizeof(rigid_body));
         return 0;
     }
 }
diff --git a/src/common/physics/index.ts b/src/common/physics/index.ts
index d0ca939..0435ff3 100644
--- a/src/common/physics/index.ts
+++ b/src/common/physics/index.ts
@@ -47,10 +47,10 @@ namespace Physics {
         } else if (type === TYPE_PLANE) {
             const nx = E.data.getFloat32(ptr + 24, true);
             const ny = E.data.getFloat32(ptr + 28, true);
-            return { id: ptr, x, y, vx, vy, mass, nx, ny };
+            return { id: ptr, type, x, y, vx, vy, mass, nx, ny };
         }
 
-        return { id: ptr, x, y, vx, vy, mass };
+        return { id: ptr, type, x, y, vx, vy, mass };
     }
 
     export function setCollisionCallback(cb: (a: number, b: number) => void) {