Skip to content

Commit 43b4c16

Browse files
committed
Use nbl::core::vector3df instead of glm
1 parent 8327499 commit 43b4c16

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

include/nbl/ext/ImGui/ImGui.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#ifndef NBL_EXT_IMGUI_UI_H
22
#define NBL_EXT_IMGUI_UI_H
33

4-
#include <glm/vec3.hpp>
5-
64
namespace nbl::ext::imgui
75
{
86
class NBL_API2 UI final : public core::IReferenceCounted{
@@ -52,7 +50,7 @@ namespace nbl::ext::imgui
5250

5351
void InputFloat4(char const* label, float* value);
5452

55-
void InputFloat3(char const* label, glm::vec3& value);
53+
void InputFloat3(char const* label, nbl::core::vector3df& value);
5654

5755
bool Combo(
5856
char const* label,

src/nbl/ext/ImGui/ImGui.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -879,14 +879,14 @@ namespace nbl::ext::imgui
879879

880880
//-------------------------------------------------------------------------------------------------
881881

882-
void UI::InputFloat3(char const* label, glm::vec3& value)
882+
void UI::InputFloat3(char const* label, nbl::core::vector3df&value)
883883
{
884-
float tempValue[3]{ value.x, value.y, value.z };
884+
float tempValue[3]{ value.X, value.Y, value.Z };
885885
InputFloat3(label, tempValue);
886886

887-
if (memcmp(tempValue, &value[0], sizeof(float) * 3) != 0)
887+
if (memcmp(tempValue, &value.X, sizeof(float) * 3) != 0)
888888
{
889-
memcpy(&value[0], tempValue, sizeof(float) * 3);
889+
memcpy(&value.X, tempValue, sizeof(float) * 3);
890890
}
891891
}
892892

0 commit comments

Comments
 (0)