loic/ochess
1
0
Fork 0
mirror of https://gitlab.com/manzerbredes/ochess.git synced 2025-04-07 02:26:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve pieces animations

Browse source
This commit is contained in:
Loic Guegan 2022-12-29 13:08:53 +01:00
parent fdab451352
commit f04f9b7019
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/game_tab/left_panel/board/BoardCanvas.cpp
View file

@ -66,15 +66,14 @@ void BoardCanvas::OnPaint(wxPaintEvent &event) {
else { else {
// Otherwise reuse buffer and animate. TEST CODE FOR NOW: // Otherwise reuse buffer and animate. TEST CODE FOR NOW:
dc.DrawBitmap(*adata.buffer, 0, 0, true); dc.DrawBitmap(*adata.buffer, 0, 0, true);
double frames=adata.duration/(1000/adata.fps); double percent=adata.frame/adata.frames;
double percent=adata.frame/frames;
// Draw moving piece // Draw moving piece
dc.DrawBitmap(*t->Get(adata.piece_moved), dc.DrawBitmap(*t->Get(adata.piece_moved),
adata.src.x + adata.frame*(adata.transVect.x/frames), adata.src.x + adata.frame*(adata.transVect.x/adata.frames),
adata.src.y + adata.frame*(adata.transVect.y/frames), false); adata.src.y + adata.frame*(adata.transVect.y/adata.frames), false);
// end drawing // end drawing
adata.frame++; adata.frame++;
if(adata.frame>=frames){ if(adata.frame>=adata.frames){
adata.reuseBuffer=false; adata.reuseBuffer=false;
SetupBoard(adata.final_board, adata.final_is_black_turn, adata.final_captures); SetupBoard(adata.final_board, adata.final_is_black_turn, adata.final_captures);
} }
@ -125,7 +124,7 @@ void BoardCanvas::Animate(std::string board, bool is_black_turn, std::map<char,
wxMemoryDC memDC(*adata.buffer); wxMemoryDC memDC(*adata.buffer);
DrawBoard(memDC); DrawBoard(memDC);
// Now compute piece start position and translation vector (Copy paste from DrawBoard()) // Now compute piece start position and translation vector
std::uint32_t piece_width = t->GetPiecesSizes(); std::uint32_t piece_width = t->GetPiecesSizes();
std::uint32_t centrer_offset = (square_width - piece_width) / 2; std::uint32_t centrer_offset = (square_width - piece_width) / 2;
if (!black_side) { if (!black_side) {
@ -153,10 +152,10 @@ void BoardCanvas::Animate(std::string board, bool is_black_turn, std::map<char,
int duration_backup=adata.duration; int duration_backup=adata.duration;
adata.duration=faster ? adata.duration_fast : adata.duration; adata.duration=faster ? adata.duration_fast : adata.duration;
adata.frame=0; adata.frame=0;
int frames=adata.duration/(1000/adata.fps); // total number of frames adata.frames=adata.duration/(1000/adata.fps); // total number of frames
int time_per_frame=adata.duration/frames; int time_per_frame=adata.duration/adata.frames;
wxStopWatch sw; wxStopWatch sw;
for(int i=frames;i>0;i--){ for(int i=adata.frames;i>0;i--){
Refresh(); Refresh();
Update(); Update();
int delay=sw.Time()-time_per_frame; int delay=sw.Time()-time_per_frame;

2
src/game_tab/left_panel/board/BoardCanvas.hpp
View file

@ -44,7 +44,7 @@ typedef std::tuple<short, short, short> ClockTime;
typedef struct AnimState { typedef struct AnimState {
wxBitmap *buffer; wxBitmap *buffer;
bool reuseBuffer; bool reuseBuffer;
int frame,duration,fps,duration_fast; int frame,frames,duration,fps,duration_fast;
std::string final_board; std::string final_board;
bool final_is_black_turn; bool final_is_black_turn;
std::map<char, std::uint8_t> final_captures; std::map<char, std::uint8_t> final_captures;