Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Tetragrama/EditorScene.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ namespace Tetragrama
std::atomic_int SelectedSceneNode = -1;
ZEngine::Core::Containers::Array<ZEngine::Importers::AssetNodeRef> HierarchiesNodeRef = {};
ZEngine::Core::Containers::Array<ZEngine::Core::Containers::String> Names = {};
ZEngine::Core::Containers::HashMap<uint32_t, uint32_t> NodeNames = {};
ZEngine::Core::Containers::UnorderedHashMap<uint32_t, uint32_t> NodeNames = {};

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

ZEngine::Core::Memory::ArenaAllocator LocalArena = {};
Expand Down
48 changes: 24 additions & 24 deletions Tetragrama/Layers/ImguiLayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#include <UIComponent.h>
#include <ZEngine/Applications/Layer.h>
#include <ZEngine/Core/Containers/Array.h>
#include <ZEngine/Core/Containers/HashMap.h>
#include <ZEngine/Core/Containers/Strings.h>
#include <ZEngine/Core/Containers/UnorderedHashMap.h>
#include <ZEngine/Core/Memory/Allocator.h>
#include <ZEngine/Helpers/NodeHierarchyHelper.h>
#include <ZEngine/Windows/Inputs/IInputEventCallback.h>
Expand All @@ -20,37 +20,37 @@ namespace Tetragrama::Layers
ImguiLayer(cstring name = "ImGUI Layer") : ZEngine::Applications::Layer(name) {}
virtual ~ImguiLayer();

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

virtual void Initialize(ZEngine::Core::Memory::ArenaAllocator* arena, ZEngine::Applications::GameApplicationPtr app) override;
virtual void Deinitialize() override;
virtual void Initialize(ZEngine::Core::Memory::ArenaAllocator* arena, ZEngine::Applications::GameApplicationPtr app) override;
virtual void Deinitialize() override;

bool OnEvent(ZEngine::Core::CoreEvent& event) override;
bool OnEvent(ZEngine::Core::CoreEvent& event) override;

void Update(ZEngine::Core::TimeStep dt) override;
void Update(ZEngine::Core::TimeStep dt) override;

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

int AddNode(Components::UIComponent* cmp, int parent, int depth);
virtual void AddUIComponent(Components::UIComponent* cmp, int parent, int depth);
int AddNode(Components::UIComponent* cmp, int parent, int depth);
virtual void AddUIComponent(Components::UIComponent* cmp, int parent, int depth);

bool OnKeyPressed(ZEngine::Windows::Events::KeyPressedEvent&) override;
bool OnKeyReleased(ZEngine::Windows::Events::KeyReleasedEvent&) override;
bool OnKeyPressed(ZEngine::Windows::Events::KeyPressedEvent&) override;
bool OnKeyReleased(ZEngine::Windows::Events::KeyReleasedEvent&) override;

bool OnMouseButtonPressed(ZEngine::Windows::Events::MouseButtonPressedEvent&) override;
bool OnMouseButtonReleased(ZEngine::Windows::Events::MouseButtonReleasedEvent&) override;
bool OnMouseButtonMoved(ZEngine::Windows::Events::MouseButtonMovedEvent&) override;
bool OnMouseButtonWheelMoved(ZEngine::Windows::Events::MouseButtonWheelEvent&) override;
bool OnTextInputRaised(ZEngine::Windows::Events::TextInputEvent&) override;
bool OnMouseButtonPressed(ZEngine::Windows::Events::MouseButtonPressedEvent&) override;
bool OnMouseButtonReleased(ZEngine::Windows::Events::MouseButtonReleasedEvent&) override;
bool OnMouseButtonMoved(ZEngine::Windows::Events::MouseButtonMovedEvent&) override;
bool OnMouseButtonWheelMoved(ZEngine::Windows::Events::MouseButtonWheelEvent&) override;
bool OnTextInputRaised(ZEngine::Windows::Events::TextInputEvent&) override;

bool OnWindowClosed(ZEngine::Windows::Events::WindowClosedEvent&) override;
bool OnWindowResized(ZEngine::Windows::Events::WindowResizedEvent&) override;
bool OnWindowMinimized(ZEngine::Windows::Events::WindowMinimizedEvent&) override;
bool OnWindowMaximized(ZEngine::Windows::Events::WindowMaximizedEvent&) override;
bool OnWindowRestored(ZEngine::Windows::Events::WindowRestoredEvent&) override;
bool OnWindowClosed(ZEngine::Windows::Events::WindowClosedEvent&) override;
bool OnWindowResized(ZEngine::Windows::Events::WindowResizedEvent&) override;
bool OnWindowMinimized(ZEngine::Windows::Events::WindowMinimizedEvent&) override;
bool OnWindowMaximized(ZEngine::Windows::Events::WindowMaximizedEvent&) override;
bool OnWindowRestored(ZEngine::Windows::Events::WindowRestoredEvent&) override;
};
ZDEFINE_PTR(ImguiLayer);
} // namespace Tetragrama::Layers
Loading
Loading