mirror of
https://github.com/HarbourMasters/SpaghettiKart
synced 2026-07-09 23:02:11 -04:00
Fix compile (#80)
* Fix compile * Fix compile * Fix mtx in fb effects --------- Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com>
This commit is contained in:
MegaMech
@@ -94,6 +94,7 @@ include_directories(
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/audio
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/debug
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/networking
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/enhancements
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/enhancements/freecam
|
||||
)
|
||||
|
||||
@@ -134,6 +135,8 @@ file(GLOB_RECURSE ALL_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
"courses/*.h"
|
||||
"src/networking/*.c"
|
||||
"src/networking/*.h"
|
||||
"src/enhancements/*.c"
|
||||
"src/enhancements/*.h"
|
||||
"src/enhancements/freecam/*.c"
|
||||
"src/enhancements/freecam/*.h"
|
||||
)
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
// mario raceway
|
||||
{ 4.1666665f, 5.5833334f, 6.1666665f, 6.75f, },
|
||||
// choco mountain
|
||||
{ 4.1666665f, 5.5833334f, 6.1666665f, 6.75f, },
|
||||
// bowser's castle
|
||||
{ 4.1666665f, 5.5833334f, 6.1666665f, 6.75f, },
|
||||
// banshee boardwalk
|
||||
{ 4.1666665f, 5.5833334f, 6.1666665f, 6.75f, },
|
||||
// yoshi valley
|
||||
{ 4.1666665f, 5.5833334f, 6.1666665f, 6.75f, },
|
||||
// frappe snowland
|
||||
{ 4.1666665f, 5.5833334f, 6.1666665f, 6.75f, },
|
||||
// koopa troopa beach
|
||||
{ 4.1666665f, 5.5833334f, 6.1666665f, 6.75f, },
|
||||
// royal raceway
|
||||
{ 4.1666665f, 5.5833334f, 6.1666665f, 6.75f, },
|
||||
// luigi raceway
|
||||
{ 4.1666665f, 5.5833334f, 6.1666665f, 6.75f, },
|
||||
// moo moo farm
|
||||
{ 4.1666665f, 5.5833334f, 6.1666665f, 6.75f, },
|
||||
// toad's turnpike
|
||||
{ 4.1666665f, 5.5833334f, 6.1666665f, 6.75f, },
|
||||
// kalimari desert
|
||||
{ 4.1666665f, 5.5833334f, 6.1666665f, 6.75f, },
|
||||
// sherbet land
|
||||
{ 4.1666665f, 5.5833334f, 6.1666665f, 6.75f, },
|
||||
// rainbow road
|
||||
{ 4.1666665f, 5.5833334f, 6.1666665f, 6.75f, },
|
||||
// wario stadium
|
||||
{ 4.1666665f, 5.5833334f, 6.1666665f, 6.75f, },
|
||||
// block fort
|
||||
{ 4.1666665f, 5.5833334f, 6.1666665f, 6.75f, },
|
||||
// skyscraper
|
||||
{ 4.1666665f, 5.5833334f, 6.1666665f, 6.75f, },
|
||||
// double deck
|
||||
{ 4.1666665f, 5.5833334f, 6.1666665f, 6.75f, },
|
||||
// d.k.'s jungle parkway
|
||||
{ 4.1666665f, 5.5833334f, 6.1666665f, 6.75f, },
|
||||
// big donut
|
||||
{ 4.1666665f, 5.5833334f, 6.1666665f, 6.75f, },
|
||||
// null
|
||||
{ 0.0f, 0.0f, 0.0f, 0.0f, },
|
||||
@@ -1,42 +0,0 @@
|
||||
// mario raceway
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// choco mountain
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// bowser's castle
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// banshee boardwalk
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// yoshi valley
|
||||
{ 3.75f, 4.5833334f, 4.5833334f, 4.5833334f, },
|
||||
// frappe snowland
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// koopa troopa beach
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// royal raceway
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// luigi raceway
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// moo moo farm
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// toad's turnpike
|
||||
{ 4.1666665f, 5.5833334f, 6.1666665f, 6.75f, },
|
||||
// kalimari desert
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// sherbet land
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// rainbow road
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// wario stadium
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// block fort
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// skyscraper
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// double deck
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// d.k.'s jungle parkway
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// big donut
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// null
|
||||
{ 0.0f, 0.0f, 0.0f, 0.0f, },
|
||||
@@ -1,42 +0,0 @@
|
||||
// mario raceway
|
||||
{ 3.3333332f, 3.9166667f, 4.5f, 5.0833334f, },
|
||||
// choco mountain
|
||||
{ 3.3333332f, 3.9166667f, 4.5f, 5.0833334f, },
|
||||
// bowser's castle
|
||||
{ 3.3333332f, 3.9166667f, 4.5f, 5.0833334f, },
|
||||
// banshee boardwalk
|
||||
{ 3.3333332f, 3.9166667f, 4.5f, 5.0833334f, },
|
||||
// yoshi valley
|
||||
{ 3.3333332f, 3.3333332f, 3.3333332f, 3.3333332f, },
|
||||
// frappe snowland
|
||||
{ 3.3333332f, 3.9166667f, 4.5f, 5.0833334f, },
|
||||
// koopa troopa beach
|
||||
{ 3.3333332f, 3.9166667f, 4.5f, 5.0833334f, },
|
||||
// royal raceway
|
||||
{ 3.3333332f, 3.9166667f, 4.5f, 5.0833334f, },
|
||||
// luigi raceway
|
||||
{ 3.3333332f, 3.9166667f, 4.5f, 5.0833334f, },
|
||||
// moo moo farm
|
||||
{ 3.3333332f, 3.9166667f, 4.5f, 5.0833334f, },
|
||||
// toad's turnpike
|
||||
{ 3.3333332f, 3.9166667f, 4.5f, 5.0833334f, },
|
||||
// kalimari desert
|
||||
{ 3.3333332f, 3.9166667f, 4.5f, 5.0833334f, },
|
||||
// sherbet land
|
||||
{ 3.3333332f, 3.9166667f, 4.5f, 5.0833334f, },
|
||||
// rainbow road
|
||||
{ 3.3333332f, 3.9166667f, 4.5f, 5.0833334f, },
|
||||
// wario stadium
|
||||
{ 3.3333332f, 3.9166667f, 4.5f, 5.0833334f, },
|
||||
// block fort
|
||||
{ 3.3333332f, 3.9166667f, 4.5f, 5.0833334f, },
|
||||
// skyscraper
|
||||
{ 3.3333332f, 3.9166667f, 4.5f, 5.0833334f, },
|
||||
// double deck
|
||||
{ 3.3333332f, 3.9166667f, 4.5f, 5.0833334f, },
|
||||
// d.k.'s jungle parkway
|
||||
{ 3.3333332f, 3.9166667f, 4.5f, 5.0833334f, },
|
||||
// big donut
|
||||
{ 3.3333332f, 3.9166667f, 4.5f, 5.0833334f, },
|
||||
// null
|
||||
{ 0.0f, 0.0f, 0.0f, 0.0f, },
|
||||
@@ -1,42 +0,0 @@
|
||||
// mario raceway
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// choco mountain
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// bowser's castle
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// banshee boardwalk
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// yoshi valley
|
||||
{ 2.9166667f, 3.75f, 3.75f, 3.75f, },
|
||||
// frappe snowland
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// koopa troopa beach
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// royal raceway
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// luigi raceway
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// moo moo farm
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// toad's turnpike
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// kalimari desert
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// sherbet land
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// rainbow road
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// wario stadium
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// block fort
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// skyscraper
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// double deck
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// d.k.'s jungle parkway
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// big donut
|
||||
{ 3.75f, 5.1666665f, 5.75f, 6.3333334f, },
|
||||
// null
|
||||
{ 0.0f, 0.0f, 0.0f, 0.0f, },
|
||||
@@ -1 +0,0 @@
|
||||
D_800DCB34, D_800DCAF4, D_800DCAF4, D_800DCAF4, D_800DCAF4, D_800DCAF4, D_800DCAF4, D_800DCAF4, D_800DCAF4, D_800DCAF4, D_800DCAF4, D_800DCAF4, D_800DCAF4, D_800DCAF4, D_800DCAF4, D_800DCAF4, D_800DCAF4, D_800DCAF4, D_800DCAF4, D_800DCAF4, D_800DCAF4,
|
||||
@@ -1,189 +0,0 @@
|
||||
{ // mario raceway
|
||||
{ 40, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 100, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 265, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 285, 1, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 420, 1, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
},
|
||||
{ // choco mountain
|
||||
{ 140, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 165, 1, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 330, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 550, 1, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 595, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
},
|
||||
{ // bowser's castle
|
||||
{ 50, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 150, 1, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 200, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 260, 1, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 435, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
},
|
||||
{ // banshee boardwalk
|
||||
{ 110, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 190, 1, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 250, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 475, 1, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 610, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
},
|
||||
{ // yoshi valley
|
||||
{ 0, 0, 0.8333333, -1533, -682, -103, 0 },
|
||||
{ 10, 0, 0.8333333, -1565, -619, -109, 0 },
|
||||
{ 20, 0, 0.8333333, -1529, -579, -109, 0 },
|
||||
{ 30, 0, 0.8333333, -1588, -534, -106, 0 },
|
||||
{ 40, 0, 0.8333333, -1598, -207, -105, 0 },
|
||||
{ 50, 0, 0.8333333, -1646, -147, -93, 0 },
|
||||
{ 60, 0, 0.8333333, -2532, -445, -90, 0 },
|
||||
},
|
||||
{ // frappe snowland
|
||||
{ 50, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 100, 1, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 150, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 290, 1, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 350, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
},
|
||||
{ // koopa troopa beach
|
||||
{ 60, 1, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 120, 1, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 200, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 280, 1, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 435, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
},
|
||||
{ // royal raceway
|
||||
{ 50, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 100, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 296, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 400, 1, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 746, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
},
|
||||
{ // luigi raceway
|
||||
{ 50, 1, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 200, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 305, 1, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 440, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 515, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
},
|
||||
{ // moo moo farm
|
||||
{ 50, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 140, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 225, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 316, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 434, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
},
|
||||
{ // toad's turnpike
|
||||
{ 50, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 100, 1, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 150, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 200, 1, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 250, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
},
|
||||
{ // kalimari desert
|
||||
{ 50, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 138, 1, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 280, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 404, 1, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 510, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
},
|
||||
{ // sherbet land
|
||||
{ 50, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 100, 1, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 150, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 200, 1, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 250, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
},
|
||||
{ // rainbow road
|
||||
{ 50, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 100, 1, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 150, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 200, 1, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 250, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
},
|
||||
{ // wario stadium
|
||||
{ 50, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 100, 1, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 150, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 200, 1, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 250, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
},
|
||||
{ // block fort
|
||||
{ 20, 0, 1.0, 0, 0, 0, 0 },
|
||||
{ 40, 0, 1.0, 0, 0, 0, 0 },
|
||||
{ 60, 0, 1.0, 0, 0, 0, 0 },
|
||||
{ 80, 0, 1.0, 0, 0, 0, 0 },
|
||||
{ 100, 0, 1.0, 0, 0, 0, 0 },
|
||||
{ 120, 0, 1.0, 0, 0, 0, 0 },
|
||||
{ 140, 0, 1.0, 0, 0, 0, 0 },
|
||||
},
|
||||
{ // skyscraper
|
||||
{ 20, 0, 1.0, 0, 0, 0, 0 },
|
||||
{ 40, 0, 1.0, 0, 0, 0, 0 },
|
||||
{ 60, 0, 1.0, 0, 0, 0, 0 },
|
||||
{ 80, 0, 1.0, 0, 0, 0, 0 },
|
||||
{ 100, 0, 1.0, 0, 0, 0, 0 },
|
||||
{ 120, 0, 1.0, 0, 0, 0, 0 },
|
||||
{ 140, 0, 1.0, 0, 0, 0, 0 },
|
||||
},
|
||||
{ // double deck
|
||||
{ 20, 0, 1.0, 0, 0, 0, 0 },
|
||||
{ 40, 0, 1.0, 0, 0, 0, 0 },
|
||||
{ 60, 0, 1.0, 0, 0, 0, 0 },
|
||||
{ 80, 0, 1.0, 0, 0, 0, 0 },
|
||||
{ 100, 0, 1.0, 0, 0, 0, 0 },
|
||||
{ 120, 0, 1.0, 0, 0, 0, 0 },
|
||||
{ 140, 0, 1.0, 0, 0, 0, 0 },
|
||||
},
|
||||
{ // d.k.'s jungle parkway
|
||||
{ 50, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 100, 1, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 150, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 190, 1, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 250, 3, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
{ 0, 0, 0.8333333, 0, 0, 0, 0 },
|
||||
},
|
||||
{ // big donut
|
||||
{ 20, 0, 1.0, 0, 0, 0, 0 },
|
||||
{ 40, 0, 1.0, 0, 0, 0, 0 },
|
||||
{ 60, 0, 1.0, 0, 0, 0, 0 },
|
||||
{ 80, 0, 1.0, 0, 0, 0, 0 },
|
||||
{ 100, 0, 1.0, 0, 0, 0, 0 },
|
||||
{ 120, 0, 1.0, 0, 0, 0, 0 },
|
||||
{ 140, 0, 1.0, 0, 0, 0, 0 },
|
||||
},
|
||||
{ // null
|
||||
{ 3, 5, 1.25, 0, 0, 0, 0 },
|
||||
{ 40, 0, 1.0, 0, 0, 0, 0 },
|
||||
{ 60, 0, 1.0, 0, 0, 0, 0 },
|
||||
{ 80, 0, 1.0, 0, 0, 0, 0 },
|
||||
{ 100, 0, 1.0, 0, 0, 0, 0 },
|
||||
{ 120, 0, 1.0, 0, 0, 0, 0 },
|
||||
{ 140, 0, 1.0, 0, 0, 0, 0 },
|
||||
},
|
||||
@@ -1 +0,0 @@
|
||||
48, 53, 53, 53, 53, 53, 53, 53, 48, 48, 40, 53, 53, 38, 53, 53, 53, 53, 53, 40, 53, 0
|
||||
@@ -1 +0,0 @@
|
||||
"m circuit", "mountain", "castle", "ghost", "maze", "snow", "beach", "p circuit", "l circuit", "farm", "highway", "desert", "sherbet", "rainbow", "stadium", "block", "skyscraper", "deck", "jungle", "doughnut",
|
||||
@@ -1 +0,0 @@
|
||||
"mario raceway", "choco mountain", "bowser's castle", "banshee boardwalk", "yoshi valley", "frappe snowland", "koopa troopa beach", "royal raceway", "luigi raceway", "moo moo farm", "toad's turnpike", "kalimari desert", "sherbet land", "rainbow road", "wario stadium", "block fort", "skyscraper", "double deck", "d.k.'s jungle parkway", "big donut",
|
||||
@@ -1,42 +0,0 @@
|
||||
// mario raceway
|
||||
{ 600, 1, 1, 1, 1, {0, 0, 0}},
|
||||
// choco mountain
|
||||
{ 700, 1, 1, 1, 1, {0, 0, 0}},
|
||||
// bowser's castle
|
||||
{ 780, 1, 1, 1, 1, {0, 0, 0}},
|
||||
// banshee boardwalk
|
||||
{ 750, 1, 1, 1, 1, {0, 0, 0}},
|
||||
// yoshi valley
|
||||
{ 690, 680, 690, 800, 1, {0, 0, 0}},
|
||||
// frappe snowland
|
||||
{ 750, 1, 1, 1, 1, {0, 0, 0}},
|
||||
// koopa troopa beach
|
||||
{ 700, 1, 1, 1, 1, {0, 0, 0}},
|
||||
// royal raceway
|
||||
{ 1000, 1, 1, 1, 1, {0, 0, 0}},
|
||||
// luigi raceway
|
||||
{ 730, 1, 1, 1, 1, {0, 0, 0}},
|
||||
// moo moo farm
|
||||
{ 560, 1, 1, 1, 1, {0, 0, 0}},
|
||||
// toad's turnpike
|
||||
{ 1000, 1, 1, 1, 1, {0, 0, 0}},
|
||||
// kalimari desert
|
||||
{ 700, 1, 1, 1, 550, {0, 0, 0}},
|
||||
// sherbet land
|
||||
{ 700, 1, 1, 1, 1, {0, 0, 0}},
|
||||
// rainbow road
|
||||
{ 1900, 1, 1, 1, 1, {0, 0, 0}},
|
||||
// wario stadium
|
||||
{ 1600, 1, 1, 1, 1, {0, 0, 0}},
|
||||
// block fort
|
||||
{ 1, 1, 1, 1, 1, {0, 0, 0}},
|
||||
// skyscraper
|
||||
{ 1, 1, 1, 1, 1, {0, 0, 0}},
|
||||
// double deck
|
||||
{ 1, 1, 1, 1, 1, {0, 0, 0}},
|
||||
// d.k.'s jungle parkway
|
||||
{ 880, 1, 1, 1, 500, {0, 0, 0}},
|
||||
// big donut
|
||||
{ 1, 1, 1, 1, 1, {0, 0, 0}},
|
||||
// null
|
||||
{ 500, 500, 500, 500, 1, {0, 0, 0}},
|
||||
@@ -1,42 +0,0 @@
|
||||
// mario raceway
|
||||
{ d_course_mario_raceway_track_waypoints, &nullPath, &nullPath, &nullPath, },
|
||||
// choco mountain
|
||||
{ d_course_choco_mountain_track_waypoints, &nullPath, &nullPath, &nullPath, },
|
||||
// bowser's castle
|
||||
{ d_course_bowsers_castle_track_waypoints, &nullPath, &nullPath, &nullPath, },
|
||||
// banshee boardwalk
|
||||
{ d_course_banshee_boardwalk_track_waypoints, &nullPath, &nullPath, &nullPath, },
|
||||
// yoshi valley
|
||||
{ d_course_yoshi_valley_track_waypoints, d_course_yoshi_valley_track_waypoints_2, d_course_yoshi_valley_track_waypoints_3, d_course_yoshi_valley_track_waypoints_4, },
|
||||
// frappe snowland
|
||||
{ d_course_frappe_snowland_track_waypoints, &nullPath, &nullPath, &nullPath, },
|
||||
// koopa troopa beach
|
||||
{ d_course_koopa_troopa_beach_track_waypoints, d_course_koopa_troopa_beach_track_waypoints_2, &nullPath, &nullPath, },
|
||||
// royal raceway
|
||||
{ d_course_royal_raceway_track_waypoints, &nullPath, &nullPath, &nullPath, },
|
||||
// luigi raceway
|
||||
{ d_course_luigi_raceway_track_waypoints, &nullPath, &nullPath, &nullPath, },
|
||||
// moo moo farm
|
||||
{ d_course_moo_moo_farm_track_waypoints, &nullPath, &nullPath, &nullPath, },
|
||||
// toad's turnpike
|
||||
{ d_course_toads_turnpike_track_waypoints, &nullPath, &nullPath, &nullPath, },
|
||||
// kalimari desert
|
||||
{ d_course_kalimari_desert_track_waypoints, &nullPath, &nullPath, &nullPath, },
|
||||
// sherbet land
|
||||
{ d_course_sherbet_land_track_waypoints, &nullPath, &nullPath, &nullPath, },
|
||||
// rainbow road
|
||||
{ d_course_rainbow_road_track_waypoints, &nullPath, &nullPath, &nullPath, },
|
||||
// wario stadium
|
||||
{ d_course_wario_stadium_track_waypoints, &nullPath, &nullPath, &nullPath, },
|
||||
// block fort
|
||||
{ &nullPath, &nullPath, &nullPath, &nullPath, },
|
||||
// skyscraper
|
||||
{ &nullPath, &nullPath, &nullPath, &nullPath, },
|
||||
// double deck
|
||||
{ &nullPath, &nullPath, &nullPath, &nullPath, },
|
||||
// d.k.'s jungle parkway
|
||||
{ d_course_dks_jungle_parkway_track_waypoints, &nullPath, &nullPath, &nullPath, },
|
||||
// big donut
|
||||
{ &nullPath, &nullPath, &nullPath, &nullPath, },
|
||||
// null
|
||||
{ &nullPath, &nullPath, &nullPath, &nullPath, },
|
||||
@@ -1,42 +0,0 @@
|
||||
// mario raceway
|
||||
{ d_course_mario_raceway_unknown_waypoints, &nullPath, &nullPath, &nullPath, },
|
||||
// choco mountain
|
||||
{ d_course_choco_mountain_unknown_waypoints, &nullPath, &nullPath, &nullPath, },
|
||||
// bowser's castle
|
||||
{ d_course_bowsers_castle_unknown_waypoints, &nullPath, &nullPath, &nullPath, },
|
||||
// banshee boardwalk
|
||||
{ d_course_banshee_boardwalk_unknown_waypoints, &nullPath, &nullPath, &nullPath, },
|
||||
// yoshi valley
|
||||
{ d_course_yoshi_valley_unknown_waypoints, d_course_yoshi_valley_unknown_waypoints_2, d_course_yoshi_valley_unknown_waypoints_3, d_course_yoshi_valley_unknown_waypoints_4, },
|
||||
// frappe snowland
|
||||
{ d_course_frappe_snowland_unknown_waypoints, &nullPath, &nullPath, &nullPath, },
|
||||
// koopa troopa beach
|
||||
{ d_course_koopa_troopa_beach_unknown_waypoints, &nullPath, &nullPath, &nullPath, },
|
||||
// royal raceway
|
||||
{ d_course_royal_raceway_unknown_waypoints, &nullPath, &nullPath, &nullPath, },
|
||||
// luigi raceway
|
||||
{ d_course_luigi_raceway_unknown_waypoints, &nullPath, &nullPath, &nullPath, },
|
||||
// moo moo farm
|
||||
{ d_course_moo_moo_farm_unknown_waypoints, &nullPath, &nullPath, &nullPath, },
|
||||
// toad's turnpike
|
||||
{ d_course_toads_turnpike_unknown_waypoints, &nullPath, &nullPath, &nullPath, },
|
||||
// kalimari desert
|
||||
{ d_course_kalimari_desert_unknown_waypoints, &nullPath, &nullPath, &nullPath, },
|
||||
// sherbet land
|
||||
{ d_course_sherbet_land_unknown_waypoints, &nullPath, &nullPath, &nullPath, },
|
||||
// rainbow road
|
||||
{ d_course_rainbow_road_unknown_waypoints, &nullPath, &nullPath, &nullPath, },
|
||||
// wario stadium
|
||||
{ d_course_wario_stadium_unknown_waypoints, &nullPath, &nullPath, &nullPath, },
|
||||
// block fort
|
||||
{ &nullPath, &nullPath, &nullPath, &nullPath, },
|
||||
// skyscraper
|
||||
{ &nullPath, &nullPath, &nullPath, &nullPath, },
|
||||
// double deck
|
||||
{ &nullPath, &nullPath, &nullPath, &nullPath, },
|
||||
// d.k.'s jungle parkway
|
||||
{ d_course_dks_jungle_parkway_unknown_waypoints, &nullPath, &nullPath, &nullPath, },
|
||||
// big donut
|
||||
{ &nullPath, &nullPath, &nullPath, &nullPath, },
|
||||
// null
|
||||
{ podium_ceremony_path, podium_ceremony_path_2, podium_ceremony_path_3, podium_ceremony_path_4, },
|
||||
@@ -1 +0,0 @@
|
||||
FLOWER_CUP, FLOWER_CUP, STAR_CUP, SPECIAL_CUP, SPECIAL_CUP, FLOWER_CUP, MUSHROOM_CUP, STAR_CUP, MUSHROOM_CUP, MUSHROOM_CUP, FLOWER_CUP, MUSHROOM_CUP, STAR_CUP, SPECIAL_CUP, STAR_CUP, BATTLE_CUP, BATTLE_CUP, BATTLE_CUP, SPECIAL_CUP, BATTLE_CUP,
|
||||
@@ -1 +0,0 @@
|
||||
D_0D008F28, D_0D008F80, D_0D008FB8, D_0D009058, D_0D0090B8, D_0D0090F8, D_0D009158, D_0D009188, D_0D0091E8, D_0D009210, D_0D009238, D_0D009260, D_0D009280, D_0D0092C8, D_0D009310, D_0D008F18, D_0D008F18, D_0D008F18, D_0D0093C0, D_0D008F18, D_0D008F18, 0
|
||||
@@ -1 +0,0 @@
|
||||
50.0f, 35.0f, 35.0f, 40.0f, 35.0f, 50.0f, 50.0f, 50.0f, 50.0f, 50.0f, 50.0f, 50.0f, 50.0f, 50.0f, 50.0f, -1.0f, -1.0f, -1.0f, 40.0f, -1.0f, 40.0f,
|
||||
@@ -1 +0,0 @@
|
||||
0.3f, 0.3f, 0.2f, 0.4f, 0.0f, 0.3f, 0.5f, 0.4f, 0.7f, 0.5f, 0.5f, 0.3f, 0.3f, 0.4f, 0.6f, 0.1f, 0.5f, 0.5f, 0.1f, 0.5f, 0.5f,
|
||||
@@ -1 +0,0 @@
|
||||
3, 2, 3, 2, 1, 1, 2, 2, 0, 1, 0, 3, 1, 3, 0, 1, 3, 2, 0, 0,
|
||||
@@ -1 +0,0 @@
|
||||
"567m", "687m", "777m", "747m", "772m", "734m", "691m", "1025m", "717m", "527m", "1036m", "753m", "756m", "2000m", "1591m", "", "", "", "893m", "",
|
||||
@@ -1,42 +0,0 @@
|
||||
// mario raceway
|
||||
{ 128, 4280, 6136, 216, 7144, 32248, },
|
||||
// choco mountain
|
||||
{ 255, 255, 255, 255, 255, 255, },
|
||||
// bowser's castle
|
||||
{ 48, 1544, 49528, 0, 0, 0, },
|
||||
// banshee boardwalk
|
||||
{ 0, 0, 0, 0, 0, 0, },
|
||||
// yoshi valley
|
||||
{ 113, 70, 255, 255, 184, 99, },
|
||||
// frappe snowland
|
||||
{ 28, 11, 90, 0, 99, 164, },
|
||||
// koopa troopa beach
|
||||
{ 48, 1688, 54136, 216, 7144, 32248, },
|
||||
// royal raceway
|
||||
{ 238, 144, 255, 255, 224, 240, },
|
||||
// luigi raceway
|
||||
{ 128, 4280, 6136, 216, 7144, 32248, },
|
||||
// moo moo farm
|
||||
{ 0, 18, 255, 197, 211, 255, },
|
||||
// toad's turnpike
|
||||
{ 0, 2, 94, 209, 65, 23, },
|
||||
// kalimari desert
|
||||
{ 195, 231, 255, 255, 192, 0, },
|
||||
// sherbet land
|
||||
{ 128, 4280, 6136, 216, 7144, 32248, },
|
||||
// rainbow road
|
||||
{ 0, 0, 0, 0, 0, 0, },
|
||||
// wario stadium
|
||||
{ 20, 30, 56, 40, 60, 110, },
|
||||
// block fort
|
||||
{ 128, 4280, 6136, 216, 7144, 32248, },
|
||||
// skyscraper
|
||||
{ 0, 0, 0, 0, 0, 0, },
|
||||
// double deck
|
||||
{ 113, 70, 255, 255, 184, 99, },
|
||||
// d.k.'s jungle parkway
|
||||
{ 255, 174, 0, 255, 229, 124, },
|
||||
// big donut
|
||||
{ 0, 0, 0, 0, 0, 0, },
|
||||
// null
|
||||
{ 238, 144, 255, 255, 224, 240, },
|
||||
@@ -1,42 +0,0 @@
|
||||
// mario raceway
|
||||
{ 0, 0, 0, 0, 0, 0, },
|
||||
// choco mountain
|
||||
{ 255, 255, 255, 255, 255, 255, },
|
||||
// bowser's castle
|
||||
{ 0, 0, 0, 0, 0, 0, },
|
||||
// banshee boardwalk
|
||||
{ 0, 0, 0, 0, 0, 0, },
|
||||
// yoshi valley
|
||||
{ 95, 40, 15, 0, 0, 0, },
|
||||
// frappe snowland
|
||||
{ 0, 99, 164, 0, 0, 0, },
|
||||
// koopa troopa beach
|
||||
{ 48, 1688, 54136, 0, 0, 0, },
|
||||
// royal raceway
|
||||
{ 255, 224, 240, 0, 0, 0, },
|
||||
// luigi raceway
|
||||
{ 216, 7144, 32248, 0, 0, 0, },
|
||||
// moo moo farm
|
||||
{ 255, 184, 99, 0, 0, 0, },
|
||||
// toad's turnpike
|
||||
{ 209, 65, 23, 0, 0, 0, },
|
||||
// kalimari desert
|
||||
{ 255, 192, 0, 0, 0, 0, },
|
||||
// sherbet land
|
||||
{ 216, 7144, 32248, 128, 4280, 6136, },
|
||||
// rainbow road
|
||||
{ 0, 0, 0, 0, 0, 0, },
|
||||
// wario stadium
|
||||
{ 0, 0, 0, 0, 0, 0, },
|
||||
// block fort
|
||||
{ 216, 7144, 32248, 0, 0, 0, },
|
||||
// skyscraper
|
||||
{ 0, 0, 0, 0, 0, 0, },
|
||||
// double deck
|
||||
{ 255, 224, 240, 0, 0, 0, },
|
||||
// d.k.'s jungle parkway
|
||||
{ 22, 145, 22, 0, 0, 0, },
|
||||
// big donut
|
||||
{ 0, 0, 0, 0, 0, 0, },
|
||||
// null
|
||||
{ 255, 224, 240, 0, 0, 0, },
|
||||
@@ -316,7 +316,7 @@ Animation* d_course_koopa_troopa_beach_unk_data5[] = {
|
||||
};
|
||||
|
||||
// No idea what this stuff is
|
||||
u32 d_course_koopa_troopa_beach_unk_data6[] = {
|
||||
uintptr_t d_course_koopa_troopa_beach_unk_data6[] = {
|
||||
0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000001,
|
||||
};
|
||||
|
||||
|
||||
@@ -34,16 +34,6 @@ extern Animation* d_rainbow_road_unk3[];
|
||||
extern uintptr_t d_rainbow_road_unk4[];
|
||||
extern u32 d_rainbow_road_unk5[];
|
||||
|
||||
extern Gfx* koopa_troopa_beach_dls1[];
|
||||
extern Gfx* koopa_troopa_beach_dls2[];
|
||||
extern u32 d_course_koopa_troopa_beach_unk_data1[];
|
||||
extern s16 d_course_koopa_troopa_beach_unk_data2[];
|
||||
extern AnimationLimbVector d_course_koopa_troopa_beach_unk_data3[];
|
||||
extern Animation d_course_koopa_troopa_beach_unk_data4;
|
||||
extern uintptr_t d_course_koopa_troopa_beach_unk4[];
|
||||
extern Animation* d_course_koopa_troopa_beach_unk_data5[];
|
||||
extern u32 d_course_koopa_troopa_beach_unk_data6[];
|
||||
|
||||
extern s16 d_course_yoshi_valley_unk1[];
|
||||
extern AnimationLimbVector d_course_yoshi_valley_unk2[];
|
||||
extern Animation d_course_yoshi_valley_unk3;
|
||||
@@ -72,12 +62,13 @@ extern u32 d_rainbow_road_unk5[];
|
||||
|
||||
extern Gfx* koopa_troopa_beach_dls1[];
|
||||
extern Gfx* koopa_troopa_beach_dls2[];
|
||||
extern u32 d_course_koopa_troopa_beach_unk_data1[];
|
||||
extern uintptr_t d_course_koopa_troopa_beach_unk_data1[];
|
||||
extern s16 d_course_koopa_troopa_beach_unk_data2[];
|
||||
extern AnimationLimbVector d_course_koopa_troopa_beach_unk_data3[];
|
||||
extern Animation d_course_koopa_troopa_beach_unk_data4;
|
||||
extern uintptr_t d_course_koopa_troopa_beach_unk4[];
|
||||
extern Animation* d_course_koopa_troopa_beach_unk_data5[];
|
||||
extern u32 d_course_koopa_troopa_beach_unk_data6[];
|
||||
extern uintptr_t d_course_koopa_troopa_beach_unk_data6[];
|
||||
|
||||
extern s16 d_course_yoshi_valley_unk1[];
|
||||
extern AnimationLimbVector d_course_yoshi_valley_unk2[];
|
||||
|
||||
@@ -1,5 +1,14 @@
|
||||
#include <libultraship.h>
|
||||
#include <libultra/gbi.h>
|
||||
#include <common_structs.h>
|
||||
#include "code_800029B0.h"
|
||||
#include "mk64.h"
|
||||
#include "main.h"
|
||||
|
||||
#include "collision_viewer.h"
|
||||
|
||||
#include "assets/other_textures.h"
|
||||
#include "assets/common_data.h"
|
||||
|
||||
//! @todo decide to use colours or textures and fix displaylists because they are buggy
|
||||
|
||||
@@ -13,7 +22,7 @@ void render_collision(void) {
|
||||
gDPSetCombineMode(gDisplayListHead++, G_CC_SHADE, G_CC_SHADE);
|
||||
|
||||
// Set matrix
|
||||
gSPMatrix(gDisplayListHead++, &gIdentityMtx2, G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
|
||||
gSPMatrix(gDisplayListHead++, LOAD_ASSET(D_0D008E98), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
|
||||
|
||||
for (size_t i = 0; i < gCollisionMeshCount; i++) {
|
||||
// Load vertices for this tri
|
||||
|
||||
@@ -59,10 +59,6 @@ void FB_CreateFramebuffers(void) {
|
||||
} \
|
||||
}
|
||||
|
||||
Mtx gIdentityMtx = {
|
||||
toFixedPointMatrix(1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0),
|
||||
};
|
||||
|
||||
/**
|
||||
* Copies the current texture data from the source frame buffer to the destination frame buffer
|
||||
* Setting oncePerFrame ensures that the copy will only happen once every game frame. This
|
||||
@@ -73,7 +69,7 @@ Mtx gIdentityMtx = {
|
||||
*/
|
||||
void FB_CopyToFramebuffer(Gfx* gfx, s32 fb_src, s32 fb_dest, u8 oncePerFrame, u8* hasCopied) {
|
||||
|
||||
gSPMatrix(gfx++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
gSPMatrix(gfx++, LOAD_ASSET(D_0D008E98), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
|
||||
gDPSetOtherMode(gfx++,
|
||||
G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_POINT | G_TT_NONE | G_TL_TILE |
|
||||
@@ -144,7 +140,7 @@ void FB_WriteFramebufferSliceToCPU(Gfx* gfx, void* buffer, u8 byteSwap) {
|
||||
*/
|
||||
void FB_DrawFromFramebuffer(Gfx* gfx, s32 fb, u8 alpha) {
|
||||
|
||||
gSPMatrix(gfx++, &gIdentityMtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
gSPMatrix(gfx++, LOAD_ASSET(D_0D008E98), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
|
||||
gDPSetEnvColor(gfx++, 255, 255, 255, alpha);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user