Stan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Queries water manager only if a model should account it.

Browse Source 
Tested By: phosit
Differential Revision: https://code.wildfiregames.com/D5122
This was SVN commit r27833.
This commit is contained in:
Vladislav Belov 2023-09-10 18:00:30 +00:00
parent becc09c23e
commit fdbcb79c3d
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/graphics/Model.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2022 Wildfire Games.
/* Copyright (C) 2023 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -297,12 +297,15 @@ void CModel::ValidatePosition()
objectHeight = cmpTerrain->GetExactGroundLevel(objTranslation.X, objTranslation.Z);
// Object height is incorrect for floating objects. We use water height instead.
CmpPtr<ICmpWaterManager> cmpWaterManager(m_Simulation, SYSTEM_ENTITY);
if (cmpWaterManager)
if (m_Flags & MODELFLAG_FLOATONWATER)
{
float waterHeight = cmpWaterManager->GetExactWaterLevel(objTranslation.X, objTranslation.Z);
if (waterHeight >= objectHeight && m_Flags & MODELFLAG_FLOATONWATER)
objectHeight = waterHeight;
CmpPtr<ICmpWaterManager> cmpWaterManager(m_Simulation, SYSTEM_ENTITY);
if (cmpWaterManager)
{
const float waterHeight = cmpWaterManager->GetExactWaterLevel(objTranslation.X, objTranslation.Z);
if (waterHeight >= objectHeight)
objectHeight = waterHeight;
}
}
// re-position and validate all props