Skip to content
Draft
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
1 change: 0 additions & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ add_executable(HumanGL

Utility/EnumHelpers.h
Utility/StridedIterator.h
Utility/VectorMultiMap.h

InterfaceBlocks/DisplayInterfaceBlock.cpp
InterfaceBlocks/DisplayInterfaceBlock.h
Expand Down
2 changes: 1 addition & 1 deletion src/Components/UserInterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ auto UserInterface::onUpdate(Engine& engine) -> void
uint16_t index = 0;
for (const auto& entry : m_blocks)
{
entry.value->onDrawUI(index, engine, *this);
entry.second->onDrawUI(index, engine, *this);
if (index < m_blocks.size() - 1)
InterfaceBlock::addSeparator();
++index;
Expand Down
4 changes: 2 additions & 2 deletions src/Components/UserInterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
#define USERINTERFACE_H

#include <imgui.h>
#include <flat_map>

#include "Engine/Engine.h"
#include "Engine/EngineComponent.h"
#include "Utility/VectorMultiMap.h"

class MeshRenderer;

Expand Down Expand Up @@ -49,7 +49,7 @@ class UserInterface : public EngineComponent
std::string m_name;
ImguiWindowData m_windowData;

VectorMultiMap<float, std::unique_ptr<InterfaceBlock>> m_blocks;
std::flat_multimap<float, std::unique_ptr<InterfaceBlock>> m_blocks;

public:
explicit UserInterface(Object& object, const std::string_view& name = "default interface", const ImguiWindowData& windowData = {});
Expand Down
82 changes: 0 additions & 82 deletions src/Utility/VectorMultiMap.h

This file was deleted.