King_DuckZ/DoorKeeper
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Start implementing pixel conversions as classes. WiP.

Browse source
This commit is contained in:
Michele Santullo 2015-08-17 17:36:45 +02:00
parent 5cea116b8f
commit 83963e67ea
4 changed files with 154 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
include/doorkeeper/components/pixelconv.hpp
View file

@ -2,19 +2,90 @@
#define id73F121AEE1EB4BA0980FAC025E5CDF05 #define id73F121AEE1EB4BA0980FAC025E5CDF05
#include "doorkeeper/components/tileiterator.hpp" #include "doorkeeper/components/tileiterator.hpp"
#include "doorkeeper/implem/maptypes.hpp"
#include <cstdint>
namespace dk { namespace dk {
template <typename T, typename T1> //MapType_IsometricStaggered,
dk::Vector<2> get_diamond_coordinates ( const dk::TileIterator<T, 2, T1>& parIterator, const dk::Vector<2>& parSize ); //MapType_Isometric,
//MapType_Orthogonal,
//MapType_Hex
template <uint32_t D>
class PixelConv {
public:
typedef Vector<D> coords;
explicit PixelConv ( MapTypes parType );
virtual coords to_pixel ( const coords& parFrom, const coords& parSize ) const = 0;
MapTypes map_type ( void ) const;
private:
const MapTypes m_map_type;
};
template <uint32_t D>
class PixelConvSquare : public PixelConv<D> {
public:
using base_class = PixelConv<D>;
using typename base_class::coords;
PixelConvSquare ( void );
virtual ~PixelConvSquare ( void ) noexcept = default;
virtual coords to_pixel ( const coords& parFrom, const coords& parSize ) const;
};
class PixelConvDiamond : public PixelConv<2> {
public:
using base_class = PixelConv<2>;
using base_class::coords;
PixelConvDiamond ( bool parStaggered, bool parFirstReentrant );
virtual ~PixelConvDiamond ( void ) noexcept = default;
virtual coords to_pixel ( const coords& parFrom, const coords& parSize ) const;
protected:
PixelConvDiamond ( MapTypes parType, bool parStaggered, bool parFirstReentrant );
};
class PixelConvHalfDiamond : public PixelConvDiamond {
public:
using base_class = PixelConvDiamond;
using base_class::coords;
explicit PixelConvHalfDiamond ( bool parHalfVertically );
virtual ~PixelConvHalfDiamond ( void ) noexcept = default;
virtual coords to_pixel ( const coords& parFrom, const coords& parSize ) const;
private:
const coords m_div;
};
class PixelConvHex : public PixelConv<2> {
public:
using base_class = PixelConv<2>;
using base_class::coords;
explicit PixelConvHex ( bool parFirstReentrant );
virtual ~PixelConvHex ( void ) noexcept = default;
virtual coords to_pixel ( const coords& parFrom, const coords& parSize ) const;
};
template <typename T, typename T1> template <typename T, typename T1>
dk::Vector<2> get_half_diamond_coordinates ( const dk::TileIterator<T, 2, T1>& parIterator, const dk::Vector<2>& parSize ); Vector<2> get_diamond_coordinates ( const TileIterator<T, 2, T1>& parIterator, const Vector<2>& parSize ) a_pure;
template <typename T, typename T1>
Vector<2> get_half_diamond_coordinates ( const TileIterator<T, 2, T1>& parIterator, const Vector<2>& parSize ) a_pure;
template <uint32_t D, typename T, typename T1> template <uint32_t D, typename T, typename T1>
dk::Vector<D> get_square_coordinates ( const dk::TileIterator<T, D, T1>& parIterator, const dk::Vector<D>& parSize ); Vector<D> get_square_coordinates ( const TileIterator<T, D, T1>& parIterator, const Vector<D>& parSize ) a_pure;
template <typename T, typename T1> template <typename T, typename T1>
dk::Vector<2> get_hex_coordinates ( const dk::TileIterator<T, 2, T1>& parIterator, const dk::Vector<2>& parSize ); Vector<2> get_hex_coordinates ( const TileIterator<T, 2, T1>& parIterator, const Vector<2>& parSize ) a_pure;
} //namespace dk } //namespace dk
#include "doorkeeper/implem/pixelconv.inl" #include "doorkeeper/implem/pixelconv.inl"

53
include/doorkeeper/implem/pixelconv.inl
View file

@ -1,30 +1,51 @@
namespace dk { namespace dk {
template <typename T, typename T1> template <typename T, typename T1>
inline inline
dk::Vector<2> get_diamond_coordinates (const dk::TileIterator<T, 2, T1>& parIterator, const dk::Vector<2>& parSize) { Vector<2> get_diamond_coordinates (const TileIterator<T, 2, T1>& parIterator, const Vector<2>& parSize) {
typedef dk::Vector<2> vec; PixelConvDiamond pconv(true, true);
return pconv.to_pixel(parIterator.position(), parSize);
const auto from(parIterator.position());
const dk::CoordinateScalarType xoffs = from.y() % 2;
return from * parSize + vec(xoffs * parSize.x() / 2, 0);
} }
template <typename T, typename T1> template <typename T, typename T1>
inline inline
dk::Vector<2> get_half_diamond_coordinates (const dk::TileIterator<T, 2, T1>& parIterator, const dk::Vector<2>& parSize) { Vector<2> get_half_diamond_coordinates (const TileIterator<T, 2, T1>& parIterator, const Vector<2>& parSize) {
typedef dk::Vector<2> vec; PixelConvHalfDiamond pconv(true);
return get_diamond_coordinates(parIterator, parSize / vec(1, 2)); return pconv.to_pixel(parIterator.position(), parSize);
} }
template <uint32_t D, typename T, typename T1> template <uint32_t D, typename T, typename T1>
inline inline
dk::Vector<D> get_square_coordinates (const dk::TileIterator<T, D, T1>& parIterator, const dk::Vector<D>& parSize) { Vector<D> get_square_coordinates (const TileIterator<T, D, T1>& parIterator, const Vector<D>& parSize) {
return parIterator.position() * parSize; PixelConvSquare<D> pconv;
return pconv.to_pixel(parIterator.position(), parSize);
} }
//template <typename T, typename T1> template <typename T, typename T1>
//inline inline
//dk::Vector<dk::CoordinateScalarType, 2> get_hex_coordinates (const dk::TileIterator<T, 2, T1>& parIterator, const dk::Vector<dk::CoordinateScalarType, 2>& parSize) { Vector<2> get_hex_coordinates (const TileIterator<T, 2, T1>& parIterator, const Vector<2>& parSize) {
//} PixelConvHex pconv(true);
return pconv.to_pixel(parIterator.position(), parSize);
}
template <uint32_t D>
PixelConv<D>::PixelConv (MapTypes parType) :
m_map_type(parType)
{
}
template <uint32_t D>
MapTypes PixelConv<D>::map_type() const {
return m_map_type;
}
template <uint32_t D>
PixelConvSquare<D>::PixelConvSquare() :
base_class(MapType_Orthogonal)
{
}
template <uint32_t D>
auto PixelConvSquare<D>::to_pixel (const coords& parFrom, const coords& parSize) const -> coords {
return parFrom * parSize;
}
} //namespace dk } //namespace dk

1
src/CMakeLists.txt
View file

@ -17,6 +17,7 @@ add_library(${PROJECT_NAME}
tylermapsource.cpp tylermapsource.cpp
tiger.c tiger.c
typename.cpp typename.cpp
pixelconv.cpp
) )
target_include_directories(${PROJECT_NAME} target_include_directories(${PROJECT_NAME}

40
src/pixelconv.cpp Normal file
View file

@ -0,0 +1,40 @@
#include "doorkeeper/components/pixelconv.hpp"
namespace dk {
PixelConvDiamond::PixelConvDiamond (bool parStaggered, bool parFirstReentrant) :
base_class(parStaggered ? MapType_IsometricStaggered : MapType_Isometric)
{
}
PixelConvDiamond::PixelConvDiamond (MapTypes parType, bool parStaggered, bool parFirstReentrant) :
base_class(MapType_IsometricStaggered)
{
}
auto PixelConvDiamond::to_pixel (const coords& parFrom, const coords& parSize) const -> coords {
const auto from(parFrom);
const CoordinateScalarType xoffs = from.y() % 2;
return from * parSize + coords(xoffs * parSize.x() / 2, 0);
}
PixelConvHalfDiamond::PixelConvHalfDiamond (bool parHalfVertically) :
base_class(MapType_IsometricStaggered, true, true),
m_div(parHalfVertically ? coords(1, 2) : coords(2, 1))
{
}
auto PixelConvHalfDiamond::to_pixel (const coords& parFrom, const coords& parSize) const -> coords {
return base_class::to_pixel(parFrom, parSize / m_div);
}
PixelConvHex::PixelConvHex (bool parFirstReentrant) :
base_class(MapType_Hex)
{
}
auto PixelConvHex::to_pixel (const coords& parFrom, const coords& parSize) const -> coords {
DK_ASSERT(false); //not implemented
return coords(0);
}
} //namespace dk