We do a little reorganizing

Trifolia · May 2, 2022 · ed12ab7 · ed12ab7
1 parent cf5b58c
commit ed12ab7
Show file tree

Hide file tree

Showing 47 changed files with 25 additions and 508 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/src/opengl/headers/plane.h → src/graphics/headers/plane.h b/src/opengl/headers/plane.h → src/graphics/headers/plane.h
diff --git a/src/opengl/headers/viewport.h → src/graphics/headers/viewport.h b/src/opengl/headers/viewport.h → src/graphics/headers/viewport.h
diff --git a/src/opengl/headers/window.h → src/graphics/headers/window.h b/src/opengl/headers/window.h → src/graphics/headers/window.h
diff --git a/src/opengl/source/plane.cpp → src/graphics/source/plane.cpp b/src/opengl/source/plane.cpp → src/graphics/source/plane.cpp
diff --git a/src/opengl/source/viewport.cpp → src/graphics/source/viewport.cpp b/src/opengl/source/viewport.cpp → src/graphics/source/viewport.cpp
diff --git a/src/opengl/source/window.cpp → src/graphics/source/window.cpp b/src/opengl/source/window.cpp → src/graphics/source/window.cpp
diff --git a/src/settingsmenu.h → src/input/headers/settingsmenu.h b/src/settingsmenu.h → src/input/headers/settingsmenu.h
diff --git a/src/settingsmenu.cpp → src/input/source/settingsmenu.cpp b/src/settingsmenu.cpp → src/input/source/settingsmenu.cpp
diff --git a/src/mac-desktop.h b/src/mac-desktop.h
diff --git a/src/mac-desktop.mm b/src/mac-desktop.mm
diff --git a/src/meson.build b/src/meson.build
@@ -51,7 +51,12 @@ global_include_dirs += include_directories('.',
     'filesystem/headers',
     'graphics/headers',
     'input/headers',
-    'opengl/headers'
+	'modshot/headers',
+	'oneshot/headers',
+    'opengl/headers',
+	'rgss/headers',
+	'thread/headers',
+	'util/headers'
 )
 
 
