iceshard-engine · Dandielo · May 13, 2023 · Feb 13, 2023 · Feb 28, 2023 · Feb 28, 2023
diff --git a/.github/workflows/cw_build_parallel.yaml b/.github/workflows/cw_build_parallel.yaml
@@ -42,6 +42,7 @@ jobs:
         pip3 install wheel
         pip3 install conan
         conan config install https://github.com/iceshard-engine/conan-config.git
+        conan profile detect
 
     - name: Install tools (GCC 12)
       if: ${{ startsWith(inputs.host, 'ubuntu') }}
@@ -63,7 +64,7 @@ jobs:
       shell: pwsh
       run: |
         .\tools\gh_ice.ps1 init
-        
+
     - name: Build targets
       shell: pwsh
       run: |

diff --git a/.github/workflows/cw_build_single.yaml b/.github/workflows/cw_build_single.yaml
@@ -39,6 +39,7 @@ jobs:
         pip3 install wheel
         pip3 install conan
         conan config install https://github.com/iceshard-engine/conan-config.git
+        conan profile detect
 
     - name: Install tools (GCC 12)
       if: ${{ startsWith(inputs.host, 'ubuntu') }}

diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml
@@ -64,7 +64,7 @@ jobs:
     name: 'Build (Windows)'
     needs: setup_workflow
     if: ${{ contains(needs.setup_workflow.outputs.tags, 'parallel') == false }}
-    uses: iceshard-engine/engine/.github/workflows/cw_build_single.yaml@master
+    uses: iceshard-engine/engine/.github/workflows/cw_build_single.yaml@ms-2303010415
     with:
       host: windows-latest
       configs: ${{ needs.setup_workflow.outputs.build_configs }}
@@ -76,7 +76,7 @@ jobs:
     name: 'Build (Linux)'
     needs: setup_workflow
     if: ${{ contains(needs.setup_workflow.outputs.tags, 'parallel') == false }}
-    uses: iceshard-engine/engine/.github/workflows/cw_build_single.yaml@master
+    uses: iceshard-engine/engine/.github/workflows/cw_build_single.yaml@ms-2303010415
     with:
       host: ubuntu-22.04
       configs: ${{ needs.setup_workflow.outputs.build_configs }}
@@ -92,7 +92,7 @@ jobs:
     name: 'Build (Windows), Parallel'
     needs: setup_workflow
     if: ${{ contains(needs.setup_workflow.outputs.tags, 'parallel') == true }}
-    uses: iceshard-engine/engine/.github/workflows/cw_build_parallel.yaml@master
+    uses: iceshard-engine/engine/.github/workflows/cw_build_parallel.yaml@ms-2303010415
     with:
       host: windows-latest
       configs: ${{ needs.setup_workflow.outputs.build_configs }}
@@ -104,7 +104,7 @@ jobs:
     name: 'Build (Linux), Parallel'
     needs: setup_workflow
     if: ${{ contains(needs.setup_workflow.outputs.tags, 'parallel') == true }}
-    uses: iceshard-engine/engine/.github/workflows/cw_build_parallel.yaml@master
+    uses: iceshard-engine/engine/.github/workflows/cw_build_parallel.yaml@ms-2303010415
     with:
       host: ubuntu-22.04
       configs: ${{ needs.setup_workflow.outputs.build_configs }}

diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@
 # Local data
 /source/data/temp
 /source/data/local
+/tools/scripts/generate_version.moon
 
 # Temporary files to ignore
 compile_commands.json

diff --git a/README.md b/README.md
@@ -1,6 +1,3 @@
-> Development on the engine is going to be paused for the time beeing, due to lots of changes outside the webz.
-> Dandielo
-
 # IceShard
 
 A small game engine project with the sole purpose to learn, improve and invent.

diff --git a/ice.bat b/ice.bat
@@ -17,7 +17,7 @@ IF NOT EXIST build\tools\ (
     CALL :_initialize
 )
 
