SFTtech · jfeo · May 7, 2015 · May 7, 2015 · May 7, 2015 · May 7, 2015
diff --git a/.mailmap b/.mailmap
@@ -10,3 +10,4 @@ Jonathan Remnant <jono4728@gmail.com>
 Henry Snoek <?> <snoek09@users.noreply.github.com>
 coop shell (Michael Enßlin, Jonas Jelten, Andre Kupka) <coop@sft.mx>
 Franz-Niclas Muschter <fm@stusta.net> <franz-niclas.muschter@stusta.net>
+Jens Feodor Nielsen <xws747@alumni.ku.dk>
diff --git a/assets/shaders/minimap.frag.glsl b/assets/shaders/minimap.frag.glsl
@@ -0,0 +1,20 @@
+#version 120
+
+uniform ivec2 minimap_orig;
+uniform ivec2 minimap_size;
+
+varying vec4 out_vertex_position;
+varying vec3 out_color;
+
+void main(void) {
+  ivec2 center = ivec2(minimap_size.x/2, minimap_size.y/2);
+  ivec2 vpos = minimap_orig + center - ivec2(out_vertex_position.x, out_vertex_position.y);
+  vec3 color;
+
+  if (!(abs(vpos.x) * center.y + abs(vpos.y) * center.x <= center.x * center.y))
+    discard;
+  else
+    color = out_color;
+
+  gl_FragColor = vec4(color, 1.0);
+}
diff --git a/assets/shaders/minimap.vert.glsl b/assets/shaders/minimap.vert.glsl
@@ -0,0 +1,13 @@
+#version 120
+
+attribute vec4 vertex_position;
+attribute vec3 color;
+
+varying vec4 out_vertex_position;
+varying vec3 out_color;
+
+void main() {
+  out_vertex_position = vertex_position;
+  out_color = color;
+  gl_Position = gl_ModelViewProjectionMatrix * vertex_position;
+}
diff --git a/libopenage/CMakeLists.txt b/libopenage/CMakeLists.txt
@@ -23,7 +23,7 @@ add_sources(libopenage
 	player.cpp
 	screenshot.cpp
 	texture.cpp
-
+  minimap.cpp
 	config.cpp
 )
 

diff --git a/libopenage/game_main.cpp b/libopenage/game_main.cpp
@@ -3,6 +3,8 @@
 #include "game_main.h"
 #include "game_spec.h"
 #include "generator.h"
