summaryrefslogtreecommitdiff
path: root/src/d/d_drawlist.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/d/d_drawlist.cpp')
-rw-r--r--src/d/d_drawlist.cpp225
1 files changed, 13 insertions, 212 deletions
diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp
index 6f8a0ed0..05528a2a 100644
--- a/src/d/d_drawlist.cpp
+++ b/src/d/d_drawlist.cpp
@@ -774,196 +774,20 @@ void dDlst_alphaModelData_c::set(u8 type, Mtx mtx, u8 alpha) {
#include "assets/l_frontZMat.h"
#include "assets/l_frontNoZSubMat.h"
-static Vec l_bonboriPos[] = {
- {0.0f, -200.0f, 0.0f},
- {0.0f, 200.0f, 0.0f},
- {100.0f, -173.205093f, 0.0f},
- {160.02063f, -100.0f, -66.282722f},
- {200.0f, 0.000006f, 0.0f},
- {160.020615f, 100.000008f, -66.282715f},
- {99.999992f, 173.205093f, 0.0f},
- {70.710678f, -173.205093f, -70.710678f},
- {66.282715f, -100.0f, -160.02063f},
- {141.421356f, 0.000006f, -141.421356f},
- {66.282707f, 100.000008f, -160.020615f},
- {70.71067f, 173.205093f, -70.71067f},
- {0.0f, -173.205093f, -100.0f},
- {-66.282722f, -100.0f, -160.02063f},
- {0.0f, 0.000006f, -200.0f},
- {-66.282715f, 100.000008f, -160.020615f},
- {0.0f, 173.205093f, -99.999985f},
- {-70.710678f, -173.205093f, -70.710678f},
- {-160.02063f, -100.0f, -66.282715f},
- {-141.421356f, 0.000006f, -141.421356f},
- {-160.020615f, 100.000008f, -66.282707f},
- {-70.710663f, 173.205093f, -70.710663f},
- {-100.0f, -173.205093f, 0.0f},
- {-160.02063f, -100.0f, 66.282722f},
- {-200.0f, 0.000006f, 0.0f},
- {-160.020615f, 100.000008f, 66.282715f},
- {-99.999985f, 173.205093f, 0.0f},
- {-70.710678f, -173.205093f, 70.710678f},
- {-66.282715f, -100.0f, 160.02063f},
- {-141.421356f, 0.000006f, 141.421356f},
- {-66.282707f, 100.000008f, 160.020615f},
- {-70.710663f, 173.205093f, 70.710663f},
- {0.0f, -173.205093f, 100.0f},
- {66.282722f, -100.0f, 160.02063f},
- {0.0f, 0.000006f, 200.0f},
- {66.282715f, 100.000008f, 160.020615f},
- {0.0f, 173.205093f, 99.999985f},
- {70.710678f, -173.205093f, 70.710678f},
- {160.02063f, -100.0f, 66.282715f},
- {141.421356f, 0.000006f, 141.421356f},
- {160.020615f, 100.000008f, 66.282707f},
- {70.710663f, 173.205093f, 70.710663f},
-};
+#include "assets/l_bonboriPos__d_drawlist.h"
+
#include "assets/l_bonboriDL.h"
-static Vec l_s_beam_checkPos[] = {
- {-97.608604f, -300.359589f, -0.000003f},
- {-255.533127f, -185.632721f, 0.000074f},
- {97.596741f, -300.359589f, -0.000003f},
- {255.521301f, -185.632492f, 0.000074f},
- {315.842987f, 0.00022f, 0.000074f},
- {255.521301f, 185.63269f, 0.000074f},
- {97.596741f, 300.359558f, 0.000074f},
- {-97.608643f, 300.359558f, 0.000074f},
- {-255.533127f, 185.632385f, 0.000074f},
- {-315.855103f, 0.000068f, 0.000074f},
- {449.556976f, 326.593872f, 9589.144531f},
- {-449.568787f, 326.593262f, 9589.144531f},
- {-171.723236f, 528.439392f, 9589.144531f},
- {171.711975f, 528.439392f, 9589.144531f},
- {555.685181f, 0.000297f, 9589.144531f},
- {-555.697266f, 0.000068f, 9589.144531f},
- {449.556976f, -326.593475f, 9589.144531f},
- {-449.568787f, -326.593842f, 9589.144531f},
- {171.711975f, -528.439453f, 9589.144531f},
- {-171.723236f, -528.439453f, 9589.144531f},
- {-178.75293f, -245.999161f, -0.000003f},
- {-0.005948f, -304.071503f, -0.000003f},
- {178.741028f, -245.999008f, -0.000003f},
- {289.212738f, -93.963249f, 0.000074f},
- {289.212738f, 93.963455f, 0.000074f},
- {178.741028f, 245.99913f, 0.000074f},
- {-0.005986f, 304.071564f, 0.000074f},
- {-178.75293f, 245.998978f, 0.000074f},
- {-289.224701f, 93.963226f, 0.000074f},
- {-289.224701f, -93.963333f, 0.000074f},
- {-326.284088f, 449.037415f, 9589.144531f},
- {-0.00591f, 555.040955f, 9589.144531f},
- {326.272583f, 449.037415f, 9589.144531f},
- {527.922791f, 171.517319f, 9589.144531f},
- {-527.934937f, 171.516785f, 9589.144531f},
- {527.922791f, -171.516815f, 9589.144531f},
- {-527.934937f, -171.517044f, 9589.144531f},
- {326.272583f, -449.037384f, 9589.144531f},
- {-0.005872f, -555.040894f, 9589.144531f},
- {-326.284027f, -449.037384f, 9589.144531f},
-};
+#include "assets/l_s_beam_checkPos__d_drawlist.h"
+
#include "assets/l_s_beam_checkDL.h"
-static Vec l_cubePos[] = {
- {-0.5f, -0.5f, -0.5f},
- {-0.5f, -0.5f, 0.5f},
- {-0.5f, 0.5f, -0.5f},
- {-0.5f, 0.5f, 0.5f},
- {0.5f, -0.5f, -0.5f},
- {0.5f, -0.5f, 0.5f},
- {0.5f, 0.5f, -0.5f},
- {0.5f, 0.5f, 0.5f},
-};
+#include "assets/l_cubePos__d_drawlist.h"
+
#include "assets/l_cubeDL.h"
-static Vec l_bonbori2Pos[] = {
- {33.141357f, -92.387955f, -19.134167f},
- {19.134172f, -92.387955f, -33.141354f},
- {0.000003f, -92.387955f, -38.268341f},
- {-19.134167f, -92.387955f, -33.141357f},
- {-33.141354f, -92.387955f, -19.134171f},
- {-38.268341f, -92.387955f, -0.000002f},
- {-33.141357f, -92.387955f, 19.134169f},
- {-19.134172f, -92.387955f, 33.141357f},
- {-0.000001f, -92.387955f, 38.268341f},
- {19.134171f, -92.387955f, 33.141357f},
- {33.141357f, -92.387955f, 19.134172f},
- {38.268345f, -92.387955f, 0.0f},
- {61.23724f, -70.710678f, -35.355331f},
- {35.355339f, -70.710678f, -61.237236f},
- {0.000005f, -70.710678f, -70.71067f},
- {-35.355331f, -70.710678f, -61.23724f},
- {-61.237236f, -70.710678f, -35.355335f},
- {-70.71067f, -70.710678f, -0.000003f},
- {-61.23724f, -70.710678f, 35.355331f},
- {-35.355339f, -70.710678f, 61.23724f},
- {-0.000002f, -70.710678f, 70.71067f},
- {35.355335f, -70.710678f, 61.237244f},
- {61.237244f, -70.710678f, 35.355339f},
- {70.710678f, -70.710678f, 0.0f},
- {80.010307f, -38.268341f, -46.193966f},
- {46.193977f, -38.268341f, -80.0103f},
- {0.000007f, -38.268341f, -92.387939f},
- {-46.193966f, -38.268341f, -80.010307f},
- {-80.0103f, -38.268341f, -46.193974f},
- {-92.387939f, -38.268341f, -0.000004f},
- {-80.010307f, -38.268341f, 46.193966f},
- {-46.193977f, -38.268341f, 80.010307f},
- {-0.000002f, -38.268341f, 92.387939f},
- {46.193974f, -38.268341f, 80.010307f},
- {80.010307f, -38.268341f, 46.193977f},
- {92.387955f, -38.268341f, 0.0f},
- {86.602531f, 0.0f, -49.999989f},
- {50.0f, 0.0f, -86.602524f},
- {0.000007f, 0.0f, -99.999992f},
- {-49.999989f, 0.0f, -86.602531f},
- {-86.602524f, 0.0f, -49.999996f},
- {-99.999992f, 0.0f, -0.000005f},
- {-86.602531f, 0.0f, 49.999989f},
- {-50.0f, 0.0f, 86.602531f},
- {-0.000003f, 0.0f, 99.999992f},
- {49.999996f, 0.0f, 86.602531f},
- {86.602531f, 0.0f, 50.0f},
- {100.0f, 0.0f, 0.0f},
- {80.010307f, 38.268341f, -46.193966f},
- {46.193977f, 38.268341f, -80.0103f},
- {0.000007f, 38.268341f, -92.387939f},
- {-46.193966f, 38.268341f, -80.010307f},
- {-80.0103f, 38.268341f, -46.193974f},
- {-92.387939f, 38.268341f, -0.000004f},
- {-80.010307f, 38.268341f, 46.193966f},
- {-46.193977f, 38.268341f, 80.010307f},
- {-0.000002f, 38.268341f, 92.387939f},
- {46.193974f, 38.268341f, 80.010307f},
- {80.010307f, 38.268341f, 46.193977f},
- {92.387955f, 38.268341f, 0.0f},
- {61.23724f, 70.710678f, -35.355331f},
- {35.355339f, 70.710678f, -61.237236f},
- {0.000005f, 70.710678f, -70.71067f},
- {-35.355331f, 70.710678f, -61.23724f},
- {-61.237236f, 70.710678f, -35.355335f},
- {-70.71067f, 70.710678f, -0.000003f},
- {-61.23724f, 70.710678f, 35.355331f},
- {-35.355339f, 70.710678f, 61.23724f},
- {-0.000002f, 70.710678f, 70.71067f},
- {35.355335f, 70.710678f, 61.237244f},
- {61.237244f, 70.710678f, 35.355339f},
- {70.710678f, 70.710678f, 0.0f},
- {33.141357f, 92.387955f, -19.134167f},
- {19.134172f, 92.387955f, -33.141354f},
- {0.000003f, 92.387955f, -38.268341f},
- {-19.134167f, 92.387955f, -33.141357f},
- {-33.141354f, 92.387955f, -19.134171f},
- {-38.268341f, 92.387955f, -0.000002f},
- {-33.141357f, 92.387955f, 19.134169f},
- {-19.134172f, 92.387955f, 33.141357f},
- {-0.000001f, 92.387955f, 38.268341f},
- {19.134171f, 92.387955f, 33.141357f},
- {33.141357f, 92.387955f, 19.134172f},
- {38.268345f, 92.387955f, 0.0f},
- {0.0f, -100.0f, 0.0f},
- {0.0f, 100.0f, 0.0f},
-};
+#include "assets/l_bonbori2Pos__d_drawlist.h"
+
#include "assets/l_bonbori2DL.h"
/* 80082838-80082E44 .text draw__22dDlst_alphaModelData_cFPA4_f */
@@ -1144,16 +968,8 @@ BOOL dDlst_alphaModel_c::draw(Mtx mtx) {
return TRUE;
}
-static Vec l_shadowVolPos[] = {
- {-1.0f, -1.0f, 0.0f},
- {-1.0f, -1.0f, -300.0f},
- {-1.0f, 1.0f, 0.0f},
- {-1.0f, 1.0f, -300.0f},
- {1.0f, -1.0f, 0.0f},
- {1.0f, -1.0f, -300.0f},
- {1.0f, 1.0f, 0.0f},
- {1.0f, 1.0f, -300.0f},
-};
+#include "assets/l_shadowVolPos__d_drawlist.h"
+
#include "assets/l_shadowVolDL.h"
#include "assets/l_shadowProjMat.h"
#include "assets/l_shadowVolMat.h"
@@ -1161,22 +977,7 @@ static Vec l_shadowVolPos[] = {
#include "assets/l_frontMat.h"
#include "assets/l_backSubMat.h"
-static Vec l_simpleShadowPos[] = {
- {0.0f, -1.0f, 0.0f},
- {0.0f, 0.0f, 0.0f},
- {1.0f, -1.0f, -1.0f},
- {1.0f, 0.0f, -1.0f},
- {-1.0f, -1.0f, -1.0f},
- {-1.0f, 0.0f, -1.0f},
- {-1.0f, -1.0f, 1.0f},
- {-1.0f, 0.0f, 1.0f},
- {1.0f, -1.0f, 1.0f},
- {1.0f, 0.0f, 1.0f},
- {-1.0f, 1.0f, -1.0f},
- {1.0f, 1.0f, -1.0f},
- {1.0f, 1.0f, 1.0f},
- {-1.0f, 1.0f, 1.0f},
-};
+#include "assets/l_simpleShadowPos__d_drawlist.h"
#include "assets/l_shadowVolumeDL.h"
@@ -2003,7 +1804,7 @@ void dDlst_alphaVolPacket::draw() {
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
GXClearVtxDesc();
GXSetVtxDesc(GX_VA_POS, GX_INDEX8);
- GXSetArray(GX_VA_POS, (void*)l_simpleShadowPos, sizeof(*l_simpleShadowPos));
+ GXSetArray(GX_VA_POS, l_simpleShadowPos, sizeof(*l_simpleShadowPos));
GXLoadPosMtxImm(mtx, GX_PNMTX0);
GXSetCurrentMtx(GX_PNMTX0);
GXCallDisplayList(l_frontMat, 0x40);
@@ -2024,7 +1825,7 @@ void dDlst_alphaInvVolPacket::draw() {
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
GXClearVtxDesc();
GXSetVtxDesc(GX_VA_POS, GX_INDEX8);
- GXSetArray(GX_VA_POS, (void*)l_simpleShadowPos, sizeof(*l_simpleShadowPos));
+ GXSetArray(GX_VA_POS, l_simpleShadowPos, sizeof(*l_simpleShadowPos));
GXLoadPosMtxImm(mtx, GX_PNMTX0);
GXSetCurrentMtx(GX_PNMTX0);
GXSetTevColor(GX_TEVREG0, g_whiteColor);
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 01:44:20 +0000