-IF NOT EXIST build\tools\activate.bat (
+IF NOT EXIST build\tools\conanrun.bat (
     ECHO Rebuilding enviroment...
     CALL :_initialize
 )
@@ -29,6 +29,10 @@ IF "%1" == "init" (
     GOTO :_exit
 )
 
+IF "%1" == "script" (
+    GOTO :_run_mini
+)
+
 :: Move to the application
 GOTO :_run
 
@@ -49,21 +53,30 @@ GOTO :_exit
 :: Initialize the project environment
 :_initialize
 PUSHD build\tools
-conan install ..\..\tools --build=missing --profile %CONAN_PROFILE%
+conan install ..\..\tools -of . --build=missing --profile %CONAN_PROFILE%
 POPD
 ECHO Workspace initialized...
 GOTO :_exit
 
 :: Application runtime
-:_run
-CALL build\tools\activate.bat
+:_run_mini
+CALL build\tools\conanrunenv_mini.bat
 CALL "%ICE_SCRIPT%" workspace.moon %*
 
 :: Save this value as it so the call to 'deactivate' wont erase it in some caes
 set ERROR_CODE=%ERRORLEVEL%
+CALL build\tools\deactivate_conanrun.bat
+
+GOTO :_errcheck
 
-CALL build\tools\deactivate.bat
+:_run
+CALL build\tools\conanrun.bat
+CALL "%ICE_SCRIPT%" workspace.moon %*
+:: Save this value as it so the call to 'deactivate' wont erase it in some caes
+set ERROR_CODE=%ERRORLEVEL%
+CALL build\tools\deactivate_conanrun.bat
 
+:_errcheck
 :: Check the command return code
 IF "%ERROR_CODE%" == "0" (
     GOTO :_exit

diff --git a/source/code/core/collections/collections.bff b/source/code/core/collections/collections.bff
@@ -1,4 +1,4 @@
-/// Copyright 2022 - 2022, Dandielo <dandielo@iceshard.net>
+/// Copyright 2022 - 2023, Dandielo <dandielo@iceshard.net>
 /// SPDX-License-Identifier: MIT
 
 .Project =

diff --git a/source/code/core/collections/collections_tests.bff b/source/code/core/collections/collections_tests.bff
@@ -1,4 +1,4 @@
-/// Copyright 2022 - 2022, Dandielo <dandielo@iceshard.net>
+/// Copyright 2022 - 2023, Dandielo <dandielo@iceshard.net>
 /// SPDX-License-Identifier: MIT
 
 .Project =

diff --git a/source/code/core/collections/public/ice/container/array.hxx b/source/code/core/collections/public/ice/container/array.hxx
@@ -1,4 +1,4 @@
-/// Copyright 2022 - 2022, Dandielo <dandielo@iceshard.net>
+/// Copyright 2022 - 2023, Dandielo <dandielo@iceshard.net>
 /// SPDX-License-Identifier: MIT
 
 #pragma once

diff --git a/source/code/core/collections/public/ice/container/hashmap.hxx b/source/code/core/collections/public/ice/container/hashmap.hxx
@@ -1,4 +1,4 @@
-/// Copyright 2022 - 2022, Dandielo <dandielo@iceshard.net>
+/// Copyright 2022 - 2023, Dandielo <dandielo@iceshard.net>
 /// SPDX-License-Identifier: MIT
 
 #pragma once
@@ -47,12 +47,18 @@ namespace ice
         inline auto values(ice::HashMap<Type, Logic>& map) noexcept -> ice::Span<Type>;
 
 
+        template<typename HashMapType> requires HashMapReadAccess<HashMapType>
+        inline auto count(HashMapType const& map) noexcept -> ice::ucount;
+
         template<typename HashMapType> requires HashMapReadAccess<HashMapType>
         inline bool full(HashMapType const& map) noexcept;
 
         template<typename HashMapType> requires HashMapReadAccess<HashMapType>
         inline bool empty(HashMapType const& map) noexcept;
 
+        template<typename HashMapType> requires HashMapReadAccess<HashMapType>
+        inline bool any(HashMapType const& map) noexcept;
+
         template<typename HashMapType> requires HashMapReadAccess<HashMapType>
         inline bool has(HashMapType const& map, ice::u64 key) noexcept;
 

diff --git a/source/code/core/collections/public/ice/container/impl/array_impl.inl b/source/code/core/collections/public/ice/container/impl/array_impl.inl
@@ -1,4 +1,4 @@
-/// Copyright 2022 - 2022, Dandielo <dandielo@iceshard.net>
+/// Copyright 2022 - 2023, Dandielo <dandielo@iceshard.net>
 /// SPDX-License-Identifier: MIT
 
 namespace ice

diff --git a/source/code/core/collections/public/ice/container/impl/hashmap_impl.inl b/source/code/core/collections/public/ice/container/impl/hashmap_impl.inl
@@ -1,4 +1,4 @@
-/// Copyright 2022 - 2022, Dandielo <dandielo@iceshard.net>
+/// Copyright 2022 - 2023, Dandielo <dandielo@iceshard.net>
 /// SPDX-License-Identifier: MIT
 
 namespace ice
@@ -639,6 +639,15 @@ namespace ice
             }
         }
 
+        template<typename Type, ice::ContainerLogic Logic>
+        inline auto try_get(ice::HashMap<Type, Logic>& map, ice::u64 key) noexcept -> Type*
+        {
+            ice::ucount const index = ice::hashmap::detail::find_or_fail(map, key);
+            return index == ice::hashmap::detail::Constant_EndOfList
+                ? nullptr
+                : map._data + index;
+        }
+
         template<typename Type, ice::ContainerLogic Logic>
         inline void remove(ice::HashMap<Type, Logic>& map, ice::u64 key) noexcept
         {
@@ -652,6 +661,13 @@ namespace ice
         }
 
 
