xuanchi/XCEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stabilize visible render item sorting

Browse Source
This commit is contained in:
ssdfasd
2026-04-05 19:19:47 +08:00
parent 31693a83b6
commit 1de8091b77
4 changed files with 73 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engine/include/XCEngine/Rendering/RenderSceneUtility.h
View File

@@ -27,6 +27,10 @@ void AppendRenderItemsForGameObject(
const Math::Vector3& cameraPosition,
std::vector<VisibleRenderItem>& outVisibleItems);
bool CompareVisibleRenderItemsStable(
const VisibleRenderItem& lhs,
const VisibleRenderItem& rhs);
std::vector<VisibleRenderItem> CollectRenderItemsForEntityIds(
const Components::Scene& scene,
const std::vector<uint64_t>& entityIds,

17
engine/src/Rendering/RenderSceneExtractor.cpp
View File

@@ -113,22 +113,7 @@ uint32_t GetAdditionalLightTypeRank(const Components::LightComponent& light) {
}
bool CompareVisibleItems(const VisibleRenderItem& lhs, const VisibleRenderItem& rhs) {
if (lhs.renderQueue != rhs.renderQueue) {
return lhs.renderQueue < rhs.renderQueue;
}
const bool isTransparentQueue = IsTransparentRenderQueue(lhs.renderQueue);
if (lhs.cameraDistanceSq != rhs.cameraDistanceSq) {
return isTransparentQueue
? lhs.cameraDistanceSq > rhs.cameraDistanceSq
: lhs.cameraDistanceSq < rhs.cameraDistanceSq;
}
if (lhs.gameObject != rhs.gameObject) {
return lhs.gameObject < rhs.gameObject;
}
return lhs.sectionIndex < rhs.sectionIndex;
return CompareVisibleRenderItemsStable(lhs, rhs);
}
} // namespace

35
engine/src/Rendering/RenderSceneUtility.cpp
View File

@@ -116,6 +116,41 @@ void AppendRenderItemsForGameObject(
outVisibleItems.push_back(visibleItem);
}
bool CompareVisibleRenderItemsStable(
const VisibleRenderItem& lhs,
const VisibleRenderItem& rhs) {
if (lhs.renderQueue != rhs.renderQueue) {
return lhs.renderQueue < rhs.renderQueue;
}
const bool isTransparentQueue = IsTransparentRenderQueue(lhs.renderQueue);
if (lhs.cameraDistanceSq != rhs.cameraDistanceSq) {
return isTransparentQueue
? lhs.cameraDistanceSq > rhs.cameraDistanceSq
: lhs.cameraDistanceSq < rhs.cameraDistanceSq;
}
const Core::uint64 lhsObjectId = lhs.gameObject != nullptr ? lhs.gameObject->GetID() : 0u;
const Core::uint64 rhsObjectId = rhs.gameObject != nullptr ? rhs.gameObject->GetID() : 0u;
if (lhsObjectId != rhsObjectId) {
return lhsObjectId < rhsObjectId;
}
if (lhs.hasSection != rhs.hasSection) {
return lhs.hasSection && !rhs.hasSection;
}
if (lhs.sectionIndex != rhs.sectionIndex) {
return lhs.sectionIndex < rhs.sectionIndex;
}
if (lhs.materialIndex != rhs.materialIndex) {
return lhs.materialIndex < rhs.materialIndex;
}
return false;
}
std::vector<VisibleRenderItem> CollectRenderItemsForEntityIds(
const Components::Scene& scene,
const std::vector<uint64_t>& entityIds,

33
tests/Rendering/unit/test_render_scene_utility.cpp
View File

@@ -11,6 +11,8 @@
#include <cmath>
#include <memory>
#include <new>
#include <type_traits>
#include <vector>
namespace {
@@ -24,7 +26,9 @@ using XCEngine::Components::Scene;
using XCEngine::Math::Matrix4x4;
using XCEngine::Math::Vector3;
using XCEngine::Rendering::BuildRenderCameraData;
using XCEngine::Rendering::CompareVisibleRenderItemsStable;
using XCEngine::Rendering::CollectRenderItemsForEntityIds;
using XCEngine::Rendering::VisibleRenderItem;
using XCEngine::Resources::Mesh;
using XCEngine::Resources::MeshSection;
using XCEngine::Resources::StaticMeshVertex;
@@ -211,4 +215,33 @@ TEST_F(RenderSceneUtilityTest, CollectRenderItemsForEntityIdsExpandsMeshSections
EXPECT_EQ(renderables[1].materialIndex, 1u);
}
TEST(RenderSceneUtilityStandaloneTest, CompareVisibleRenderItemsUsesStableObjectIdOrdering) {
using Storage = std::aligned_storage_t<sizeof(GameObject), alignof(GameObject)>;
Storage storage[2];
GameObject* lowerIdHigherAddress = new (&storage[1]) GameObject("LowerId");
GameObject* higherIdLowerAddress = new (&storage[0]) GameObject("HigherId");
ASSERT_LT(lowerIdHigherAddress->GetID(), higherIdLowerAddress->GetID());
ASSERT_GT(
reinterpret_cast<uintptr_t>(lowerIdHigherAddress),
reinterpret_cast<uintptr_t>(higherIdLowerAddress));
VisibleRenderItem lhs = {};
lhs.gameObject = lowerIdHigherAddress;
lhs.renderQueue = 2000;
lhs.cameraDistanceSq = 9.0f;
VisibleRenderItem rhs = {};
rhs.gameObject = higherIdLowerAddress;
rhs.renderQueue = 2000;
rhs.cameraDistanceSq = 9.0f;
EXPECT_TRUE(CompareVisibleRenderItemsStable(lhs, rhs));
EXPECT_FALSE(CompareVisibleRenderItemsStable(rhs, lhs));
higherIdLowerAddress->~GameObject();
lowerIdHigherAddress->~GameObject();
}
} // namespace