Skip to content

Commit a0551b0

Browse files
committed
fix(Camera3D): 'UseDefaultSkybox' is now correctly used
1 parent a232b6d commit a0551b0

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

Nostalgia/things/thinkers/3d/camera_3d.cpp

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,13 @@ void Camera3D::SetVariables(Farg<ThingData> data)
5555
data.get_variable(mViewCutoffFar, "Far", "CutoffFar");
5656
if(bool use_default_skybox{false}; data.get_variable(use_default_skybox, "UseDefaultSkybox") == OK)
5757
{
58-
mEnvironment.mType = Environment::BG_SKYBOX;
59-
mEnvironment.mSkyboxTextureID = UID::t_ShittySkybox;
58+
if(use_default_skybox)
59+
{
60+
mEnvironment.mType = Environment::BG_SKYBOX;
61+
mEnvironment.mSkyboxTextureID = UID::t_ShittySkybox;
62+
}
63+
else
64+
{ mEnvironment.mType = Environment::BG_CLEAR_COLOR; }
6065
}
6166
data.get_variable(mInitCurrent, "Current", "CurrentCamera", "IsCurrent");
6267
if(data.get_variable(mEnvironment.mSkyboxTextureID, "EnvironmentSkybox") == OK)
@@ -67,8 +72,7 @@ void Camera3D::SetVariables(Farg<ThingData> data)
6772
mEnvironment.mType = Environment::BG_CUSTOM_COLOR;
6873
mEnvironment.mCustomColor = color;
6974
}
70-
data.get_variable(mEnvironment.mCustomColorAlpha,
71-
"EnvironmentColorAlpha", "EnvironmentAlpha");
75+
data.get_variable(mEnvironment.mCustomColorAlpha, "EnvironmentColorAlpha", "EnvironmentAlpha");
7276
}
7377

7478
Shared<ThingData> Camera3D::GetVariables() const
@@ -80,9 +84,8 @@ Shared<ThingData> Camera3D::GetVariables() const
8084
data->set_variable(mViewCutoffNear, "Near");
8185
data->set_variable(mViewCutoffFar, "Far");
8286
data->set_variable(mInitCurrent, "Current");
83-
if(mEnvironment.mType == Environment::BG_SKYBOX
84-
and mEnvironment.mSkyboxTextureID == UID::t_ShittySkybox)
85-
{ data->set_variable(true, "UseDefaultSkybox"); }
87+
data->set_variable((mEnvironment.mType == Environment::BG_SKYBOX
88+
and mEnvironment.mSkyboxTextureID == UID::t_ShittySkybox), "UseDefaultSkybox");
8689
if(mEnvironment.mType == Environment::BG_CUSTOM_COLOR)
8790
{ data->set_variable(mEnvironment.mCustomColor.glm(), "EnvironmentColor"); }
8891
data->set_variable(mEnvironment.mCustomColorAlpha, "EnvironmentColorAlpha");

0 commit comments

Comments
 (0)