Archive/portal64-still-alive
1
0
Fork 0
mirror of https://github.com/mwpenny/portal64-still-alive.git synced 2024-10-19 22:27:36 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Start work on test chamber 07

Browse source
This commit is contained in:
James Lambert 2023-03-10 21:21:51 -07:00
parent 274194a3dc
commit f4b149d24b
5 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Makefile
View file

@ -21,8 +21,8 @@ OPTIMIZER := -O0
LCDEFS := -DDEBUG -g -Isrc/ -I/usr/include/n64/nustd -Werror -Wall LCDEFS := -DDEBUG -g -Isrc/ -I/usr/include/n64/nustd -Werror -Wall
N64LIB := -lultra_rom -lnustd N64LIB := -lultra_rom -lnustd
ifeq ($(WITH_DEBUGGER),1) ifeq ($(PORTAL64_WITH_DEBUGGER),1)
LCDEFS += -DWITH_DEBUGGER LCDEFS += -DPORTAL64_WITH_DEBUGGER
endif endif
BASE_TARGET_NAME = build/portal BASE_TARGET_NAME = build/portal
@ -36,8 +36,8 @@ ASMOBJECTS = $(patsubst %.s, build/%.o, $(ASMFILES))
CODEFILES = $(shell find src/ -type f -name '*.c') CODEFILES = $(shell find src/ -type f -name '*.c')
ifeq ($(WITH_GFX_VALIDATOR),1) ifeq ($(PORTAL64_WITH_GFX_VALIDATOR),1)
LCDEFS += -DWITH_GFX_VALIDATOR LCDEFS += -DPORTAL64_WITH_GFX_VALIDATOR
CODEFILES += gfxvalidator/validator.c gfxvalidator/error_printer.c gfxvalidator/command_printer.c CODEFILES += gfxvalidator/validator.c gfxvalidator/error_printer.c gfxvalidator/command_printer.c
endif endif
@ -252,7 +252,8 @@ TEST_CHAMBERS = assets/test_chambers/test_chamber_00/test_chamber_00.blend \
assets/test_chambers/test_chamber_03/test_chamber_03.blend \ assets/test_chambers/test_chamber_03/test_chamber_03.blend \
assets/test_chambers/test_chamber_04/test_chamber_04.blend \ assets/test_chambers/test_chamber_04/test_chamber_04.blend \
assets/test_chambers/test_chamber_05/test_chamber_05.blend \ assets/test_chambers/test_chamber_05/test_chamber_05.blend \
assets/test_chambers/test_chamber_06/test_chamber_06.blend assets/test_chambers/test_chamber_06/test_chamber_06.blend \
assets/test_chambers/test_chamber_07/test_chamber_07.blend
TEST_CHAMBER_HEADERS = $(TEST_CHAMBERS:%.blend=build/%.h) TEST_CHAMBER_HEADERS = $(TEST_CHAMBERS:%.blend=build/%.h)
TEST_CHAMBER_OBJECTS = $(TEST_CHAMBERS:%.blend=build/%_geo.o) TEST_CHAMBER_OBJECTS = $(TEST_CHAMBERS:%.blend=build/%_geo.o)
@ -351,7 +352,7 @@ CODEOBJECTS = $(patsubst %.c, build/%.o, $(CODEFILES)) $(MODEL_OBJECTS) build/as
CODEOBJECTS_NO_DEBUG = $(CODEOBJECTS) CODEOBJECTS_NO_DEBUG = $(CODEOBJECTS)
ifeq ($(WITH_DEBUGGER),1) ifeq ($(PORTAL64_WITH_DEBUGGER),1)
CODEOBJECTS_NO_DEBUG += build/debugger/debugger_stub.o build/debugger/serial.o CODEOBJECTS_NO_DEBUG += build/debugger/debugger_stub.o build/debugger/serial.o
endif endif
@ -370,7 +371,7 @@ $(BASE_TARGET_NAME).z64: $(CODESEGMENT)_no_debug.o $(OBJECTS) $(CP_LD_SCRIPT)_no
# with debugger # with debugger
CODEOBJECTS_DEBUG = $(CODEOBJECTS) CODEOBJECTS_DEBUG = $(CODEOBJECTS)
ifeq ($(WITH_DEBUGGER),1) ifeq ($(PORTAL64_WITH_DEBUGGER),1)
CODEOBJECTS_DEBUG += build/debugger/debugger.o build/debugger/serial.o CODEOBJECTS_DEBUG += build/debugger/debugger.o build/debugger/serial.o
endif endif

