oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-02 16:38:41 +00:00
Code Wiki Activity

Node definition manager refactor (#7016)

Browse source 
* Rename IWritableNodeDefManager to NodeDefManager
* Make INodeDefManager functions const
* Use "const *NodeDefManager" instead of "*INodeDefManager"
* Remove unused INodeDefManager class
* Merge NodeDefManager and CNodeDefManager
* Document NodeDefManager
This commit is contained in:
Dániel Juhász 2018-02-10 22:04:16 +02:00 • committed by SmallJoker
parent 617d94c803
commit 3face01a20
61 changed files with 583 additions and 457 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/unittest/test.cpp
View file

@ -45,7 +45,7 @@ public:
~TestGameDef();
IItemDefManager *getItemDefManager() { return m_itemdef; }
INodeDefManager *getNodeDefManager() { return m_nodedef; }
const NodeDefManager *getNodeDefManager() { return m_nodedef; }
ICraftDefManager *getCraftDefManager() { return m_craftdef; }
ITextureSource *getTextureSource() { return m_texturesrc; }
IShaderSource *getShaderSource() { return m_shadersrc; }
@ -80,7 +80,7 @@ public:
private:
IItemDefManager *m_itemdef = nullptr;
INodeDefManager *m_nodedef = nullptr;
const NodeDefManager *m_nodedef = nullptr;
ICraftDefManager *m_craftdef = nullptr;
ITextureSource *m_texturesrc = nullptr;
IShaderSource *m_shadersrc = nullptr;
@ -113,7 +113,7 @@ TestGameDef::~TestGameDef()
void TestGameDef::defineSomeNodes()
{
IWritableItemDefManager *idef = (IWritableItemDefManager *)m_itemdef;
IWritableNodeDefManager *ndef = (IWritableNodeDefManager *)m_nodedef;
NodeDefManager *ndef = (NodeDefManager *)m_nodedef;
ItemDefinition itemdef;
ContentFeatures f;

4
src/unittest/test_mapnode.cpp
View file

@ -31,7 +31,7 @@ public:
void runTests(IGameDef *gamedef);
void testNodeProperties(INodeDefManager *nodedef);
void testNodeProperties(const NodeDefManager *nodedef);
};
static TestMapNode g_test_instance;
@ -43,7 +43,7 @@ void TestMapNode::runTests(IGameDef *gamedef)
////////////////////////////////////////////////////////////////////////////////
void TestMapNode::testNodeProperties(INodeDefManager *nodedef)
void TestMapNode::testNodeProperties(const NodeDefManager *nodedef)
{
MapNode n(CONTENT_AIR);

16
src/unittest/test_noderesolver.cpp
View file

@ -34,18 +34,18 @@ public:
void runTests(IGameDef *gamedef);
void testNodeResolving(IWritableNodeDefManager *ndef);
void testPendingResolveCancellation(IWritableNodeDefManager *ndef);
void testDirectResolveMethod(IWritableNodeDefManager *ndef);
void testNoneResolveMethod(IWritableNodeDefManager *ndef);
void testNodeResolving(NodeDefManager *ndef);
void testPendingResolveCancellation(NodeDefManager *ndef);
void testDirectResolveMethod(NodeDefManager *ndef);
void testNoneResolveMethod(NodeDefManager *ndef);
};
static TestNodeResolver g_test_instance;
void TestNodeResolver::runTests(IGameDef *gamedef)
{
IWritableNodeDefManager *ndef =
(IWritableNodeDefManager *)gamedef->getNodeDefManager();
NodeDefManager *ndef =
(NodeDefManager *)gamedef->getNodeDefManager();
ndef->resetNodeResolveState();
TEST(testNodeResolving, ndef);
@ -104,7 +104,7 @@ void Foobaz::resolveNodeNames()
}
void TestNodeResolver::testNodeResolving(IWritableNodeDefManager *ndef)
void TestNodeResolver::testNodeResolving(NodeDefManager *ndef)
{
Foobar foobar;
size_t i;
@ -182,7 +182,7 @@ void TestNodeResolver::testNodeResolving(IWritableNodeDefManager *ndef)
}
void TestNodeResolver::testPendingResolveCancellation(IWritableNodeDefManager *ndef)
void TestNodeResolver::testPendingResolveCancellation(NodeDefManager *ndef)
{
Foobaz foobaz1;
foobaz1.test_content1 = 1234;

16
src/unittest/test_schematic.cpp
View file

@ -30,9 +30,9 @@ public:
void runTests(IGameDef *gamedef);
void testMtsSerializeDeserialize(INodeDefManager *ndef);
void testLuaTableSerialize(INodeDefManager *ndef);
void testFileSerializeDeserialize(INodeDefManager *ndef);
void testMtsSerializeDeserialize(const NodeDefManager *ndef);
void testLuaTableSerialize(const NodeDefManager *ndef);
void testFileSerializeDeserialize(const NodeDefManager *ndef);
static const content_t test_schem1_data[7 * 6 * 4];
static const content_t test_schem2_data[3 * 3 * 3];
@ -44,8 +44,8 @@ static TestSchematic g_test_instance;
void TestSchematic::runTests(IGameDef *gamedef)
{
IWritableNodeDefManager *ndef =
(IWritableNodeDefManager *)gamedef->getNodeDefManager();
NodeDefManager *ndef =
(NodeDefManager *)gamedef->getNodeDefManager();
ndef->setNodeRegistrationStatus(true);
@ -58,7 +58,7 @@ void TestSchematic::runTests(IGameDef *gamedef)
////////////////////////////////////////////////////////////////////////////////
void TestSchematic::testMtsSerializeDeserialize(INodeDefManager *ndef)
void TestSchematic::testMtsSerializeDeserialize(const NodeDefManager *ndef)
{
static const v3s16 size(7, 6, 4);
static const u32 volume = size.X * size.Y * size.Z;
@ -104,7 +104,7 @@ void TestSchematic::testMtsSerializeDeserialize(INodeDefManager *ndef)
}
void TestSchematic::testLuaTableSerialize(INodeDefManager *ndef)
void TestSchematic::testLuaTableSerialize(const NodeDefManager *ndef)
{
static const v3s16 size(3, 3, 3);
static const u32 volume = size.X * size.Y * size.Z;
@ -132,7 +132,7 @@ void TestSchematic::testLuaTableSerialize(INodeDefManager *ndef)
}
void TestSchematic::testFileSerializeDeserialize(INodeDefManager *ndef)
void TestSchematic::testFileSerializeDeserialize(const NodeDefManager *ndef)
{
static const v3s16 size(3, 3, 3);
static const u32 volume = size.X * size.Y * size.Z;

6
src/unittest/test_voxelalgorithms.cpp
View file

@ -30,21 +30,21 @@ public:
void runTests(IGameDef *gamedef);
void testVoxelLineIterator(INodeDefManager *ndef);
void testVoxelLineIterator(const NodeDefManager *ndef);
};
static TestVoxelAlgorithms g_test_instance;
void TestVoxelAlgorithms::runTests(IGameDef *gamedef)
{
INodeDefManager *ndef = gamedef->getNodeDefManager();
const NodeDefManager *ndef = gamedef->getNodeDefManager();
TEST(testVoxelLineIterator, ndef);
}
////////////////////////////////////////////////////////////////////////////////
void TestVoxelAlgorithms::testVoxelLineIterator(INodeDefManager *ndef)
void TestVoxelAlgorithms::testVoxelLineIterator(const NodeDefManager *ndef)
{
// Test some lines
// Do not test lines that start or end on the border of

4
src/unittest/test_voxelmanipulator.cpp
View file

@ -33,7 +33,7 @@ public:
void runTests(IGameDef *gamedef);
void testVoxelArea();
void testVoxelManipulator(INodeDefManager *nodedef);
void testVoxelManipulator(const NodeDefManager *nodedef);
};
static TestVoxelManipulator g_test_instance;
@ -80,7 +80,7 @@ void TestVoxelManipulator::testVoxelArea()
}
void TestVoxelManipulator::testVoxelManipulator(INodeDefManager *nodedef)
void TestVoxelManipulator::testVoxelManipulator(const NodeDefManager *nodedef)
{
VoxelManipulator v;