medfall

commit 45824016175de7364d8cc59c675df35501ae341c
parent 3889c3d127d96d0330913e86c961324fb985dab9
Author: Michael Savage <mikejsavage@gmail.com>
Date:   Fri Sep 18 13:24:27 +0100

Rearrange some files

Diffstat:
.gitignore
 | 
6
++----
README.md
 | 
6
+++---
bsp.png
 | 
0

btt.cc
 | 
2
+-
doodles/tile_coords_to_view_coords.png
 | 
0

hm.cc
 | 
2
+-
hm.png
 | 
0

mountains512.png
 | 
0

pp.cc
 | 
2
+-
screenshots/bsp.png
 | 
0

screenshots/hm.png
 | 
0

screenshots/tiles.png
 | 
0

terrains/Srtm_ramp2.world.21600x10800.jpg
 | 
0

terrains/mountains512.png
 | 
0

tiles.png
 | 
0

15 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,8 @@
 medfall
 pp
+
 *.o
 *.so
-ttvfs
-*.bsp
 
-*.jpg
-*.png
+*.bsp
 *.parts
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-![BSP renderer](bsp.png)
-![Terrain renderer](hm.png)
-![Terrain paging](tiles.png)
+![BSP renderer](screenshots/bsp.png)
+![Terrain renderer](screenshots/hm.png)
+![Terrain paging](screenshots/tiles.png)
 
 OpenGL 3.2 support:
 
diff --git a/bsp.png b/bsp.png
Binary files differ.
diff --git a/btt.cc b/btt.cc
@@ -228,7 +228,7 @@ extern "C" GAME_INIT( game_init ) {
 	state->test_outline_un_vp = glGetUniformLocation( state->test_outline_shader, "vp" );
 
 	int w, h;
-	u8 * pixels = stbi_load( "mountains512.png", &w, &h, nullptr, 1 );
+	u8 * pixels = stbi_load( "terrains/mountains512.png", &w, &h, nullptr, 1 );
 	heightmap_init( &state->hm, &mem->persistent_arena, pixels, w, h, 0, 0,
 		state->test_at_position, state->test_at_normal, state->test_at_lit );
 
diff --git a/doodles/tile_coords_to_view_coords.png b/doodles/tile_coords_to_view_coords.png
Binary files differ.
diff --git a/hm.cc b/hm.cc
@@ -91,7 +91,7 @@ static WORK_QUEUE_CALLBACK( testwq ) {
 extern "C" GAME_INIT( game_init ) {
 	state->pos = glm::vec3( 15000, 3000, 50 );
 	state->angles = glm::radians( glm::vec3( -90, 45, 0 ) );
-	terrain_init( &state->tm, "Srtm_ramp2.world.21600x10800.jpg.parts", &mem->persistent_arena );
+	terrain_init( &state->tm, "terrains/Srtm_ramp2.world.21600x10800.jpg.parts", &mem->persistent_arena );
 	terrain_teleport( &state->tm, state->pos );
 
 	workqueue_init( &state->background_tasks, &mem->persistent_arena, 2 );
diff --git a/hm.png b/hm.png
Binary files differ.
diff --git a/mountains512.png b/mountains512.png
Binary files differ.
diff --git a/pp.cc b/pp.cc
@@ -38,7 +38,7 @@ void write_tile( const std::string & dir, const int tx, const int ty ) {
 }
 
 int main( int argc, char ** argv ) {
-	const std::string path = argc == 2 ? argv[ 1 ] : "mountains512.png";
+	const std::string path = argc == 2 ? argv[ 1 ] : "terrains/mountains512.png";
 	pixels = stbi_load( path.c_str(), &w, &h, nullptr, 1 );
 
 	const std::string dir = path + ".parts";
diff --git a/screenshots/bsp.png b/screenshots/bsp.png
Binary files differ.
diff --git a/screenshots/hm.png b/screenshots/hm.png
Binary files differ.
diff --git a/screenshots/tiles.png b/screenshots/tiles.png
Binary files differ.
diff --git a/terrains/Srtm_ramp2.world.21600x10800.jpg b/terrains/Srtm_ramp2.world.21600x10800.jpg
Binary files differ.
diff --git a/terrains/mountains512.png b/terrains/mountains512.png
Binary files differ.
diff --git a/tiles.png b/tiles.png
Binary files differ.