refactor: move scene view infinite grid pass into renderer
This commit is contained in:
@@ -19,7 +19,6 @@ set(EDITOR_TEST_SOURCES
|
||||
${CMAKE_SOURCE_DIR}/editor/src/Viewport/SceneViewportMoveGizmo.cpp
|
||||
${CMAKE_SOURCE_DIR}/editor/src/Viewport/SceneViewportRotateGizmo.cpp
|
||||
${CMAKE_SOURCE_DIR}/editor/src/Viewport/SceneViewportScaleGizmo.cpp
|
||||
${CMAKE_SOURCE_DIR}/editor/src/Viewport/SceneViewportGrid.cpp
|
||||
)
|
||||
|
||||
add_executable(editor_tests ${EDITOR_TEST_SOURCES})
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
#include "Viewport/SceneViewportCameraController.h"
|
||||
#include "Viewport/SceneViewportGrid.h"
|
||||
#include "Viewport/SceneViewportMath.h"
|
||||
|
||||
#include <XCEngine/Components/GameObject.h>
|
||||
#include <XCEngine/Core/Math/Vector4.h>
|
||||
#include <XCEngine/Rendering/Passes/BuiltinInfiniteGridPass.h>
|
||||
#include <cmath>
|
||||
|
||||
namespace {
|
||||
@@ -47,25 +47,40 @@ bool IsPowerOfTenSpacing(float value) {
|
||||
|
||||
} // namespace
|
||||
|
||||
using XCEngine::Editor::BuildSceneGridParameters;
|
||||
XCEngine::Rendering::Passes::InfiniteGridPassData ToInfiniteGridPassData(
|
||||
const XCEngine::Editor::SceneViewportOverlayData& overlay) {
|
||||
XCEngine::Rendering::Passes::InfiniteGridPassData data = {};
|
||||
data.valid = overlay.valid;
|
||||
data.cameraPosition = overlay.cameraPosition;
|
||||
data.cameraForward = overlay.cameraForward;
|
||||
data.cameraRight = overlay.cameraRight;
|
||||
data.cameraUp = overlay.cameraUp;
|
||||
data.verticalFovDegrees = overlay.verticalFovDegrees;
|
||||
data.nearClipPlane = overlay.nearClipPlane;
|
||||
data.farClipPlane = overlay.farClipPlane;
|
||||
data.orbitDistance = overlay.orbitDistance;
|
||||
return data;
|
||||
}
|
||||
|
||||
using XCEngine::Editor::BuildSceneViewportAxisDragPlaneNormal;
|
||||
using XCEngine::Editor::SceneViewportCameraController;
|
||||
using XCEngine::Editor::BuildSceneViewportProjectionMatrix;
|
||||
using XCEngine::Editor::BuildSceneViewportViewMatrix;
|
||||
using XCEngine::Editor::ProjectSceneViewportWorldPoint;
|
||||
using XCEngine::Editor::SceneGridParameters;
|
||||
using XCEngine::Editor::SceneViewportOverlayData;
|
||||
using XCEngine::Components::GameObject;
|
||||
using XCEngine::Math::Vector3;
|
||||
using XCEngine::Math::Vector4;
|
||||
using XCEngine::Rendering::Passes::BuildInfiniteGridParameters;
|
||||
using XCEngine::Rendering::Passes::InfiniteGridParameters;
|
||||
|
||||
TEST(SceneViewportOverlayRenderer_Test, BuildSceneGridParametersUsesPowerOfTenSpacingSeries) {
|
||||
TEST(SceneViewportOverlayRenderer_Test, BuildInfiniteGridParametersUsesPowerOfTenSpacingSeries) {
|
||||
SceneViewportOverlayData overlay = {};
|
||||
overlay.valid = true;
|
||||
overlay.cameraPosition = Vector3(0.0f, 6.0f, -6.0f);
|
||||
overlay.cameraForward = Vector3(0.0f, -0.5f, 0.8660254f);
|
||||
|
||||
const SceneGridParameters parameters = BuildSceneGridParameters(overlay);
|
||||
const InfiniteGridParameters parameters = BuildInfiniteGridParameters(ToInfiniteGridPassData(overlay));
|
||||
|
||||
EXPECT_TRUE(parameters.valid);
|
||||
EXPECT_TRUE(IsPowerOfTenSpacing(parameters.baseScale));
|
||||
@@ -74,7 +89,7 @@ TEST(SceneViewportOverlayRenderer_Test, BuildSceneGridParametersUsesPowerOfTenSp
|
||||
EXPECT_GT(parameters.fadeDistance, parameters.baseScale);
|
||||
}
|
||||
|
||||
TEST(SceneViewportOverlayRenderer_Test, BuildSceneGridParametersIsStableAcrossHorizontalCameraMovement) {
|
||||
TEST(SceneViewportOverlayRenderer_Test, BuildInfiniteGridParametersIsStableAcrossHorizontalCameraMovement) {
|
||||
SceneViewportOverlayData left = {};
|
||||
left.valid = true;
|
||||
left.cameraPosition = Vector3(-120.0f, 12.0f, 40.0f);
|
||||
@@ -83,8 +98,8 @@ TEST(SceneViewportOverlayRenderer_Test, BuildSceneGridParametersIsStableAcrossHo
|
||||
SceneViewportOverlayData right = left;
|
||||
right.cameraPosition = Vector3(380.0f, 12.0f, -260.0f);
|
||||
|
||||
const SceneGridParameters leftParameters = BuildSceneGridParameters(left);
|
||||
const SceneGridParameters rightParameters = BuildSceneGridParameters(right);
|
||||
const InfiniteGridParameters leftParameters = BuildInfiniteGridParameters(ToInfiniteGridPassData(left));
|
||||
const InfiniteGridParameters rightParameters = BuildInfiniteGridParameters(ToInfiniteGridPassData(right));
|
||||
|
||||
EXPECT_TRUE(leftParameters.valid);
|
||||
EXPECT_TRUE(rightParameters.valid);
|
||||
@@ -93,7 +108,7 @@ TEST(SceneViewportOverlayRenderer_Test, BuildSceneGridParametersIsStableAcrossHo
|
||||
EXPECT_FLOAT_EQ(leftParameters.fadeDistance, rightParameters.fadeDistance);
|
||||
}
|
||||
|
||||
TEST(SceneViewportOverlayRenderer_Test, BuildSceneGridParametersExpandsScaleAsCameraHeightGrows) {
|
||||
TEST(SceneViewportOverlayRenderer_Test, BuildInfiniteGridParametersExpandsScaleAsCameraHeightGrows) {
|
||||
SceneViewportOverlayData nearOverlay = {};
|
||||
nearOverlay.valid = true;
|
||||
nearOverlay.cameraPosition = Vector3(0.0f, 3.0f, -4.0f);
|
||||
@@ -102,8 +117,8 @@ TEST(SceneViewportOverlayRenderer_Test, BuildSceneGridParametersExpandsScaleAsCa
|
||||
SceneViewportOverlayData farOverlay = nearOverlay;
|
||||
farOverlay.cameraPosition = Vector3(0.0f, 120.0f, -150.0f);
|
||||
|
||||
const SceneGridParameters nearParameters = BuildSceneGridParameters(nearOverlay);
|
||||
const SceneGridParameters farParameters = BuildSceneGridParameters(farOverlay);
|
||||
const InfiniteGridParameters nearParameters = BuildInfiniteGridParameters(ToInfiniteGridPassData(nearOverlay));
|
||||
const InfiniteGridParameters farParameters = BuildInfiniteGridParameters(ToInfiniteGridPassData(farOverlay));
|
||||
|
||||
EXPECT_TRUE(nearParameters.valid);
|
||||
EXPECT_TRUE(farParameters.valid);
|
||||
@@ -111,20 +126,20 @@ TEST(SceneViewportOverlayRenderer_Test, BuildSceneGridParametersExpandsScaleAsCa
|
||||
EXPECT_GE(farParameters.fadeDistance, nearParameters.fadeDistance);
|
||||
}
|
||||
|
||||
TEST(SceneViewportOverlayRenderer_Test, BuildSceneGridParametersPromotesMajorLinesByDecimalGrouping) {
|
||||
TEST(SceneViewportOverlayRenderer_Test, BuildInfiniteGridParametersPromotesMajorLinesByDecimalGrouping) {
|
||||
SceneViewportOverlayData overlay = {};
|
||||
overlay.valid = true;
|
||||
overlay.cameraPosition = Vector3(0.0f, 14.0f, -18.0f);
|
||||
overlay.cameraForward = Vector3(0.0f, -0.5f, 0.8660254f);
|
||||
|
||||
const SceneGridParameters parameters = BuildSceneGridParameters(overlay);
|
||||
const InfiniteGridParameters parameters = BuildInfiniteGridParameters(ToInfiniteGridPassData(overlay));
|
||||
|
||||
EXPECT_TRUE(parameters.valid);
|
||||
EXPECT_TRUE(IsPowerOfTenSpacing(parameters.baseScale));
|
||||
EXPECT_TRUE(IsPowerOfTenSpacing(parameters.baseScale * 10.0f));
|
||||
}
|
||||
|
||||
TEST(SceneViewportOverlayRenderer_Test, BuildSceneGridParametersFadesTowardNextScaleBeforeThreshold) {
|
||||
TEST(SceneViewportOverlayRenderer_Test, BuildInfiniteGridParametersFadesTowardNextScaleBeforeThreshold) {
|
||||
SceneViewportOverlayData earlyOverlay = {};
|
||||
earlyOverlay.valid = true;
|
||||
earlyOverlay.cameraPosition = Vector3(0.0f, 4.0f, -6.0f);
|
||||
@@ -132,8 +147,8 @@ TEST(SceneViewportOverlayRenderer_Test, BuildSceneGridParametersFadesTowardNextS
|
||||
SceneViewportOverlayData lateOverlay = earlyOverlay;
|
||||
lateOverlay.cameraPosition = Vector3(0.0f, 18.0f, -6.0f);
|
||||
|
||||
const SceneGridParameters earlyParameters = BuildSceneGridParameters(earlyOverlay);
|
||||
const SceneGridParameters lateParameters = BuildSceneGridParameters(lateOverlay);
|
||||
const InfiniteGridParameters earlyParameters = BuildInfiniteGridParameters(ToInfiniteGridPassData(earlyOverlay));
|
||||
const InfiniteGridParameters lateParameters = BuildInfiniteGridParameters(ToInfiniteGridPassData(lateOverlay));
|
||||
|
||||
EXPECT_FLOAT_EQ(earlyParameters.baseScale, 1.0f);
|
||||
EXPECT_FLOAT_EQ(lateParameters.baseScale, 1.0f);
|
||||
@@ -141,7 +156,7 @@ TEST(SceneViewportOverlayRenderer_Test, BuildSceneGridParametersFadesTowardNextS
|
||||
EXPECT_GT(lateParameters.transitionBlend, 0.90f);
|
||||
}
|
||||
|
||||
TEST(SceneViewportOverlayRenderer_Test, BuildSceneGridParametersSwitchesScaleAtHalfThePreviousDistanceThreshold) {
|
||||
TEST(SceneViewportOverlayRenderer_Test, BuildInfiniteGridParametersSwitchesScaleAtHalfThePreviousDistanceThreshold) {
|
||||
SceneViewportOverlayData nearOverlay = {};
|
||||
nearOverlay.valid = true;
|
||||
nearOverlay.cameraPosition = Vector3(0.0f, 19.9f, -6.0f);
|
||||
@@ -149,8 +164,8 @@ TEST(SceneViewportOverlayRenderer_Test, BuildSceneGridParametersSwitchesScaleAtH
|
||||
SceneViewportOverlayData farOverlay = nearOverlay;
|
||||
farOverlay.cameraPosition = Vector3(0.0f, 20.0f, -6.0f);
|
||||
|
||||
const SceneGridParameters nearParameters = BuildSceneGridParameters(nearOverlay);
|
||||
const SceneGridParameters farParameters = BuildSceneGridParameters(farOverlay);
|
||||
const InfiniteGridParameters nearParameters = BuildInfiniteGridParameters(ToInfiniteGridPassData(nearOverlay));
|
||||
const InfiniteGridParameters farParameters = BuildInfiniteGridParameters(ToInfiniteGridPassData(farOverlay));
|
||||
|
||||
EXPECT_FLOAT_EQ(nearParameters.baseScale, 1.0f);
|
||||
EXPECT_FLOAT_EQ(farParameters.baseScale, 10.0f);
|
||||
@@ -158,7 +173,7 @@ TEST(SceneViewportOverlayRenderer_Test, BuildSceneGridParametersSwitchesScaleAtH
|
||||
EXPECT_LT(farParameters.transitionBlend, 0.05f);
|
||||
}
|
||||
|
||||
TEST(SceneViewportOverlayRenderer_Test, BuildSceneGridParametersIgnoresStaleOrbitDistanceForSameView) {
|
||||
TEST(SceneViewportOverlayRenderer_Test, BuildInfiniteGridParametersIgnoresStaleOrbitDistanceForSameView) {
|
||||
SceneViewportOverlayData nearOrbit = {};
|
||||
nearOrbit.valid = true;
|
||||
nearOrbit.cameraPosition = Vector3(0.0f, 12.0f, -24.0f);
|
||||
@@ -168,8 +183,8 @@ TEST(SceneViewportOverlayRenderer_Test, BuildSceneGridParametersIgnoresStaleOrbi
|
||||
SceneViewportOverlayData farOrbit = nearOrbit;
|
||||
farOrbit.orbitDistance = 200.0f;
|
||||
|
||||
const SceneGridParameters nearOrbitParameters = BuildSceneGridParameters(nearOrbit);
|
||||
const SceneGridParameters farOrbitParameters = BuildSceneGridParameters(farOrbit);
|
||||
const InfiniteGridParameters nearOrbitParameters = BuildInfiniteGridParameters(ToInfiniteGridPassData(nearOrbit));
|
||||
const InfiniteGridParameters farOrbitParameters = BuildInfiniteGridParameters(ToInfiniteGridPassData(farOrbit));
|
||||
|
||||
EXPECT_TRUE(nearOrbitParameters.valid);
|
||||
EXPECT_TRUE(farOrbitParameters.valid);
|
||||
|
||||
Reference in New Issue
Block a user