From 751c02edc8bb4cb99c2c6fac22f6504fd7716bc3 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 8 Feb 2022 17:19:25 +0100 Subject: [PATCH] Revert "Changes for assignment 2" This reverts commit 8d2bdbe9d882a237a03afaf2993ed483723a7094. --- src/gamelogic.cpp | 3 --- src/program.cpp | 4 ---- 2 files changed, 7 deletions(-) diff --git a/src/gamelogic.cpp b/src/gamelogic.cpp index 5b8c282..8f24f26 100644 --- a/src/gamelogic.cpp +++ b/src/gamelogic.cpp @@ -18,9 +18,6 @@ #define GLM_ENABLE_EXPERIMENTAL #include -#include "utilities/imageLoader.hpp" -#include "utilities/glfont.h" - enum KeyFrameAction { BOTTOM, TOP }; diff --git a/src/program.cpp b/src/program.cpp index 2256a69..54b56eb 100644 --- a/src/program.cpp +++ b/src/program.cpp @@ -27,10 +27,6 @@ void runProgram(GLFWwindow* window, CommandLineOptions options) // Disable built-in dithering glDisable(GL_DITHER); - // Enable transparency - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - // Set default colour after clearing the colour buffer glClearColor(0.3f, 0.5f, 0.8f, 1.0f);