mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2024-11-25 05:25:14 +00:00
nuke TARGET_N64 remnants
This commit is contained in:
parent
c33936e862
commit
bf174e36a6
3 changed files with 1 additions and 17 deletions
|
@ -267,20 +267,8 @@ static void geo_process_perspective(struct GraphNodePerspective *node) {
|
||||||
* range of this node.
|
* range of this node.
|
||||||
*/
|
*/
|
||||||
static void geo_process_level_of_detail(struct GraphNodeLevelOfDetail *node) {
|
static void geo_process_level_of_detail(struct GraphNodeLevelOfDetail *node) {
|
||||||
#ifdef GBI_FLOATS
|
|
||||||
Mtx *mtx = gMatStackFixed[gMatStackIndex];
|
|
||||||
s16 distanceFromCam = (s32) -mtx->m[3][2]; // z-component of the translation column
|
|
||||||
#else
|
|
||||||
// The fixed point Mtx type is defined as 16 longs, but it's actually 16
|
|
||||||
// shorts for the integer parts followed by 16 shorts for the fraction parts
|
|
||||||
Mtx *mtx = gMatStackFixed[gMatStackIndex];
|
|
||||||
s16 distanceFromCam = -GET_HIGH_S16_OF_32(mtx->m[1][3]); // z-component of the translation column
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef TARGET_N64
|
|
||||||
// We assume modern hardware is powerful enough to draw the most detailed variant
|
// We assume modern hardware is powerful enough to draw the most detailed variant
|
||||||
distanceFromCam = 0;
|
s16 distanceFromCam = 0;
|
||||||
#endif
|
|
||||||
|
|
||||||
if (node->minDistance <= distanceFromCam && distanceFromCam < node->maxDistance) {
|
if (node->minDistance <= distanceFromCam && distanceFromCam < node->maxDistance) {
|
||||||
if (node->node.children != 0) {
|
if (node->node.children != 0) {
|
||||||
|
|
|
@ -13,10 +13,8 @@
|
||||||
#include "shadow.h"
|
#include "shadow.h"
|
||||||
#include "sm64.h"
|
#include "sm64.h"
|
||||||
|
|
||||||
#ifndef TARGET_N64
|
|
||||||
// Avoid Z-fighting
|
// Avoid Z-fighting
|
||||||
#define find_floor_height_and_data 0.4 + find_floor_height_and_data
|
#define find_floor_height_and_data 0.4 + find_floor_height_and_data
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @file shadow.c
|
* @file shadow.c
|
||||||
|
|
|
@ -394,10 +394,8 @@ s32 lvl_init_act_selector_values_and_stars(UNUSED s32 arg, UNUSED s32 unused) {
|
||||||
sInitSelectedActNum = 0;
|
sInitSelectedActNum = 0;
|
||||||
sVisibleStars = 0;
|
sVisibleStars = 0;
|
||||||
sActSelectorMenuTimer = 0;
|
sActSelectorMenuTimer = 0;
|
||||||
#ifdef NO_SEGMENTED_MEMORY
|
|
||||||
sSelectedActIndex = 0;
|
sSelectedActIndex = 0;
|
||||||
sSelectableStarIndex = 0;
|
sSelectableStarIndex = 0;
|
||||||
#endif
|
|
||||||
sObtainedStars = save_file_get_course_star_count(gCurrSaveFileNum - 1, gCurrCourseNum - 1);
|
sObtainedStars = save_file_get_course_star_count(gCurrSaveFileNum - 1, gCurrCourseNum - 1);
|
||||||
|
|
||||||
// Don't count 100 coin star
|
// Don't count 100 coin star
|
||||||
|
|
Loading…
Reference in a new issue