mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-10 15:45:37 +00:00
Code Issues Projects Releases Wiki Activity

Move serialization detournavigator/ -> components/

Browse Source
This commit is contained in:
elsid 2021-10-30 17:01:50 +02:00
parent 01c712d5f1
commit 5325495f46
No known key found for this signature in database
GPG Key ID: D27B8E8D10A2896B
10 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/openmw_test_suite/CMakeLists.txt
View File

@ -41,10 +41,11 @@ if (GTEST_FOUND AND GMOCK_FOUND)
detournavigator/recastmeshobject.cpp detournavigator/recastmeshobject.cpp
detournavigator/navmeshtilescache.cpp detournavigator/navmeshtilescache.cpp
detournavigator/tilecachedrecastmeshmanager.cpp detournavigator/tilecachedrecastmeshmanager.cpp
detournavigator/serialization/binaryreader.cpp
detournavigator/serialization/binarywriter.cpp serialization/binaryreader.cpp
detournavigator/serialization/sizeaccumulator.cpp serialization/binarywriter.cpp
detournavigator/serialization/integration.cpp serialization/sizeaccumulator.cpp
serialization/integration.cpp
settings/parser.cpp settings/parser.cpp

6
apps/openmw_test_suite/detournavigator/serialization/binaryreader.cpp → apps/openmw_test_suite/serialization/binaryreader.cpp
View File

