mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-16 04:23:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

First pink screen!

Browse Source
This commit is contained in:
Lurs
2026-02-21 22:15:39 +01:00
parent a41c3d59b4
commit 22a86deb76
34 changed files with 238 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_alink_kandelaar.inc
+3 -3
View File
@@ -196,8 +196,8 @@ void daAlink_c::preKandelaarDraw() {
field_0x32c8 = 0;
}
f32 near = dComIfGd_getView()->near;
f32 far = dComIfGd_getView()->far;
f32 near_ = dComIfGd_getView()->near_;
f32 far_ = dComIfGd_getView()->far_;
mDoLib_pos2camera(&mKandelaarFlamePos, &proj);
proj.z += 30.0f;
@@ -205,7 +205,7 @@ void daAlink_c::preKandelaarDraw() {
proj.z = -0.01f;
}
field_0x344c = ((near + (far * near) / proj.z) / (far - near) + 1.0f) * 1.6777215E7f;
field_0x344c = ((near_ + (far_ * near_) / proj.z) / (far_ - near_) + 1.0f) * 1.6777215E7f;
}
void daAlink_c::setKandelaarModel() {
src/d/actor/d_a_midna.cpp
+3 -3
View File
@@ -3234,9 +3234,9 @@ int daMidna_c::execute() {
if (!checkShadowModeTalkWait() || fopAcM_getTalkEventPartner(link) == this) {
if (!checkStateFlg0(FLG0_UNK_8000)) {
offStateFlg0((daMidna_FLG0)(FLG0_NPC_NEAR | FLG0_NPC_FAR));
BOOL far;
if (fopAcIt_Judge((fopAcIt_JudgeFunc)daMidna_searchNpc, &far)) {
if (!far) {
BOOL far_;
if (fopAcIt_Judge((fopAcIt_JudgeFunc)daMidna_searchNpc, &far_)) {
if (!far_) {
onStateFlg0(FLG0_NPC_NEAR);
} else {
onStateFlg0(FLG0_NPC_FAR);
src/d/actor/d_a_mirror.cpp
+3 -3
View File
@@ -270,7 +270,7 @@ void dMirror_packet_c::mainDraw() {
int prjPosNum = 4;
view_class* view = dComIfGd_getView();
f32 temp_f22 = -view->near;
f32 temp_f22 = -view->near_;
cXyz* var_r21 = mQuad;
cXyz* var_r22 = sp19C;
int var_r23 = 0;
@@ -427,12 +427,12 @@ void dMirror_packet_c::mainDraw() {
j3dSys.reinitGX();
GXSetScissor(scissor[0], scissor[1], scissor[2], scissor[3]);
mirrorZdraw(sp150, sp138, view->far, var_f31, var_f30, var_f29, var_f28, var_f27);
mirrorZdraw(sp150, sp138, view->far_, var_f31, var_f30, var_f29, var_f28, var_f27);
}
}
void dMirror_packet_c::draw() {
mDoLib_clipper::changeFar(dComIfGd_getView()->far);
mDoLib_clipper::changeFar(dComIfGd_getView()->far_);
if (!mDoLib_clipper::clip(j3dSys.getViewMtx(), &mMaxVal, &mMinVal)) {
mainDraw();
}
src/d/actor/d_a_obj_ari.cpp
+3 -3
View File
@@ -510,14 +510,14 @@ void daObjARI_c::Z_BufferChk() {
dComIfGd_peekZ(vec2.x, vec2.y, &mBufferZ);
}
f32 near = dComIfGd_getView()->near;
f32 far = dComIfGd_getView()->far;
f32 near_ = dComIfGd_getView()->near_;
f32 far_ = dComIfGd_getView()->far_;
mDoLib_pos2camera(&vec1, &vec2);
vec2.z += 50.0f;
if (vec2.z > 0.0f) {
vec2.z = 0.0f;
}
mScreenZ = ((near + far * near / vec2.z) / (far - near) + 1.0f) * 0xffffff;
mScreenZ = ((near_ + far_ * near_ / vec2.z) / (far_ - near_) + 1.0f) * 0xffffff;
}
int daObjARI_c::Delete() {
src/d/actor/d_a_obj_cho.cpp
+3 -3
View File
@@ -300,14 +300,14 @@ void daObjCHO_c::Z_BufferChk() {
dComIfGd_peekZ(vec2.x, vec2.y, &mBufferZ);
}
f32 near = dComIfGd_getView()->near;
f32 far = dComIfGd_getView()->far;
f32 near_ = dComIfGd_getView()->near_;
f32 far_ = dComIfGd_getView()->far_;
mDoLib_pos2camera(&vec1, &vec2);
vec2.z += 50.0f;
if (vec2.z > 0.0f) {
vec2.z = 0.0f;
}
mScreenZ = ((near + far * near / vec2.z) / (far - near) + 1.0f) * 0xffffff;
mScreenZ = ((near_ + far_ * near_ / vec2.z) / (far_ - near_) + 1.0f) * 0xffffff;
}
void daObjCHO_c::ParticleSet() {
src/d/actor/d_a_obj_dan.cpp
+3 -3
View File
@@ -278,14 +278,14 @@ void daObjDAN_c::Z_BufferChk() {
dComIfGd_peekZ(vec2.x, vec2.y, &mBufferZ);
}
f32 near = dComIfGd_getView()->near;
f32 far = dComIfGd_getView()->far;
f32 near_ = dComIfGd_getView()->near_;
f32 far_ = dComIfGd_getView()->far_;
mDoLib_pos2camera(&vec1, &vec2);
vec2.z += 50.0f;
if (vec2.z > 0.0f) {
vec2.z = 0.0f;
}
mScreenZ = ((near + far * near / vec2.z) / (far - near) + 1.0f) * 0xffffff;
mScreenZ = ((near_ + far_ * near_ / vec2.z) / (far_ - near_) + 1.0f) * 0xffffff;
}
void daObjDAN_c::ParticleSet() {
src/d/actor/d_a_obj_kabuto.cpp
+3 -3
View File
@@ -444,14 +444,14 @@ void daObjKABUTO_c::Z_BufferChk() {
dComIfGd_peekZ(vec2.x, vec2.y, &mBufferZ);
}
f32 near = dComIfGd_getView()->near;
f32 far = dComIfGd_getView()->far;
f32 near_ = dComIfGd_getView()->near_;
f32 far_ = dComIfGd_getView()->far_;
mDoLib_pos2camera(&vec1, &vec2);
vec2.z += 50.0f;
if (vec2.z > 0.0f) {
vec2.z = 0.0f;
}
mScreenZ = ((near + far * near / vec2.z) / (far - near) + 1.0f) * 0xffffff;
mScreenZ = ((near_ + far_ * near_ / vec2.z) / (far_ - near_) + 1.0f) * 0xffffff;
}
void daObjKABUTO_c::Action() {
src/d/actor/d_a_obj_kamakiri.cpp
+3 -3
View File
@@ -536,14 +536,14 @@ void daObjKAM_c::Z_BufferChk() {
{
dComIfGd_peekZ(currentProj.x, currentProj.y, &field_0x9bc);
}
f32 near = dComIfGd_getView()->near;
f32 far = dComIfGd_getView()->far;
f32 near_ = dComIfGd_getView()->near_;
f32 far_ = dComIfGd_getView()->far_;
mDoLib_pos2camera(&currentOffset, &currentProj);
currentProj.z += 50.0f;
if (currentProj.z > 0.0f) {
currentProj.z = 0.0f;
}
field_0x9b8 = ((near + (far * near) / currentProj.z) / (far - near) + 1.0f) * 16777215.0f;
field_0x9b8 = ((near_ + (far_ * near_) / currentProj.z) / (far_ - near_) + 1.0f) * 16777215.0f;
}
void daObjKAM_c::ParticleSet() {
src/d/actor/d_a_obj_katatsumuri.cpp
+3 -3
View File
@@ -610,8 +610,8 @@ void daObjKAT_c::Z_BufferChk() {
dComIfGd_peekZ(projected.x,projected.y, &field_0x804);
}
f32 near = dComIfGd_getView()->near;
f32 far = dComIfGd_getView()->far;
f32 near_ = dComIfGd_getView()->near_;
f32 far_ = dComIfGd_getView()->far_;
mDoLib_pos2camera(&curWithOff, &projected);
projected.z += 50.0f;
@@ -619,7 +619,7 @@ void daObjKAT_c::Z_BufferChk() {
projected.z = 0.0f;
}
field_0x800 = ((near + far * near / projected.z) / (far - near) + 1.0f) * 16777215.0f;
field_0x800 = ((near_ + far_ * near_ / projected.z) / (far_ - near_) + 1.0f) * 16777215.0f;
}
int daObjKAT_c::Delete() {
src/d/actor/d_a_obj_kuwagata.cpp
+2 -2
View File
@@ -543,8 +543,8 @@ void daObjKUW_c::Z_BufferChk() {
}
view_class* view = dComIfGd_getView();
f32 nearPlane = view->near;
f32 farPlane = view->far;
f32 nearPlane = view->near_;
f32 farPlane = view->far_;
mDoLib_pos2camera(&cStack_68, &local_5c);
local_5c.z += 50.0f;
src/d/actor/d_a_obj_mirror_chain.cpp
+1 -1
View File
@@ -38,7 +38,7 @@ void dScissorBegin_packet_c::draw() {
cXyz spEC[5];
int sp60 = 4;
view_class* view_p = dComIfGd_getView();
f32 sp58 = -view_p->near;
f32 sp58 = -view_p->near_;
cXyz* sp54 = mQuad;
cXyz* var_r30 = spEC;
src/d/actor/d_a_obj_ten.cpp
+3 -3
View File
@@ -605,14 +605,14 @@ void daObjTEN_c::Z_BufferChk() {
{
dComIfGd_peekZ(local_5c.x, local_5c.y, &field_0x61c);
}
f32 near = dComIfGd_getView()->near;
f32 far = dComIfGd_getView()->far;
f32 near_ = dComIfGd_getView()->near_;
f32 far_ = dComIfGd_getView()->far_;
mDoLib_pos2camera(&cStack_68, &local_5c);
local_5c.z += 50.0f;
if (local_5c.z > 0.0f) {
local_5c.z = 0.0f;
}
field_0x618 = ((near + ((far * near) / local_5c.z)) / (far - near) + 1.0f) * 16777215.0f;
field_0x618 = ((near_ + ((far_ * near_) / local_5c.z)) / (far_ - near_) + 1.0f) * 16777215.0f;
}
static u8 hio_set;
src/d/actor/d_a_obj_tombo.cpp
+3 -3
View File
@@ -516,15 +516,15 @@ void daObjTOMBO_c::Z_BufferChk() {
{
dComIfGd_peekZ(local_5c.x, local_5c.y, &field_0x754);
}
f32 near = dComIfGd_getView()->near;
f32 far = dComIfGd_getView()->far;
f32 near_ = dComIfGd_getView()->near_;
f32 far_ = dComIfGd_getView()->far_;
mDoLib_pos2camera(&cStack_68, &local_5c);
local_5c.z += 50.0f;
if (local_5c.z > 0.0f) {
local_5c.z = 0.0f;
}
field_0x750 =
((near + ((far * near) / local_5c.z)) / (far - near) + 1.0f) * 16777215.0f;
((near_ + ((far_ * near_) / local_5c.z)) / (far_ - near_) + 1.0f) * 16777215.0f;
}
int daObjTOMBO_c::Delete() {
src/d/d_camera.cpp
+5 -5
View File
@@ -10763,10 +10763,10 @@ static void view_setup(camera_process_class* i_this) {
dComIfGd_setViewport(viewport);
dComIfGd_setView(view);
f32 far;
f32 far_;
f32 var_f30;
if (getComStat(8)) {
far = view->far;
far_ = view->far_;
} else {
#if DEBUG
if (g_envHIO.mOther.mAdjustCullFar != 0) {
@@ -10776,10 +10776,10 @@ static void view_setup(camera_process_class* i_this) {
{
var_f30 = dStage_stagInfo_GetCullPoint(dComIfGp_getStageStagInfo());
}
far = var_f30;
far_ = var_f30;
}
mDoLib_clipper::setup(view->fovy, view->aspect, view->near, far);
mDoLib_clipper::setup(view->fovy, view->aspect, view->near_, far_);
}
static void store(camera_process_class* i_camera) {
@@ -10990,7 +10990,7 @@ static int camera_draw(camera_process_class* i_this) {
int trim_height = body->TrimHeight();
window->setScissor(0.0f, trim_height, FB_WIDTH, FB_HEIGHT - trim_height * 2.0f);
C_MTXPerspective(process->projMtx, process->fovy, process->aspect, process->near, process->far);
C_MTXPerspective(process->projMtx, process->fovy, process->aspect, process->near_, process->far_);
mDoMtx_lookAt(process->viewMtx, &process->lookat.eye, &process->lookat.center,
&process->lookat.up, process->bank);
src/d/d_demo.cpp
+2 -2
View File
@@ -450,7 +450,7 @@ f32 dDemo_camera_c::JSGGetProjectionNear() const {
return 0.0f;
}
return view->near;
return view->near_;
}
void dDemo_camera_c::JSGSetProjectionNear(f32 i_projNear) {
@@ -465,7 +465,7 @@ f32 dDemo_camera_c::JSGGetProjectionFar() const {
return 1.0f;
}
return view->far;
return view->far_;
}
void dDemo_camera_c::JSGSetProjectionFar(f32 i_projFar) {
src/d/d_insect.cpp
+2 -2
View File
@@ -98,8 +98,8 @@ void dInsect_c::CalcZBuffer(f32 param_0) {
field_0x578 = 0;
}
f32 view_near = dComIfGd_getView()->near;
f32 view_far = dComIfGd_getView()->far;
f32 view_near = dComIfGd_getView()->near_;
f32 view_far = dComIfGd_getView()->far_;
mDoLib_pos2camera(&pos, &pos_projected);
pos_projected.z += param_0;
src/d/d_kankyo.cpp
+14 -14
View File
@@ -4398,8 +4398,8 @@ static void setLightTevColorType_MAJI_sub(J3DMaterial* material_p, dKy_tevstr_c*
fog_info->mEndZ = tevstr_p->mFogEndZ;
if (dComIfGd_getView() != NULL) {
fog_info->mNearZ = dComIfGd_getView()->near;
fog_info->mFarZ = dComIfGd_getView()->far;
fog_info->mNearZ = dComIfGd_getView()->near_;
fog_info->mFarZ = dComIfGd_getView()->far_;
}
if (fog_info->mType == 7) {
@@ -9326,10 +9326,10 @@ static void GxFogSet_Sub(GXColor* fog_col_p) {
color = *fog_col_p;
if (dComIfGd_getView() != NULL) {
if (dComIfGd_getView()->near >= 0.0f && dComIfGd_getView()->far >= 0.0f) {
if (dComIfGd_getView()->near < dComIfGd_getView()->far) {
near_z = dComIfGd_getView()->near;
far_z = dComIfGd_getView()->far;
if (dComIfGd_getView()->near_ >= 0.0f && dComIfGd_getView()->far_ >= 0.0f) {
if (dComIfGd_getView()->near_ < dComIfGd_getView()->far_) {
near_z = dComIfGd_getView()->near_;
far_z = dComIfGd_getView()->far_;
}
}
}
@@ -9361,10 +9361,10 @@ void dKy_GxFog_tevstr_set(dKy_tevstr_c* tevstr_p) {
color.b = tevstr_p->FogCol.b;
if (dComIfGd_getView() != NULL) {
if (dComIfGd_getView()->near >= 0.0f && dComIfGd_getView()->far >= 0.0f) {
if (dComIfGd_getView()->near < dComIfGd_getView()->far) {
near_z = dComIfGd_getView()->near;
far_z = dComIfGd_getView()->far;
if (dComIfGd_getView()->near_ >= 0.0f && dComIfGd_getView()->far_ >= 0.0f) {
if (dComIfGd_getView()->near_ < dComIfGd_getView()->far_) {
near_z = dComIfGd_getView()->near_;
far_z = dComIfGd_getView()->far_;
}
}
}
@@ -9383,10 +9383,10 @@ void dKy_GfFog_tevstr_set(dKy_tevstr_c* tevstr_p) {
color.b = tevstr_p->FogCol.b;
if (dComIfGd_getView() != NULL) {
if (dComIfGd_getView()->near >= 0.0f && dComIfGd_getView()->far >= 0.0f) {
if (dComIfGd_getView()->near < dComIfGd_getView()->far) {
near_z = dComIfGd_getView()->near;
far_z = dComIfGd_getView()->far;
if (dComIfGd_getView()->near_ >= 0.0f && dComIfGd_getView()->far_ >= 0.0f) {
if (dComIfGd_getView()->near_ < dComIfGd_getView()->far_) {
near_z = dComIfGd_getView()->near_;
far_z = dComIfGd_getView()->far_;
}
}
}
src/d/d_s_name.cpp
+4 -4
View File
@@ -96,8 +96,8 @@ s32 dScnName_c::create() {
dDlst_window_c* window = dComIfGp_getWindow(0);
dComIfGp_setCamera(0, (camera_class*)&mCamera);
mCamera.near = 1.0f;
mCamera.far = 100000.0f;
mCamera.near_ = 1.0f;
mCamera.far_ = 100000.0f;
mCamera.fovy = 45.0f;
mCamera.aspect = mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getHeightF();
mCamera.lookat.eye.set(0.0f, 0.0f, -1000.0f);
@@ -139,8 +139,8 @@ static const char* dummyString(int i) {
#endif
void dScnName_c::setView() {
C_MTXPerspective(mCamera.projMtx, mCamera.fovy, mCamera.aspect, mCamera.near,
mCamera.far);
C_MTXPerspective(mCamera.projMtx, mCamera.fovy, mCamera.aspect, mCamera.near_,
mCamera.far_);
mDoMtx_lookAt(mCamera.viewMtx, &mCamera.lookat.eye, &mCamera.lookat.center,
mCamera.bank);
MTXInverse(mCamera.viewMtx, mCamera.invViewMtx);