Rename tilecoordinates to pixelconv and move content to dk.
This commit is contained in:
parent
e2273e0d14
commit
5cea116b8f
4 changed files with 13 additions and 11 deletions
|
@ -3,7 +3,7 @@
|
|||
|
||||
#include "doorkeeper/components/tileiterator.hpp"
|
||||
|
||||
namespace dkh {
|
||||
namespace dk {
|
||||
template <typename T, typename T1>
|
||||
dk::Vector<2> get_diamond_coordinates ( const dk::TileIterator<T, 2, T1>& parIterator, const dk::Vector<2>& parSize );
|
||||
|
||||
|
@ -15,8 +15,8 @@ namespace dkh {
|
|||
|
||||
template <typename T, typename T1>
|
||||
dk::Vector<2> get_hex_coordinates ( const dk::TileIterator<T, 2, T1>& parIterator, const dk::Vector<2>& parSize );
|
||||
} //namespace dkh
|
||||
} //namespace dk
|
||||
|
||||
#include "doorkeeper/implem/tilecoordinates.inl"
|
||||
#include "doorkeeper/implem/pixelconv.inl"
|
||||
|
||||
#endif
|
|
@ -1,4 +1,4 @@
|
|||
namespace dkh {
|
||||
namespace dk {
|
||||
template <typename T, typename T1>
|
||||
inline
|
||||
dk::Vector<2> get_diamond_coordinates (const dk::TileIterator<T, 2, T1>& parIterator, const dk::Vector<2>& parSize) {
|
||||
|
@ -27,4 +27,4 @@ namespace dkh {
|
|||
//inline
|
||||
//dk::Vector<dk::CoordinateScalarType, 2> get_hex_coordinates (const dk::TileIterator<T, 2, T1>& parIterator, const dk::Vector<dk::CoordinateScalarType, 2>& parSize) {
|
||||
//}
|
||||
} //namespace dkh
|
||||
} //namespace dk
|
|
@ -3,7 +3,7 @@
|
|||
#include "platform.h"
|
||||
#include "platformstrings.h"
|
||||
#include "doorkeeper/helpers/asciimapsource.hpp"
|
||||
#include "doorkeeper/helpers/tilecoordinates.hpp"
|
||||
#include "doorkeeper/components/pixelconv.hpp"
|
||||
#include "doorkeeper/helpers/maploader.hpp"
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
|
@ -218,7 +218,7 @@ namespace {
|
|||
|
||||
for (auto itTile = parView.begin(parLayer), itTileEND = parView.end(parLayer); itTile != itTileEND; ++itTile) {
|
||||
SDL_Rect rect_dst;
|
||||
const auto pixel_pos = dkh::get_diamond_coordinates(itTile, tilesize);
|
||||
const auto pixel_pos = dk::get_diamond_coordinates(itTile, tilesize);
|
||||
rect_src.y = offsets[*itTile];
|
||||
rect_src.h = original_size.y() - offsets[*itTile];
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include <gtest/gtest.h>
|
||||
#include "doorkeeper/helpers/asciimapsource.hpp"
|
||||
#include "doorkeeper/doorkeeper.hpp"
|
||||
#include "doorkeeper/helpers/tilecoordinates.hpp"
|
||||
#include "doorkeeper/components/pixelconv.hpp"
|
||||
#include "asciimapsource.hpp"
|
||||
#include <sstream>
|
||||
#include <memory>
|
||||
|
@ -55,8 +55,10 @@ TEST_F(asciimapsource, coordinates) {
|
|||
|
||||
full_view.setFrom(coords2(0));
|
||||
for (auto itTile = full_view.begin(*layer), itTileEND = full_view.end(*layer); itTile != itTileEND; ++itTile) {
|
||||
const coords2 expected_coords(tile_size * itTile.position());
|
||||
const auto returned_coords(dkh::get_square_coordinates<2>(itTile, tile_size));
|
||||
EXPECT_EQ(expected_coords, returned_coords);
|
||||
{
|
||||
const coords2 expected_coords(tile_size * itTile.position());
|
||||
const auto returned_coords(dk::get_square_coordinates<2>(itTile, tile_size));
|
||||
EXPECT_EQ(expected_coords, returned_coords);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue