Fix tests

src/lib/compiler/compileImages.ts

@@ -71,7 +71,7 @@ export const imageTileAllocationColorOnly: ImageTileAllocationStrategy = (
   // After that split evenly between bank 1 and 2
   return {
     tileIndex: 128 + Math.floor((tileIndex - 256) / 2),
-    inVRAM2: tileIndex % 2 === 0,
+    inVRAM2: tileIndex % 2 !== 0,
   };
 };
 

test/data/compiler/compileData.test.js

@@ -2,7 +2,7 @@ import compile, {
   precompileBackgrounds,
   precompileScenes,
 } from "../../../src/lib/compiler/compileData";
-import { compileSceneProjectiles } from "../../../src/lib/compiler/compileData2";
+import { compileSceneProjectiles } from "../../../src/lib/compiler/generateGBVMData";
 import { EVENT_TEXT, EVENT_IF_TRUE, EVENT_SET_TRUE } from "../../../src/consts";
 import { projectileStateTest } from "./_files/data/projectiles";
 import { getTestScriptHandlers } from "../../getTestScriptHandlers";

test/data/compiler/compileImages.test.ts

@@ -1,4 +1,7 @@
-import compileImages from "lib/compiler/compileImages";
+import compileImages, {
+  imageTileAllocationColorOnly,
+  imageTileAllocationDefault,
+} from "lib/compiler/compileImages";
 import { BackgroundData } from "shared/lib/entities/entitiesTypes";
 
 const BYTES_PER_TILE = 16;