+
+        template<typename HashMapType> requires HashMapReadAccess<HashMapType>
+        inline auto count(HashMapType const& map) noexcept -> ice::ucount
+        {
+            return map._count;
+        }
+
         template<typename HashMapType> requires HashMapReadAccess<HashMapType>
         inline bool full(HashMapType const& map) noexcept
         {
@@ -667,6 +683,12 @@ namespace ice
             return map._count == 0;
         }
 
+        template<typename HashMapType> requires HashMapReadAccess<HashMapType>
+        inline bool any(HashMapType const& map) noexcept
+        {
+            return ice::hashmap::empty(map) == false;
+        }
+
         template<typename HashMapType> requires HashMapReadAccess<HashMapType>
         inline bool has(HashMapType const& map, ice::u64 key) noexcept
         {

diff --git a/source/code/core/collections/public/ice/container/impl/linked_queue_impl.inl b/source/code/core/collections/public/ice/container/impl/linked_queue_impl.inl
@@ -1,4 +1,4 @@
-/// Copyright 2022 - 2022, Dandielo <dandielo@iceshard.net>
+/// Copyright 2022 - 2023, Dandielo <dandielo@iceshard.net>
 /// SPDX-License-Identifier: MIT
 
 namespace ice
@@ -120,8 +120,8 @@ namespace ice
             return std::atomic_load_explicit(&queue._head, std::memory_order_relaxed) == nullptr;
         }
 
-        template<typename NodeType>
-        inline void push(ice::AtomicLinkedQueue<NodeType>& queue, NodeType* node) noexcept
+        template<typename NodeType, typename DerivedNodeType>
+        inline void push(ice::AtomicLinkedQueue<NodeType>& queue, DerivedNodeType* node) noexcept
         {
             NodeType* const previous_tail = std::atomic_exchange_explicit(
                 &queue._tail, node, std::memory_order_relaxed
@@ -185,7 +185,7 @@ namespace ice
                     NodeType* previous = std::atomic_exchange_explicit(
                         &queue._head, result->next, std::memory_order_relaxed
                     );
-                    assert(previous == nullptr);
+                    ICE_ASSERT_CORE(previous == nullptr);
                 }
             }
             return result;

diff --git a/source/code/core/collections/public/ice/container/impl/queue_impl.inl b/source/code/core/collections/public/ice/container/impl/queue_impl.inl
@@ -1,4 +1,4 @@
-/// Copyright 2022 - 2022, Dandielo <dandielo@iceshard.net>
+/// Copyright 2022 - 2023, Dandielo <dandielo@iceshard.net>
 /// SPDX-License-Identifier: MIT
 
 namespace ice

diff --git a/source/code/core/collections/public/ice/container/linked_queue.hxx b/source/code/core/collections/public/ice/container/linked_queue.hxx
@@ -1,4 +1,4 @@
-/// Copyright 2022 - 2022, Dandielo <dandielo@iceshard.net>
+/// Copyright 2022 - 2023, Dandielo <dandielo@iceshard.net>
 /// SPDX-License-Identifier: MIT
 
 #pragma once
@@ -76,8 +76,8 @@ namespace ice
         template<typename NodeType>
         inline bool empty(ice::AtomicLinkedQueue<NodeType> const& queue) noexcept;
 
-        template<typename NodeType>
-        inline void push(ice::AtomicLinkedQueue<NodeType>& queue, NodeType* node) noexcept;
+        template<typename NodeType, typename DerivedNodeType = NodeType>
+        inline void push(ice::AtomicLinkedQueue<NodeType>& queue, DerivedNodeType* node) noexcept;
 
         template<typename NodeType>
         inline auto pop(ice::AtomicLinkedQueue<NodeType>& queue) noexcept -> NodeType*;

diff --git a/source/code/core/collections/public/ice/container/queue.hxx b/source/code/core/collections/public/ice/container/queue.hxx
@@ -1,4 +1,4 @@
-/// Copyright 2022 - 2022, Dandielo <dandielo@iceshard.net>
+/// Copyright 2022 - 2023, Dandielo <dandielo@iceshard.net>
 /// SPDX-License-Identifier: MIT
 
 #pragma once

diff --git a/source/code/core/collections/public/ice/container_concepts.hxx b/source/code/core/collections/public/ice/container_concepts.hxx
@@ -1,4 +1,4 @@
-/// Copyright 2022 - 2022, Dandielo <dandielo@iceshard.net>
+/// Copyright 2022 - 2023, Dandielo <dandielo@iceshard.net>
 /// SPDX-License-Identifier: MIT
 
 #pragma once