@ -1,6 +1,6 @@
#include "format.hpp" #include "format.hpp"
#include <components/detournavigator/serialization/binaryreader.hpp> #include <components/serialization/binaryreader.hpp>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <gmock/gmock.h> #include <gmock/gmock.h>
@ -12,8 +12,8 @@
namespace namespace
{ {
using namespace testing; using namespace testing;
using namespace DetourNavigator::Serialization; using namespace Serialization;
using namespace DetourNavigator::SerializationTesting; using namespace SerializationTesting;
TEST(DetourNavigatorSerializationBinaryReaderTest, shouldReadArithmeticTypeValue) TEST(DetourNavigatorSerializationBinaryReaderTest, shouldReadArithmeticTypeValue)
{ {

6
apps/openmw_test_suite/detournavigator/serialization/binarywriter.cpp → apps/openmw_test_suite/serialization/binarywriter.cpp
View File

@ -1,6 +1,6 @@
#include "format.hpp" #include "format.hpp"
#include <components/detournavigator/serialization/binarywriter.hpp> #include <components/serialization/binarywriter.hpp>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <gmock/gmock.h> #include <gmock/gmock.h>
@ -12,8 +12,8 @@
namespace namespace
{ {
using namespace testing; using namespace testing;
using namespace DetourNavigator::Serialization; using namespace Serialization;
using namespace DetourNavigator::SerializationTesting; using namespace SerializationTesting;
TEST(DetourNavigatorSerializationBinaryWriterTest, shouldWriteArithmeticTypeValue) TEST(DetourNavigatorSerializationBinaryWriterTest, shouldWriteArithmeticTypeValue)
{ {

8
apps/openmw_test_suite/detournavigator/serialization/format.hpp → apps/openmw_test_suite/serialization/format.hpp
View File

@ -1,12 +1,12 @@
#ifndef OPENMW_TEST_SUITE_DETOURNAVIGATOR_SERIALIZATION_FORMAT_H #ifndef OPENMW_TEST_SUITE_SERIALIZATION_FORMAT_H
#define OPENMW_TEST_SUITE_DETOURNAVIGATOR_SERIALIZATION_FORMAT_H #define OPENMW_TEST_SUITE_SERIALIZATION_FORMAT_H
#include <components/detournavigator/serialization/format.hpp> #include <components/serialization/format.hpp>
#include <utility> #include <utility>
#include <type_traits> #include <type_traits>
namespace DetourNavigator::SerializationTesting namespace SerializationTesting
{ {
struct Pod struct Pod
{ {

10
apps/openmw_test_suite/detournavigator/serialization/integration.cpp → apps/openmw_test_suite/serialization/integration.cpp
View File

@ -1,8 +1,8 @@
#include "format.hpp" #include "format.hpp"
#include <components/detournavigator/serialization/sizeaccumulator.hpp> #include <components/serialization/sizeaccumulator.hpp>
#include <components/detournavigator/serialization/binarywriter.hpp> #include <components/serialization/binarywriter.hpp>
#include <components/detournavigator/serialization/binaryreader.hpp> #include <components/serialization/binaryreader.hpp>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <gmock/gmock.h> #include <gmock/gmock.h>
@ -12,8 +12,8 @@
namespace namespace
{ {
using namespace testing; using namespace testing;
using namespace DetourNavigator::Serialization; using namespace Serialization;
using namespace DetourNavigator::SerializationTesting; using namespace SerializationTesting;
struct DetourNavigatorSerializationIntegrationTest : Test struct DetourNavigatorSerializationIntegrationTest : Test
{ {

6
apps/openmw_test_suite/detournavigator/serialization/sizeaccumulator.cpp → apps/openmw_test_suite/serialization/sizeaccumulator.cpp
View File

@ -1,6 +1,6 @@
#include "format.hpp" #include "format.hpp"
#include <components/detournavigator/serialization/sizeaccumulator.hpp> #include <components/serialization/sizeaccumulator.hpp>
#include <gtest/gtest.h> #include <gtest/gtest.h>
@ -12,8 +12,8 @@
namespace namespace
{ {
using namespace testing; using namespace testing;
using namespace DetourNavigator::Serialization; using namespace Serialization;
using namespace DetourNavigator::SerializationTesting; using namespace SerializationTesting;
TEST(DetourNavigatorSerializationSizeAccumulatorTest, shouldProvideSizeForArithmeticType) TEST(DetourNavigatorSerializationSizeAccumulatorTest, shouldProvideSizeForArithmeticType)
{ {

6
components/detournavigator/serialization/binaryreader.hpp → components/serialization/binaryreader.hpp
View File

@ -1,5 +1,5 @@
#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_BINARYREADER_H #ifndef OPENMW_COMPONENTS_SERIALIZATION_BINARYREADER_H
#define OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_BINARYREADER_H #define OPENMW_COMPONENTS_SERIALIZATION_BINARYREADER_H
#include <cassert> #include <cassert>
#include <cstddef> #include <cstddef>
@ -7,7 +7,7 @@
#include <stdexcept> #include <stdexcept>
#include <type_traits> #include <type_traits>
namespace DetourNavigator::Serialization namespace Serialization
{ {
class BinaryReader class BinaryReader
{ {

6
components/detournavigator/serialization/binarywriter.hpp → components/serialization/binarywriter.hpp
View File

@ -1,5 +1,5 @@
#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_BINARYWRITER_H #ifndef OPENMW_COMPONENTS_SERIALIZATION_BINARYWRITER_H
#define OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_BINARYWRITER_H #define OPENMW_COMPONENTS_SERIALIZATION_BINARYWRITER_H
#include <cassert> #include <cassert>
#include <cstddef> #include <cstddef>
@ -7,7 +7,7 @@
#include <stdexcept> #include <stdexcept>
#include <type_traits> #include <type_traits>
namespace DetourNavigator::Serialization namespace Serialization
{ {
struct BinaryWriter struct BinaryWriter
{ {

9
components/detournavigator/serialization/format.hpp → components/serialization/format.hpp
View File

@ -1,5 +1,5 @@
#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_FORMAT_H #ifndef OPENMW_COMPONENTS_SERIALIZATION_FORMAT_H
#define OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_FORMAT_H #define OPENMW_COMPONENTS_SERIALIZATION_FORMAT_H
#include <algorithm> #include <algorithm>
#include <cstddef> #include <cstddef>
@ -8,7 +8,7 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
namespace DetourNavigator::Serialization namespace Serialization
{ {
enum class Mode enum class Mode
{ {
@ -22,6 +22,9 @@ namespace DetourNavigator::Serialization
template <class ... Args> template <class ... Args>
struct IsContiguousContainer<std::vector<Args ...>> : std::true_type {}; struct IsContiguousContainer<std::vector<Args ...>> : std::true_type {};
template <class T, std::size_t n>
struct IsContiguousContainer<std::array<T, n>> : std::true_type {};
template <class T> template <class T>
constexpr bool isContiguousContainer = IsContiguousContainer<std::decay_t<T>>::value; constexpr bool isContiguousContainer = IsContiguousContainer<std::decay_t<T>>::value;

6
components/detournavigator/serialization/sizeaccumulator.hpp → components/serialization/sizeaccumulator.hpp
View File

@ -1,10 +1,10 @@
#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_SIZEACCUMULATOR_H #ifndef OPENMW_COMPONENTS_SERIALIZATION_SIZEACCUMULATOR_H
#define OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_SIZEACCUMULATOR_H #define OPENMW_COMPONENTS_SERIALIZATION_SIZEACCUMULATOR_H
#include <cstddef> #include <cstddef>
#include <type_traits> #include <type_traits>
namespace DetourNavigator::Serialization namespace Serialization
{ {
class SizeAccumulator class SizeAccumulator
{ {