Implement test chamber 6
This commit is contained in:
parent
6a274ab71c
commit
7d71ed2708
2
Makefile
2
Makefile
|
@ -227,7 +227,7 @@ build/src/scene/ball_catcher.o: build/assets/models/props/combine_ball_catcher.h
|
|||
|
||||
build/assets/models/player/chell.h: assets/materials/chell.skm.yaml
|
||||
|
||||
# ANIM_TEST_CHAMBERS = build/assets/test_chambers/test_chamber_03/test_chamber_03_anim.o
|
||||
ANIM_TEST_CHAMBERS = build/assets/test_chambers/test_chamber_03/test_chamber_03_anim.o
|
||||
|
||||
build/anims.ld: $(ANIM_LIST) $(ANIM_TEST_CHAMBERS) tools/generate_animation_ld.js
|
||||
@mkdir -p $(@D)
|
||||
|
|
|
@ -527,4 +527,14 @@ materials:
|
|||
r: 0
|
||||
g: 0
|
||||
b: 0
|
||||
a: 0
|
||||
a: 0
|
||||
|
||||
solid_black_cap:
|
||||
gDPSetPrimColor:
|
||||
r: 32
|
||||
g: 32
|
||||
b: 32
|
||||
gSPGeometryMode:
|
||||
set: [G_LIGHTING, G_SHADE]
|
||||
gDPSetCombineMode:
|
||||
color: ["PRIMITIVE", "0", "SHADE", "0"]
|
Binary file not shown.
|
@ -181,6 +181,7 @@ void cutsceneRunnerStartStep(struct CutsceneRunner* runner) {
|
|||
}
|
||||
case CutsceneStepTypeGoto:
|
||||
runner->currentStep += step->gotoStep.relativeInstructionIndex;
|
||||
cutsceneRunnerStartStep(runner);
|
||||
break;
|
||||
case CutsceneStepTypeStartCutscene:
|
||||
cutsceneStart(&gCurrentLevel->cutscenes[step->cutscene.cutsceneIndex]);
|
||||
|
|
Loading…
Reference in a new issue