diff --git a/source/code/core/collections/public/ice/container_logic.hxx b/source/code/core/collections/public/ice/container_logic.hxx
@@ -1,4 +1,4 @@
-/// Copyright 2022 - 2022, Dandielo <dandielo@iceshard.net>
+/// Copyright 2022 - 2023, Dandielo <dandielo@iceshard.net>
 /// SPDX-License-Identifier: MIT
 
 #pragma once

diff --git a/source/code/core/collections/public/ice/container_types.hxx b/source/code/core/collections/public/ice/container_types.hxx
@@ -1,4 +1,4 @@
-/// Copyright 2022 - 2022, Dandielo <dandielo@iceshard.net>
+/// Copyright 2022 - 2023, Dandielo <dandielo@iceshard.net>
 /// SPDX-License-Identifier: MIT
 
 #pragma once

diff --git a/source/code/core/collections/public/ice/shard_container.hxx b/source/code/core/collections/public/ice/shard_container.hxx
@@ -1,4 +1,4 @@
-/// Copyright 2022 - 2022, Dandielo <dandielo@iceshard.net>
+/// Copyright 2022 - 2023, Dandielo <dandielo@iceshard.net>
 /// SPDX-License-Identifier: MIT
 
 #pragma once

diff --git a/source/code/core/collections/public/ice/sort.hxx b/source/code/core/collections/public/ice/sort.hxx
@@ -1,4 +1,4 @@
-/// Copyright 2022 - 2022, Dandielo <dandielo@iceshard.net>
+/// Copyright 2022 - 2023, Dandielo <dandielo@iceshard.net>
 /// SPDX-License-Identifier: MIT
 
 #pragma once
@@ -18,6 +18,9 @@ namespace ice
     template<typename K, typename V, typename Pred>
     inline void sort(ice::Span<K> keys, ice::Span<V> values, Pred&& pred) noexcept;
 
+    template<typename Node, typename Pred>
+    inline auto sort_linked_list(Node* left_list, ice::u32 size, Pred&& pred) noexcept -> Node*;
+
     namespace detail
     {
 
@@ -84,4 +87,58 @@ namespace ice
         ice::detail::qsort(keys, values, std::forward<Pred>(pred), first_index, last_index);
     }
 
+    template<typename Node, typename Pred>
+    inline auto sort_linked_list(Node* left_list, ice::u32 size, Pred&& pred) noexcept -> Node*
+    {
+        Node* right_list = left_list;
+        if (size == 1)
+        {
+            left_list->next = nullptr;
+            return left_list;
+        }
+        else if (size == 2)
+        {
+            right_list = right_list->next;
+            right_list->next = nullptr;
+            left_list->next = nullptr;
+        }
+        else
+        {
+            uint32_t const half_size = size / 2;
+            for (uint32_t idx = half_size; idx > 0; --idx)
+            {
+                right_list = right_list->next;
+            }
+
+            Node* next = right_list->next;
+            right_list->next = nullptr;
+            right_list = next;
+
+            left_list = ice::sort_linked_list(left_list, half_size + 1, pred);
+            right_list = ice::sort_linked_list(right_list, size - (half_size + 1), pred);
+        }
+
+        Node result{ .next = left_list }; // Keep the head of the list
+        left_list = &result;
+        while (left_list->next != nullptr && right_list != nullptr)
+        {
+            Node* temp = left_list->next;
+            if (pred(*temp, *right_list) == false) // TRUE == IS OKAY, FALSE == NEEDS SWAP
+            {
+                // We swapped the whole lists...
+                left_list->next = right_list;
+                right_list = temp;
+            }
+
+            // We can advance the left list
+            left_list = left_list->next;
+        }
+
+        // Attach the rest of the right list
+        left_list->next = right_list;
+
+        // Return the 'next' element of the result.
+        return result.next;
+    }
+
 } // namespace ice
diff --git a/source/code/core/collections/public/ice/span.hxx b/source/code/core/collections/public/ice/span.hxx
@@ -1,4 +1,4 @@
-/// Copyright 2022 - 2022, Dandielo <dandielo@iceshard.net>
+/// Copyright 2022 - 2023, Dandielo <dandielo@iceshard.net>
 /// SPDX-License-Identifier: MIT
 
 #pragma once

diff --git a/source/code/core/collections/public/ice/string/heap_string.hxx b/source/code/core/collections/public/ice/string/heap_string.hxx
@@ -1,4 +1,4 @@
-/// Copyright 2022 - 2022, Dandielo <dandielo@iceshard.net>
+/// Copyright 2022 - 2023, Dandielo <dandielo@iceshard.net>
 /// SPDX-License-Identifier: MIT
 
 #pragma once