Crylia/Tetris_SDL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

finish title screen, fix game logic, add textures, somehow forgot the T tetromino lol

Browse Source
This commit is contained in:
Rene Kievits
2024-10-14 22:45:46 +02:00
parent 190f81176d
commit 24c8c3fe2c
25 changed files with 399 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/Tetromino.cpp
View File

@@ -1,7 +1,7 @@
#include "Tetromino.hpp"
#include "GameBoard.hpp"
Tetromino::Tetromino(TetrominoShape shape) : x(0), y(0) {
#include <iostream>
Tetromino::Tetromino(TetrominoShape shape) : x(0), y(0), textureShape(shape) {
initializeShape(shape);
currentRotationState = 1;
@@ -16,29 +16,44 @@ Tetromino::Tetromino(TetrominoShape shape) : x(0), y(0) {
switch (dist6(rng)) {
case 0:
color.r = 255;
color.r = 0;
color.g = 191;
color.b = 255;
break;
case 1:
color.g = 255;
color.r = 255;
color.g = 215;
color.b = 0;
break;
case 2:
color.b = 255;
color.r = 138;
color.g = 43;
color.b = 226;
break;
case 3:
color.r = 255;
color.g = 255;
color.r = 0;
color.g = 204;
color.b = 102;
break;
case 4:
color.g = 255;
color.b = 255;
color.r = 255;
color.g = 69;
color.b = 0;
break;
case 5:
color.r = 30;
color.g = 144;
color.b = 255;
break;
case 6:
color.r = 255;
color.g = 140;
color.b = 0;
break;
default:
break;
}
}
void Tetromino::initializeShape(TetrominoShape s) {
@@ -61,6 +76,9 @@ void Tetromino::initializeShape(TetrominoShape s) {
case TetrominoShape::L:
shape = { {0, 0, 1}, {1, 1, 1} };
break;
case TetrominoShape::T:
shape = { {1, 1, 1}, {0, 1, 0} };
break;
default:
shape = { {0} };
break;
@@ -102,11 +120,9 @@ double Tetromino::getRotationAngle( ) const {
}
const vector<vector<int>>& Tetromino::getShape( ) const { return shape; }
const TetrominoShape Tetromino::getShapeEnumn( ) const { return textureShape; }
int Tetromino::getX( ) const { return x; }
int Tetromino::getY( ) const { return y; }
void Tetromino::setTexture(const TetrominoShape shape) { this->textureShape = shape; }
const TetrominoShape Tetromino::getTexture( ) const { return textureShape; }
SDL_Color Tetromino::getColor( ) const { return color; }