GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 1.12

Browse Source 
# Conflicts:
#	Content/Editor/MaterialTemplates/Deformable.shader
#	Flax.flaxproj
#	Source/Engine/Content/Content.h
#	Source/Engine/Serialization/JsonTools.cpp
This commit is contained in:
Wojtek Figat
2026-04-01 17:14:21 +02:00
parent 9f54bca831 9a7abd751f
commit 2fc95bdf57
115 changed files with 2933 additions and 1074 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Tools/ModelTool/ModelTool.cpp
View File

@@ -438,7 +438,7 @@ bool ModelTool::GenerateModelSDF(Model* inputModel, const ModelData* modelData,
minDistance *= -1; // Voxel is inside the geometry so turn it into negative distance to the surface
const int32 xAddress = x + yAddress;
formatWrite(voxels.Get() + xAddress * formatStride, minDistance * encodeMAD.X + encodeMAD.Y);
formatWrite(voxels.Get() + xAddress * formatStride, (float)minDistance * encodeMAD.X + encodeMAD.Y);
}
}
};