BIN
assets/test_chambers/test_chamber_07/test_chamber_07.blend Normal file
View file

Binary file not shown.

12
src/graphics/graphics.c
View file

@ -11,11 +11,11 @@ extern OSMesgQueue *schedulerCommandQueue;
void* gLevelSegment; void* gLevelSegment;
#if WITH_GFX_VALIDATOR #if PORTAL64_WITH_GFX_VALIDATOR
#include "../../gfxvalidator/validator.h" #include "../../gfxvalidator/validator.h"
#endif #endif
#if WITH_DEBUGGER #if PORTAL64_WITH_DEBUGGER
#include "../../debugger/debugger.h" #include "../../debugger/debugger.h"
#include "../../debugger/serial.h" #include "../../debugger/serial.h"
@ -124,8 +124,8 @@ void graphicsCreateTask(struct GraphicsTask* targetTask, GraphicsCallback callba
scTask->next = 0; scTask->next = 0;
scTask->state = 0; scTask->state = 0;
#if WITH_GFX_VALIDATOR #if PORTAL64_WITH_GFX_VALIDATOR
#if WITH_DEBUGGER #if PORTAL64_WITH_DEBUGGER
struct GFXValidationResult validationResult; struct GFXValidationResult validationResult;
zeroMemory(&validationResult, sizeof(struct GFXValidationResult)); zeroMemory(&validationResult, sizeof(struct GFXValidationResult));
@ -134,8 +134,8 @@ void graphicsCreateTask(struct GraphicsTask* targetTask, GraphicsCallback callba
gdbBreak(); gdbBreak();
} }
#endif // WITH_DEBUGGER #endif // PORTAL64_WITH_DEBUGGER
#endif // WITH_GFX_VALIDATOR #endif // PORTAL64_WITH_GFX_VALIDATOR
osSendMesg(schedulerCommandQueue, (OSMesg)scTask, OS_MESG_BLOCK); osSendMesg(schedulerCommandQueue, (OSMesg)scTask, OS_MESG_BLOCK);
} }

4
src/main.c
View file

@ -22,7 +22,7 @@
#include "levels/levels.h" #include "levels/levels.h"
#include "levels/checkpoint.h" #include "levels/checkpoint.h"
#ifdef WITH_DEBUGGER #ifdef PORTAL64_WITH_DEBUGGER
#include "../debugger/debugger.h" #include "../debugger/debugger.h"
#endif #endif
@ -151,7 +151,7 @@ static void gameProc(void* arg) {
heapInit(_heapStart, memoryEnd); heapInit(_heapStart, memoryEnd);
romInit(); romInit();
#ifdef WITH_DEBUGGER #ifdef PORTAL64_WITH_DEBUGGER
OSThread* debugThreads[2]; OSThread* debugThreads[2];
debugThreads[0] = &gameThread; debugThreads[0] = &gameThread;
gdbInitDebugger(gPiHandle, &dmaMessageQ, debugThreads, 1); gdbInitDebugger(gPiHandle, &dmaMessageQ, debugThreads, 1);

1
src/scene/signage.c
View file

@ -74,6 +74,7 @@ short gLevelWarnings[] = {
LevelWarningsBallHit | LevelWarningsBallCollect, LevelWarningsBallHit | LevelWarningsBallCollect,
LevelWarningsBallHit | LevelWarningsBallCollect | LevelWarningsLiquid | LevelWarningsDrinking, LevelWarningsBallHit | LevelWarningsBallCollect | LevelWarningsLiquid | LevelWarningsDrinking,
LevelWarningsCubeDispense | LevelWarningsCubeHit, LevelWarningsCubeDispense | LevelWarningsCubeHit,
LevelWarningsSpeedyIn | LevelWarningsSpeedyOut,
}; };
static struct Coloru8 gSignageOnColor = {0, 0, 0, 255}; static struct Coloru8 gSignageOnColor = {0, 0, 0, 255};