1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
diff --git a/tools/k4aviewer/k4alogdockcontrol.cpp b/tools/k4aviewer/k4alogdockcontrol.cpp
index 4289f71..407e912 100644
--- a/tools/k4aviewer/k4alogdockcontrol.cpp
+++ b/tools/k4aviewer/k4alogdockcontrol.cpp
@@ -161,7 +161,7 @@ K4ADockControlStatus K4ALogDockControl::Show()
if (updated)
{
- ImGui::SetScrollHere(1.0f);
+ ImGui::SetScrollHereY(1.0f);
}
ImGui::EndChild();
diff --git a/tools/k4aviewer/k4asourceselectiondockcontrol.cpp b/tools/k4aviewer/k4asourceselectiondockcontrol.cpp
index 812608b..31e961d 100644
--- a/tools/k4aviewer/k4asourceselectiondockcontrol.cpp
+++ b/tools/k4aviewer/k4asourceselectiondockcontrol.cpp
@@ -34,7 +34,7 @@ K4ASourceSelectionDockControl::K4ASourceSelectionDockControl()
K4ADockControlStatus K4ASourceSelectionDockControl::Show()
{
- ImGui::SetNextTreeNodeOpen(true, ImGuiCond_FirstUseEver);
+ ImGui::SetNextItemOpen(true, ImGuiCond_FirstUseEver);
if (ImGui::TreeNode("Open Device"))
{
ImGuiExtensions::K4AComboBox("Device S/N",
diff --git a/tools/k4aviewer/k4adevicedockcontrol.cpp b/tools/k4aviewer/k4adevicedockcontrol.cpp
index 8fe5687..6d1e95a 100644
--- a/tools/k4aviewer/k4adevicedockcontrol.cpp
+++ b/tools/k4aviewer/k4adevicedockcontrol.cpp
@@ -333,7 +333,7 @@ K4ADockControlStatus K4ADeviceDockControl::Show()
if (m_firstRun || depthEnabledStateChanged)
{
- ImGui::SetNextTreeNodeOpen(m_config.EnableDepthCamera);
+ ImGui::SetNextItemOpen(m_config.EnableDepthCamera);
}
ImGui::Indent();
@@ -376,7 +376,7 @@ K4ADockControlStatus K4ADeviceDockControl::Show()
if (m_firstRun || colorEnableStateChanged)
{
- ImGui::SetNextTreeNodeOpen(m_config.EnableColorCamera);
+ ImGui::SetNextItemOpen(m_config.EnableColorCamera);
}
ImGui::Indent();
@@ -710,7 +710,7 @@ K4ADockControlStatus K4ADeviceDockControl::Show()
if (m_firstRun && (m_syncInConnected || m_syncOutConnected))
{
- ImGui::SetNextTreeNodeOpen(true);
+ ImGui::SetNextItemOpen(true);
}
if (ImGui::TreeNode("External Sync"))
{
diff --git a/tools/k4aviewer/k4aviewerimage.cpp b/tools/k4aviewer/k4aviewerimage.cpp
index 68899f1..ad23490 100644
--- a/tools/k4aviewer/k4aviewerimage.cpp
+++ b/tools/k4aviewer/k4aviewerimage.cpp
@@ -134,7 +134,9 @@ GLenum K4AViewerImage::Create(std::shared_ptr<K4AViewerImage> *out,
K4AViewerImage::operator ImTextureID() const
{
- return reinterpret_cast<ImTextureID>(static_cast<intptr_t>(m_texture.Id()));
+ // m_texture.Id() : GLUint, 32 bit unsigned
+ // ImTextureID : ImU64, 64 bit unsigned
+ return m_texture.Id();
}
K4AViewerImage::operator GLuint() const
|
