AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AxioDL/urde

This commit is contained in:
Phillip Stephens 2016-09-03 00:24:06 -07:00
parent 12e6702389 c29013ba89
commit 5880137b3a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Runtime/World/CWorldTransManager.cpp
View File

@ -353,11 +353,12 @@ void CWorldTransManager::EnableTransition(const CAnimRes& samusRes,
if (bgRes != -1) if (bgRes != -1)
{ {
x4_modelData->x100_bgModelData[0] = CStaticRes(bgRes, bgScale); CStaticRes bg(bgRes, bgScale);
x4_modelData->x100_bgModelData[0] = bg;
x4_modelData->x100_bgModelData[0].Touch(CModelData::EWhichModel::Normal, 0); x4_modelData->x100_bgModelData[0].Touch(CModelData::EWhichModel::Normal, 0);
x4_modelData->x100_bgModelData[1] = CStaticRes(bgRes, bgScale); x4_modelData->x100_bgModelData[1] = bg;
x4_modelData->x100_bgModelData[1].Touch(CModelData::EWhichModel::Normal, 0); x4_modelData->x100_bgModelData[1].Touch(CModelData::EWhichModel::Normal, 0);
x4_modelData->x100_bgModelData[2] = CStaticRes(bgRes, bgScale); x4_modelData->x100_bgModelData[2] = bg;
x4_modelData->x100_bgModelData[2].Touch(CModelData::EWhichModel::Normal, 0); x4_modelData->x100_bgModelData[2].Touch(CModelData::EWhichModel::Normal, 0);
zeus::CAABox bounds = x4_modelData->x100_bgModelData[0].GetBounds(); zeus::CAABox bounds = x4_modelData->x100_bgModelData[0].GetBounds();
x1c_bgHeight = (bounds.max.z - bounds.min.z) * bgScale.z; x1c_bgHeight = (bounds.max.z - bounds.min.z) * bgScale.z;