mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-25 18:04:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

kankyo mostly done (#2269)

Browse Source 
* work on kankyo

* some more kankyo work

* kankyo almost done

* kankyo mostly done

* first cleanup pass

* some more renaming

* rename a bunch of kankyo vars

* fix regression
This commit is contained in:
TakaRikka
2024-12-24 06:52:12 -08:00
committed by GitHub
parent d874f05f44
commit ad2badcd29
83 changed files with 5300 additions and 3384 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_vrbox.cpp
+15 -15
View File
@@ -17,7 +17,7 @@ static int daVrbox_Draw(vrbox_class* i_this) {
daVrbox_color_set(i_this);
if (g_env_light.mVrboxInvisible) {
if (g_env_light.hide_vrbox) {
return 1;
}
@@ -64,16 +64,16 @@ static int daVrbox_Draw(vrbox_class* i_this) {
/* 804986B8-80498850 000218 0198+00 1/1 0/0 0/0 .text daVrbox_color_set__FP11vrbox_class
*/
static int daVrbox_color_set(vrbox_class* i_this) {
if ((g_env_light.mVrKasumiCol.r + g_env_light.mVrKasumiCol.g +
g_env_light.mVrKasumiCol.b + g_env_light.mVrSkyCol.r + g_env_light.mVrSkyCol.g +
g_env_light.mVrSkyCol.b + g_env_light.mVrkumoCol.r + g_env_light.mVrkumoCol.g +
g_env_light.mVrkumoCol.b) == 0)
if ((g_env_light.vrbox_kasumi_outer_col.r + g_env_light.vrbox_kasumi_outer_col.g +
g_env_light.vrbox_kasumi_outer_col.b + g_env_light.vrbox_sky_col.r + g_env_light.vrbox_sky_col.g +
g_env_light.vrbox_sky_col.b + g_env_light.vrbox_kumo_top_col.r + g_env_light.vrbox_kumo_top_col.g +
g_env_light.vrbox_kumo_top_col.b) == 0)
{
g_env_light.mVrboxInvisible = true;
g_env_light.hide_vrbox = true;
return 1;
}
g_env_light.mVrboxInvisible = false;
g_env_light.hide_vrbox = false;
J3DModelData* modelData = i_this->mpSoraModel->getModelData();
J3DGXColorS10 color;
@@ -83,9 +83,9 @@ static int daVrbox_color_set(vrbox_class* i_this) {
material_0->setCullMode(0);
material_0->change();
color.r = g_env_light.mVrSkyCol.r;
color.g = g_env_light.mVrSkyCol.g;
color.b = g_env_light.mVrSkyCol.b;
color.r = g_env_light.vrbox_sky_col.r;
color.g = g_env_light.vrbox_sky_col.g;
color.b = g_env_light.vrbox_sky_col.b;
color.a = 255;
material_0->setTevColor(0, &color);
}
@@ -95,10 +95,10 @@ static int daVrbox_color_set(vrbox_class* i_this) {
material_1->setCullMode(0);
material_1->change();
color.r = g_env_light.mVrOkuKasumiCol.r;
color.g = g_env_light.mVrOkuKasumiCol.g;
color.b = g_env_light.mVrOkuKasumiCol.b;
color.a = g_env_light.mVrOkuKasumiCol.a;
color.r = g_env_light.vrbox_kasumi_inner_col.r;
color.g = g_env_light.vrbox_kasumi_inner_col.g;
color.b = g_env_light.vrbox_kasumi_inner_col.b;
color.a = g_env_light.vrbox_kasumi_inner_col.a;
material_1->setTevColor(0, &color);
}
@@ -142,7 +142,7 @@ static int daVrbox_Create(fopAc_ac_c* i_this) {
if (fopAcM_entrySolidHeap(this_, daVrbox_solidHeapCB, 0xC60)) {
dComIfGp_onStatus(1);
g_env_light.mVrboxInvisible = false;
g_env_light.hide_vrbox = false;
} else {
phase = cPhs_ERROR_e;
}