Merge pull request #29 from AdaEngine/feature/tilemaps

TileMap

.github/workflows/docs.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Setup Xcode version
         uses: maxim-lobanov/setup-xcode@v1.6.0
         with:
-          xcode-version: '15.2'
+          xcode-version: '15.3'
       - uses: actions/checkout@v2
       - name: Build Documentation
         run: swift package --allow-writing-to-directory ./docs generate-documentation --target AdaEngine --output-path ./docs --transform-for-static-hosting --hosting-base-path adaengine-docs

.gitignore

@@ -27,7 +27,9 @@ build/
 /bazel-*
 /MODULE.bazel.lock
 
+# Documentation
 /docs
+.docs/
 
 Derived/
 

Package.swift

@@ -15,12 +15,6 @@ import Glibc
 import Darwin.C
 #endif
 
-#if (arch(arm64) || arch(arm))
-let useNeon = true
-#else
-let useNeon = false
-#endif
-
 #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
 let isVulkanEnabled = false
 #else
@@ -98,10 +92,6 @@ var commonPlugins: [Target.PluginUsage] = []
 #if os(macOS)
 commonPlugins.append(.plugin(name: "SwiftLintPlugin"))
 
-//if isVulkanEnabled {
-//    commonPlugins.append(.plugin(name: "SPIRVBuildPlugin"))
-//}
-
 #endif
 
 var swiftSettings: [SwiftSetting] = [
@@ -156,7 +146,6 @@ var adaEngineDependencies: [Target.Dependency] = [
     "SPIRVCompiler",
     .product(name: "box2d", package: "box2d-swift"),
     "AdaEngineMacros"
-//    "Vulkan"
 ]
 
 #if os(Linux)
@@ -234,8 +223,7 @@ targets += [
         name: "SPIRVCompiler",
         dependencies: [
             "glslang"
-        ],
-        publicHeadersPath: "."
+        ]
     )
 ]
 
@@ -300,11 +288,3 @@ if useLocalDeps {
         .package(url: "https://github.com/AdaEngine/libpng", branch: "main"),
     ]
 }
-
-// MARK: - Vulkan -
-//
-//// We turn on vulkan via build
-//if isVulkanEnabled {
-//    adaEngineTarget.dependencies.append(.target(name: "Vulkan"))
-//    package.dependencies.append(.package(path: "vendors/Vulkan"))
-//}

Sources/AdaEngine/Audio/Engines/MiniAudioEngine.swift

@@ -194,7 +194,7 @@ final class MiniSound: Sound {
 
     private init(prototype: MiniSound) throws {
         self.sound = ada.ma_make_sound()
-        var engine = ada.ma_sound_get_engine(prototype.sound)
+        let engine = ada.ma_sound_get_engine(prototype.sound)
         let result = ada.ma_sound_init_copy(engine, prototype.sound, 0, nil, sound)
 
         if result != MA_SUCCESS {

Sources/AdaEngine/Scene/ECS/World/Archetype.swift

@@ -17,7 +17,7 @@ struct EntityRecord {
     var row: Int
 }
 
-/// Types for defining [`Archetype`]s, collections of entities that have the same set of
+/// Types for defining Archetypes, collections of entities that have the same set of
 /// components.
 public final class Archetype: Hashable, Identifiable {
 

Sources/AdaEngine/Scene/Physics/Physics2D/Body2D.swift

@@ -5,7 +5,7 @@
 //  Created by v.prusakov on 3/19/23.
 //
 
-import box2d
+@_implementationOnly import box2d
 import Math
 
 // An object that represents physics 2D body.

Sources/AdaEngine/Scene/Physics/Physics2D/Physics2DSystem.swift

@@ -5,7 +5,7 @@
 //  Created by v.prusakov on 7/8/22.
 //
 
-import box2d
+@_implementationOnly import box2d
 import Math
 
 // - TODO: (Vlad) Runtime update shape resource

Sources/AdaEngine/Scene/Physics/Physics2D/PhysicsWorld2D.swift

@@ -5,7 +5,7 @@
 //  Created by v.prusakov on 7/6/22.
 //
 
-import box2d
+@_implementationOnly import box2d
 import Math
 
 /// An object that holds and simulate all 2D physics bodies.

Sources/SPIRVCompiler/spirv_compiler.cpp

@@ -5,7 +5,7 @@
 //  Created by v.prusakov on 3/11/23.
 //
 
-#include "spirv_compiler.hpp"
+#include "include/spirv_compiler.h"
 #include "glslang_resource_limits.hpp"
 
 #include "glslang/Include/Types.h"