From 187abe3f5e2219e0a80c0cdca4db362e223b60ae Mon Sep 17 00:00:00 2001 From: Mattes D Date: Sun, 26 Feb 2017 22:49:23 +0100 Subject: Gen: Moved PiecePool into a separate file. Also rewritten the PieceGenerator to use std::unique_ptr. --- tests/LoadablePieces/CMakeLists.txt | 4 ++-- tests/LuaThreadStress/CMakeLists.txt | 4 ++-- tests/PieceRotation/CMakeLists.txt | 4 ++-- tests/PieceRotation/PieceRotationTest.cpp | 2 +- tests/SchematicFileSerializer/CMakeLists.txt | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'tests') diff --git a/tests/LoadablePieces/CMakeLists.txt b/tests/LoadablePieces/CMakeLists.txt index b71a64474..4c8f698bf 100644 --- a/tests/LoadablePieces/CMakeLists.txt +++ b/tests/LoadablePieces/CMakeLists.txt @@ -17,7 +17,7 @@ set (SHARED_SRCS ${CMAKE_SOURCE_DIR}/src/Bindings/LuaState.cpp ${CMAKE_SOURCE_DIR}/src/Generating/ChunkDesc.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/PieceGenerator.cpp + ${CMAKE_SOURCE_DIR}/src/Generating/PiecePool.cpp ${CMAKE_SOURCE_DIR}/src/Generating/Prefab.cpp ${CMAKE_SOURCE_DIR}/src/Generating/PrefabPiecePool.cpp ${CMAKE_SOURCE_DIR}/src/Generating/VerticalLimit.cpp @@ -47,7 +47,7 @@ set (SHARED_HDRS ${CMAKE_SOURCE_DIR}/src/Bindings/LuaState.h ${CMAKE_SOURCE_DIR}/src/Generating/ChunkDesc.h - ${CMAKE_SOURCE_DIR}/src/Generating/PieceGenerator.h + ${CMAKE_SOURCE_DIR}/src/Generating/PiecePool.h ${CMAKE_SOURCE_DIR}/src/Generating/Prefab.h ${CMAKE_SOURCE_DIR}/src/Generating/PrefabPiecePool.h ${CMAKE_SOURCE_DIR}/src/Generating/VerticalLimit.h diff --git a/tests/LuaThreadStress/CMakeLists.txt b/tests/LuaThreadStress/CMakeLists.txt index 402b77d23..dcadb34aa 100644 --- a/tests/LuaThreadStress/CMakeLists.txt +++ b/tests/LuaThreadStress/CMakeLists.txt @@ -17,7 +17,7 @@ set (SHARED_SRCS ${CMAKE_SOURCE_DIR}/src/Bindings/LuaState.cpp ${CMAKE_SOURCE_DIR}/src/Generating/ChunkDesc.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/PieceGenerator.cpp + ${CMAKE_SOURCE_DIR}/src/Generating/PiecePool.cpp ${CMAKE_SOURCE_DIR}/src/Generating/Prefab.cpp ${CMAKE_SOURCE_DIR}/src/Generating/PrefabPiecePool.cpp ${CMAKE_SOURCE_DIR}/src/Generating/VerticalLimit.cpp @@ -47,7 +47,7 @@ set (SHARED_HDRS ${CMAKE_SOURCE_DIR}/src/Bindings/LuaState.h ${CMAKE_SOURCE_DIR}/src/Generating/ChunkDesc.h - ${CMAKE_SOURCE_DIR}/src/Generating/PieceGenerator.h + ${CMAKE_SOURCE_DIR}/src/Generating/PiecePool.h ${CMAKE_SOURCE_DIR}/src/Generating/Prefab.h ${CMAKE_SOURCE_DIR}/src/Generating/PrefabPiecePool.h ${CMAKE_SOURCE_DIR}/src/Generating/VerticalLimit.h diff --git a/tests/PieceRotation/CMakeLists.txt b/tests/PieceRotation/CMakeLists.txt index 53b4f273f..bb1b37a53 100644 --- a/tests/PieceRotation/CMakeLists.txt +++ b/tests/PieceRotation/CMakeLists.txt @@ -17,7 +17,7 @@ set (SHARED_SRCS ${CMAKE_SOURCE_DIR}/src/Bindings/LuaState.cpp ${CMAKE_SOURCE_DIR}/src/Generating/ChunkDesc.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/PieceGenerator.cpp + ${CMAKE_SOURCE_DIR}/src/Generating/PiecePool.cpp ${CMAKE_SOURCE_DIR}/src/Generating/Prefab.cpp ${CMAKE_SOURCE_DIR}/src/Generating/PrefabPiecePool.cpp ${CMAKE_SOURCE_DIR}/src/Generating/VerticalLimit.cpp @@ -47,7 +47,7 @@ set (SHARED_HDRS ${CMAKE_SOURCE_DIR}/src/Bindings/LuaState.h ${CMAKE_SOURCE_DIR}/src/Generating/ChunkDesc.h - ${CMAKE_SOURCE_DIR}/src/Generating/PieceGenerator.h + ${CMAKE_SOURCE_DIR}/src/Generating/PiecePool.h ${CMAKE_SOURCE_DIR}/src/Generating/Prefab.h ${CMAKE_SOURCE_DIR}/src/Generating/PrefabPiecePool.h ${CMAKE_SOURCE_DIR}/src/Generating/VerticalLimit.h diff --git a/tests/PieceRotation/PieceRotationTest.cpp b/tests/PieceRotation/PieceRotationTest.cpp index 3e325b54c..ace3bd489 100644 --- a/tests/PieceRotation/PieceRotationTest.cpp +++ b/tests/PieceRotation/PieceRotationTest.cpp @@ -5,7 +5,7 @@ #include "Globals.h" #include #include -#include "Generating/PieceGenerator.h" +#include "Generating/PiecePool.h" diff --git a/tests/SchematicFileSerializer/CMakeLists.txt b/tests/SchematicFileSerializer/CMakeLists.txt index 792349a9d..99589c999 100644 --- a/tests/SchematicFileSerializer/CMakeLists.txt +++ b/tests/SchematicFileSerializer/CMakeLists.txt @@ -38,7 +38,7 @@ set (SHARED_HDRS ${CMAKE_SOURCE_DIR}/src/Bindings/LuaState.h ${CMAKE_SOURCE_DIR}/src/Generating/ChunkDesc.h - ${CMAKE_SOURCE_DIR}/src/Generating/PieceGenerator.h + ${CMAKE_SOURCE_DIR}/src/Generating/PiecePool.h ${CMAKE_SOURCE_DIR}/src/Generating/Prefab.h ${CMAKE_SOURCE_DIR}/src/Generating/PrefabPiecePool.h ${CMAKE_SOURCE_DIR}/src/Generating/VerticalLimit.h -- cgit v1.2.3