+#include "engine.h"
+#include "minimap.h"
 
 namespace openage {
 

diff --git a/libopenage/game_renderer.cpp b/libopenage/game_renderer.cpp
@@ -51,7 +51,7 @@ GameRenderer::GameRenderer(openage::Engine *e)
 	// load textures and stuff
 	gaben = new Texture{data_dir->join("gaben.png")};
 
-	std::vector<gamedata::palette_color> player_color_lines;
+	std::vector<gamedata::palette_color> player_color_lines, general_color_lines;
 	util::read_csv_file(asset_dir.join("player_palette.docx"), player_color_lines);
 
 	GLfloat *playercolors = new GLfloat[player_color_lines.size() * 4];
@@ -91,6 +91,15 @@ GameRenderer::GameRenderer(openage::Engine *e)
 	auto alphamask_frag = new shader::Shader(GL_FRAGMENT_SHADER, alphamask_frag_code);
 	delete[] alphamask_frag_code;
 
+	char *minimap_vert_code;
+	util::read_whole_file(&minimap_vert_code, data_dir->join("shaders/minimap.vert.glsl"));
+	auto minimap_vert = new shader::Shader(GL_VERTEX_SHADER, minimap_vert_code);
+	delete[] minimap_vert_code;
+
+	char *minimap_frag_code;
+	util::read_whole_file(&minimap_frag_code, data_dir->join("shaders/minimap.frag.glsl"));
+	auto minimap_frag = new shader::Shader(GL_FRAGMENT_SHADER, minimap_frag_code);
+	delete[] minimap_frag_code;
 
 
 	// create program for rendering simple textures
@@ -134,12 +143,23 @@ GameRenderer::GameRenderer(openage::Engine *e)
 	glUniform1i(alphamask_shader::mask_texture, 1);
 	alphamask_shader::program->stopusing();
 
+
+	// create program for rendering within the minimap
+	minimap_shader::program = new shader::Program(minimap_vert, minimap_frag);
+	minimap_shader::program->link();
+	minimap_shader::size = minimap_shader::program->get_uniform_id("minimap_size");
+	minimap_shader::orig = minimap_shader::program->get_uniform_id("minimap_orig");
+	minimap_shader::color = minimap_shader::program->get_attribute_id("color");
+
+
 	// after linking, the shaders are no longer necessary
 	delete plaintexture_vert;
 	delete plaintexture_frag;
 	delete teamcolor_frag;
 	delete alphamask_vert;
 	delete alphamask_frag;
+	delete minimap_vert;
+	delete minimap_frag;
 
 	// Renderer keybinds
 	// TODO: a renderer settings struct
@@ -165,6 +185,7 @@ GameRenderer::~GameRenderer() {
 	delete texture_shader::program;
 	delete teamcolor_shader::program;
 	delete alphamask_shader::program;
+	delete minimap_shader::program;
 }
 
 bool GameRenderer::on_draw() {

diff --git a/libopenage/game_renderer.h b/libopenage/game_renderer.h
@@ -15,7 +15,13 @@
 #include "options.h"
 #include "player.h"
 
+#include "minimap.h"
+
 namespace openage {
+/* namespace minimap_shader { */
+/* extern shader::Program *program; */
+/* extern GLint size, orig, color; */
+/* } */
 
 
 /**

diff --git a/libopenage/game_spec.cpp b/libopenage/game_spec.cpp
@@ -328,6 +328,9 @@ void GameSpec::load_terrain(AssetManager &am) {
 	terrain_data.blending_masks.reserve(terrain_data.blendmode_count);
 	terrain_data.terrain_id_priority_map  = std::make_unique<int[]>(terrain_data.terrain_id_count);
 	terrain_data.terrain_id_blendmode_map = std::make_unique<int[]>(terrain_data.terrain_id_count);
+	terrain_data.terrain_id_map_color_hi_map  = std::make_unique<uint8_t[]>(terrain_data.terrain_id_count);
+	terrain_data.terrain_id_map_color_med_map = std::make_unique<uint8_t[]>(terrain_data.terrain_id_count);
+	terrain_data.terrain_id_map_color_low_map = std::make_unique<uint8_t[]>(terrain_data.terrain_id_count);
 	terrain_data.influences_buf           = std::make_unique<struct influence[]>(terrain_data.terrain_id_count);
 
 
@@ -345,6 +348,9 @@ void GameSpec::load_terrain(AssetManager &am) {
 		// TODO: terrain double-define check?
 		terrain_data.terrain_id_priority_map[terrain_id]  = line->blend_priority;
 		terrain_data.terrain_id_blendmode_map[terrain_id] = line->blend_mode;
+    terrain_data.terrain_id_map_color_hi_map[terrain_id] = line->map_color_hi;
+    terrain_data.terrain_id_map_color_med_map[terrain_id] = line->map_color_med;
+    terrain_data.terrain_id_map_color_low_map[terrain_id] = line->map_color_low;
 
 		// TODO: remove hardcoding and rely on nyan data
 		auto terraintex_filename = util::sformat("%s/%d.slp.png", this->terrain_path.c_str(), line->slp_id);

diff --git a/libopenage/main.cpp b/libopenage/main.cpp
@@ -42,6 +42,8 @@ int run_game(const main_arguments &args) {
 		GameRenderer renderer{&engine};
 		GameControl control{&engine};
 		Generator generator{&engine};
+		Minimap minimap = Minimap(coord::camhud_delta{200, 100}, coord::camhud{5, 5});
+		engine.register_drawhud_action(&minimap);
 
 		log::log(MSG(info).fmt("Loading time   [game]: %5.3f s", timer.getval() / 1.0e9));