Migrate atlas_test

WolfireGames · May 11, 2022 · 60b1930 · 60b1930
1 parent 5f4acb2
commit 60b1930
Show file tree

Hide file tree

Showing 7 changed files with 155 additions and 81 deletions.
diff --git a/Projects/CMakeLists.txt b/Projects/CMakeLists.txt
@@ -367,9 +367,9 @@ IF(LINUX)
 
     #-no-strict-aliasing for the sake of angelscript
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -rdynamic -g -fno-omit-frame-pointer") #We add G because we want to be able to debug the coredump
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -rdynamic -fno-omit-frame-pointer")
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -rdynamic -fno-omit-frame-pointer")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -g -fno-omit-frame-pointer") #We add G because we want to be able to debug the coredump
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fno-omit-frame-pointer")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer")
 
 ENDIF()
 
@@ -890,8 +890,6 @@ IF(LINUX AND BUILD_OGDA) #Making Ogda linux only for now.
     )
 ENDIF()
 
-ADD_DEFINITIONS(-DUNIT_TESTS)
-
 SET(OVERGROWTH_INTERNAL_SRCS
     ${LIBDIR}/ovr_sdk_win_1.12.0_public/OculusSDK/LibOVR/Src/OVR_StereoProjection.cpp
     ${LIBDIR}/ovr_sdk_win_1.12.0_public/OculusSDK/LibOVR/Src/OVR_CAPI_Util.cpp

diff --git a/Source/Main/main.cpp b/Source/Main/main.cpp
@@ -52,9 +52,6 @@
 #if ENABLE_FPU_SIGNALS == 1
 #include <fenv.h>
 #endif
-#ifdef UNIT_TESTS
-#include <UnitTests/testmain.h>
-#endif
 #include <sstream>
 
 extern Config config;

diff --git a/Source/UnitTests/testmain.cpp b/Source/UnitTests/testmain.cpp
diff --git a/Source/UnitTests/testmain.h b/Source/UnitTests/testmain.h
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
@@ -3,12 +3,15 @@ ADD_SUBDIRECTORY(../Libraries/googletest-1.11.0 googletest)
 set(SRCDIR "${CMAKE_SOURCE_DIR}/../Source")
 
 set(TEST_SRCS
+    ${SRCDIR}/Graphics/atlasnodetree.h
+    ${SRCDIR}/Graphics/atlasnodetree.cpp   
     ${SRCDIR}/Utility/serialize.h
     ${SRCDIR}/Utility/serialize.cpp
     ${SRCDIR}/Utility/strings.h
     ${SRCDIR}/Utility/strings.cpp)
 
-add_executable(OvergrowthTests 
+add_executable(OvergrowthTests
+    atlas_test.cpp
     string_test.cpp
     ${TEST_SRCS})
 

diff --git a/Tests/atlas_test.cpp b/Tests/atlas_test.cpp
@@ -0,0 +1,146 @@
+//-----------------------------------------------------------------------------
+//           Name: atlastest.cpp
+//      Developer: Wolfire Games LLC
+//    Description:
+//        License: Read below
+//-----------------------------------------------------------------------------
+//
+//   Copyright 2022 Wolfire Games LLC
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+//
+//-----------------------------------------------------------------------------
+#include <Graphics/atlasnodetree.h>
+#include <Logging/logdata.h>
+
+#include <gtest/gtest.h>
+
+#include <cmath>
+#include <cstdlib>
+
+#include <set>
+
+TEST(Graphics, AtlasVerifyIds)
+{
+    AtlasNodeTree tree(ivec2(1024, 1024), 64);
+
+    /*
+    LOGI << "Size: " << tree.nodecount << std::endl;
+    for( int i = 0; i < tree.nodecount; i++ )
+    {
+        LOGI << tree.data[i] << std::endl;
+    }
+    */
+
+    for (int i = 1; i < tree.GetNodeCount() - 1; i++) {
+        EXPECT_EQ(tree.GetNodeRoot()[i].id + 1, tree.GetNodeRoot()[i + 1].id);
+    }
+}
+
+TEST(Graphics, AtlasAlloc1) {
+    AtlasNodeTree tree(ivec2(1024, 1024), 64);
+
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(512, 512)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(512, 512)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(512, 512)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(512, 512)).valid()) << "Expected valid element";
+    EXPECT_FALSE(tree.RetrieveNode(ivec2(512, 512)).valid()) << "Last element should be invalid";
+}
+
+TEST(Graphics, AtlasAlloc2) {
+    AtlasNodeTree tree(ivec2(1024, 1024), 64);
+
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(256, 256)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(256, 256)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(512, 512)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(512, 512)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(512, 512)).valid()) << "Expected valid element";
+    EXPECT_FALSE(tree.RetrieveNode(ivec2(512, 512)).valid()) << "Last element should be invalid";
+}
+
+TEST(Graphics, AtlasAlloc3) {
+    AtlasNodeTree tree(ivec2(1024, 1024), 64);
+
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(512, 512)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(256, 256)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(256, 256)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(512, 512)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(512, 512)).valid()) << "Expected valid element";
+    EXPECT_FALSE(tree.RetrieveNode(ivec2(512, 512)).valid()) << "Last element should be invalid";
+}
+
+TEST(Graphics, AtlasAlloc4)
+{
+    AtlasNodeTree tree(ivec2(1024, 1024), 64);
+
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(512, 512)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(128, 128)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(128, 128)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(256, 256)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(512, 512)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(512, 512)).valid()) << "Expected valid element";
+    EXPECT_FALSE(tree.RetrieveNode(ivec2(512, 512)).valid()) << "Last element should be invalid";
+}
+
+TEST(Graphics, AtlasAlloc5) {
+    AtlasNodeTree tree(ivec2(1024, 1024), 64);
+
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(512, 512)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(256, 256)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(256, 256)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(256, 256)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(256, 256)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(512, 512)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(512, 512)).valid()) << "Expected valid element";
+    EXPECT_FALSE(tree.RetrieveNode(ivec2(64, 64)).valid()) << "Last element should be invalid";
+}
+
+TEST(Graphics, AtlasAlloc6) {
+    AtlasNodeTree tree(ivec2(1024, 1024), 64);
+
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(512, 512)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(64, 128)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(128, 64)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(128, 128)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(512, 512)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(512, 512)).valid()) << "Expected valid element";
+    EXPECT_FALSE(tree.RetrieveNode(ivec2(512, 512)).valid()) << "Last element should be invalid";
+}
+
+TEST(Graphics, AtlasAlloc7) {
+
+    AtlasNodeTree tree(ivec2(1024, 1024), 64);
+
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(500, 512)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(64, 128)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(100, 64)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(128, 100)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(512, 500)).valid()) << "Expected valid element";
+    EXPECT_TRUE(tree.RetrieveNode(ivec2(512, 512)).valid()) << "Expected valid element";
+    EXPECT_FALSE(tree.RetrieveNode(ivec2(512, 512)).valid()) << "Last element should be invalid";
+}
+
+TEST(Graphics, AtlasInsertCheck) {
+    AtlasNodeTree tree(ivec2(1024, 1024), 64);
+
+    std::set<AtlasNodeTree::AtlasNode*> pset;
+
+    pset.insert(tree.RetrieveNode(ivec2(512, 512)).node);
+    pset.insert(tree.RetrieveNode(ivec2(64, 128)).node);
+    pset.insert(tree.RetrieveNode(ivec2(128, 64)).node);
+    pset.insert(tree.RetrieveNode(ivec2(128, 128)).node);
+    pset.insert(tree.RetrieveNode(ivec2(512, 512)).node);
+    pset.insert(tree.RetrieveNode(ivec2(512, 512)).node);
+
+    EXPECT_EQ(pset.size(), 6);
+}
diff --git a/Tests/string_test.cpp b/Tests/string_test.cpp
@@ -24,12 +24,12 @@
 #include <Utility/strings.h>
 #include <Utility/serialize.h>
 
+#include <gtest/gtest.h>
+
 #include <cmath>
 #include <cstdlib>
 #include <set>
 
-#include <gtest/gtest.h>
-
 static uint32_t hexflip(uint32_t v) {
     char str[9];
     uint32_t vout;