print_n_panic/Microtransactions64
0
0
Fork 0
mirror of https://github.com/Print-and-Panic/Microtransactions64.git synced 2026-01-21 10:17:19 -08:00
Code Issues Packages Projects Releases Wiki Activity

Remove OBJECTS_REJ and clean up core render func (By Fazana) (#735)

Browse Source 
* crowd pleaser

* Fix debug boxes

* fix comments

* renamed temp graphics head to be consistent

---------

Co-authored-by: Fazana <52551480+FazanaJ@users.noreply.github.com>
This commit is contained in:
arthurtilly
2023-12-16 02:48:32 +13:00
committed by GitHub
parent 76dae5e8dd
commit 9fc928ed70
11 changed files with 75 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/config/config_safeguards.h
View File

@@ -49,26 +49,6 @@
#undef BETTER_REVERB
#endif
/*****************
* config_graphics.h
*/
#ifndef F3DEX_GBI_2
#undef OBJECTS_REJ // OBJECTS_REJ requires f3dex2.
#endif // !F3DEX_GBI_2
#ifndef F3DEX_GBI_SHARED
#undef OBJECTS_REJ // Non F3DEX-based ucodes do NOT support ucode switching.
#endif // !F3DEX_GBI_SHARED
#ifdef OBJECTS_REJ
// Enable required ucodes.
#define F3DEX2_REJ_GBI
#define F3DLX2_REJ_GBI
#endif // OBJECTS_REJ
/*****************
* config_debug.h
*/

2
include/object_constants.h
View File

@@ -49,8 +49,6 @@ enum ObjFlags {
OBJ_FLAG_PERSISTENT_RESPAWN = (1 << 14), // 0x00004000
OBJ_FLAG_VELOCITY_PLATFORM = (1 << 15), // 0x00008000
OBJ_FLAG_DONT_CALC_COLL_DIST = (1 << 16), // 0x00010000
OBJ_FLAG_UCODE_SMALL = (1 << 17), // 0x00020000
OBJ_FLAG_UCODE_LARGE = (1 << 18), // 0x00040000
OBJ_FLAG_SILHOUETTE = (1 << 19), // 0x00080000
OBJ_FLAG_OCCLUDE_SILHOUETTE = (1 << 20), // 0x00100000
OBJ_FLAG_OPACITY_FROM_CAMERA_DIST = (1 << 21), // 0x00200000

3
include/types.h
View File

@@ -248,9 +248,6 @@ struct GraphNodeObject {
/*0x4C*/ struct SpawnInfo *spawnInfo;
/*0x50*/ Mat4 *throwMatrix; // matrix ptr
/*0x54*/ Vec3f cameraToObject;
#ifdef OBJECTS_REJ
u16 ucode;
#endif
};
struct ObjectNode {