Game-Decompilation/portal64-still-alive
1
0
Fork 0
mirror of https://github.com/mwpenny/portal64-still-alive.git synced 2024-11-23 04:19:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Work on level build process

Browse Source
This commit is contained in:
James Lambert 2022-05-03 21:44:29 -06:00
parent 59c03abe37
commit b9480a4766
7 changed files with 194 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -111,9 +111,11 @@ portal_pak_modified/%.png: portal_pak_dir/%.png assets/%.ims
## Materials
####################
build/assets/materials/materials.h: assets/materials/materials.yaml $(TEXTURE_IMAGES)
build/assets/materials/static.h: assets/materials/static.skm.yaml $(TEXTURE_IMAGES)
@mkdir -p $(@D)
$(SKELATOOL64) -n materials -m $< -M $@
$(SKELATOOL64) -n static -m $< -M $@
src/levels/level_def_gen.h: build/assets/materials/static.h
####################
## Test Chambers
@ -128,10 +130,10 @@ build/%.fbx: %.blend
@mkdir -p $(@D)
$(BLENDER_2_9) $< --background --python tools/export_fbx.py -- $@
build/assets/test_chambers/%.h build/assets/test_chambers/%_geo.c: build/assets/test_chambers/%.fbx $(SKELATOOL64)
$(SKELATOOL64) -l -s 2.56 -c 0.01 -n $(<:build/assets/test_chambers/%.fbx=%) -o $(<:%.fbx=%.h) $<
build/assets/test_chambers/%.h build/assets/test_chambers/%_geo.c: build/assets/test_chambers/%.fbx $(SKELATOOL64) build/assets/materials/static.h
$(SKELATOOL64) -l -s 2.56 -c 0.01 -n $(<:build/assets/test_chambers/%.fbx=%) -m assets/materials/static.skm.yaml -o $(<:%.fbx=%.h) $<
build/assets/test_chambers/%.o: build/assets/test_chambers/%.c
build/assets/test_chambers/%.o: build/assets/test_chambers/%.c build/assets/materials/static.h
@mkdir -p $(@D)
$(CC) $(CFLAGS) -MM $^ -MF "$(@:.o=.d)" -MT"$@"
$(CC) $(CFLAGS) -c -o $@ $<

4
assets/materials/materials.yaml → assets/materials/static.skm.yaml
View File

@ -2,5 +2,5 @@ materials:
concrete_modular_wall001d:
gDPSetTile:
filename: ../../portal_pak_modified/materials/concrete/concrete_modular_wall001d.png
fmt: G_IM_FMT_I
siz: G_IM_SIZ_4b
siz: G_IM_SIZ_4b
twoTone: true

BIN
assets/test_chambers/test_chamber_00/test_chamber_00_0.blend
View File

Binary file not shown.

8
src/levels/level_def_gen.h Normal file
View File

@ -0,0 +1,8 @@
#ifndef __LEVEL_DEF_GEN_H__
#define __LEVEL_DEF_GEN_H__
#include "../../build/assets/materials/static.h"
#include "level_definition.h"
#endif

7
src/levels/level_definition.h
View File

@ -3,9 +3,16 @@
#include "../physics/collision_scene.h"
struct StaticContentElement {
Gfx* displayList;
u8 materialIndex;
};
struct LevelDefinition {
struct CollisionObject* collisionQuads;
struct StaticContentElement *staticContent;
short collisionQuadCount;
short staticContentCount;
};
#endif

172
src/levels/test_chamber_00_0/model.inc.h
View File

