etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-23 04:25:11 +00:00
Code Issues Projects Releases Packages Wiki Activity
sm64coopdx/data/dynos_bin_col.cpp

722 lines
29 KiB
C++
Raw Normal View History

Refactor coop-specific DynOS code
2022-03-31 06:04:41 +00:00
#include "dynos.cpp.h"
extern "C" {
#include "include/surface_terrains.h"
Add 'specials' to DynOS collisions
2022-03-31 06:52:50 +00:00
#include "include/level_misc_macros.h"
#include "include/special_preset_names.h"
Refactor coop-specific DynOS code
2022-03-31 06:04:41 +00:00
}
// Free data pointers, but keep nodes and tokens intact
// Delete nodes generated from GfxDynCmds
template <typename T>
More DynOS refactoring
2022-04-02 02:50:42 +00:00
void ClearGfxDataNodes(DataNodes<T> &aDataNodes) {
Refactor coop-specific DynOS code
2022-03-31 06:04:41 +00:00
for (s32 i = aDataNodes.Count(); i != 0; --i) {
Delete(aDataNodes[i - 1]->mData);
}
}
Fixed up collision bug, added collision file validation, allowed lua to get builtin collisions
2022-04-09 02:17:57 +00:00
////////////////
// Validation //
////////////////
#define COL_SECTION_UNKNOWN 0
#define COL_SECTION_VTX 1
#define COL_SECTION_TRI 2
#define COL_SECTION_SPECIAL 3
#define COL_SECTION_WATER_BOX 4
#define COL_SECTION_END 5
struct CollisionValidationData {
u32 tokenIndex;
u8 section;
const char* lastSymbol;
u32 vtxAlloc;
u32 vtxCount;
u32 triAlloc;
u32 triCount;
u32 specialAlloc;
u32 specialCount;
u32 waterBoxAlloc;
u32 waterBoxCount;
};
static void ValidateColSectionChange(GfxData* aGfxData, struct CollisionValidationData& aColValData, u8 section) {
if (aColValData.section == COL_SECTION_END) {
PrintError("Found new col section after COL_END");
}
if (aColValData.section != section) {
if (aColValData.vtxAlloc != aColValData.vtxCount) {
PrintError("Improper vtx count found in section. Allocated: %u, Defined: %u", aColValData.vtxAlloc, aColValData.vtxCount);
}
if (aColValData.triAlloc != aColValData.triCount) {
PrintError("Improper triangle count found in section. Allocated: %u, Defined: %u", aColValData.triAlloc, aColValData.triCount);
}
if (aColValData.specialAlloc != aColValData.specialCount) {
PrintError("Improper sepcial count found in section. Allocated: %u, Defined: %u", aColValData.triAlloc, aColValData.triCount);
}
if (aColValData.waterBoxAlloc != aColValData.waterBoxCount) {
PrintError("Improper water box count found in section. Allocated: %u, Defined: %u", aColValData.waterBoxAlloc, aColValData.waterBoxCount);
}
}
aColValData.section = section;
}
static void ValidateColInit(GfxData* aGfxData, struct CollisionValidationData& aColValData) {
if (aColValData.tokenIndex != 0) {
PrintError("COL_INIT found after the first token");
}
ValidateColSectionChange(aGfxData, aColValData, COL_SECTION_VTX);
}
static void ValidateColVertexInit(GfxData* aGfxData, struct CollisionValidationData& aColValData, s16 arg0) {
if (strcmp(aColValData.lastSymbol, "COL_INIT") != 0) {
PrintError("COL_VERTEX_INIT found outside of vertex section");
}
if (arg0 < 0) {
PrintError("COL_VERTEX_INIT with a negative count: %d", arg0);
}
aColValData.vtxAlloc = arg0;
aColValData.vtxCount = 0;
}
static void ValidateColVertex(GfxData* aGfxData, struct CollisionValidationData& aColValData, s16 arg0, s16 arg1, s16 arg2) {
if (aColValData.section != COL_SECTION_VTX) {
PrintError("COL_VERTEX found outside of vertex section");
}
aColValData.vtxCount++;
}
static void ValidateColTriInit(GfxData* aGfxData, struct CollisionValidationData& aColValData, s16 arg0, s16 arg1) {
if (arg1 < 0) {
PrintError("COL_TRI_INIT with a negative count: %d", arg1);
}
ValidateColSectionChange(aGfxData, aColValData, COL_SECTION_TRI);
aColValData.triAlloc = arg1;
aColValData.triCount = 0;
}
static void ValidateColTri(GfxData* aGfxData, struct CollisionValidationData& aColValData, s16 arg0, s16 arg1, s16 arg2) {
if (aColValData.section != COL_SECTION_TRI) {
PrintError("COL_TRI found outside of triangle section");
}
if (arg0 < 0 || arg0 > aColValData.vtxCount) {
PrintError("COL_TRI used vertex outside of known range for first param: %d", arg0);
}
if (arg1 < 0 || arg1 > aColValData.vtxCount) {
PrintError("COL_TRI used vertex outside of known range for second param: %d", arg1);
}
if (arg2 < 0 || arg2 > aColValData.vtxCount) {
PrintError("COL_TRI used vertex outside of known range for third param: %d", arg2);
}
aColValData.triCount++;
}
static void ValidateColTriSpecial(GfxData* aGfxData, struct CollisionValidationData& aColValData, s16 arg0, s16 arg1, s16 arg2, s16 arg3) {
ValidateColTri(aGfxData, aColValData, arg0, arg1, arg2);
}
static void ValidateColStop(GfxData* aGfxData, struct CollisionValidationData& aColValData) {
ValidateColSectionChange(aGfxData, aColValData, COL_SECTION_UNKNOWN);
}
static void ValidateColEnd(GfxData* aGfxData, struct CollisionValidationData& aColValData) {
ValidateColSectionChange(aGfxData, aColValData, COL_SECTION_END);
}
static void ValidateColSpecialInit(GfxData* aGfxData, struct CollisionValidationData& aColValData, s16 arg0) {
if (arg0 < 0) {
PrintError("COL_SPECIAL_INIT with a negative count: %d", arg0);
}
ValidateColSectionChange(aGfxData, aColValData, COL_SECTION_SPECIAL);
aColValData.specialAlloc = arg0;
aColValData.specialCount = 0;
}
static void ValidateColWaterBoxInit(GfxData* aGfxData, struct CollisionValidationData& aColValData, s16 arg0) {
if (arg0 < 0) {
PrintError("COL_WATER_BOX_INIT with a negative count: %d", arg0);
}
ValidateColSectionChange(aGfxData, aColValData, COL_SECTION_WATER_BOX);
aColValData.waterBoxAlloc = arg0;
aColValData.waterBoxCount = 0;
}
static void ValidateColWaterBox(GfxData* aGfxData, struct CollisionValidationData& aColValData, s16 arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4, s16 arg5) {
if (aColValData.section != COL_SECTION_WATER_BOX) {
PrintError("COL_WATER_BOX found outside of water box section");
}
aColValData.waterBoxCount++;
}
static void ValidateColSpecialObject(GfxData* aGfxData, struct CollisionValidationData& aColValData, s16 arg0, s16 arg1, s16 arg2, s16 arg3) {
if (aColValData.section != COL_SECTION_SPECIAL) {
PrintError("SPECIAL_OBJECT found outside of special section");
}
aColValData.specialCount++;
}
static void ValidateColSpecialObjectWithYaw(GfxData* aGfxData, struct CollisionValidationData& aColValData, s16 arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4) {
if (aColValData.section != COL_SECTION_SPECIAL) {
PrintError("SPECIAL_OBJECT_WITH_YAW found outside of special section");
}
aColValData.specialCount++;
}
static void ValidateColSpecialObjectWithYawAndParam(GfxData* aGfxData, struct CollisionValidationData& aColValData, s16 arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4, s16 arg5) {
if (aColValData.section != COL_SECTION_SPECIAL) {
PrintError("SPECIAL_OBJECT_WITH_YAW_AND_PARAM found outside of special section");
}
aColValData.specialCount++;
}
DynOS level parsing - phase 1
2022-04-02 00:19:26 +00:00
/////////////
// Parsing //
/////////////
Refactor coop-specific DynOS code
2022-03-31 06:04:41 +00:00
#define COLLISION_SIZE_PER_TOKEN 4
#define col_constant(x) if (_Arg == #x) { return (s16) (x); }
Added vanilla lvl cols to level gen, changed how pointer offsets are saved
2022-04-08 06:06:10 +00:00
static s64 DynOS_Col_ParseConstants(const String& _Arg, bool* found) {
*found = true;
Added support for SM76's JUMP_AREA, added missing lvl geos, reordered parsing
2022-04-08 01:34:44 +00:00
Refactor coop-specific DynOS code
2022-03-31 06:04:41 +00:00
// Surface constants
col_constant(SURFACE_DEFAULT);
col_constant(SURFACE_BURNING);
SURFACE_RAYCAST (#177) * SURFACE_RAYCAST * Exclude from camera collision
2022-09-13 02:56:24 +00:00
col_constant(SURFACE_RAYCAST);
Refactor coop-specific DynOS code
2022-03-31 06:04:41 +00:00
col_constant(SURFACE_0004);
col_constant(SURFACE_HANGABLE);
col_constant(SURFACE_SLOW);
col_constant(SURFACE_DEATH_PLANE);
col_constant(SURFACE_CLOSE_CAMERA);
col_constant(SURFACE_WATER);
col_constant(SURFACE_FLOWING_WATER);
col_constant(SURFACE_INTANGIBLE);
col_constant(SURFACE_VERY_SLIPPERY);
col_constant(SURFACE_SLIPPERY);
col_constant(SURFACE_NOT_SLIPPERY);
col_constant(SURFACE_TTM_VINES);
col_constant(SURFACE_MGR_MUSIC);
col_constant(SURFACE_INSTANT_WARP_1B);
col_constant(SURFACE_INSTANT_WARP_1C);
col_constant(SURFACE_INSTANT_WARP_1D);
col_constant(SURFACE_INSTANT_WARP_1E);
col_constant(SURFACE_SHALLOW_QUICKSAND);
col_constant(SURFACE_DEEP_QUICKSAND);
col_constant(SURFACE_INSTANT_QUICKSAND);
col_constant(SURFACE_DEEP_MOVING_QUICKSAND);
col_constant(SURFACE_SHALLOW_MOVING_QUICKSAND);
col_constant(SURFACE_QUICKSAND);
col_constant(SURFACE_MOVING_QUICKSAND);
col_constant(SURFACE_WALL_MISC);
col_constant(SURFACE_NOISE_DEFAULT);
col_constant(SURFACE_NOISE_SLIPPERY);
col_constant(SURFACE_HORIZONTAL_WIND);
col_constant(SURFACE_INSTANT_MOVING_QUICKSAND);
col_constant(SURFACE_ICE);
col_constant(SURFACE_LOOK_UP_WARP);
col_constant(SURFACE_HARD);
col_constant(SURFACE_WARP);
col_constant(SURFACE_TIMER_START);
col_constant(SURFACE_TIMER_END);
col_constant(SURFACE_HARD_SLIPPERY);
col_constant(SURFACE_HARD_VERY_SLIPPERY);
col_constant(SURFACE_HARD_NOT_SLIPPERY);
col_constant(SURFACE_VERTICAL_WIND);
col_constant(SURFACE_BOSS_FIGHT_CAMERA);
col_constant(SURFACE_CAMERA_FREE_ROAM);
col_constant(SURFACE_THI3_WALLKICK);
col_constant(SURFACE_CAMERA_8_DIR);
col_constant(SURFACE_CAMERA_MIDDLE);
col_constant(SURFACE_CAMERA_ROTATE_RIGHT);
col_constant(SURFACE_CAMERA_ROTATE_LEFT);
col_constant(SURFACE_CAMERA_BOUNDARY);
col_constant(SURFACE_NOISE_VERY_SLIPPERY_73);
col_constant(SURFACE_NOISE_VERY_SLIPPERY_74);
col_constant(SURFACE_NOISE_VERY_SLIPPERY);
col_constant(SURFACE_NO_CAM_COLLISION);
col_constant(SURFACE_NO_CAM_COLLISION_77);
col_constant(SURFACE_NO_CAM_COL_VERY_SLIPPERY);
col_constant(SURFACE_NO_CAM_COL_SLIPPERY);
col_constant(SURFACE_SWITCH);
col_constant(SURFACE_VANISH_CAP_WALLS);
Add the rest of the surface constants to DynOS
2022-03-31 06:08:19 +00:00
col_constant(SURFACE_PAINTING_WOBBLE_A6);
col_constant(SURFACE_PAINTING_WOBBLE_A7);
col_constant(SURFACE_PAINTING_WOBBLE_A8);
col_constant(SURFACE_PAINTING_WOBBLE_A9);
col_constant(SURFACE_PAINTING_WOBBLE_AA);
col_constant(SURFACE_PAINTING_WOBBLE_AB);
col_constant(SURFACE_PAINTING_WOBBLE_AC);
col_constant(SURFACE_PAINTING_WOBBLE_AD);
col_constant(SURFACE_PAINTING_WOBBLE_AE);
col_constant(SURFACE_PAINTING_WOBBLE_AF);
col_constant(SURFACE_PAINTING_WOBBLE_B0);
col_constant(SURFACE_PAINTING_WOBBLE_B1);
col_constant(SURFACE_PAINTING_WOBBLE_B2);
col_constant(SURFACE_PAINTING_WOBBLE_B3);
col_constant(SURFACE_PAINTING_WOBBLE_B4);
col_constant(SURFACE_PAINTING_WOBBLE_B5);
col_constant(SURFACE_PAINTING_WOBBLE_B6);
col_constant(SURFACE_PAINTING_WOBBLE_B7);
col_constant(SURFACE_PAINTING_WOBBLE_B8);
col_constant(SURFACE_PAINTING_WOBBLE_B9);
col_constant(SURFACE_PAINTING_WOBBLE_BA);
col_constant(SURFACE_PAINTING_WOBBLE_BB);
col_constant(SURFACE_PAINTING_WOBBLE_BC);
col_constant(SURFACE_PAINTING_WOBBLE_BD);
col_constant(SURFACE_PAINTING_WOBBLE_BE);
col_constant(SURFACE_PAINTING_WOBBLE_BF);
col_constant(SURFACE_PAINTING_WOBBLE_C0);
col_constant(SURFACE_PAINTING_WOBBLE_C1);
col_constant(SURFACE_PAINTING_WOBBLE_C2);
col_constant(SURFACE_PAINTING_WOBBLE_C3);
col_constant(SURFACE_PAINTING_WOBBLE_C4);
col_constant(SURFACE_PAINTING_WOBBLE_C5);
col_constant(SURFACE_PAINTING_WOBBLE_C6);
col_constant(SURFACE_PAINTING_WOBBLE_C7);
col_constant(SURFACE_PAINTING_WOBBLE_C8);
col_constant(SURFACE_PAINTING_WOBBLE_C9);
col_constant(SURFACE_PAINTING_WOBBLE_CA);
col_constant(SURFACE_PAINTING_WOBBLE_CB);
col_constant(SURFACE_PAINTING_WOBBLE_CC);
col_constant(SURFACE_PAINTING_WOBBLE_CD);
col_constant(SURFACE_PAINTING_WOBBLE_CE);
col_constant(SURFACE_PAINTING_WOBBLE_CF);
col_constant(SURFACE_PAINTING_WOBBLE_D0);
col_constant(SURFACE_PAINTING_WOBBLE_D1);
col_constant(SURFACE_PAINTING_WOBBLE_D2);
col_constant(SURFACE_PAINTING_WARP_D3);
col_constant(SURFACE_PAINTING_WARP_D4);
col_constant(SURFACE_PAINTING_WARP_D5);
col_constant(SURFACE_PAINTING_WARP_D6);
col_constant(SURFACE_PAINTING_WARP_D7);
col_constant(SURFACE_PAINTING_WARP_D8);
col_constant(SURFACE_PAINTING_WARP_D9);
col_constant(SURFACE_PAINTING_WARP_DA);
col_constant(SURFACE_PAINTING_WARP_DB);
col_constant(SURFACE_PAINTING_WARP_DC);
col_constant(SURFACE_PAINTING_WARP_DD);
col_constant(SURFACE_PAINTING_WARP_DE);
col_constant(SURFACE_PAINTING_WARP_DF);
col_constant(SURFACE_PAINTING_WARP_E0);
col_constant(SURFACE_PAINTING_WARP_E1);
col_constant(SURFACE_PAINTING_WARP_E2);
col_constant(SURFACE_PAINTING_WARP_E3);
col_constant(SURFACE_PAINTING_WARP_E4);
col_constant(SURFACE_PAINTING_WARP_E5);
col_constant(SURFACE_PAINTING_WARP_E6);
col_constant(SURFACE_PAINTING_WARP_E7);
col_constant(SURFACE_PAINTING_WARP_E8);
col_constant(SURFACE_PAINTING_WARP_E9);
col_constant(SURFACE_PAINTING_WARP_EA);
col_constant(SURFACE_PAINTING_WARP_EB);
col_constant(SURFACE_PAINTING_WARP_EC);
col_constant(SURFACE_PAINTING_WARP_ED);
col_constant(SURFACE_PAINTING_WARP_EE);
col_constant(SURFACE_PAINTING_WARP_EF);
col_constant(SURFACE_PAINTING_WARP_F0);
col_constant(SURFACE_PAINTING_WARP_F1);
col_constant(SURFACE_PAINTING_WARP_F2);
col_constant(SURFACE_PAINTING_WARP_F3);
col_constant(SURFACE_TTC_PAINTING_1);
col_constant(SURFACE_TTC_PAINTING_2);
col_constant(SURFACE_TTC_PAINTING_3);
col_constant(SURFACE_PAINTING_WARP_F7);
col_constant(SURFACE_PAINTING_WARP_F8);
col_constant(SURFACE_PAINTING_WARP_F9);
col_constant(SURFACE_PAINTING_WARP_FA);
col_constant(SURFACE_PAINTING_WARP_FB);
col_constant(SURFACE_PAINTING_WARP_FC);
col_constant(SURFACE_WOBBLING_WARP);
Refactor coop-specific DynOS code
2022-03-31 06:04:41 +00:00
col_constant(SURFACE_TRAPDOOR);
// Surface class constants
col_constant(SURFACE_CLASS_DEFAULT);
col_constant(SURFACE_CLASS_VERY_SLIPPERY);
col_constant(SURFACE_CLASS_SLIPPERY);
col_constant(SURFACE_CLASS_NOT_SLIPPERY);
// Surface flag constants
col_constant(SURFACE_FLAG_DYNAMIC);
col_constant(SURFACE_FLAG_NO_CAM_COLLISION);
col_constant(SURFACE_FLAG_X_PROJECTION);
Add 'specials' to DynOS collisions
2022-03-31 06:52:50 +00:00
// Specials
col_constant(special_null_start);
col_constant(special_yellow_coin);
col_constant(special_yellow_coin_2);
col_constant(special_unknown_3);
col_constant(special_boo);
col_constant(special_unknown_5);
col_constant(special_lll_moving_octagonal_mesh_platform);
col_constant(special_snow_ball);
col_constant(special_lll_drawbridge_spawner);
col_constant(special_empty_9);
col_constant(special_lll_rotating_block_with_fire_bars);
col_constant(special_lll_floating_wood_bridge);
col_constant(special_tumbling_platform);
col_constant(special_lll_rotating_hexagonal_ring);
col_constant(special_lll_sinking_rectangular_platform);
col_constant(special_lll_sinking_square_platforms);
col_constant(special_lll_tilting_square_platform);
col_constant(special_lll_bowser_puzzle);
col_constant(special_mr_i);
col_constant(special_small_bully);
col_constant(special_big_bully);
col_constant(special_empty_21);
col_constant(special_empty_22);
col_constant(special_empty_23);
col_constant(special_empty_24);
col_constant(special_empty_25);
col_constant(special_moving_blue_coin);
col_constant(special_jrb_chest);
col_constant(special_water_ring);
col_constant(special_mine);
col_constant(special_empty_30);
col_constant(special_empty_31);
col_constant(special_butterfly);
col_constant(special_bowser);
col_constant(special_wf_rotating_wooden_platform);
col_constant(special_small_bomp);
col_constant(special_wf_sliding_platform);
col_constant(special_tower_platform_group);
col_constant(special_rotating_counter_clockwise);
col_constant(special_wf_tumbling_bridge);
col_constant(special_large_bomp);
col_constant(special_level_geo_03);
col_constant(special_level_geo_04);
col_constant(special_level_geo_05);
col_constant(special_level_geo_06);
col_constant(special_level_geo_07);
col_constant(special_level_geo_08);
col_constant(special_level_geo_09);
col_constant(special_level_geo_0A);
col_constant(special_level_geo_0B);
col_constant(special_level_geo_0C);
col_constant(special_level_geo_0D);
col_constant(special_level_geo_0E);
col_constant(special_level_geo_0F);
col_constant(special_level_geo_10);
col_constant(special_level_geo_11);
col_constant(special_level_geo_12);
col_constant(special_level_geo_13);
col_constant(special_level_geo_14);
col_constant(special_level_geo_15);
col_constant(special_level_geo_16);
col_constant(special_bubble_tree);
col_constant(special_spiky_tree);
col_constant(special_snow_tree);
col_constant(special_unknown_tree);
col_constant(special_palm_tree);
col_constant(special_wooden_door);
col_constant(special_haunted_door);
col_constant(special_unknown_door);
col_constant(special_metal_door);
col_constant(special_hmc_door);
col_constant(special_unknown2_door);
col_constant(special_wooden_door_warp);
col_constant(special_unknown1_door_warp);
col_constant(special_metal_door_warp);
col_constant(special_unknown2_door_warp);
col_constant(special_unknown3_door_warp);
col_constant(special_castle_door_warp);
col_constant(special_castle_door);
col_constant(special_0stars_door);
col_constant(special_1star_door);
col_constant(special_3star_door);
col_constant(special_key_door);
col_constant(special_null_end);
Added vanilla lvl cols to level gen, changed how pointer offsets are saved
2022-04-08 06:06:10 +00:00
*found = false;
return 0;
}
static s16 ParseColSymbolArg(GfxData* aGfxData, DataNode<Collision>* aNode, u64& aTokenIndex) {
const String& _Arg = aNode->mTokens[aTokenIndex++];
// Integers
bool integerFound = false;
s64 integerValue = DynOS_Misc_ParseInteger(_Arg, &integerFound);
if (integerFound) {
return integerValue;
}
// Constants
bool constantFound = false;
s64 constantValue = DynOS_Col_ParseConstants(_Arg, &constantFound);
if (constantFound) {
return constantValue;
}
// Recursive descent parsing
bool rdSuccess = false;
s64 rdValue = DynOS_RecursiveDescent_Parse(_Arg.begin(), &rdSuccess, DynOS_Col_ParseConstants);
if (rdSuccess) {
return rdValue;
}
Refactor coop-specific DynOS code
2022-03-31 06:04:41 +00:00
// Unknown
PrintError(" ERROR: Unknown col arg: %s", _Arg.begin());
return 0;
}
Fixed up collision bug, added collision file validation, allowed lua to get builtin collisions
2022-04-09 02:17:57 +00:00
#define col_symbol_0(symb, validate) \
if (_Symbol == #symb) { \
validate(aGfxData, aColValData); \
aColValData.lastSymbol = _Symbol.begin(); \
Collision _Cl[] = { symb() }; \
memcpy(aHead, _Cl, sizeof(_Cl)); \
aHead += (sizeof(_Cl) / sizeof(_Cl[0])); \
return; \
Refactor coop-specific DynOS code
2022-03-31 06:04:41 +00:00
}
Fixed up collision bug, added collision file validation, allowed lua to get builtin collisions
2022-04-09 02:17:57 +00:00
#define col_symbol_1(symb, validate) \
Refactor coop-specific DynOS code
2022-03-31 06:04:41 +00:00
if (_Symbol == #symb) { \
s16 _Arg0 = ParseColSymbolArg(aGfxData, aNode, aTokenIndex); \
Fixed up collision bug, added collision file validation, allowed lua to get builtin collisions
2022-04-09 02:17:57 +00:00
validate(aGfxData, aColValData, _Arg0); \
aColValData.lastSymbol = _Symbol.begin(); \
Refactor coop-specific DynOS code
2022-03-31 06:04:41 +00:00
Collision _Cl[] = { symb(_Arg0) }; \
memcpy(aHead, _Cl, sizeof(_Cl)); \
aHead += (sizeof(_Cl) / sizeof(_Cl[0])); \
return; \
}
Fixed up collision bug, added collision file validation, allowed lua to get builtin collisions
2022-04-09 02:17:57 +00:00
#define col_symbol_2(symb, validate) \
Refactor coop-specific DynOS code
2022-03-31 06:04:41 +00:00
if (_Symbol == #symb) { \
s16 _Arg0 = ParseColSymbolArg(aGfxData, aNode, aTokenIndex); \
s16 _Arg1 = ParseColSymbolArg(aGfxData, aNode, aTokenIndex); \
Fixed up collision bug, added collision file validation, allowed lua to get builtin collisions
2022-04-09 02:17:57 +00:00
validate(aGfxData, aColValData, _Arg0, _Arg1); \
aColValData.lastSymbol = _Symbol.begin(); \
Refactor coop-specific DynOS code
2022-03-31 06:04:41 +00:00
Collision _Cl[] = { symb(_Arg0, _Arg1) }; \
memcpy(aHead, _Cl, sizeof(_Cl)); \
aHead += (sizeof(_Cl) / sizeof(_Cl[0])); \
return; \
}
Fixed up collision bug, added collision file validation, allowed lua to get builtin collisions
2022-04-09 02:17:57 +00:00
#define col_symbol_3(symb, validate) \
Refactor coop-specific DynOS code
2022-03-31 06:04:41 +00:00
if (_Symbol == #symb) { \
s16 _Arg0 = ParseColSymbolArg(aGfxData, aNode, aTokenIndex); \
s16 _Arg1 = ParseColSymbolArg(aGfxData, aNode, aTokenIndex); \
s16 _Arg2 = ParseColSymbolArg(aGfxData, aNode, aTokenIndex); \
Fixed up collision bug, added collision file validation, allowed lua to get builtin collisions
2022-04-09 02:17:57 +00:00
validate(aGfxData, aColValData, _Arg0, _Arg1, _Arg2); \
aColValData.lastSymbol = _Symbol.begin(); \
Refactor coop-specific DynOS code
2022-03-31 06:04:41 +00:00
Collision _Cl[] = { symb(_Arg0, _Arg1, _Arg2) }; \
memcpy(aHead, _Cl, sizeof(_Cl)); \
aHead += (sizeof(_Cl) / sizeof(_Cl[0])); \
return; \
}
Fixed up collision bug, added collision file validation, allowed lua to get builtin collisions
2022-04-09 02:17:57 +00:00
#define col_symbol_4(symb, validate) \
Refactor coop-specific DynOS code
2022-03-31 06:04:41 +00:00
if (_Symbol == #symb) { \
s16 _Arg0 = ParseColSymbolArg(aGfxData, aNode, aTokenIndex); \
s16 _Arg1 = ParseColSymbolArg(aGfxData, aNode, aTokenIndex); \
s16 _Arg2 = ParseColSymbolArg(aGfxData, aNode, aTokenIndex); \
s16 _Arg3 = ParseColSymbolArg(aGfxData, aNode, aTokenIndex); \
Fixed up collision bug, added collision file validation, allowed lua to get builtin collisions
2022-04-09 02:17:57 +00:00
validate(aGfxData, aColValData, _Arg0, _Arg1, _Arg2, _Arg3); \
aColValData.lastSymbol = _Symbol.begin(); \
Refactor coop-specific DynOS code
2022-03-31 06:04:41 +00:00
Collision _Cl[] = { symb(_Arg0, _Arg1, _Arg2, _Arg3) }; \
memcpy(aHead, _Cl, sizeof(_Cl)); \
aHead += (sizeof(_Cl) / sizeof(_Cl[0])); \
return; \
}
Fixed up collision bug, added collision file validation, allowed lua to get builtin collisions
2022-04-09 02:17:57 +00:00
#define col_symbol_5(symb, validate) \
Add 'specials' to DynOS collisions
2022-03-31 06:52:50 +00:00
if (_Symbol == #symb) { \
s16 _Arg0 = ParseColSymbolArg(aGfxData, aNode, aTokenIndex); \
s16 _Arg1 = ParseColSymbolArg(aGfxData, aNode, aTokenIndex); \
s16 _Arg2 = ParseColSymbolArg(aGfxData, aNode, aTokenIndex); \
s16 _Arg3 = ParseColSymbolArg(aGfxData, aNode, aTokenIndex); \
s16 _Arg4 = ParseColSymbolArg(aGfxData, aNode, aTokenIndex); \
Fixed up collision bug, added collision file validation, allowed lua to get builtin collisions
2022-04-09 02:17:57 +00:00
validate(aGfxData, aColValData, _Arg0, _Arg1, _Arg2, _Arg3, \
_Arg4); \
aColValData.lastSymbol = _Symbol.begin(); \
Add 'specials' to DynOS collisions
2022-03-31 06:52:50 +00:00
Collision _Cl[] = { symb(_Arg0, _Arg1, _Arg2, _Arg3, _Arg4) }; \
memcpy(aHead, _Cl, sizeof(_Cl)); \
aHead += (sizeof(_Cl) / sizeof(_Cl[0])); \
return; \
}
Fixed up collision bug, added collision file validation, allowed lua to get builtin collisions
2022-04-09 02:17:57 +00:00
#define col_symbol_6(symb, validate) \
Refactor coop-specific DynOS code
2022-03-31 06:04:41 +00:00
if (_Symbol == #symb) { \
s16 _Arg0 = ParseColSymbolArg(aGfxData, aNode, aTokenIndex); \
s16 _Arg1 = ParseColSymbolArg(aGfxData, aNode, aTokenIndex); \
s16 _Arg2 = ParseColSymbolArg(aGfxData, aNode, aTokenIndex); \
s16 _Arg3 = ParseColSymbolArg(aGfxData, aNode, aTokenIndex); \
s16 _Arg4 = ParseColSymbolArg(aGfxData, aNode, aTokenIndex); \
s16 _Arg5 = ParseColSymbolArg(aGfxData, aNode, aTokenIndex); \
Fixed up collision bug, added collision file validation, allowed lua to get builtin collisions
2022-04-09 02:17:57 +00:00
validate(aGfxData, aColValData, _Arg0, _Arg1, _Arg2, _Arg3, \
_Arg4, _Arg5); \
aColValData.lastSymbol = _Symbol.begin(); \
Refactor coop-specific DynOS code
2022-03-31 06:04:41 +00:00
Collision _Cl[] = { symb(_Arg0, _Arg1, _Arg2, _Arg3, _Arg4, _Arg5) }; \
memcpy(aHead, _Cl, sizeof(_Cl)); \
aHead += (sizeof(_Cl) / sizeof(_Cl[0])); \
return; \
}
Fixed up collision bug, added collision file validation, allowed lua to get builtin collisions
2022-04-09 02:17:57 +00:00
static void ParseCollisionSymbol(GfxData* aGfxData, DataNode<Collision>* aNode, Collision*& aHead, u64& aTokenIndex, Array<u64>& aSwitchNodes, struct CollisionValidationData& aColValData) {
aColValData.tokenIndex = aTokenIndex;
Refactor coop-specific DynOS code
2022-03-31 06:04:41 +00:00
const String& _Symbol = aNode->mTokens[aTokenIndex++];
Fixed up collision bug, added collision file validation, allowed lua to get builtin collisions
2022-04-09 02:17:57 +00:00
col_symbol_0(COL_INIT, ValidateColInit);
col_symbol_1(COL_VERTEX_INIT, ValidateColVertexInit);
col_symbol_3(COL_VERTEX, ValidateColVertex);
col_symbol_2(COL_TRI_INIT, ValidateColTriInit);
col_symbol_3(COL_TRI, ValidateColTri);
col_symbol_4(COL_TRI_SPECIAL, ValidateColTriSpecial);
col_symbol_0(COL_TRI_STOP, ValidateColStop);
col_symbol_0(COL_END, ValidateColEnd);
col_symbol_1(COL_SPECIAL_INIT, ValidateColSpecialInit);
col_symbol_1(COL_WATER_BOX_INIT, ValidateColWaterBoxInit);
col_symbol_6(COL_WATER_BOX, ValidateColWaterBox);
col_symbol_4(SPECIAL_OBJECT, ValidateColSpecialObject);
col_symbol_5(SPECIAL_OBJECT_WITH_YAW, ValidateColSpecialObjectWithYaw);
col_symbol_6(SPECIAL_OBJECT_WITH_YAW_AND_PARAM, ValidateColSpecialObjectWithYawAndParam);
Refactor coop-specific DynOS code
2022-03-31 06:04:41 +00:00
// Unknown
PrintError(" ERROR: Unknown col symbol: %s", _Symbol.begin());
}
DynOS level parsing - phase 1
2022-04-02 00:19:26 +00:00
DataNode<Collision>* DynOS_Col_Parse(GfxData* aGfxData, DataNode<Collision>* aNode, bool aDisplayPercent) {
Refactor coop-specific DynOS code
2022-03-31 06:04:41 +00:00
if (aNode->mData) return aNode;
// Collision data
aNode->mData = New<Collision>(aNode->mTokens.Count() * COLLISION_SIZE_PER_TOKEN);
Collision* _Head = aNode->mData;
Array<u64> _SwitchNodes;
Fixed up collision bug, added collision file validation, allowed lua to get builtin collisions
2022-04-09 02:17:57 +00:00
struct CollisionValidationData colValData = { 0 };
colValData.lastSymbol = aNode->mTokens[0].begin();
Refactor coop-specific DynOS code
2022-03-31 06:04:41 +00:00
for (u64 _TokenIndex = 0; _TokenIndex < aNode->mTokens.Count();) { // Don't increment _TokenIndex here!
Fixed up collision bug, added collision file validation, allowed lua to get builtin collisions
2022-04-09 02:17:57 +00:00
ParseCollisionSymbol(aGfxData, aNode, _Head, _TokenIndex, _SwitchNodes, colValData);
Refactor coop-specific DynOS code
2022-03-31 06:04:41 +00:00
if (aDisplayPercent && aGfxData->mErrorCount == 0) { PrintNoNewLine("%3d%%\b\b\b\b", (s32) (_TokenIndex * 100) / aNode->mTokens.Count()); }
}
Fixed up collision bug, added collision file validation, allowed lua to get builtin collisions
2022-04-09 02:17:57 +00:00
if (colValData.section != COL_SECTION_END) {
PrintError("Collision did not end with COL_END");
}
Refactor coop-specific DynOS code
2022-03-31 06:04:41 +00:00
if (aDisplayPercent && aGfxData->mErrorCount == 0) { Print("100%%"); }
aNode->mSize = (u32)(_Head - aNode->mData);
aNode->mLoadIndex = aGfxData->mLoadIndex++;
Fixed up collision bug, added collision file validation, allowed lua to get builtin collisions
2022-04-09 02:17:57 +00:00
if (aGfxData->mErrorCount > 0) {
Clang/mac fixes
2022-04-12 04:43:55 +00:00
Print("Failed to parse collision: '%s'", aNode->mName.begin());
Fixed up collision bug, added collision file validation, allowed lua to get builtin collisions
2022-04-09 02:17:57 +00:00
}
Refactor coop-specific DynOS code
2022-03-31 06:04:41 +00:00
return aNode;
}
DynOS cleanup
2022-04-02 00:54:32 +00:00
/////////////
// Writing //
/////////////
DynOS Bin Compression (#131)
2022-06-25 07:52:53 +00:00
void DynOS_Col_Write(BinFile* aFile, GfxData* aGfxData, DataNode<Collision> *aNode) {
DynOS cleanup
2022-04-02 00:54:32 +00:00
if (!aNode->mData) return;
// Name
DynOS Bin Compression (#131)
2022-06-25 07:52:53 +00:00
aFile->Write<u8>(DATA_TYPE_COLLISION);
DynOS cleanup
2022-04-02 00:54:32 +00:00
aNode->mName.Write(aFile);
// Data
DynOS Bin Compression (#131)
2022-06-25 07:52:53 +00:00
aFile->Write<u32>(aNode->mSize);
DynOS cleanup
2022-04-02 00:54:32 +00:00
for (u32 i = 0; i != aNode->mSize; ++i) {
DynOS Bin Compression (#131)
2022-06-25 07:52:53 +00:00
aFile->Write<Collision>(aNode->mData[i]);
DynOS cleanup
2022-04-02 00:54:32 +00:00
}
}
More DynOS refactoring
2022-04-02 02:50:42 +00:00
static bool DynOS_Col_WriteBinary(const SysPath &aOutputFilename, GfxData *aGfxData, DataNode<Collision>* _Node) {
DynOS Bin Compression (#131)
2022-06-25 07:52:53 +00:00
BinFile *_File = BinFile::OpenW(aOutputFilename.c_str());
DynOS cleanup
2022-04-02 00:54:32 +00:00
if (!_File) {
PrintError(" ERROR: Unable to create file \"%s\"", aOutputFilename.c_str());
return false;
}
More DynOS refactoring
2022-04-02 02:50:42 +00:00
DynOS_Col_Write(_File, aGfxData, _Node);
DynOS cleanup
2022-04-02 00:54:32 +00:00
DynOS Bin Compression (#131)
2022-06-25 07:52:53 +00:00
BinFile::Close(_File);
return DynOS_Bin_Compress(aOutputFilename);
DynOS cleanup
2022-04-02 00:54:32 +00:00
}
/////////////
// Loading //
/////////////
DynOS Bin Compression (#131)
2022-06-25 07:52:53 +00:00
DataNode<Collision>* DynOS_Col_Load(BinFile *aFile, GfxData *aGfxData) {
DynOS cleanup
2022-04-02 00:54:32 +00:00
DataNode<Collision> *_Node = New<DataNode<Collision>>();
// Name
_Node->mName.Read(aFile);
// Data
DynOS Bin Compression (#131)
2022-06-25 07:52:53 +00:00
_Node->mSize = aFile->Read<u32>();
DynOS cleanup
2022-04-02 00:54:32 +00:00
_Node->mData = New<Collision>(_Node->mSize);
for (u32 i = 0; i != _Node->mSize; ++i) {
DynOS Bin Compression (#131)
2022-06-25 07:52:53 +00:00
_Node->mData[i] = aFile->Read<Collision>();
DynOS cleanup
2022-04-02 00:54:32 +00:00
}
More progress toward custom DynOS levels
2022-04-02 22:14:04 +00:00
// Add it
if (aGfxData != NULL) {
aGfxData->mCollisions.Add(_Node);
}
DynOS cleanup
2022-04-02 00:54:32 +00:00
return _Node;
}
Rewrite of hash/cache system
2022-04-16 20:05:10 +00:00
DataNode<Collision>* DynOS_Col_LoadFromBinary(const SysPath &aFilename, const char *aCollisionName) {
DynOS cleanup
2022-04-02 00:54:32 +00:00
// Load data from binary file
DataNode<Collision>* collisionNode = NULL;
DynOS Bin Compression (#131)
2022-06-25 07:52:53 +00:00
BinFile *_File = DynOS_Bin_Decompress(aFilename);
DynOS cleanup
2022-04-02 00:54:32 +00:00
if (_File) {
DynOS Bin Compression (#131)
2022-06-25 07:52:53 +00:00
u8 type = _File->Read<u8>();
Added Light_t, Ambient_t, and began adding vanilla lvl geos to DynOS level gen
2022-04-05 04:25:40 +00:00
if (type == DATA_TYPE_COLLISION) {
collisionNode = DynOS_Col_Load(_File, NULL);
}
DynOS Bin Compression (#131)
2022-06-25 07:52:53 +00:00
BinFile::Close(_File);
DynOS cleanup
2022-04-02 00:54:32 +00:00
}
return collisionNode;
}
More DynOS refactoring
2022-04-02 02:50:42 +00:00
//////////////
// Generate //
//////////////
void DynOS_Col_Generate(const SysPath &aPackFolder, Array<Pair<u64, String>> _ActorsFolders, GfxData *_GfxData) {
for (auto &_ColNode : _GfxData->mCollisions) {
String _ColRootName = _ColNode->mName;
// If there is an existing binary file for this collision, skip and go to the next actor
SysPath _ColFilename = fstring("%s/%s.col", aPackFolder.c_str(), _ColRootName.begin());
if (fs_sys_file_exists(_ColFilename.c_str())) {
DynOS Bin Compression (#131)
2022-06-25 07:52:53 +00:00
#ifdef DEVELOPMENT
// Compress file to gain some space
if (!DynOS_Bin_IsCompressed(_ColFilename)) {
DynOS_Bin_Compress(_ColFilename);
}
#endif
More DynOS refactoring
2022-04-02 02:50:42 +00:00
continue;
}
// Init
_GfxData->mErrorCount = 0;
_GfxData->mLoadIndex = 0;
// Parse data
PrintNoNewLine("%s.col: Model identifier: %X - Processing... ", _ColRootName.begin(), _GfxData->mModelIdentifier);
DynOS_Col_Parse(_GfxData, _ColNode, true);
// Write if no error
if (_GfxData->mErrorCount == 0) {
DynOS_Col_WriteBinary(_ColFilename, _GfxData, _ColNode);
} else {
Print(" %u error(s): Unable to parse data", _GfxData->mErrorCount);
}
// Clear data pointers
ClearGfxDataNodes(_GfxData->mCollisions);
}
}
Reference in a new issue Copy permalink