Added another example

Makefile

@@ -4,11 +4,24 @@ OBJ := obj
 CXX := g++
 LD := g++
 
+DESTDIR?=/
+PREFIX=/usr
+INSTALL?=install
+
 SOURCES := $(wildcard $(SRC)/*.cpp)
 OBJECTS := $(patsubst $(SRC)/%.cpp, $(OBJ)/%.o, $(SOURCES))
 
-all: program
+.PHONY: all
+all: build
 
+.PHONY: build
+build: program
+
+.PHONY: install
+install:
+	${INSTALL} -Dm755 program ${DESTDIR}${PREFIX}/bin/y3s2-gui-project
+
+.PHONY: clean
 clean:
 	rm -f program
 	rm -rf obj

examples/maze4.txt

@@ -0,0 +1,11 @@
+XXXXXXXXX
+X       X
+XXX  XX X
+X       X
+X X XX  X
+X X     X
+X XXX XXX
+X       X
+XXXXXX  X
+XG      X
+XXXXXXXXX

examples/maze5.txt

@@ -0,0 +1,5 @@
+  XX  
+      
+XX  XX
+      
+  XX  

examples/maze6.txt

@@ -0,0 +1,5 @@
+XXXXXXXXXX
+X X   X  X
+X XXX    X
+X     X  X
+XXXXXXXXXX

src/main.cpp

@@ -95,6 +95,9 @@ void load_maze(const std::string& path) {
 			case 'X':
 				row.push_back(1);
 				break;
+			case 'G':
+				row.push_back(2);
+				break;
 			default:
 				row.push_back(-1);
 			}

src/maze.cpp

@@ -8,28 +8,36 @@
 
 #include "utils.hpp"
 
-constexpr double PI = 3.14159265358979;
-
 MazeScreen::MazeScreen(const std::vector<std::vector<int>>& maze): 
 	maze(maze), 
 	angleX(0), 
 	mouseCapture(false),
-	posX(1),
+	posX(9999),
-	posZ(1) {}
+	posZ(9999),
+	solid(true) {
+	for (int i = 0; i < maze.size(); i++) {
+		for (int j = 0; j < maze[i].size(); j++) {
+			if (maze[i][j] == 0 && j < posZ) {
+				posX = i;
+				posZ = j;
+			}
+		}
+	}
+}
 
 void MazeScreen::display() {
+	glClearColor(0.8, 0.8, 0.8, 1);
 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 	glMatrixMode(GL_MODELVIEW);
 	glLoadIdentity();
 
-	//configures the camera with the position_x and position_z variables
 	gluLookAt(
 		posX, 
 		0, 
 		posZ, 
-		posX + cos((angleX * PI) / 180) * 3, 
+		posX + cos(Utils::toRad<float>(angleX)) * 3, 
 		0, 
-		posZ - sin((angleX * PI) / 180) * 3, 
+		posZ - sin(Utils::toRad<float>(angleX)) * 3, 
 		0, 
 		1, 
 		0
@@ -37,6 +45,14 @@ void MazeScreen::display() {
 
 	for (int i = 0; i < maze.size(); i++) {
 		for (int j = 0; j < maze[i].size(); j++) {
+			// Draw floor
+			glPushMatrix();
+			glColor3ub(0x33, 0x33, 0x33);
+			glTranslatef(i, -1, j);
+			glutSolidCube(1);
+			glPopMatrix();
+
+			float green, blue;
 			switch (maze[i][j]) {
 			case -1:
 				glPushMatrix();
@@ -47,18 +63,28 @@ void MazeScreen::display() {
 				break;
 			case 1:
 				glPushMatrix();
-				// Scale green by X
+
-				auto green = Utils::clamp<float>(Utils::nummap<float>(abs(i - posX), 0, 3, 0, 1), 0, 1);
-				// Scale blue by Z
-				auto blue = Utils::clamp<float>(Utils::nummap<float>(abs(j - posZ), 0, 3, 0, 1), 0, 1);
-				glColor3f(1, green, blue);
 				glTranslatef(i, 0, j);
+
+				// Scale green by X
+				green = Utils::clamp<float>(Utils::nummap<float>(abs(i - posX), 0, 3, 0, 1), 0, 1);
+				// Scale blue by Z
+				blue = Utils::clamp<float>(Utils::nummap<float>(abs(j - posZ), 0, 3, 0, 1), 0, 1);
+
+				glColor3f(1, green, blue);
+				glutWireCube(1);
 				if (solid) {
+					glColor3f(1, green, blue);
 					glutSolidCube(1);
 				}
-				else {
+
-					glutWireCube(1);
+				glPopMatrix();
-				}
+				break;
+			case 2:
+				glPushMatrix();
+				glColor3ub(0xee, 0xee, 0x00);
+				glTranslatef(i, -1, j);
+				glutSolidCube(1);
 				glPopMatrix();
 				break;
 			}
@@ -75,7 +101,7 @@ void MazeScreen::keyboard(unsigned char key, int x, int y) {
 		glutSetCursor(GLUT_CURSOR_INHERIT);
 	}
 	else if (key == ' ') {
-		solid = !solid;
+		solid = false;
 	} 
 	else if (key == 'w') {
 		forceX += 1;
@@ -105,6 +131,10 @@ void MazeScreen::keyboardUp(unsigned char key, int x, int y) {
 	else if (key == 'd') {
 		forceZ -= 1;
 	}
+	else if (key == ' ') {
+		solid = true;
+	} 
+
 }
 
 int gameTime;
@@ -114,8 +144,8 @@ void MazeScreen::idle() {
 	auto deltaTime = (newTime - gameTime) / 1000.0;
 	gameTime = newTime;
 
-	posX += forceX * deltaTime * cos(angleX * PI / 180) + forceZ * deltaTime * sin(angleX * PI / 180);
+	posX += forceX * deltaTime * cos(Utils::toRad<float>(angleX)) + forceZ * deltaTime * sin(Utils::toRad<float>(angleX));
-	posZ += forceZ * deltaTime * cos(angleX * PI / 180) - forceX * deltaTime * sin(angleX * PI / 180);
+	posZ += forceZ * deltaTime * cos(Utils::toRad<float>(angleX)) - forceX * deltaTime * sin(Utils::toRad<float>(angleX));
 
 	glutPostRedisplay();
 }

src/no_maze.cpp

@@ -20,3 +20,9 @@ void NoMazeScreen::display() {
 	glFlush();
 	glutSwapBuffers();
 }
+
+void NoMazeScreen::keyboard(unsigned char key, int x, int y) {
+	if (key == '\e') {
+		exit(EXIT_SUCCESS);
+	}
+}

src/no_maze.h

@@ -4,4 +4,5 @@
 
 struct NoMazeScreen : public GlutEvents {
 	virtual void display();
+	virtual void keyboard(unsigned char key, int x, int y);
 };

src/utils.hpp

@@ -26,4 +26,14 @@ namespace Utils {
 	constexpr T toRad(T deg) {
 		return deg * PI / 180;
 	}
+
+	template <typename T>
+	constexpr T min(T a, T b) {
+		if (a < b) {
+			return a;
+		}
+		else {
+			return b;
+		}
+	}
 }

y3s2-gui-project.desktop

@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Maze Y3S2 GUI Project
+Exec=y3s2-gui-project
+Terminal=false
+Type=Application
+Categories=Game;

y3s2-gui-project.spec

@@ -0,0 +1,36 @@
+Name:           y3s2-gui-project
+Version:        1.0.7
+Release:        1%{?dist}
+Summary:        Maze project in OpenGL for Graphics and User Interfaces lecture in year 3, semester 2
+
+License:        UNLICENSED
+URL:            https://codeberg.org/kbruen/%{name}
+Source0:        https://codeberg.org/kbruen/%{name}/archive/v%{version}.tar.gz
+
+BuildRequires:  mesa-libGLU-devel
+BuildRequires:  freeglut-devel
+BuildRequires:  desktop-file-utils
+
+%description
+Maze project in OpenGL for Graphics and User Interfaces lecture in year 3, semester 2
+
+%global debug_package %{nil}
+
+%prep
+%autosetup -n %{name}
+
+
+%build
+mkdir obj
+%make_build
+
+
+%install
+%make_install
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{name}.desktop
+
+
+%files
+%{_bindir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+