@@ -15,14 +18,10 @@ test("should compile images", async () => {
     [],
     false,
     `${__dirname}/_files/`,
-    `${__dirname}/_tmp/`,
     { warnings: () => {} }
   );
-  expect(res.tilemaps["img1"].length).toEqual(360);
-  expect(res.tilemapsTileset["img1"].length).toEqual(1);
-  expect(res.tilesets[res.tilemapsTileset["img1"][0]].length).toEqual(
-    114 * BYTES_PER_TILE
-  );
+  expect(res[0].tilemap.length).toEqual(360);
+  expect(res[0].vramData[0].length).toEqual(114 * BYTES_PER_TILE);
 });
 
 test("should compile split large images into two tilesets for CGB mode", async () => {
@@ -37,17 +36,11 @@ test("should compile split large images into two tilesets for CGB mode", async (
     [],
     true,
     `${__dirname}/_files/`,
-    `${__dirname}/_tmp/`,
     { warnings: () => {} }
   );
-  expect(res.tilemaps["img1"].length).toEqual(3136);
-  expect(res.tilemapsTileset["img1"].length).toEqual(2);
-  expect(res.tilesets[res.tilemapsTileset["img1"][0]].length).toEqual(
-    192 * BYTES_PER_TILE
-  );
-  expect(res.tilesets[res.tilemapsTileset["img1"][1]].length).toEqual(
-    192 * BYTES_PER_TILE
-  );
+  expect(res[0].tilemap.length).toEqual(3136);
+  expect(res[0].vramData[0].length).toEqual(192 * BYTES_PER_TILE);
+  expect(res[0].vramData[1].length).toEqual(192 * BYTES_PER_TILE);
 });
 
 test("should compile large images into one overflowing bank when not in color only mode", async () => {
@@ -62,17 +55,13 @@ test("should compile large images into one overflowing bank when not in color on
     [],
     false,
     `${__dirname}/_files/`,
-    `${__dirname}/_tmp/`,
     { warnings: () => {} }
   );
-  expect(res.tilemaps["img1"].length).toEqual(3136);
-  expect(res.tilemapsTileset["img1"].length).toEqual(1);
-  expect(res.tilesets[res.tilemapsTileset["img1"][0]].length).toEqual(
-    384 * BYTES_PER_TILE
-  );
+  expect(res[0].tilemap.length).toEqual(3136);
+  expect(res[0].vramData[0].length).toEqual(384 * BYTES_PER_TILE);
 });
 
-test("should split tiles into two banks evenly when in color only mode", async () => {
+test("should split tiles into two banks when in color only mode, filling first 128 tiles of vram bank 1 first", async () => {
   const backgroundData = [
     {
       id: "img1",
@@ -84,15 +73,52 @@ test("should split tiles into two banks evenly when in color only mode", async (
     [],
     true,
     `${__dirname}/_files/`,
-    `${__dirname}/_tmp/`,
     { warnings: () => {} }
   );
-  expect(res.tilemaps["img1"].length).toEqual(1440);
-  expect(res.tilemapsTileset["img1"].length).toEqual(2);
-  expect(res.tilesets[res.tilemapsTileset["img1"][0]].length).toEqual(
-    96 * BYTES_PER_TILE
-  );
-  expect(res.tilesets[res.tilemapsTileset["img1"][1]].length).toEqual(
-    95 * BYTES_PER_TILE
-  );
+  expect(res[0].tilemap.length).toEqual(1440);
+  expect(res[0].vramData[0].length).toEqual(128 * BYTES_PER_TILE);
+  expect(res[0].vramData[1].length).toEqual(63 * BYTES_PER_TILE);
+});
+
+test("Should allocate all tiles to VRAM1 in original order by default", () => {
+  const backgroundData = [
+    {
+      id: "img1",
+      filename: "parallax.png",
+    },
+  ] as unknown as BackgroundData;
+  for (let i = 0; i < 192; i++) {
+    expect(imageTileAllocationDefault(i, 192, backgroundData)).toEqual({
+      tileIndex: i,
+      inVRAM2: false,
+    });
+  }
+});
+
+test("Should allocate first 128 tiles to vram1, next 128 to vram2 and split the rest evenly when in color only mode", () => {
+  const backgroundData = [
+    {
+      id: "img1",
+      filename: "parallax.png",
+    },
+  ] as unknown as BackgroundData;
+  for (let i = 0; i < 384; i++) {
+    let shouldBeVRAM2 = false;
+    let index = i;
+    // Tiles 128 to 255 go in vram2
+    if (i >= 128 && i < 256) {
+      shouldBeVRAM2 = true;
+      index -= 128;
+    }
+    // After 255 tiles alternate between vram1 and vram2
+    if (i >= 256) {
+      shouldBeVRAM2 = i % 2 !== 0;
+      index = Math.floor((i - 256) / 2) + 128;
+    }
+
+    expect(imageTileAllocationColorOnly(i, 384, backgroundData)).toEqual({
+      tileIndex: index,
+      inVRAM2: shouldBeVRAM2,
+    });
+  }
 });

test/data/compiler/scriptBuilder2.test.ts

@@ -1,4 +1,4 @@
-import { PrecompiledScene } from "../../../src/lib/compiler/compileData2";
+import { PrecompiledScene } from "../../../src/lib/compiler/generateGBVMData";
 import ScriptBuilder from "../../../src/lib/compiler/scriptBuilder";
 import { ScriptEvent } from "../../../src/shared/lib/entities/entitiesTypes";
 import {

test/dummydata.ts

@@ -35,7 +35,7 @@ import { projectTemplatesRoot } from "../src/consts";
 import {
   PrecompiledBackground,
   PrecompiledSprite,
-} from "../src/lib/compiler/compileData2";
+} from "../src/lib/compiler/generateGBVMData";
 
 export const dummySceneNormalized: SceneNormalized = {
   id: "",
@@ -109,7 +109,6 @@ export const dummyPrecompiledBackground: PrecompiledBackground = {
   name: "",
   width: 1,
   height: 1,
-  data: new Uint8Array(),
   tileset: {
     symbol: "ts_1",
     data: new Uint8Array(),
@@ -175,7 +174,6 @@ export const dummyPrecompiledSpriteSheet: PrecompiledSprite = {
     symbol: "ts_1",
     data: new Uint8Array(),
   },
-  data: [],
   tiles: [],
   metasprites: [],
   animationOffsets: [],
@@ -185,6 +183,7 @@ export const dummyPrecompiledSpriteSheet: PrecompiledSprite = {
   width: 32,
   height: 32,
   animSpeed: 15,
+  vramData: [[], []],
 };
 
 export const dummyMusic: Music = {