Merge pull request #717 from themikelester/stb

Cutscene (demo) support for Wind Waker
magcius · Nov 21, 2024 · 6e3fb61 · 6e3fb61
2 parents 831ba43 + 29efd76
commit 6e3fb61
Show file tree

Hide file tree

Showing 13 changed files with 2,962 additions and 68 deletions.
diff --git a/src/Common/JSYSTEM/JStudio.ts b/src/Common/JSYSTEM/JStudio.ts
diff --git a/src/ZeldaWindWaker/Grass.ts b/src/ZeldaWindWaker/Grass.ts
@@ -123,8 +123,8 @@ function checkGroundY(globals: dGlobals, roomIdx: number, pos: vec3) {
 }
 
 function setColorFromRoomNo(globals: dGlobals, materialParams: MaterialParams, roomNo: number): void {
-    colorCopy(materialParams.u_Color[ColorKind.C0], globals.roomStatus[roomNo].tevStr.colorC0);
-    colorCopy(materialParams.u_Color[ColorKind.C1], globals.roomStatus[roomNo].tevStr.colorK0);
+    colorCopy(materialParams.u_Color[ColorKind.C0], globals.roomCtrl.status[roomNo].tevStr.colorC0);
+    colorCopy(materialParams.u_Color[ColorKind.C1], globals.roomCtrl.status[roomNo].tevStr.colorK0);
 }
 
 function distanceCull(camPos: ReadonlyVec3, objPos: ReadonlyVec3, maxDist = 20000) {
@@ -397,7 +397,7 @@ export class FlowerPacket {
     }
 
     private drawRoom(globals: dGlobals, roomIdx: number, renderInstManager: GfxRenderInstManager, viewerInput: ViewerRenderInput): void {
-        if (!globals.roomStatus[roomIdx].visible)
+        if (!globals.roomCtrl.status[roomIdx].visible)
             return;
 
         if (this.rooms[roomIdx].length === 0)
@@ -719,7 +719,7 @@ export class TreePacket {
     }
 
     private drawRoom(globals: dGlobals, roomIdx: number, renderInstManager: GfxRenderInstManager, viewerInput: ViewerRenderInput, device: GfxDevice) {
-        if (!globals.roomStatus[roomIdx].visible)
+        if (!globals.roomCtrl.status[roomIdx].visible)
             return;
 
         const room = this.rooms[roomIdx];
@@ -1016,7 +1016,7 @@ export class GrassPacket {
     }
 
     private drawRoom(globals: dGlobals, roomIdx: number, renderInstManager: GfxRenderInstManager, viewerInput: ViewerRenderInput): void {
-        if (!globals.roomStatus[roomIdx].visible)
+        if (!globals.roomCtrl.status[roomIdx].visible)
             return;
 
         const room = this.rooms[roomIdx];

diff --git a/src/ZeldaWindWaker/Main.ts b/src/ZeldaWindWaker/Main.ts