Work on test chamber 07

assets/materials/static.skm.yaml

@@ -348,7 +348,7 @@ materials:
         ../../portal_pak_modified/materials/models/props/door_02.png
       siz: G_IM_SIZ_16b
       fmt: G_IM_FMT_RGBA
-      t:
+      s:
         mirror: true
     gSPGeometryMode:
       set: [G_LIGHTING, G_SHADE]

assets/models/props/door_02.flags

@@ -1 +1 @@
--m assets/materials/static.skm.yaml -m assets/materials/objects.skm.yaml --default-material door_02
+-r 90,0,0 -m assets/materials/static.skm.yaml -m assets/materials/objects.skm.yaml --default-material door_02 --fps 24

src/main.c

@@ -161,7 +161,7 @@ static void gameProc(void* arg) {
     contactSolverInit(&gContactSolver);
     portalSurfaceCleanupQueueInit();
     savefileNew();
-    levelLoad(2);
+    levelLoad(7);
     cutsceneRunnerReset();
     controllersInit();
     initAudio(fps);

src/models/models.c

@@ -18,9 +18,6 @@ Gfx* w_portal_gun_gfx = &portal_gun_w_portalgun_model_gfx[0];
 Gfx* button_gfx = &props_button_model_gfx[0];
 short button_material_index = BUTTON_INDEX;
 
-Gfx* door_01_gfx = &props_door_01_model_gfx[0];
-short door_01_material_index = DOOR_01_INDEX;
-
 Gfx* cylinder_gfx = &props_cylinder_test_model_gfx[0];
 short cylinder_material_index = PLASTIC_PLASTICWALL001A_INDEX;
 

src/models/models.h

@@ -8,12 +8,6 @@ extern Gfx* w_portal_gun_gfx;
 extern Gfx* button_gfx;
 extern short button_material_index;
 
-extern Gfx* door_01_gfx;
-extern short door_01_material_index;
-
-extern Gfx* door_01_gfx;
-extern short door_01_material_index;
-
 extern Gfx* cylinder_gfx;
 extern short cylinder_material_index;
 

src/scene/door.c

@@ -10,6 +10,8 @@
 #include "../physics/collision_box.h"
 #include "../physics/collision_scene.h"
 
+#include "../build/assets/materials/static.h"
+
 #include "../build/assets/models/props/door_01.h"
 #include "../build/assets/models/props/door_02.h"
 
@@ -35,6 +37,7 @@ struct DoorTypeDefinition gDoorTypeDefinitions[] = {
         &props_door_01_model_gfx[0],
         &props_door_01_Armature_open_clip,
         &props_door_01_Armature_close_clip,
+        DOOR_01_INDEX,
         -1,
         1.0f,
     },
@@ -43,6 +46,7 @@ struct DoorTypeDefinition gDoorTypeDefinitions[] = {
         &props_door_02_model_gfx[0],
         &props_door_02_Armature_open_clip,
         &props_door_02_Armature_close_clip,
+        DOOR_02_INDEX,
         PROPS_DOOR_02_DOOR_BONE,
         3.0f,
     },
@@ -51,6 +55,7 @@ struct DoorTypeDefinition gDoorTypeDefinitions[] = {
 void doorRender(void* data, struct DynamicRenderDataList* renderList, struct RenderState* renderState) {
     struct Door* door = (struct Door*)data;
     Mtx* matrix = renderStateRequestMatrices(renderState, 1);
+    struct DoorTypeDefinition* typeDefinition = &gDoorTypeDefinitions[door->doorDefinition->doorType];
 
     if (!matrix) {
         return;
@@ -71,7 +76,7 @@ void doorRender(void* data, struct DynamicRenderDataList* renderList, struct Ren
 
     skCalculateTransforms(&door->armature, armature);
 
-    dynamicRenderListAddData(renderList, door_01_gfx, matrix, door_01_material_index, &door->rigidBody.transform.position, armature);
+    dynamicRenderListAddData(renderList, typeDefinition->model, matrix, typeDefinition->materialIndex, &door->rigidBody.transform.position, armature);
 }
 
 void doorInit(struct Door* door, struct DoorDefinition* doorDefinition, struct World* world) {

src/scene/door.h

@@ -17,6 +17,7 @@ struct DoorTypeDefinition {
     Gfx* model;
     struct SKAnimationClip* openClip;
     struct SKAnimationClip* closeClip;
+    short materialIndex;
     short colliderBoneIndex;
     float closeSpeed;
 };