@ -270,6 +270,172 @@ u64 test_chamber_00_0_metalwall048b_rgba32[] = {
};
u64 materials_concrete_modular_wall001d_i_4b[] = {
0x3433211014323222, 0x2111000025544445, 0x4355443544455456, 0x6788788887898765,
0x78899875799a9999, 0x9999887799ababa9, 0xaaaaaaabaaaabaaa, 0xabbbbcabbcccbba8,
0x898aaa99aaaaaaaa, 0x9aa999a998abbbba, 0xbaaaaaaaaacccccc, 0xbcbccccdddccbbb8,
0x9a99abaaabaa99aa, 0xa9998889989bbcca, 0xbbaaa9aaaacccbcc, 0xbcbcccccdccbcbb8,
0x9b979aa99bb999aa, 0x99aa98899abbccca, 0xaaabaaaa9acdcccb, 0xccccccccccccccb8,
0x9ba9abb9abca99aa, 0xaaaba999aabcccbb, 0xa9aaaaabbbcdcccd, 0xcdcccdcabcccdbb9,
0xcb99bba99aba99aa, 0x9abbba99aabccccb, 0xb9abcbccccddddcc, 0xcddcddcbcccdcccb,
0xcbbabbbaabbaaabb, 0xaabbbaababcccccb, 0xccbbcbcbbcddddcc, 0xcdccddcccccccccb,
0xcccbb9babbbbaabc, 0xbbcbaaaabbbccccb, 0xccbbcbbbccdddccc, 0xcccccddcdddcbbba,
0xbcc9abbababbaabb, 0xbbbabbaababccccc, 0xcbccbbccccdddccc, 0xccbccddcdedddcc9,
0xbbc9bcbbbbbbabbc, 0xbabbabaaabbbcccc, 0xcccbbccddccddccd, 0xcccdddedefdecbb8,
0xcabbbbbbcccbabcc, 0xbabbbbaaaabccccc, 0xcccbaccddddddccc, 0xcdddddedffedbbb8,
0xbbbabbbbccbcbbcc, 0xbbbcbaababbcccdd, 0xdcccbbcccccdddcc, 0xccddddeddeebabc8,
0xcccbbbabccbbbbbc, 0xccccbaaabbccbcdc, 0xcddccccccccddccb, 0xbbbddddddfea9bc8,
0xcdcbbbaacccbbbcc, 0xbbcbbcbbbbbbbbcc, 0xdcccddccccdddccb, 0xcccddcdddefdbcc8,
0xabbabccbcdcbbbcc, 0xbbbbbcbccbabbbcc, 0xddcccddddddddccc, 0xccdddddbddefedd8,
0xabaabccbcccbbbcb, 0xbbbccbbccbbabbdc, 0xccccccdddddccbcc, 0xcccddddddddeeed8,
0xaaabccccccccbccc, 0xbccbcbbbbcbaabcc, 0xcdccccccdddcdcbc, 0xcccdcddddedeeee9,
0xababbbcccccbabcc, 0xcccbcbabbcbabbcc, 0xdcccccdcddcccccc, 0xcccccdddeeddeed8,
0x9baabbbccccbbabc, 0xccccbbbaaabbbbcc, 0xccccccddddddcccc, 0xcccdcdddddddeec8,
0x9b9abbbccbcbabcb, 0xccbccbbaaaabccdd, 0xdccccdcdcddcdddd, 0xcdeddddeddeeefe7,
0x8baaccbbcccbabcb, 0xbbcccbbbaaacdddc, 0xdcdccdccccdccdcc, 0xdefededddedddfd8,
0x8aabcbbbcccbaabb, 0xbabccbbbbabccddc, 0xdcdddccccccccdcc, 0xdeeddedcdedddec6,
0x999bcbbbcccbbbcb, 0xbbbccbcbbbbccdcc, 0xdddddcccccdddddc, 0xcddddeddefddefd8,
0x9a9bcccbbcbabbbc, 0xcbccbccbccccdccc, 0xddddcddddddddcdd, 0xdddeeeeeeeeedfe8,
0x7a9cccbcbbbbbbcc, 0xcccccccbccccdddd, 0xdddddddccddedcdd, 0xddeeeeeeeeeddfe8,
0x7aacdcbbbbbbbbcc, 0xccbbcccccbbddddd, 0xddeddeddcceeddcd, 0xcdeedeeeeeffefd7,
0x8bbddcccbbbbbccc, 0xcbccccbccccddddd, 0xddddddddddeedccd, 0xddeeddefeefeefe7,
0x8abddccccbbbbbcc, 0xccccbbbcccccdddd, 0xddddccdddddddddd, 0xdcddddeefefeeff8,
0x9bbccccccccbabcc, 0xcbcbbbcccccddddd, 0xdddccddddcdddddc, 0xcbcdddeefffdefc7,
0x9baccccccccaabbb, 0xbbbbbcccddcddddc, 0xcdddddeedddddddc, 0xcccddeeeffdadfe7,
0xabbcccccccbbabbc, 0xcbbbbcccddcdeddd, 0xdddddeeeeedddddc, 0xcdddcdeeefc9add7,
0xbbaccccccbbbbccc, 0xcccccccccdcddddd, 0xddddcdddeedddddd, 0xcddddedeeedbacb7,
0xbbaccccccccbbccc, 0xcccccccddddddddd, 0xdddddddddddddddd, 0xdcdccddeeeedcbb7,
0xacbcccccccccbbcc, 0xccccccccdddddddd, 0xddddddddddeedddd, 0xcccddddefecdcbb6,
0x9dcdccccccccbcbc, 0xccccccdddddcdedd, 0xdddddddddddedddd, 0xccdddddeffeedaa7,
0x9cbccccccccbbbbc, 0xccccccddddcdeeed, 0xdddddddddeeeecdd, 0xccdddddeeefebba7,
0x9bbcdccccccbbccb, 0xccccccccddcdeedd, 0xdddddddddeeedddd, 0xdccdddddeeeffdc8,
0x9caccccccccbbbbb, 0xccccccccddddeddd, 0xddddddddddeedddd, 0xddddeddddeecdec7,
0xbdbcccccccccbbbb, 0xcbbcbbbcdccdeddd, 0xdddddddeededdddc, 0xddddddddeedbbec7,
0xbcbccccccbbbbbbb, 0xbbbbbbbccccddddd, 0xddddddddeddddddc, 0xccddddddeeddddc8,
0xacbbcbccccbbbbbb, 0xbabbbabcccccdddd, 0xddddddddddedddcd, 0xcccddccddedeecb8,
0x9bbbccbcccbbbcbb, 0xcbbaabbcddccdddd, 0xddddddddddddcccc, 0xccccccccdedcbcb8,
0x9babccbbccbbbcbb, 0xbcbbbcccddccdede, 0xddddddddededcccc, 0xdccccccdededddc8,
0x79accccccccbbbbb, 0xbbbbbbcddddcdeed, 0xdcddddddddedddcd, 0xccccdccdedeefec9,
0x89accccccbcccccc, 0xccccccdedddddedc, 0xcccdddddddeddddd, 0xdccddddeeeeffec8,
0x8b9abbcccccccdcc, 0xccccddedddcccddd, 0xdcddddddddeddedd, 0xddddddddeeefffd9,
0x7aa99aabcbcccdcc, 0xcccbcdcddccccddd, 0xddddddcdddeddddd, 0xddddddddeeeeefd8,
0x9cba9bccccccccbc, 0xcccccccdddcccddc, 0xcddddccdddeeddde, 0xddddddddeeefeea7,
0xbddcbccccccccccc, 0xccccccccddcddedc, 0xcddddddddddedcdd, 0xddddddddefefedb9,
0xaddccbccdcccabcb, 0xbbbccccddddddedd, 0xdddeeddddddddddd, 0xdddddeeeceeeedb9,
0x9cdccabacdccbccb, 0xbbcccccdcccddedd, 0xdddedddddddededd, 0xdeddeeeeeddcdcc9,
0xadeccbbacccccccc, 0xcccbcccccccdeedd, 0xddddddddeeeedeee, 0xeedeeeeddddccdc8,
0xadeddcbacddcccbc, 0xccccccccccdeeedd, 0xdeeeddddededeeee, 0xeddeeefcdddcdcca,
0x8cdedcbbcdcccbcb, 0xbccccccccccdeeee, 0xdeeeddddedeeedee, 0xdeeeeefedcccddcc,
0xacefedcbbccddccc, 0xbddccdddddcdeedd, 0xeeeeeeededddedee, 0xeeeeeefeedcddddb,
0xbdffeccabccddddc, 0xcccccccdddccdedd, 0xeeeeeeeededdeeee, 0xeeeffefeedddddec,
0xccefdccccddddddd, 0xdcccccbcdddcdddd, 0xeeeeeeddeeddeeee, 0xedeffefedddccdeb,
0xdcdfcbccccdddddc, 0xddddccccdddeddee, 0xeeeeeedddeeddeee, 0xeeeffffeeedcddec,
0xcdeedbccbcdddddc, 0xcdcdccccddeddddd, 0xefeedeedeeedddee, 0xeeeffffeeecddddb,
0xacefccbcccdddddc, 0xcddcccccddeeeddd, 0xeeedeeeddeeddeee, 0xeeeeffeeeedddddb,
0xadeecaacccdddddb, 0xcddcbcccdddeedde, 0xeeedeeddeedddeee, 0xeeeeefffeeeeeeeb,
0xbcddba9cccdddddd, 0xdddcccccccddeede, 0xeeedeedeeedddded, 0xefffffffeedeedd9,
0x8cedccaccbcddedd, 0xdddddccccbdeeeee, 0xdddeeeddeddeddee, 0xeefeffffeddedcd9,
0xbdeedcaccbcddddd, 0xdddddcccdcdeddde, 0xeddeeeeeeeeddddd, 0xdeeeffeeeddeddc9,
0xcddcdcbcdcdddddd, 0xdddddcbcdcdeeccd, 0xeeeeeeeeeedddddd, 0xeeefffeeddeedcc8,
0xcedddcbcddcddcbc, 0xcdddccbccceedddd, 0xdeeeeedededdddee, 0xfeeeefdddeeeebca,
0xdeeedb9cdddddccc, 0xccdcdcbddceedddd, 0xdeeedeedddddddef, 0xfefeeedddddeedc9,
0xcddddcacdddddddd, 0xdcdcdccddddedddd, 0xdeeeeddddddddeef, 0xfefffedddccedbc8,
0xadddddabddeddddd, 0xddccddddeddcbcdd, 0xdddeedddddddddee, 0xeeeffddeeddedcc7,
0x9decedabddeedddd, 0xdddddddccddcbccc, 0xcdcdeedddedddddd, 0xdeeffeddddeeddc6,
0xacdcedbbdddedddd, 0xdddcddccccdccccc, 0xccddceedeedcccde, 0xedefededdcdeddc8,
0xacdcdcbbccddddde, 0xdddcddccccddddcd, 0xcdddcdeeeddddcde, 0xeeefeddddbbedbb9,
0x9acbedbabbcdddee, 0xeddddcbbcccddddd, 0xddddcddddddddcdd, 0xddefeccdcaaddda8,
0xaaabedbaa9bdcdde, 0xeddcdcbbcdcccccd, 0xddddcccddcbcccde, 0xddddccdddccedcb7,
0xaaacedccbbcddddd, 0xdcccddcbccdcbabd, 0xddccccccccbbccdd, 0xdcccccdddddedbb9,
0x99aceeddcccddddd, 0xdcccddcbcdccbabd, 0xddbcccccccbbddfe, 0xdccccddddcdddcda,
0x9aabeeddccceddde, 0xdcccddcbcddcbccd, 0xddbbcbcdccbbdeff, 0xeddcdeeddccdddd9,
0xaa9bdeedcbceeedd, 0xecbccccccdddcccd, 0xdcccccddccbbdefe, 0xddddddddddedecb9,
0x9baceeedcccddddd, 0xddbbcbbbcdddccdd, 0xccccccddcdbbdded, 0xdccccdddddedeca7,
0xabaceeecccccdddd, 0xdcabcccbcdccdddd, 0xdcccccdcdcbbdddd, 0xcddccdddcdedeb98,
0x9aacdedccccdddcc, 0xccaacccbccccccdd, 0xddccdcccddcbdddd, 0xccddddddccddddc9,
0x8aaadddcbbcdddbc, 0xbaabcdccccbcccdd, 0xcccddccdddccdeed, 0xccddedcddcdddde9,
0x9abcddcbbbcdccba, 0xa9abccccdcbcdddd, 0xbcccdcbcdddddddc, 0xbbccdccdedcddcc8,
0x9bccbccbcbcdcbbb, 0xaaabcdccccbcccdc, 0xcccddcccdcddeedc, 0xbabccdcdddddeeb7,
0x9bcdccccccddcabb, 0xbaabddcbbcbbcccc, 0xccdedddddddceedc, 0xbbbcdddcceedddb8,
0x9bcccccddddddccc, 0xcaacdcbbbbbbccdc, 0xcddddddddddcdddd, 0xcccccddddeeedcc9,
0xaabccbbcdddddccc, 0xcbbcccbabbbbcccc, 0xcdddeddccddcccdd, 0xdddccddddddddcd9,
0xabbcdbcddddddddc, 0xcccccbaaabbccccc, 0xddcdddcccccccabc, 0xddcbccccdddccdd8,
0xabbcccceedcddddc, 0xccbccbbbbbbbcccd, 0xdcddddddcccdcbbc, 0xdcccccccccddddd8,
0x8bccbccdddddddcb, 0xca9bccbcbbbbcccc, 0xccdcddddcddddbbc, 0xdccccdccbcccdba8,
0x9abccdddddddcdcb, 0xcbacccbbbbbbccbb, 0xccdccddddddddbbc, 0xddccbcccccccd9b9,
0xaabccddddddcdccc, 0xccccccccbbbbcccb, 0xccdccdddcdddcccd, 0xddcccbbcccbacb98,
0xabbcddddddcccccc, 0xccccccccbbbbccbb, 0xccccccddddddcccd, 0xdcdddbccbbbacd98,
0xabbcdddddddccccc, 0xcccccbccbbabbbbc, 0xccccccccccdddccd, 0xdddddccccbbbcdb9,
0xabbcccccccdccdcc, 0xcccbccccabbbbacc, 0xcddccddccccdddcd, 0xddddcccbccbcddc9,
0xbcbbccbccccccccc, 0xcccbbbcbbbccbbbb, 0xcdccccdccdddddcd, 0xcddddcccccccddc9,
0xaccbbbbbcccccccc, 0xccbabbbbbbbccbbb, 0xccdcccdcddddddcd, 0xddddddddcbccdcb8,
0xaccbbbbbbccccccc, 0xcccbbbbbbbbccbbb, 0xccddccdcddddeddd, 0xdddddddcbcccccb8,
0x8bbabbbbbccbcccc, 0xcccccccbbbbbbbbb, 0xccdccccdcddddddd, 0xdcdddeedcdcccdc8,
0x8bcbbbbbbcccccbb, 0xccccccbbbbbbcbbb, 0xbccccddccddddddd, 0xdcdddeedddcccdb7,
0x9bccbabbbccbccbb, 0xcccbccbbbcbcbbcb, 0xbccccddccddddddd, 0xdddddeddddddcdc8,
0x8abbbbcbbcbbcbbb, 0xcccbcbbbccbbbbbb, 0xcccccddddddddddd, 0xdcddddddddddccd8,
0x9a9bbbccbcbbbbbb, 0xbcccbbcccccccccb, 0xcccccddddddddcdd, 0xdccdddddddddddc8,
0x9aaabbbccccbbbcc, 0xbbccbbbccccccccc, 0xccbcdddddddedcdd, 0xddddddeeeedcddc8,
0xab9abbbccccbabcb, 0xbbbbbbbbcdccccbc, 0xcccccddddddddddd, 0xdcdddddededddee7,
0x9baaccbccccbbbbb, 0xbbbbbbbcccccdccb, 0xccdccddddddcddcc, 0xccdddddddeddded7,
0x99abcbbbcccbaabb, 0xbbccbabbccccdddc, 0xcccddddddddddddc, 0xdddddedddeeddfd6,
0x999bcbbbcccbabbb, 0xbbccbabccccccdcc, 0xccddddddddddeddc, 0xcddeedddeeddefd8,
0x8a9bccaacccabbbc, 0xccbbbbbbccccdddc, 0xccdddddddddedddd, 0xdddeeeeeeeeeefd8,
0x7a9bccbbbcbbbbcc, 0xccbbbbbbbbcddddc, 0xcddddddccddedddd, 0xddedeeeeeeeddee8,
0x79acccbbbcbbbbcc, 0xccbbbbbbbabcdddc, 0xcddcdeddcceeddcd, 0xddedddeeeeeeefd7,
0x9bacbcccccbbbbcc, 0xbbbccbabcbccdddc, 0xdddcddddddeddccd, 0xdddddbefeeeeefe8,
0x8aadcccdcccbbbcc, 0xccbcbbbbccccdddd, 0xdddccddddddddddd, 0xddddddeeeefeeff9,
0x9bbcbbcccccbbbcc, 0xcccbbbbbccbcdddd, 0xcddccdddeddddddd, 0xddddddeeeffdefc8,
0x9bacbcccdccbabcc, 0xbbbbbbccddccdddc, 0xcddddddeeeeedddc, 0xccddddeeefdadfe8,
0xabbccccccdccbbcb, 0xbbbbbcccddcddddd, 0xdddddddeeeeedcdc, 0xdddddeeeefd9bde8,
0xbbacccccccccccbb, 0xbccbcbcccdcddddd, 0xdeedddddeeeddcdd, 0xdddddeeeefebacb8,
0xbabccbcccccbbcbb, 0xbccccbccddcddddd, 0xddedddddddedddcd, 0xdddcddeefeffccb8,
0xacbccbccccccbbbb, 0xcbbccbbcdddddddd, 0xddddddcdddedcddc, 0xdccddddefeefdbb7,
0x9dbccbbbccccbbbb, 0xcbbccccdccdcdedd, 0xdddddcccdddddddd, 0xcccdccdeefeedab8,
0xacbccbbccccbabbb, 0xbccbccddccccdedd, 0xdddddcccdddddcdd, 0xcccdcdddeeedbbb8,
0xabbccbbccccbbbbb, 0xbccccccccdccdedd, 0xddddcccddddddccd, 0xccccddddeeefecc8,
0xacabbbbbbbbbbbbb, 0xbbbbbbcccdccdedd, 0xdddddcdcdddcdcdd, 0xcddddddddeecdec7,
0xcdabbcbcbbcbabba, 0xbbbbbbbcdcccdddc, 0xdddddddddddddddd, 0xdddddcddeedbced7,
0xbcabbcbcbbcaabba, 0xabbbbbbcccccdddd, 0xdddddcdddddddddd, 0xcccdccddeedddec8,
0xabaabbbccccbbbba, 0xaaabbbbccdccdddd, 0xdddddddddddddddd, 0xcccddccdeeededb8,
0x8aabbbbccccbbbaa, 0xbaaaaba9ccbbcdcc, 0xcccccccddccdcccc, 0xccccdccccddbaba7,
};
Gfx materials_concrete_modular_wall001d[] = {
gsDPPipeSync(),
gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, ENVIRONMENT, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, ENVIRONMENT),
gsDPSetPrimColor(255, 255, 183, 188, 187, 255),
gsDPSetEnvColor(60, 60, 56, 255),
gsSPTexture(65535, 65535, 0, 0, G_ON),
gsDPTileSync(),
gsDPSetTextureImage(G_IM_FMT_I, G_IM_SIZ_16b, 1, materials_concrete_modular_wall001d_i_4b),
gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 6, 0),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 2047, 512),
gsDPPipeSync(),
gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_4b, 4, 0, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 6, 0),
gsDPSetTileSize(0, 0, 0, 252, 508),
gsSPEndDisplayList(),
// gsDPPipeSync(),
// gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, ENVIRONMENT, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, ENVIRONMENT),
// gsSPTexture(65535, 65535, 0, 0, 1),
// gsDPTileSync(),
// gsDPSetTextureImage(G_IM_FMT_I, G_IM_SIZ_16b, 1, materials_concrete_modular_wall001d_i_4b),
// gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_16b, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 6, 0),
// gsDPLoadSync(),
// gsDPLoadBlock(7, 0, 0, 2047, 512),
// gsDPPipeSync(),
// gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_4b, 4, 0, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 6, 0),
// gsDPSetTileSize(0, 0, 0, 252, 508),
// gsDPSetPrimColor(0, 0, 176, 185, 182, 255),
// gsDPSetEnvColor(114, 117, 118, 255),
// gsSPEndDisplayList(),
};
Vtx test_chamber_00_0_test_chamber_00_0_mesh_vtx_cull[8] = {
{{{0, 0, -2560},0, {-16, -16},{0x0, 0x0, 0x0, 0x0}}},
{{{0, 0, 0},0, {-16, -16},{0x0, 0x0, 0x0, 0x0}}},
@ -521,7 +687,8 @@ Gfx mat_test_chamber_00_0_concrete_modular_wall001a[] = {
gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, ENVIRONMENT, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, ENVIRONMENT),
gsSPTexture(65535, 65535, 0, 0, 1),
gsDPTileSync(),
gsDPSetTextureImage(G_IM_FMT_I, G_IM_SIZ_16b, 1, test_chamber_00_0_concrete_modular_wall001a_i4),
// gsDPSetTextureImage(G_IM_FMT_I, G_IM_SIZ_16b, 1, test_chamber_00_0_concrete_modular_wall001a_i4),
gsDPSetTextureImage(G_IM_FMT_I, G_IM_SIZ_16b, 1, materials_concrete_modular_wall001d_i_4b),
gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_16b, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 6, 0),
gsDPLoadSync(),
gsDPLoadBlock(7, 0, 0, 2047, 512),
@ -587,7 +754,8 @@ Gfx test_chamber_00_0_test_chamber_00_0_mesh[] = {
gsSPVertex(test_chamber_00_0_test_chamber_00_0_mesh_vtx_cull + 0, 8, 0),
gsSPSetGeometryMode(G_LIGHTING),
gsSPCullDisplayList(0, 7),
gsSPDisplayList(mat_test_chamber_00_0_concrete_modular_wall001a),
gsSPDisplayList(materials_concrete_modular_wall001d),
// gsSPDisplayList(mat_test_chamber_00_0_concrete_modular_wall001a),
gsSPDisplayList(test_chamber_00_0_test_chamber_00_0_mesh_tri_0),
gsSPDisplayList(mat_test_chamber_00_0_concrete_modular_ceiling001a),
gsSPDisplayList(test_chamber_00_0_test_chamber_00_0_mesh_tri_1),

9
src/main.c
View File

@ -159,15 +159,6 @@ static void gameProc(void* arg) {
sceneUpdate(&gScene);
timeUpdateDelta();
char msg[64];
sprintf(msg, "current=%x start=%x end=%x dpstat=%x spstat=%x\n",
IO_READ(DPC_CURRENT_REG),
IO_READ(DPC_START_REG),
IO_READ(DPC_END_REG),
IO_READ(DPC_STATUS_REG),
IO_READ(SP_STATUS_REG));
break;
case (OS_SC_DONE_MSG):