Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source
This commit is contained in:
Wojciech Figat
2026-04-16 14:04:21 +02:00
parent 232db03427 51af51d008
commit 712420cca7
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Engine/Level/Actors/Camera.cpp
+2
View File
@@ -454,6 +454,7 @@ void Camera::Serialize(SerializeStream& stream, const void* otherObj)
SERIALIZE_MEMBER(CustomAspectRatio, _customAspectRatio); SERIALIZE_MEMBER(CustomAspectRatio, _customAspectRatio);
SERIALIZE_MEMBER(Near, _near); SERIALIZE_MEMBER(Near, _near);
SERIALIZE_MEMBER(Far, _far); SERIALIZE_MEMBER(Far, _far);
SERIALIZE_MEMBER(OrthoSize, _orthoSize);
SERIALIZE_MEMBER(OrthoScale, _orthoScale); SERIALIZE_MEMBER(OrthoScale, _orthoScale);
SERIALIZE(RenderLayersMask); SERIALIZE(RenderLayersMask);
SERIALIZE(RenderFlags); SERIALIZE(RenderFlags);
@@ -470,6 +471,7 @@ void Camera::Deserialize(DeserializeStream& stream, ISerializeModifier* modifier
DESERIALIZE_MEMBER(CustomAspectRatio, _customAspectRatio); DESERIALIZE_MEMBER(CustomAspectRatio, _customAspectRatio);
DESERIALIZE_MEMBER(Near, _near); DESERIALIZE_MEMBER(Near, _near);
DESERIALIZE_MEMBER(Far, _far); DESERIALIZE_MEMBER(Far, _far);
DESERIALIZE_MEMBER(OrthoSize, _orthoSize);
DESERIALIZE_MEMBER(OrthoScale, _orthoScale); DESERIALIZE_MEMBER(OrthoScale, _orthoScale);
DESERIALIZE(RenderLayersMask); DESERIALIZE(RenderLayersMask);
DESERIALIZE(RenderFlags); DESERIALIZE(RenderFlags);
Source/Engine/Terrain/TerrainPatch.cpp
+3 -3
View File
@@ -2591,11 +2591,11 @@ void TerrainPatch::ExtractCollisionGeometry(Array<Float3>& vertexBuffer, Array<i
const int32 indexCount = (rows - 1) * (cols - 1) * 6; const int32 indexCount = (rows - 1) * (cols - 1) * 6;
indexBuffer.Resize(indexCount); indexBuffer.Resize(indexCount);
int32* ib = indexBuffer.Get(); int32* ib = indexBuffer.Get();
for (int32 col = 0; col < cols - 1; col++) for (int32 row = 0; row < rows - 1; row++)
{ {
for (int32 row = 0; row < rows - 1; row++) for (int32 col = 0; col < cols - 1; col++)
{ {
#define GET_INDEX(x, y) *ib++ = (col + (y)) + (row + (x)) * cols #define GET_INDEX(x, y) *ib++ = (col + (y)) * cols + (row + (x))
GET_INDEX(0, 0); GET_INDEX(0, 0);
GET_INDEX(1, 1); GET_INDEX(1, 1);