From d35de8422123004965bd1fd64389c43a630b9c87 Mon Sep 17 00:00:00 2001 From: a dinosaur Date: Mon, 2 Sep 2024 19:13:29 +1000 Subject: [PATCH] rearrange some sources --- Sources/Voxelotl/CMakeLists.txt | 20 +++++++++---------- Sources/Voxelotl/{ => Common}/Color.swift | 0 .../Voxelotl/{ => Common}/FPSCalculator.swift | 0 .../{ => Resource}/NSImageLoader.swift | 0 4 files changed, 10 insertions(+), 10 deletions(-) rename Sources/Voxelotl/{ => Common}/Color.swift (100%) rename Sources/Voxelotl/{ => Common}/FPSCalculator.swift (100%) rename Sources/Voxelotl/{ => Resource}/NSImageLoader.swift (100%) diff --git a/Sources/Voxelotl/CMakeLists.txt b/Sources/Voxelotl/CMakeLists.txt index a4cee82..255e327 100644 --- a/Sources/Voxelotl/CMakeLists.txt +++ b/Sources/Voxelotl/CMakeLists.txt @@ -7,8 +7,10 @@ add_executable(Voxelotl MACOSX_BUNDLE shadertypes.h shader.metal - # Common library + # Common utility library Common/ConcurrentDictionary.swift + Common/Color.swift + Common/FPSCalculator.swift # Maths library Math/FloatExtensions.swift @@ -34,7 +36,7 @@ add_executable(Voxelotl MACOSX_BUNDLE Random/SplitMix64.swift # Resource classes - NSImageLoader.swift + Resource/NSImageLoader.swift # Renderer classes Renderer/Material.swift @@ -47,23 +49,21 @@ add_executable(Voxelotl MACOSX_BUNDLE Input/GameController.swift Input/Mouse.swift - # Core utility classes - CubeMeshBuilder.swift - Color.swift - Camera.swift - FPSCalculator.swift - GameDelegate.swift - Application.swift - # Game logic classes Chunk.swift WorldGenerator.swift + CubeMeshBuilder.swift ChunkMeshBuilder.swift World.swift Raycast.swift + Camera.swift Player.swift Game.swift + # Core application classes + GameDelegate.swift + Application.swift + main.swift) set_source_files_properties( diff --git a/Sources/Voxelotl/Color.swift b/Sources/Voxelotl/Common/Color.swift similarity index 100% rename from Sources/Voxelotl/Color.swift rename to Sources/Voxelotl/Common/Color.swift diff --git a/Sources/Voxelotl/FPSCalculator.swift b/Sources/Voxelotl/Common/FPSCalculator.swift similarity index 100% rename from Sources/Voxelotl/FPSCalculator.swift rename to Sources/Voxelotl/Common/FPSCalculator.swift diff --git a/Sources/Voxelotl/NSImageLoader.swift b/Sources/Voxelotl/Resource/NSImageLoader.swift similarity index 100% rename from Sources/Voxelotl/NSImageLoader.swift rename to Sources/Voxelotl/Resource/NSImageLoader.swift