[Piece] Add fromValue
This commit is contained in:
@@ -24,7 +24,7 @@ Piece::Optional Board::piece(const Square &square) const {
|
||||
BitBoard mask = indexToBitBoard(square.index());
|
||||
for (const auto &kPieceBb : mPieceBBs) {
|
||||
if (kPieceBb & mask) {
|
||||
return Piece(indexToColor(i), indexToType(i));
|
||||
return Piece::fromValue(i);
|
||||
}
|
||||
|
||||
i++;
|
||||
|
@@ -52,14 +52,6 @@ private:
|
||||
static inline BitBoard indexToBitBoard(unsigned i) {
|
||||
return (1ULL << i);
|
||||
}
|
||||
|
||||
static inline PieceColor indexToColor(unsigned i) {
|
||||
return static_cast<PieceColor>(i % 2);
|
||||
}
|
||||
|
||||
static inline PieceType indexToType(unsigned i) {
|
||||
return static_cast<PieceType>(i - (i % 2));
|
||||
}
|
||||
};
|
||||
|
||||
std::ostream &operator<<(std::ostream &os, const Board &board);
|
||||
|
@@ -42,6 +42,9 @@ std::optional<PieceType> Piece::pieceTypeFromSymbol(char symbol) {
|
||||
default: return std::nullopt;
|
||||
}
|
||||
}
|
||||
Piece::Optional Piece::fromValue(unsigned int value) {
|
||||
return Piece(valToColor(value), valToType(value));
|
||||
}
|
||||
|
||||
bool operator==(const Piece &lhs, const Piece &rhs) {
|
||||
return lhs.color() == rhs.color() && lhs.type() == rhs.type();
|
||||
|
@@ -27,6 +27,7 @@ public:
|
||||
Piece(PieceColor color, PieceType type);
|
||||
|
||||
static Optional fromSymbol(char symbol);
|
||||
static Optional fromValue(unsigned value);
|
||||
|
||||
static std::optional<PieceType> pieceTypeFromSymbol(char symbol);
|
||||
|
||||
@@ -38,6 +39,14 @@ public:
|
||||
private:
|
||||
const PieceColor mColor;
|
||||
const PieceType mType;
|
||||
|
||||
static inline PieceColor valToColor(unsigned v) {
|
||||
return static_cast<PieceColor>(v % 2);
|
||||
}
|
||||
|
||||
static inline PieceType valToType(unsigned v) {
|
||||
return static_cast<PieceType>(v - (v % 2));
|
||||
}
|
||||
};
|
||||
|
||||
bool operator==(const Piece &lhs, const Piece &rhs);
|
||||
|
Reference in New Issue
Block a user