gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

RangeManager: Grid for 2D array, enum cleanups.

Browse Source 
Range manager has several `std::vector` for fixed-size arrays and 2D
grids. By using proper data structures, the code readability is
improved.
This also moves around the LosVisibility enum.

Comments by: Stan`, nani
Differential Revision: https://code.wildfiregames.com/D2770
This was SVN commit r23769.
This commit is contained in:
wraitii
2020-06-13 09:05:40 +00:00
parent 6f70a901f8
commit 939002f0dc
14 changed files with 453 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/simulation2/tests/test_SerializeTemplates.h
+34 -1
View File
@@ -1,4 +1,4 @@
/* Copyright (C) 2019 Wildfire Games.
/* Copyright (C) 2020 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@@ -18,6 +18,7 @@
#include "lib/self_test.h"
#include "scriptinterface/ScriptInterface.h"
#include "simulation2/helpers/Grid.h"
#include "simulation2/serialization/DebugSerializer.h"
#include "simulation2/serialization/SerializeTemplates.h"
@@ -28,6 +29,19 @@
class TestSerializeTemplates : public CxxTest::TestSuite
{
public:
void test_Debug_array()
{
ScriptInterface script("Test", "Test", g_ScriptRuntime);
std::stringstream stream;
CDebugSerializer serialize(script, stream);
std::array<u32, 6> value = {
3, 0, 1, 4, 1, 5
};
SerializeArray<SerializeU32_Unbounded>()(serialize, "E", value);
TS_ASSERT_STR_EQUALS(stream.str(), "E: 3\nE: 0\nE: 1\nE: 4\nE: 1\nE: 5\n");
}
void test_Debug_vector()
{
ScriptInterface script("Test", "Test", g_ScriptRuntime);
@@ -53,4 +67,23 @@ public:
SerializeSet<SerializeU32_Unbounded>()(serialize, "E", value);
TS_ASSERT_STR_EQUALS(stream.str(), "size: 5\nE: 0\nE: 1\nE: 3\nE: 4\nE: 5\n");
}
void test_Debug_grid()
{
ScriptInterface script("Test", "Test", g_ScriptRuntime);
std::stringstream stream;
CDebugSerializer serialize(script, stream);
Grid<u16> value;
value.resize(3,2);
// Checkerboard pattern.
for (u8 j = 0; j < value.height(); ++j)
for (u8 i = 0; i < value.width(); ++i)
value.set(i, j, ((i % 2) + (j % 2)) % 2);
SerializedGridCompressed<SerializeU16_Unbounded>()(serialize, "E", value);
TS_ASSERT_STR_EQUALS(stream.str(), "width: 3\nheight: 2\n"
"#: 1\nE: 0\n#: 1\nE: 1\n#: 1\nE: 0\n"
"#: 1\nE: 1\n#: 1\nE: 0\n#: 1\nE: 1\n");
}
};