Skip to content

Commit

Permalink
promote and improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
@irrld
irrld committed Oct 10, 2023
1 parent e4b465d commit 8aaed3e
Show file tree
Hide file tree
Showing 22 changed files with 486 additions and 69 deletions.
9 changes: 5 additions & 4 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,11 @@ set(GlistApp_SOURCES
${APP_DIR}/src/color.cpp
${APP_DIR}/src/app/main.cpp
${APP_DIR}/src/app/app.cpp
${APP_DIR}/src/loading_canvas.cpp
${APP_DIR}/src/menu_canvas.cpp
${APP_DIR}/src/message_canvas.cpp
${APP_DIR}/src/game_canvas.cpp
${APP_DIR}/src/canvas/promote_screen.cpp
${APP_DIR}/src/canvas/loading_canvas.cpp
${APP_DIR}/src/canvas/menu_canvas.cpp
${APP_DIR}/src/canvas/message_canvas.cpp
${APP_DIR}/src/canvas/game_canvas.cpp
${APP_DIR}/src/chess/chess_board.cpp
${APP_DIR}/src/chess/piece.cpp
${APP_DIR}/src/net/packets.cpp
Expand Down
Binary file modified assets/images/button.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/panel.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/pieces/MaskPieces-Sheet.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions src/app/app.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
*/

#include "app.h"
#include <loading_canvas.h>
#include "game_canvas.h"
#include "menu_canvas.h"
#include "canvas/loading_canvas.h"
#include "canvas/game_canvas.h"

gApp::gApp() {
}
Expand All @@ -26,6 +25,7 @@ void gApp::setup() {
cursor_->setFiltering(2, 2);
cursor_height_ = cursor_->getHeight();
cursor_width_ = 16;
//auto* cnv = new GameCanvas(this, CreateRef<ChessConnectionDummy>(), nullptr);
auto* cnv = new LoadingCanvas(this);
appmanager->setCurrentCanvas(cnv);
appmanager->getWindow()->setCursorMode(0x00034002); // GLFW_CURSOR_HIDDEN
Expand Down
174 changes: 135 additions & 39 deletions src/game_canvas.cpp → src/canvas/game_canvas.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ GameCanvas::~GameCanvas() {
}

void GameCanvas::setup() {
enableAlphaBlending();
if (!connection_->IsHost()) {
player_color_ = kPieceColorBlack;
flip_board_ = true;
Expand All @@ -33,6 +34,8 @@ void GameCanvas::setup() {
white_pieces_.setFiltering(2, 2);
black_pieces_.loadImage("pieces/BlackPieces-Sheet.png");
black_pieces_.setFiltering(2, 2);
mask_pieces_.loadImage("pieces/MaskPieces-Sheet.png");
mask_pieces_.setFiltering(2, 2);
outliner_.loadImage("outliner.png");
outliner_.setFiltering(2, 2);
ResetSelection();
Expand All @@ -41,6 +44,12 @@ void GameCanvas::setup() {
input_lock_ = true;
game_started_ = false;
ended_ = false;
promote_screen_ = new PromoteScreen(root_, this, player_color_);
promote_screen_->Setup();
promote_screen_->SetSelectCallback([this](PieceType type) {
promoting_ = false;
connection_->Promote(promote_piece_x_, promote_piece_y_, type, player_color_);
});
// todo move chess board spaghetti stuff to connection and handle everything there
chess_board_ = CreateRef<ChessBoard>(*connection_->GetBoardData());
connection_->SetOnMove([this](int x, int y, int to_x, int to_y) {
Expand All @@ -66,6 +75,7 @@ void GameCanvas::setup() {
});
connection_->SetOnStartGame([this]() {
game_started_ = true;
input_lock_ = false;
});
connection_->SetOnEndGame([this](PieceColor color) {
input_lock_ = true;
Expand All @@ -79,20 +89,23 @@ void GameCanvas::setup() {
SetInfoText("You lost!");
}
});
connection_->SetOnPieceChance([this](int x, int y, PieceType type, PieceColor color) {
chess_board_->SetPiece(x, y, type, color);
});
connection_->Ready();
}


void GameCanvas::update() {
game_time_ += appmanager->getElapsedTime();
if (promoting_) {
promote_screen_->Update();
}
UpdateInfoText();
if (ended_) {
dance_anim_time_ += appmanager->getElapsedTime();
return;
}
if (game_started_) {
UpdateFallAnimation();
}
}

void GameCanvas::UpdateInfoText() {
Expand All @@ -104,32 +117,15 @@ void GameCanvas::UpdateInfoText() {
}
}

void GameCanvas::UpdateFallAnimation() {
if (fall_anim_dist_ > 0.0f) {
fall_anim_dist_ = Lerp(fall_anim_dist_, 0.0f, 0.01f + (game_time_ / 20.0f));
if (fall_anim_dist_ < 0.001f) {
fall_anim_dist_ = 0.0f;
input_lock_ = false;
}
}
}

void GameCanvas::draw() {
clearColor(0x6f, 0x75, 0x83);
if (!game_started_) {
return;
}
DrawBoard();
DrawInfoText();
// pos * 2 -> pos * 4 / 2 -> pos * pixelScale / 2
DrawPromote();
root_->DrawCursor();
/*for (int x = 0; x < 8; ++x) {
for (int y = 0; y < 8; ++y) {
RenderUtil::DrawFont(gToStr(x) + " " + gToStr(y),
board_pos_x + (7 + x * 16) * RenderUtil::kPixelScale,
board_pos_y + (10 + y * 12) * RenderUtil::kPixelScale, {1.0f, 0, 0});
}
}*/
}

void GameCanvas::HighlightPosition(int board_x, int board_y, const gColor& color) {
Expand All @@ -142,6 +138,8 @@ void GameCanvas::HighlightPosition(int board_x, int board_y, const gColor& color
}

bool GameCanvas::Move(int x, int y, int to_x, int to_y) {
animate_start_ = game_time_;
animate_duration_ = 0.18f;
animate_move_piece_x_ = to_x;
animate_move_piece_y_ = to_y;
animate_from_pos_x_ = (7 + x * 16) * RenderUtil::kPixelScale;
Expand All @@ -162,8 +160,10 @@ bool GameCanvas::Move(int x, int y, int to_x, int to_y) {
SetInfoText("Promote your pawn!");
promoting_ = true;
show_moves_ = false;
hover_piece_x_ = to_x;
hover_piece_y_ = to_y;
promote_piece_x_ = to_x;
promote_piece_y_ = to_y;
promote_screen_->Reset();
promote_screen_->SetPromotePosition(to_x, to_y);
return false;
} else {
SetInfoText("Your opponent is promoting its pawn!");
Expand All @@ -176,8 +176,10 @@ bool GameCanvas::Move(int x, int y, int to_x, int to_y) {
SetInfoText("Promote your pawn!");
promoting_ = true;
show_moves_ = false;
hover_piece_x_ = to_x;
hover_piece_y_ = to_y;
promote_piece_x_ = to_x;
promote_piece_y_ = to_y;
promote_screen_->Reset();
promote_screen_->SetPromotePosition(to_x, to_y);
return false;
} else {
SetInfoText("Your opponent is promoting its pawn!");
Expand Down Expand Up @@ -224,16 +226,40 @@ void GameCanvas::DrawInfoText() {
}
}

void GameCanvas::DrawPromote() {
if (!promoting_) {
return;
}
promote_screen_->Draw();
}

void GameCanvas::DrawPiece(int x, int y) {
int render_offset_x = (7 + x * 16) * RenderUtil::kPixelScale;
int render_offset_y = (6 + ConvertY(y) * 12 - piece_offset_) * RenderUtil::kPixelScale;

Ref<Piece> piece = chess_board_->GetPiece(x, y);
if (hover_piece_x_ == x && hover_piece_y_ == y) {
if (!show_moves_) {
HighlightPosition(x, y, {0.0f, 139 / 255.0f, 203 / 255.0f});
if (piece && (!animate_ || (animate_move_piece_x_ != x && animate_move_piece_y_ != y))) {
const gColor& og_color = renderer->getColor();
renderer->setColor(0.0f, 0.545f, 0.796f);
DrawOutline(piece->GetType(), board_pos_x + render_offset_x, board_pos_y + render_offset_y, RenderUtil::kPixelScale);
renderer->setColor(og_color);
} else {
HighlightPosition(x, y, {0.0f, 0.545f, 0.796f});
}
}
}
if (show_moves_) {
if (move_piece_x_ == x && move_piece_y_ == y) {
HighlightPosition(x, y, {250 / 255.0f, 100 / 255.0f, 20 / 255.0f});
if (piece && (!animate_ || (animate_move_piece_x_ != x && animate_move_piece_y_ != y))) {
const gColor& og_color = renderer->getColor();
renderer->setColor(0.98f, 0.394f, 0.078f);
DrawOutline(piece->GetType(), board_pos_x + render_offset_x, board_pos_y + render_offset_y, RenderUtil::kPixelScale);
renderer->setColor(og_color);
} else {
HighlightPosition(x, y, {0.98f, 0.394f, 0.078f});
}
}
Ref<Piece> hover_piece =
chess_board_->GetPiece(move_piece_x_, move_piece_y_);
Expand All @@ -256,17 +282,16 @@ void GameCanvas::DrawPiece(int x, int y) {
if (index < 0) {
return;
}
int render_offset_x = (7 + x * 16) * RenderUtil::kPixelScale;
int render_offset_y = (6 + ConvertY(y) * 12 - piece_offset_) * RenderUtil::kPixelScale;
if (animate_ && animate_move_piece_x_ == x && animate_move_piece_y_ == y) {
image.drawSub(board_pos_x + animate_from_pos_x_, board_pos_y + animate_from_pos_y_, // render pos
float t = std::min((game_time_ - animate_start_) / animate_duration_, 1.0);
animate_current_pos_x_ = Lerp(animate_from_pos_x_, animate_to_pos_x_, t);
animate_current_pos_y_ = Lerp(animate_from_pos_y_, animate_to_pos_y_, t);
image.drawSub(board_pos_x + animate_current_pos_x_, board_pos_y + animate_current_pos_y_, // render pos
16 * RenderUtil::kPixelScale, 32 * RenderUtil::kPixelScale, // render size
index * 16, index * 32, // image pos
16, 32 // image size
);
animate_from_pos_x_ = Lerp(animate_from_pos_x_, animate_to_pos_x_, 0.15f);
animate_from_pos_y_ = Lerp(animate_from_pos_y_, animate_to_pos_y_, 0.15f);
if (std::abs(animate_to_pos_x_ - animate_from_pos_x_) < 0.02f && std::abs(animate_to_pos_y_ - animate_from_pos_y_) < 0.02f) {
if (t >= 1.0f) {
animate_ = false;
}
} else if (ended_ && (piece->GetColor() == winner_color_ || winner_color_ == kPieceColorNone)) {
Expand All @@ -280,15 +305,75 @@ void GameCanvas::DrawPiece(int x, int y) {
(int) gRadToDeg(std::cos(dance_anim_time_ * 3) * 0.25f) // rotation
);
} else {
int start_offset = -fall_anim_dist_ * 800 * (x + 1);
image.drawSub(board_pos_x + render_offset_x, board_pos_y + render_offset_y + start_offset, // render pos
image.drawSub(board_pos_x + render_offset_x, board_pos_y + render_offset_y, // render pos
16 * RenderUtil::kPixelScale, 32 * RenderUtil::kPixelScale, // render size
index * 16, index * 32, // image pos
16, 32 // image size
);
}
}

void GameCanvas::DrawPieceAnimating(PieceType type, PieceColor color, int board_x, int board_y, int to_board_x, int to_board_y, float progress) {
float from_pos_x = (7 + board_x * 16) * RenderUtil::kPixelScale;
float from_pos_y = (6 + ConvertY(board_y) * 12 - piece_offset_) * RenderUtil::kPixelScale;
float to_pos_x = (7 + to_board_x * 16) * RenderUtil::kPixelScale;
float to_pos_y = (6 + ConvertY(to_board_y) * 12 - piece_offset_) * RenderUtil::kPixelScale;
float current_pos_x = Lerp(from_pos_x, to_pos_x, progress);
float current_pos_y = Lerp(from_pos_y, to_pos_y, progress);
auto& pieces = color == kPieceColorWhite ? white_pieces_ : black_pieces_;
int index = type - 1;
pieces.drawSub(board_pos_x + current_pos_x, board_pos_y + current_pos_y, // render pos
16 * RenderUtil::kPixelScale, 32 * RenderUtil::kPixelScale, // render size
index * 16, index * 32, // image pos
16, 32 // image size
);
}

void GameCanvas::DrawPieceAnimatingUnbound(PieceType type, PieceColor color, int x, int y, int to_board_x, int to_board_y, float progress) {
float to_pos_x = (7 + to_board_x * 16) * RenderUtil::kPixelScale;
float to_pos_y = (6 + ConvertY(to_board_y) * 12 - piece_offset_) * RenderUtil::kPixelScale;
float current_pos_x = Lerp(x, board_pos_x + to_pos_x, progress);
float current_pos_y = Lerp(y, board_pos_y + to_pos_y, progress);
auto& pieces = color == kPieceColorWhite ? white_pieces_ : black_pieces_;
int index = type - 1;
pieces.drawSub(current_pos_x, current_pos_y, // render pos
16 * RenderUtil::kPixelScale, 32 * RenderUtil::kPixelScale, // render size
index * 16, index * 32, // image pos
16, 32 // image size
);
}

void GameCanvas::DrawPiece(PieceType type, PieceColor color, int x, int y, float scale) {
auto& pieces = color == kPieceColorWhite ? white_pieces_ : black_pieces_;
int index = type - 1;
pieces.drawSub(x, y, // render pos
16 * scale, 32 * scale, // render size
index * 16, index * 32, // image pos
16, 32 // image size
);
}

void GameCanvas::DrawOutline(PieceType type, int x, int y, float scale) {
int index = type - 1;
int offsets[16]{
-1,0,
0,-1,
1,0,
0,1,
0,-1,
-1,0,
0,1,
1,0
};
for (int i = 0; i < 16; i += 2) {
mask_pieces_.drawSub(x + (scale * offsets[i]), y + (scale * offsets[i + 1]), // render pos
16 * scale, 32 * scale, // render size
index * 16, index * 32, // image pos
16, 32 // image size
);
}
}

int GameCanvas::ConvertY(int y) {
return flip_board_ ? y : 7 - y;
}
Expand All @@ -313,7 +398,11 @@ void GameCanvas::charPressed(unsigned int codepoint) {

void GameCanvas::mouseMoved(int x, int y) {
root_->SetCursorPos(x, y);
if (input_lock_ || promoting_ || connection_->GetCurrentTurn() != player_color_) {
if (promoting_) {
promote_screen_->OnMouseMoved(x, y);
return;
}
if (input_lock_ || connection_->GetCurrentTurn() != player_color_) {
return;
}
// gLogi("GameCanvas") << "mouseMoved" << ", x:" << x << ", y:" << y;
Expand All @@ -337,19 +426,27 @@ void GameCanvas::mouseDragged(int x, int y, int button) {
// gLogi("GameCanvas") << "mouseDragged" << ", x:" << x << ", y:" << y << ", b:" << button;
root_->SetCursorPos(x, y);
root_->SetCursorType(CursorType::kHandClosed);
if (promoting_) {
promote_screen_->OnMouseMoved(x, y);
return;
}
}

void GameCanvas::mousePressed(int x, int y, int button) {
// gLogi("GameCanvas") << "mousePressed" << ", x:" << x << ", y:" << y << ", b:" << button;
root_->SetCursorType(CursorType::kHandClosed);
if (promoting_) {
promote_screen_->OnMousePressed(x, y);
}
}

void GameCanvas::mouseReleased(int x, int y, int button) {
root_->SetCursorType(CursorType::kArrow);
if (animate_ || input_lock_ || connection_->GetCurrentTurn() != player_color_) {
if (promoting_) {
promote_screen_->OnMouseReleased(x, y);
return;
}
if (promoting_) {
if (animate_ || input_lock_ || connection_->GetCurrentTurn() != player_color_) {
return;
}

Expand Down Expand Up @@ -380,7 +477,6 @@ void GameCanvas::mouseReleased(int x, int y, int button) {
bool switch_turn = Move(move_piece_x_, move_piece_y_, hover_piece_x_, hover_piece_y_);
connection_->Move(move_piece_x_, move_piece_y_, hover_piece_x_,
hover_piece_y_, switch_turn);

ResetSelection();
}
}
Expand Down
Loading

0 comments on commit 8aaed3e

Please sign in to comment.