Skip to content

Commit c9d8c35

Browse files
jnyfahjnyfah
authored
feat: added support of HashSet and OrderedHashMap containers
1 parent 65d4471 commit c9d8c35

23 files changed

Lines changed: 2063 additions & 321 deletions

‎Tetragrama/EditorScene.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ namespace Tetragrama
2929
std::atomic_int SelectedSceneNode = -1;
3030
ZEngine::Core::Containers::Array<ZEngine::Importers::AssetNodeRef> HierarchiesNodeRef = {};
3131
ZEngine::Core::Containers::Array<ZEngine::Core::Containers::String> Names = {};
32-
ZEngine::Core::Containers::HashMap<uint32_t, uint32_t> NodeNames = {};
32+
ZEngine::Core::Containers::UnorderedHashMap<uint32_t, uint32_t> NodeNames = {};
3333

3434
ZEngine::Helpers::Ref<ZEngine::Helpers::ThreadSafeQueue<ZEngine::Managers::AssetManager::AssetHandle>> PendingOnLoadHierarchies = nullptr;
35-
ZEngine::Core::Containers::HashMap<uint64_t, uint32_t> HashToAssetFile = {};
35+
ZEngine::Core::Containers::UnorderedHashMap<uint64_t, uint32_t> HashToAssetFile = {};
3636
ZEngine::Core::Containers::Array<EditorAssetSceneFiles> AssetFiles = {};
3737

3838
ZEngine::Core::Memory::ArenaAllocator LocalArena = {};

‎Tetragrama/Layers/ImguiLayer.h‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#include <UIComponent.h>
33
#include <ZEngine/Applications/Layer.h>
44
#include <ZEngine/Core/Containers/Array.h>
5-
#include <ZEngine/Core/Containers/HashMap.h>
65
#include <ZEngine/Core/Containers/Strings.h>
6+
#include <ZEngine/Core/Containers/UnorderedHashMap.h>
77
#include <ZEngine/Core/Memory/Allocator.h>
88
#include <ZEngine/Helpers/NodeHierarchyHelper.h>
99
#include <ZEngine/Windows/Inputs/IInputEventCallback.h>
@@ -20,37 +20,37 @@ namespace Tetragrama::Layers
2020
ImguiLayer(cstring name = "ImGUI Layer") : ZEngine::Applications::Layer(name) {}
2121
virtual ~ImguiLayer();
2222

23-
ZEngine::Core::Containers::Array<ZEngine::Helpers::NodeHierarchy> NodeHierarchies = {};
24-
ZEngine::Core::Containers::Array<uint32_t> NodeToRender = {};
25-
ZEngine::Core::Containers::HashMap<uint32_t, Components::UIComponent*> NodeUIComponents = {};
26-
ZEngine::Core::Containers::HashMap<ZEngine::Windows::Inputs::GlfwKeyCode, int> KeyEntries = {};
23+
ZEngine::Core::Containers::Array<ZEngine::Helpers::NodeHierarchy> NodeHierarchies = {};
24+
ZEngine::Core::Containers::Array<uint32_t> NodeToRender = {};
25+
ZEngine::Core::Containers::UnorderedHashMap<uint32_t, Components::UIComponent*> NodeUIComponents = {};
26+
ZEngine::Core::Containers::UnorderedHashMap<ZEngine::Windows::Inputs::GlfwKeyCode, int> KeyEntries = {};
2727

28-
virtual void Initialize(ZEngine::Core::Memory::ArenaAllocator* arena, ZEngine::Applications::GameApplicationPtr app) override;
29-
virtual void Deinitialize() override;
28+
virtual void Initialize(ZEngine::Core::Memory::ArenaAllocator* arena, ZEngine::Applications::GameApplicationPtr app) override;
29+
virtual void Deinitialize() override;
3030

31-
bool OnEvent(ZEngine::Core::CoreEvent& event) override;
31+
bool OnEvent(ZEngine::Core::CoreEvent& event) override;
3232

33-
void Update(ZEngine::Core::TimeStep dt) override;
33+
void Update(ZEngine::Core::TimeStep dt) override;
3434

35-
void Render(ZEngine::Rendering::Renderers::GraphicRenderer* const renderer, ZEngine::Hardwares::CommandBuffer* const command_buffer) override;
35+
void Render(ZEngine::Rendering::Renderers::GraphicRenderer* const renderer, ZEngine::Hardwares::CommandBuffer* const command_buffer) override;
3636

37-
int AddNode(Components::UIComponent* cmp, int parent, int depth);
38-
virtual void AddUIComponent(Components::UIComponent* cmp, int parent, int depth);
37+
int AddNode(Components::UIComponent* cmp, int parent, int depth);
38+
virtual void AddUIComponent(Components::UIComponent* cmp, int parent, int depth);
3939

40-
bool OnKeyPressed(ZEngine::Windows::Events::KeyPressedEvent&) override;
41-
bool OnKeyReleased(ZEngine::Windows::Events::KeyReleasedEvent&) override;
40+
bool OnKeyPressed(ZEngine::Windows::Events::KeyPressedEvent&) override;
41+
bool OnKeyReleased(ZEngine::Windows::Events::KeyReleasedEvent&) override;
4242

43-
bool OnMouseButtonPressed(ZEngine::Windows::Events::MouseButtonPressedEvent&) override;
44-
bool OnMouseButtonReleased(ZEngine::Windows::Events::MouseButtonReleasedEvent&) override;
45-
bool OnMouseButtonMoved(ZEngine::Windows::Events::MouseButtonMovedEvent&) override;
46-
bool OnMouseButtonWheelMoved(ZEngine::Windows::Events::MouseButtonWheelEvent&) override;
47-
bool OnTextInputRaised(ZEngine::Windows::Events::TextInputEvent&) override;
43+
bool OnMouseButtonPressed(ZEngine::Windows::Events::MouseButtonPressedEvent&) override;
44+
bool OnMouseButtonReleased(ZEngine::Windows::Events::MouseButtonReleasedEvent&) override;
45+
bool OnMouseButtonMoved(ZEngine::Windows::Events::MouseButtonMovedEvent&) override;
46+
bool OnMouseButtonWheelMoved(ZEngine::Windows::Events::MouseButtonWheelEvent&) override;
47+
bool OnTextInputRaised(ZEngine::Windows::Events::TextInputEvent&) override;
4848

49-
bool OnWindowClosed(ZEngine::Windows::Events::WindowClosedEvent&) override;
50-
bool OnWindowResized(ZEngine::Windows::Events::WindowResizedEvent&) override;
51-
bool OnWindowMinimized(ZEngine::Windows::Events::WindowMinimizedEvent&) override;
52-
bool OnWindowMaximized(ZEngine::Windows::Events::WindowMaximizedEvent&) override;
53-
bool OnWindowRestored(ZEngine::Windows::Events::WindowRestoredEvent&) override;
49+
bool OnWindowClosed(ZEngine::Windows::Events::WindowClosedEvent&) override;
50+
bool OnWindowResized(ZEngine::Windows::Events::WindowResizedEvent&) override;
51+
bool OnWindowMinimized(ZEngine::Windows::Events::WindowMinimizedEvent&) override;
52+
bool OnWindowMaximized(ZEngine::Windows::Events::WindowMaximizedEvent&) override;
53+
bool OnWindowRestored(ZEngine::Windows::Events::WindowRestoredEvent&) override;
5454
};
5555
ZDEFINE_PTR(ImguiLayer);
5656
} // namespace Tetragrama::Layers

0 commit comments

Comments
 (0)