From e1706e2aa1315274faca338c3e61eeb0dcd60995 Mon Sep 17 00:00:00 2001 From: Ralphie Morell Date: Mon, 30 Oct 2023 21:50:00 -0400 Subject: [PATCH] test model v1 --- .../object_gi_boss_soul/gGIBossSoulSkullDL | 19 ++ .../gGIBossSoulSkullDL_tri_0 | 163 +++++++++++ .../gGIBossSoulSkullDL_tri_1 | 26 ++ .../gGIBossSoulSkullDL_tri_2 | 7 + .../gGIBossSoulSkullDL_tri_3 | 48 ++++ .../gGIBossSoulSkullDL_tri_4 | 245 ++++++++++++++++ .../gGIBossSoulSkullDL_vtx_0 | 173 ++++++++++++ .../gGIBossSoulSkullDL_vtx_1 | 26 ++ .../gGIBossSoulSkullDL_vtx_2 | 6 + .../gGIBossSoulSkullDL_vtx_3 | 58 ++++ .../gGIBossSoulSkullDL_vtx_4 | 267 ++++++++++++++++++ .../mat_gGIBossSoulSkullDL_Gem_eyes | 21 ++ .../mat_gGIBossSoulSkullDL_skull_black | 21 ++ .../mat_gGIBossSoulSkullDL_skull_eyes | 21 ++ .../mat_gGIBossSoulSkullDL_skull_horns | 21 ++ .../mat_gGIBossSoulSkullDL_skull_surface | 21 ++ .../objects/object_gi_boss_soul/noise_tex | Bin 0 -> 1116 bytes .../object_gi_boss_soul/noise_tex_copy | Bin 0 -> 2140 bytes soh/assets/soh_assets.h | 3 + soh/soh/Enhancements/randomizer/draw.cpp | 39 +-- 20 files changed, 1169 insertions(+), 16 deletions(-) create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_0 create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_1 create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_2 create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_3 create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_4 create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0 create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_1 create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_2 create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_3 create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4 create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_Gem_eyes create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_black create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_eyes create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_horns create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_surface create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/noise_tex create mode 100644 OTRExporter/assets/objects/object_gi_boss_soul/noise_tex_copy diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL new file mode 100644 index 000000000..be842d37d --- /dev/null +++ b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_0 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_0 new file mode 100644 index 000000000..87cfedfaf --- /dev/null +++ b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_0 @@ -0,0 +1,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_1 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_1 new file mode 100644 index 000000000..de52a892e --- /dev/null +++ b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_1 @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_2 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_2 new file mode 100644 index 000000000..a0b27f7e9 --- /dev/null +++ b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_2 @@ -0,0 +1,7 @@ + + + + + + + diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_3 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_3 new file mode 100644 index 000000000..6dbbdc411 --- /dev/null +++ b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_3 @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_4 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_4 new file mode 100644 index 000000000..13013ff53 --- /dev/null +++ b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_tri_4 @@ -0,0 +1,245 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0 new file mode 100644 index 000000000..82c478df5 --- /dev/null +++ b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_0 @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_1 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_1 new file mode 100644 index 000000000..2544d138b --- /dev/null +++ b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_1 @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_2 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_2 new file mode 100644 index 000000000..3de701602 --- /dev/null +++ b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_2 @@ -0,0 +1,6 @@ + + + + + + diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_3 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_3 new file mode 100644 index 000000000..80d934941 --- /dev/null +++ b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_3 @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4 b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4 new file mode 100644 index 000000000..98009f97b --- /dev/null +++ b/OTRExporter/assets/objects/object_gi_boss_soul/gGIBossSoulSkullDL_vtx_4 @@ -0,0 +1,267 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_Gem_eyes b/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_Gem_eyes new file mode 100644 index 000000000..774994e9e --- /dev/null +++ b/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_Gem_eyes @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_black b/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_black new file mode 100644 index 000000000..8a475974d --- /dev/null +++ b/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_black @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_eyes b/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_eyes new file mode 100644 index 000000000..90ecc4518 --- /dev/null +++ b/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_eyes @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_horns b/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_horns new file mode 100644 index 000000000..2ea52e133 --- /dev/null +++ b/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_horns @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_surface b/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_surface new file mode 100644 index 000000000..1b5b65898 --- /dev/null +++ b/OTRExporter/assets/objects/object_gi_boss_soul/mat_gGIBossSoulSkullDL_skull_surface @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/OTRExporter/assets/objects/object_gi_boss_soul/noise_tex b/OTRExporter/assets/objects/object_gi_boss_soul/noise_tex new file mode 100644 index 0000000000000000000000000000000000000000..aaf4e331f15f797a3b1122b58c57b3767e66bc0f GIT binary patch literal 1116 zcma)5S&rmH5G^FcIk*X5eDlKxBf5LKx?JVw&9uYY}ZlKyY|id266pZ|L)_-3^t z{^e>VIz`u(`^dKQ%g2w`bDu%x{^r%I8%i=wg`pMy&>oT`wvAwTeqNf)RT*l1cl(+W z4O3wm5FDBuCz%Uiv0TQ&*Cj#VNy!7F8h~R}KQ9uTqZsmTyW<5x_pt+H9l4&R zNV*$EuA#8o9Vc?s{bsv;)Pm5GMBTP6z|sQ5v2V)EX1(5QHV?AIOLmqzz`$u>%G@KX zAm1U#Q1`b#-cdY`0zWyHA&UB`uvJOq1z;j%s@!gUchADQtBSnLBiuZ{ObIeINsvAl zKp>GPf~X&wGE1T`oqzfLxlOSLfeJL;gpe$uxkXczdF&C0F2DWpa%!p~b}e0&RKxLI z%T231NzwpnD1Z9&={oddS76r=ISB@l@A&(Ji`>A~6jZ+b`Tf)mbH67OcwTj)5Scc{ zK!pLxobvMFI`+$@k4zv-0AY+25fE@S6z$W{&&H?oX}(_jP*+sLjS^qu9wmr;+rj%{ zAEy-|@BH@CVH4;m%+kORMa{#BXIWla6lGO6!#wp(?ire4hv`1{96uqtA;^bi)3$9t zo$9i#W2i_9OzJvM;xx4+nwI?IFm%JTj73}=LclXD2+J}FLmcRYNZGH3zUij9O&r(N zIC{GkOwTb52m2bcW%RfiySf=qM4ckHqqfwB78L>#iUN&&l-#mE4Q;=iy9hjP)*G6p zcAUU-vK4wNFT$)pja`3!_q^mt=2&vXvP9&Xrb8$zFlv{%J+_yZm#3OgWf__(%K$o# zDT@+s;Ci{tRaQ>d>(W(+JVHPr6kC2^iS&+v`RR%Lt01bUX&g>t6B|4yh?4GjP~1K+ zRyjYNyVUUyr+Hf5EKR78{fMr0WJ>e{hlZM*At{kGk< zoB8^f@B6V|^o#wtA9sD8b<1}4`pMPKy5;JSt6Sz1_+WFbkE_FGzU#q*&dPQML+cGs(0eCWBAFIAB+{qL)^;J{#(*^U779F9Cck7oMvyi7MiAz1X(~0sQ40!#}eYwJr z)w$3!#TWA08q`zmoX`3-iMlqu)Ut1KlNXALA#>#Hnt0flT_;zLs4+)eg_T-0z2Jv# z==wz%=q<_ft_t{={8V=eviFAWeF#3h{wM3p2TJs82JFS)hc4641%p29MHs>^6Wz%( z_P%H)*j`R&0VaIl)cQF&g7^Hu`S~RA&8l$%2Rru~ep=hPLVc9b!Em_yQawC50ZL_7 zkVWyC0UUWR_wL|gup?AW-state.gfxCtx); - + OPEN_DISPS(play->state.gfxCtx); + Gfx_SetupDL_25Xlu(play->state.gfxCtx); - gSPSegment(POLY_XLU_DISP++, 8, (uintptr_t)Gfx_TwoTexScroll( - play->state.gfxCtx, 0, 0 * (play->state.frames * 0), - 0 * (play->state.frames * 0), 16, 32, 1, 1 * (play->state.frames * 1), - -1 * (play->state.frames * 8), 16, 32 - )); - Matrix_Push(); - Matrix_Translate(0.0f, -50.0f, 0.0f, MTXMODE_APPLY); - Matrix_Scale(3.0f, 3.0f, 3.0f, MTXMODE_APPLY); - Matrix_ReplaceRotation(&play->billboardMtxF); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD); - gDPSetGrayscaleColor(POLY_XLU_DISP++, colors[slot][0], colors[slot][1], colors[slot][2], 255); - gSPGrayscale(POLY_XLU_DISP++, true); - gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gGiBlueFireFlameDL); - gSPGrayscale(POLY_XLU_DISP++, false); - Matrix_Pop(); + gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gBossSoulSkullDL); + + + // TODO Add flame as backdrop for test model? + // Gfx_SetupDL_25Xlu(play->state.gfxCtx); + // gSPSegment(POLY_XLU_DISP++, 8, (uintptr_t)Gfx_TwoTexScroll( + // play->state.gfxCtx, 0, 0 * (play->state.frames * 0), + // 0 * (play->state.frames * 0), 16, 32, 1, 1 * (play->state.frames * 1), + // -1 * (play->state.frames * 8), 16, 32 + // )); + // Matrix_Push(); + // gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), + // G_MTX_MODELVIEW | G_MTX_LOAD); + // //Matrix_Translate(0.0f, -50.0f, 0.0f, MTXMODE_APPLY); + // //Matrix_Scale(5.0f, 5.0f, 5.0f, MTXMODE_APPLY); + // Matrix_ReplaceRotation(&play->billboardMtxF); + // gDPSetGrayscaleColor(POLY_XLU_DISP++, colors[slot][0], colors[slot][1], colors[slot][2], 255); + // gSPGrayscale(POLY_XLU_DISP++, true); + // gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gGiBlueFireFlameDL); + // gSPGrayscale(POLY_XLU_DISP++, false); + // Matrix_Pop(); CLOSE_DISPS(play->state.gfxCtx);