Move platform/graphics/ to graphics/

CMakeLists.txt

@@ -98,12 +98,13 @@ add_executable(cavex
 				source/network/server_local.c
 				source/network/server_world.c
 
-				source/platform/graphics/displaylist.c
-				source/platform/graphics/gfx_util.c
-				source/platform/graphics/gfx.c
-				source/platform/graphics/gui_util.c
-				source/platform/graphics/render_block.c
-				source/platform/graphics/render_item.c
+				source/graphics/gfx_util.c
+				source/graphics/gui_util.c
+				source/graphics/render_block.c
+				source/graphics/render_item.c
+
+				source/platform/displaylist.c
+				source/platform/gfx.c
 				source/platform/input.c
 				source/platform/thread.c
 				source/platform/time.c

Makefile

@@ -23,7 +23,7 @@ include $(DEVKITPPC)/wii_rules
 #---------------------------------------------------------------------------------
 TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
-SOURCES		:=	source source/block source/platform/graphics source/network source/game source/game/gui source/platform source/item source/cNBT
+SOURCES		:=	source source/block source/graphics source/network source/game source/game/gui source/platform source/item source/cNBT
 DATA		:=
 TEXTURES	:=	textures
 INCLUDES	:=

source/block/blocks.h

@@ -24,7 +24,7 @@
 #include <stdint.h>
 
 #include "../item/items.h"
-#include "../platform/graphics/displaylist.h"
+#include "../platform/displaylist.h"
 
 #define TEXTURE_INDEX(x, y) (((y)*14) + (x))
 #define TEXTURE_X(idx) ((idx) % 14)
@@ -186,8 +186,8 @@ extern struct block block_iron_door;
 
 extern struct block* blocks[256];
 
-#include "../platform/graphics/render_block.h"
-#include "../platform/graphics/render_item.h"
+#include "../graphics/render_block.h"
+#include "../graphics/render_item.h"
 
 void blocks_init(void);
 enum side blocks_side_opposite(enum side s);

source/chunk.c

@@ -26,7 +26,7 @@
 #include "block/blocks.h"
 #include "chunk.h"
 #include "game/game_state.h"
-#include "platform/graphics/gfx.h"
+#include "platform/gfx.h"
 #include "stack.h"
 
 #define CHUNK_INDEX(x, y, z) ((x) + ((z) + (y)*CHUNK_SIZE) * CHUNK_SIZE)

source/chunk.h

@@ -29,7 +29,7 @@
 
 #include "block/blocks.h"
 #include "chunk_mesher.h"
-#include "platform/graphics/displaylist.h"
+#include "platform/displaylist.h"
 #include "world.h"
 
 #define CHUNK_SIZE_BITS 0xF

source/chunk_mesher.c

@@ -21,7 +21,7 @@
 #include <stdint.h>
 
 #include "chunk_mesher.h"
-#include "platform/graphics/displaylist.h"
+#include "platform/displaylist.h"
 #include "platform/thread.h"
 #include "stack.h"
 #include "world.h"

source/game/camera.c

@@ -19,7 +19,7 @@
 
 #include <assert.h>
 
-#include "../platform/graphics/gfx.h"
+#include "../platform/gfx.h"
 #include "../platform/input.h"
 #include "camera.h"
 #include "game_state.h"

source/game/gui/screen.c

@@ -19,7 +19,7 @@
 
 #include <assert.h>
 
-#include "../../platform/graphics/gfx.h"
+#include "../../platform/gfx.h"
 #include "../game_state.h"
 
 void screen_set(struct screen* s) {

source/game/gui/screen_ingame.c

@@ -20,10 +20,10 @@
 #include <stddef.h>
 
 #include "../../block/blocks.h"
+#include "../../graphics/gfx_util.h"
+#include "../../graphics/gui_util.h"
 #include "../../network/server_interface.h"
-#include "../../platform/graphics/gfx.h"
-#include "../../platform/graphics/gfx_util.h"
-#include "../../platform/graphics/gui_util.h"
+#include "../../platform/gfx.h"
 #include "../../platform/input.h"
 #include "../game_state.h"
 

source/game/gui/screen_load_world.c

@@ -17,9 +17,9 @@
 	along with CavEX.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "../../graphics/gui_util.h"
 #include "../../network/server_local.h"
-#include "../../platform/graphics/gfx.h"
-#include "../../platform/graphics/gui_util.h"
+#include "../../platform/gfx.h"
 #include "../game_state.h"
 
 static void screen_lworld_update(struct screen* s, float dt) {

source/game/gui/screen_select_world.c

@@ -17,10 +17,10 @@
 	along with CavEX.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "../../graphics/gui_util.h"
 #include "../../network/level_archive.h"
 #include "../../network/server_interface.h"
-#include "../../platform/graphics/gfx.h"
-#include "../../platform/graphics/gui_util.h"
+#include "../../platform/gfx.h"
 #include "../../platform/input.h"
 #include "../../stack.h"
 #include "../../util.h"

source/graphics/gfx_util.c

@@ -19,8 +19,8 @@
 
 #include <assert.h>
 
-#include "../../game/game_state.h"
-#include "gfx.h"
+#include "../game/game_state.h"
+#include "../platform/gfx.h"
 #include "gfx_util.h"
 
 void gutil_sky_box(mat4 view_matrix, float celestial_angle, vec3 color_top,

source/graphics/gfx_util.h

@@ -20,9 +20,9 @@
 #ifndef GFX_UTIL_H
 #define GFX_UTIL_H
 
-#include "../../cglm/cglm.h"
+#include "../cglm/cglm.h"
 
-#include "../../world.h"
+#include "../world.h"
 
 void gutil_sky_box(mat4 view_matrix, float celestial_angle, vec3 color_top,
 				   vec3 color_bottom);

source/graphics/gui_util.c

@@ -19,7 +19,7 @@
 
 #include <string.h>
 
-#include "gfx.h"
+#include "../platform/gfx.h"
 #include "gui_util.h"
 
 int gutil_control_icon(int x, enum gutil_control_icon icon, char* str) {

source/graphics/render_block.c

@@ -19,10 +19,10 @@
 
 #include <stdint.h>
 
-#include "../../block/blocks.h"
-#include "../../chunk.h"
-#include "../../util.h"
-#include "gfx.h"
+#include "../block/blocks.h"
+#include "../chunk.h"
+#include "../platform/gfx.h"
+#include "../util.h"
 #include "render_block.h"
 
 #define BLK_LEN 256

source/graphics/render_block.h

@@ -23,11 +23,11 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-#include "../../cglm/cglm.h"
+#include "../cglm/cglm.h"
 
-#include "../../block/blocks.h"
-#include "../../world.h"
-#include "displaylist.h"
+#include "../block/blocks.h"
+#include "../platform/displaylist.h"
+#include "../world.h"
 
 #define TEX_OFFSET(x) ((x)*18 + 3)
 

source/graphics/render_item.c

@@ -19,9 +19,9 @@
 
 #include <string.h>
 
-#include "../../block/blocks.h"
-#include "displaylist.h"
-#include "gfx.h"
+#include "../block/blocks.h"
+#include "../platform/displaylist.h"
+#include "../platform/gfx.h"
 #include "gui_util.h"
 #include "render_item.h"
 

source/graphics/render_item.h

@@ -20,9 +20,9 @@
 #ifndef RENDER_ITEM_H
 #define RENDER_ITEM_H
 
-#include "../../cglm/cglm.h"
+#include "../cglm/cglm.h"
 
-#include "../../item/items.h"
+#include "../item/items.h"
 
 void render_item_init(void);
 void render_item_update_light(uint8_t light);

source/item/items.c

@@ -20,7 +20,7 @@
 #include <assert.h>
 
 #include "../block/blocks.h"
-#include "../platform/graphics/render_item.h"
+#include "../graphics/render_item.h"
 #include "items_object.h"
 
 struct item* items[ITEMS_MAX];

source/main.c

@@ -31,12 +31,12 @@
 #include "daytime.h"
 #include "game/game_state.h"
 #include "game/gui/screen.h"
+#include "graphics/gfx_util.h"
+#include "graphics/gui_util.h"
 #include "network/client_interface.h"
 #include "network/server_interface.h"
 #include "network/server_local.h"
-#include "platform/graphics/gfx.h"
-#include "platform/graphics/gfx_util.h"
-#include "platform/graphics/gui_util.h"
+#include "platform/gfx.h"
 #include "platform/input.h"
 #include "world.h"
 

source/platform/gfx.h

@@ -23,7 +23,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "../../cglm/cglm.h"
+#include "../cglm/cglm.h"
 
 enum gfx_blend {
 	MODE_BLEND,

source/platform/pc/gfx.c

@@ -24,11 +24,11 @@
 #include <math.h>
 #include <string.h>
 
-#include "../../../game/game_state.h"
-#include "../../../lodepng/lodepng.h"
-#include "../../../util.h"
-#include "../../input.h"
+#include "../../game/game_state.h"
+#include "../../lodepng/lodepng.h"
+#include "../../util.h"
 #include "../gfx.h"
+#include "../input.h"
 
 static GLuint textures[8];
 

source/platform/wii/gfx.c

@@ -24,7 +24,7 @@
 #include <ogc/tpl.h>
 #include <string.h>
 
-#include "../../../util.h"
+#include "../../util.h"
 #include "../gfx.h"
 
 #include "textures.h"

source/world.c

@@ -21,7 +21,7 @@
 
 #include "game/game_state.h"
 #include "lighting.h"
-#include "platform/graphics/gfx.h"
+#include "platform/gfx.h"
 #include "world.h"
 
 // params depend on fog texture