Skip to content

fix WeatherParticleMesh assertion failure on high precipitation settings #561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nschimme merged 4 commits into from
Oct 1, 2026
Merged

fix WeatherParticleMesh assertion failure on high precipitation settings #561

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6533c69
add Web platform landing page and PWA setup instructions
nschimme Sep 14, 2026
817e32d
Merge branch 'MUME:master' into master
nschimme Sep 24, 2026
9704f61
Fix WeatherParticleMesh assertion failure on high precipitation settings
nschimme Oct 1, 2026
b343f2d
Fix WeatherParticleMesh assertion failure on high precipitation settings
nschimme Oct 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/opengl/legacy/WeatherMeshes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ void WeatherParticleMesh::setIntensity(const float intensity)
return;
}

assert(isClamped(intensity, 0.f, 1.f));
m_intensity = std::clamp(intensity, 0.f, 1.f);
assert(intensity >= 0.f);
m_intensity = std::max(0.f, intensity);
}

void WeatherParticleMesh::init()
Expand Down Expand Up @@ -174,9 +174,11 @@ void WeatherParticleMesh::virt_render(const GLRenderState &renderState)
if (m_intensity > 0.0f) {
// Thinning: use precipitation intensity to drive instance count.
const auto maxCount = static_cast<GLsizei>(m_numParticles);
const auto count = std::max<GLsizei>(1,
static_cast<GLsizei>(m_intensity
* static_cast<float>(maxCount)));
const auto count = (m_intensity >= 1.0f)
? maxCount
: std::max<GLsizei>(1,
static_cast<GLsizei>(
m_intensity * static_cast<float>(maxCount)));

const glm::mat4 mvp = renderState.mvp.value_or(m_functions.getProjectionMatrix());
auto &prog = deref(m_renderProgram);
Expand Down
Loading