Bug fixing

src/geno/shaders/GenoShader2c.cpp

@@ -29,8 +29,8 @@
 #include "GenoShader2c.h"
 
 GenoShader2c::GenoShader2c() :
-	GenoMvpShader("src/geno/shaders/src/Shader2c/Shader2cv.gls",
-	              "src/geno/shaders/src/Shader2c/Shader2cf.gls",
+	GenoMvpShader("res/shaders/Shader2c/Shader2cv.gls",
+	              "res/shaders/Shader2c/Shader2cf.gls",
 	               GENO_SHADER_STRING_IS_PATH) {
 	colorLoc = glGetUniformLocation(program, "inputColor");
 }

src/geno/shaders/GenoShader2ss.cpp

@@ -29,8 +29,8 @@
 #include "GenoShader2ss.h"
 
 GenoShader2ss::GenoShader2ss() :
-	GenoMvpShader("src/geno/shaders/src/Shader2ss/Shader2ssv.gls",
-	              "src/geno/shaders/src/Shader2ss/Shader2ssf.gls",
+	GenoMvpShader("res/shaders/Shader2ss/Shader2ssv.gls",
+	              "res/shaders/Shader2ss/Shader2ssf.gls",
 	               GENO_SHADER_STRING_IS_PATH) {
 	textureTransformLoc = glGetUniformLocation(program, "textureTransform");
 }

src/geno/shaders/GenoShader2t.cpp

@@ -29,8 +29,8 @@
 #include "GenoShader2t.h"
 
 GenoShader2t::GenoShader2t() :
-	GenoMvpShader("src/geno/shaders/src/Shader2t/Shader2tv.gls",
-	              "src/geno/shaders/src/Shader2t/Shader2tf.gls",
+	GenoMvpShader("res/shaders/Shader2t/Shader2tv.gls",
+	              "res/shaders/Shader2t/Shader2tf.gls",
 	               GENO_SHADER_STRING_IS_PATH) {}
 
 GenoShader2t::~GenoShader2t() {}

src/main.cpp

@@ -132,6 +132,7 @@ bool init() {
 	GenoWindowCreateInfo winInfo = {};
 	winInfo.defaultPosition = true;
 	winInfo.fullscreen      = true;
+
 	winInfo.title           = "Genome";
 	winInfo.numHints        = GENO_ARRAY_SIZE(winHints) / 2;
 	winInfo.hints           = winHints;

src/pinball/Intro.cpp

@@ -52,8 +52,6 @@ Intro::Intro(GenoCamera2D * camera, GlowShader * glow, uint32 next, uint32 reset
 }
 
 void Intro::update() {
-	if (GenoInput::getKeyState(GLFW_KEY_N) == GENO_INPUT_PRESSED)
-		complete = true;
 	if (state == FADE_IN) {
 		const static auto SHADE = 0.5f;
 		time += GenoEngine::getLoop()->getDelta();

src/pinball/Level.cpp

@@ -67,8 +67,6 @@ Level::Level(GenoCamera2D * camera, GlowShader * glow, uint32 next, uint32 reset
 }
 
 void Level::update() {
-	if (GenoInput::getKeyState(GLFW_KEY_N) == GENO_INPUT_PRESSED)
-		complete = true;
 	if (state == FADE_IN) {
 		bar->setColor(fromHSV(120, 0.8f, 1));
 		bar->dimensions.x()      = 1845;

src/pinball/levels/Level1.h

@@ -93,7 +93,7 @@ Scene * loadLevel1(GenoCamera2D * camera, GlowShader * glow) {
 		)
 	};
 
-	return new Level(camera, glow, 5, 4, "res/img/Level1.png", numColors, palette, numWalls, walls, 7, 0, 3, { 184.5, 724.793 }, { 300, 0 });
+	return new Level(camera, glow, 5, 4, "res/img/Level1.png", numColors, palette, numWalls, walls, 6, 0, 3, { 184.5, 724.793 }, { 300, 0 });
 }
 
 #define GNARLY_PINBALL_LEVEL1_FORWARD