pass TFogOptions by value, not pointer, and rearrange struct fields to minimize alignment issues

This commit is contained in:
Nick Fisher
2025-06-05 16:40:53 +08:00
parent a9553da1d4
commit acf03ea0c7
2 changed files with 22 additions and 21 deletions

View File

@@ -256,27 +256,26 @@ namespace thermion
auto *view = reinterpret_cast<View *>(tView);
view->setFrontFaceWindingInverted(inverted);
}
EMSCRIPTEN_KEEPALIVE void View_setFogOptions(TView *tView, TFogOptions *tFogOptions)
EMSCRIPTEN_KEEPALIVE void View_setFogOptions(TView *tView, TFogOptions tFogOptions)
{
auto view = reinterpret_cast<View *>(tView);
FogOptions fogOptions {
.distance = tFogOptions->distance,
.cutOffDistance = tFogOptions->cutOffDistance,
.maximumOpacity = tFogOptions->maximumOpacity,
.height = tFogOptions->height,
.heightFalloff = tFogOptions->heightFalloff,
.color = LinearColor(tFogOptions->linearColor.x, tFogOptions->linearColor.y, tFogOptions->linearColor.z),
.density = tFogOptions->density,
.inScatteringStart = tFogOptions->inScatteringStart,
.inScatteringSize = tFogOptions->inScatteringSize,
.fogColorFromIbl = tFogOptions->fogColorFromIbl,
.skyColor = reinterpret_cast<Texture *>(tFogOptions->skyColor),
.enabled = tFogOptions->enabled
.distance = tFogOptions.distance,
.cutOffDistance = tFogOptions.cutOffDistance,
.maximumOpacity = tFogOptions.maximumOpacity,
.height = tFogOptions.height,
.heightFalloff = tFogOptions.heightFalloff,
.color = LinearColor(tFogOptions.linearColorR, tFogOptions.linearColorG, tFogOptions.linearColorB),
.density = tFogOptions.density,
.inScatteringStart = tFogOptions.inScatteringStart,
.inScatteringSize = tFogOptions.inScatteringSize,
.fogColorFromIbl = tFogOptions.fogColorFromIbl == 1,
.skyColor = reinterpret_cast<Texture *>(tFogOptions.skyColor),
.enabled = tFogOptions.enabled == 1
};
TRACE("Setting fog enabled to %d (tFogOptions->cutOffDistance %f)", fogOptions.enabled, tFogOptions->cutOffDistance);
TRACE("Setting fog enabled to %d (tFogOptions.cutOffDistance %f)", fogOptions.enabled, tFogOptions.cutOffDistance);
view->setFogOptions(fogOptions);
}