summaryrefslogtreecommitdiff
path: root/frontends/gl
diff options
context:
space:
mode:
Diffstat (limited to 'frontends/gl')
-rw-r--r--frontends/gl/drawable.c4
-rw-r--r--frontends/gl/main.c5
-rw-r--r--frontends/gl/ui.c5
3 files changed, 1 insertions, 13 deletions
diff --git a/frontends/gl/drawable.c b/frontends/gl/drawable.c
index 86f2410..4d88a0a 100644
--- a/frontends/gl/drawable.c
+++ b/frontends/gl/drawable.c
@@ -36,10 +36,6 @@ bool load_image(char* file_name, GLuint texture) {
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, w, h, 0, GL_RGB, GL_UNSIGNED_BYTE, data);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glGenerateMipmap(GL_TEXTURE_2D);
stbi_image_free(data);
diff --git a/frontends/gl/main.c b/frontends/gl/main.c
index ffd5794..25d8d87 100644
--- a/frontends/gl/main.c
+++ b/frontends/gl/main.c
@@ -87,9 +87,6 @@ int main(void) {
SDL_GL_SetAttribute( SDL_GL_CONTEXT_MAJOR_VERSION, 4 );
SDL_GL_SetAttribute( SDL_GL_CONTEXT_MINOR_VERSION, 5 );
SDL_GL_SetAttribute( SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE );
-
- SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
- SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
if (SCREEN_FULLSCREEN) {
window = SDL_CreateWindow(
@@ -148,7 +145,7 @@ int main(void) {
glClearColor(0.2f, 0.3f, 0.3f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT);
- //draw_tetris_board(&ui);
+ draw_tetris_board(&ui);
draw_current(&ui);
SDL_GL_SwapWindow(window);
diff --git a/frontends/gl/ui.c b/frontends/gl/ui.c
index f21292c..963c1aa 100644
--- a/frontends/gl/ui.c
+++ b/frontends/gl/ui.c
@@ -12,14 +12,10 @@ void load_tetris_board(tetris_board_t *board, GLfloat x, GLfloat y, GLfloat w, G
board->x_offset = x;
board->y_offset = y;
-
- glGenTextures(1, &board->block.texture);
- load_image("block.jpg", board->block.texture);
}
void draw_tetris_board(cetris_ui *ui) {
glBindVertexArray(ui->board.block.vao);
- glBindTexture(GL_TEXTURE_2D, ui->skin.block_texture);
for (int x = 0; x < ui->board.game.config.board_x; x++) {
for (int y = ui->board.game.highest_line; y < ui->board.game.config.board_y; y++) {
if (ui->board.game.board[x][y] & SLOT_OCCUPIED) {
@@ -37,7 +33,6 @@ void draw_tetris_board(cetris_ui *ui) {
}
void draw_current(cetris_ui *ui) {
- glBindTexture(GL_TEXTURE_2D, ui->skin.block_texture);
glBindVertexArray(ui->board.block.vao);
for (int s = 0; s < 4; s++) {
for (int j = 0; j < 4; j++) {