@@ -72,6 +77,8 @@ main_source = files(
 	'audio/source/soundemitter.cpp',
 	'audio/source/sdlsoundsource.cpp',
 	'audio/source/vorbissource.cpp',
+	'filesystem/source/filesystem.cpp',
+	'filesystem/source/rgssad.cpp',
 	'graphics/source/autotiles.cpp',
 	'graphics/source/bitmap.cpp',
 	'graphics/source/graphics.cpp',
@@ -80,33 +87,31 @@ main_source = files(
 	'graphics/source/scene.cpp',
 	'graphics/source/tilemap.cpp',
 	'graphics/source/tileatlas.cpp',
+	'graphics/source/window.cpp',
+	'graphics/source/viewport.cpp',
+	'graphics/source/plane.cpp',
+	'input/source/input.cpp',
+	'input/source/keybindings.cpp',
+	'input/source/settingsmenu.cpp',
 	'opengl/source/glstate.cpp',
 	'opengl/source/gl-debug.cpp',
 	'opengl/source/gl-fun.cpp',
 	'opengl/source/gl-meta.cpp',
-	'opengl/source/plane.cpp',
 	'opengl/source/shader.cpp',
 	'opengl/source/texpool.cpp',
 	'opengl/source/vertex.cpp',
 	'opengl/source/tilequad.cpp',
-	'opengl/source/window.cpp',
-	'opengl/source/screen.cpp',
-	'opengl/source/viewport.cpp',
-	'opengl/source/table.cpp',
-	'input/source/input.cpp',
-	'input/source/keybindings.cpp',
-	'filesystem/source/filesystem.cpp',
-	'filesystem/source/rgssad.cpp',
-	'main.cpp',
-	'eventthread.cpp',
-	'etc.cpp',
-	'config.cpp',
-	'settingsmenu.cpp',
-	'sharedstate.cpp',
-	'oneshot.cpp',
-	'i18n.cpp',
-	'otherview-message.cpp',
-	'crash-handler.cpp'
+	'modshot/source/otherview-message.cpp',
+	'modshot/source/display.cpp',
+	'oneshot/source/screen.cpp',
+	'oneshot/source/oneshot.cpp',
+	'oneshot/source/i18n.cpp',
+	'rgss/source/table.cpp',
+	'rgss/source/etc.cpp',
+	'thread/source/eventthread.cpp',
+	'thread/source/sharedstate.cpp',
+	'util/source/config.cpp',
+	'main.cpp'
 )
 
 global_sources += main_source

diff --git a/src/crash-handler.h → src/modshot/headers/crash-handler.h b/src/crash-handler.h → src/modshot/headers/crash-handler.h
diff --git a/src/display.h → src/modshot/headers/display.h b/src/display.h → src/modshot/headers/display.h
diff --git a/src/otherview-message.h → src/modshot/headers/otherview-message.h b/src/otherview-message.h → src/modshot/headers/otherview-message.h
diff --git a/src/crash-handler.cpp → src/modshot/source/crash-handler.cpp b/src/crash-handler.cpp → src/modshot/source/crash-handler.cpp
diff --git a/src/display.cpp → src/modshot/source/display.cpp b/src/display.cpp → src/modshot/source/display.cpp
diff --git a/src/otherview-message.cpp → src/modshot/source/otherview-message.cpp b/src/otherview-message.cpp → src/modshot/source/otherview-message.cpp
diff --git a/src/i18n.h → src/oneshot/headers/i18n.h b/src/i18n.h → src/oneshot/headers/i18n.h
diff --git a/src/oneshot.h → src/oneshot/headers/oneshot.h b/src/oneshot.h → src/oneshot/headers/oneshot.h
diff --git a/src/pipe.h → src/oneshot/headers/pipe.h b/src/pipe.h → src/oneshot/headers/pipe.h
diff --git a/src/trstr.h → src/oneshot/headers/trstr.h b/src/trstr.h → src/oneshot/headers/trstr.h
diff --git a/src/xdg-user-dir-lookup.h → src/oneshot/headers/xdg-user-dir-lookup.h b/src/xdg-user-dir-lookup.h → src/oneshot/headers/xdg-user-dir-lookup.h
diff --git a/src/i18n.cpp → src/oneshot/source/i18n.cpp b/src/i18n.cpp → src/oneshot/source/i18n.cpp
diff --git a/src/oneshot.cpp → src/oneshot/source/oneshot.cpp b/src/oneshot.cpp → src/oneshot/source/oneshot.cpp
diff --git a/src/opengl/source/screen.cpp → src/oneshot/source/screen.cpp b/src/opengl/source/screen.cpp → src/oneshot/source/screen.cpp
diff --git a/src/xdg-user-dir-lookup.c → src/oneshot/source/xdg-user-dir-lookup.c b/src/xdg-user-dir-lookup.c → src/oneshot/source/xdg-user-dir-lookup.c
diff --git a/src/global-ibo.h → src/opengl/headers/global-ibo.h b/src/global-ibo.h → src/opengl/headers/global-ibo.h
diff --git a/src/binding.h → src/rgss/headers/binding.h b/src/binding.h → src/rgss/headers/binding.h
diff --git a/src/etc-internal.h → src/rgss/headers/etc-internal.h b/src/etc-internal.h → src/rgss/headers/etc-internal.h
diff --git a/src/etc.h → src/rgss/headers/etc.h b/src/etc.h → src/rgss/headers/etc.h
diff --git a/src/serial-util.h → src/rgss/headers/serial-util.h b/src/serial-util.h → src/rgss/headers/serial-util.h
diff --git a/src/serializable.h → src/rgss/headers/serializable.h b/src/serializable.h → src/rgss/headers/serializable.h
diff --git a/src/opengl/headers/table.h → src/rgss/headers/table.h b/src/opengl/headers/table.h → src/rgss/headers/table.h
diff --git a/src/etc.cpp → src/rgss/source/etc.cpp b/src/etc.cpp → src/rgss/source/etc.cpp
diff --git a/src/opengl/source/table.cpp → src/rgss/source/table.cpp b/src/opengl/source/table.cpp → src/rgss/source/table.cpp
diff --git a/src/eventthread.h → src/thread/headers/eventthread.h b/src/eventthread.h → src/thread/headers/eventthread.h
diff --git a/src/sharedstate.h → src/thread/headers/sharedstate.h b/src/sharedstate.h → src/thread/headers/sharedstate.h
diff --git a/src/eventthread.cpp → src/thread/source/eventthread.cpp b/src/eventthread.cpp → src/thread/source/eventthread.cpp
diff --git a/src/sharedstate.cpp → src/thread/source/sharedstate.cpp b/src/sharedstate.cpp → src/thread/source/sharedstate.cpp
diff --git a/src/boost-hash.h → src/util/headers/boost-hash.h b/src/boost-hash.h → src/util/headers/boost-hash.h
diff --git a/src/config.h → src/util/headers/config.h b/src/config.h → src/util/headers/config.h
diff --git a/src/debugwriter.h → src/util/headers/debugwriter.h b/src/debugwriter.h → src/util/headers/debugwriter.h
diff --git a/src/exception.h → src/util/headers/exception.h b/src/exception.h → src/util/headers/exception.h
diff --git a/src/intrulist.h → src/util/headers/intrulist.h b/src/intrulist.h → src/util/headers/intrulist.h
diff --git a/src/util.h → src/util/headers/util.h b/src/util.h → src/util/headers/util.h
diff --git a/src/config.cpp → src/util/source/config.cpp b/src/config.cpp → src/util/source/config.cpp