give map to gamestate

g4stly · Sep 25, 2019 · 24d3608 · 24d3608
1 parent 5a55bfa
commit 24d3608
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 26 deletions.
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ LIBS 	= -lSDL2
 TARGET 	= build/raycast
 SOURCES = src/app.cpp
 SOURCES += src/display/display.cpp src/display/engine.cpp
-SOURCES += src/game/gamestate.cpp 
+SOURCES += src/game/gamestate.cpp src/game/map.cpp
 SOURCES += src/util/vector.cpp
 OBJECTS	= $(SOURCES:.cpp=.o)
 

diff --git a/src/display/engine.cpp b/src/display/engine.cpp
@@ -6,29 +6,6 @@
 
 #include "engine.h"
 
-const static int mock_map[20*20] = {
-	1, 8, 1, 8, 8, 8, 1, 8, 1, 1, 8, 1, 8, 8, 8, 1, 8, 1, 1,
-	1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
-	1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 4,
-	4, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 1,
-	1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4,
-	3, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 1,
-	1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4,
-	6, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 1,
-	1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
-	1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
-	1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
-	1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 4,
-	1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
-	4, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 1,
-	1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4,
-	3, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 1,
-	1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4,
-	6, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 1,
-	1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
-	1, 1, 4, 4, 1, 4, 1, 4, 1, 1, 1, 4, 4, 1, 4, 1, 4, 1, 1
-};
-
 struct RayCastArgs {
 	// arguments 
 	const int *map;
@@ -118,7 +95,10 @@ static void rayCaster(RayCastArgs *args)
 		}
 
 		for (int y = a.line_height; y >= 0; y--) {
-			a.color = a.hit > 0 ? 0xFFFFFFFF : 0xFFD0D0D0;
+			a.color = 0xFF0000;
+			if (a.hit < 0) {
+				a.color = (a.color << 1) & 0x7F7F7F;
+			}
 			a.pixels[x + (a.screenw * (a.line_start - y))] = a.color;
 		}
 	}
@@ -130,7 +110,9 @@ void Engine::Render(GameState *g, int w, int h, uint32_t *pixels, int pitch)
 
 	// real position, direction, and camera plane vectors
 	RayCastArgs args = {
-		mock_map, 19, 19, w, h,
+		g->GetMap(),
+		g->GetMapWidth() - 1,
+		g->GetMapHeight() - 1, w, h,
 		g->GetPosX(), g->GetPosY(),
 		g->GetDirX(), g->GetDirY(),
 		g->GetPlaneX(), g->GetPlaneY(),

diff --git a/src/game/gamestate.cpp b/src/game/gamestate.cpp
@@ -91,3 +91,19 @@ void GameState::Rotate(bool left, double dt)
 	direction.Rotate(theta);
 	camera.Rotate(theta);
 }
+
+int GameState::GetMapWidth() {
+	return map.width;
+}
+
+int GameState::GetMapHeight() {
+	return map.height;
+}
+
+const int *GameState::GetMap() {
+	return map.map;
+}
+
+const uint32_t *GameState::GetTextures() {
+	return map.textures;
+}
diff --git a/src/game/gamestate.h b/src/game/gamestate.h
@@ -1,6 +1,7 @@
 #ifndef gamestate_h_
 #define gamestate_h_
 
+#include "map.h"
 #include "util/vector.h"
 
 #define MAP_WIDTH (10)
@@ -20,6 +21,9 @@ class GameState {
 	Vector camera;
 	double rot_speed = 3.0;
 	double move_speed = 5.0;
+
+	// map
+	Map map;
 public:
 	GameState();
 
@@ -31,6 +35,7 @@ class GameState {
 private:
 	void Move(Vector *v, bool forward, double dt);
 public:
+	// player methods
 	double GetPosX();
 	double GetPosY();
 	double GetDirX();
@@ -40,6 +45,12 @@ class GameState {
 	void Move(bool forward, double dt);
 	void Strafe(bool left, double dt);
 	void Rotate(bool left, double dt);
+
+	// map methods
+	int GetMapWidth();
+	int GetMapHeight();
+	const int *GetMap();
+	const uint32_t *GetTextures();
 };
 
 

diff --git a/src/game/map.cpp b/src/game/map.cpp
@@ -0,0 +1,32 @@
+#include "map.h"
+
+#define MAP_WIDTH (20)
+#define MAP_HEIGHT (20)
+static int mock_map[MAP_WIDTH*MAP_HEIGHT] = {
+	1, 8, 1, 8, 8, 8, 1, 8, 1, 1, 8, 1, 8, 8, 8, 1, 8, 1, 1,
+	1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+	1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 4,
+	4, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+	1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4,
+	3, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+	1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4,
+	6, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+	1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+	1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+	1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+	1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 4,
+	1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+	4, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+	1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4,
+	3, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+	1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4,
+	6, 0, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+	1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+	1, 1, 4, 4, 1, 4, 1, 4, 1, 1, 1, 4, 4, 1, 4, 1, 4, 1, 1
+};
+
+Map::Map() {
+	width = MAP_WIDTH;
+	height = MAP_HEIGHT;
+	map = mock_map;
+}
diff --git a/src/game/map.h b/src/game/map.h
@@ -0,0 +1,14 @@
+#ifndef MAP_H_
+#define MAP_H_
+
+#include <cstdint>
+
+class Map {
+public:
+	int *map;
+	int width, height;
+	uint32_t textures[4096];
+	Map();
+};
+
+#endif