Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated imgui to latest v1.91.5 #306

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Updated imgui to latest v1.91.5 #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4c970b
updated to 1.90.9
HasKha Nov 25, 2024
b4d9cf0
updated to v1.91.4
HasKha Nov 25, 2024
fc4046e
updated imgui dependency to v1.91.5
HasKha Nov 25, 2024
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
2 changes: 1 addition & 1 deletion deps/imgui/imgui
Open in desktop
Submodule imgui updated 109 files
2 changes: 1 addition & 1 deletion include/polyscope/render/engine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ class TextureBuffer {
// bool withAlpha = true, bool useMipMap = false, bool repeat = false);

// used to interop with external things, e.g. ImGui
virtual void* getNativeHandle() = 0;
virtual ImTextureID getNativeHandle() = 0;
virtual uint32_t getNativeBufferID() = 0;

protected:
Expand Down
2 changes: 1 addition & 1 deletion include/polyscope/render/mock_opengl/mock_gl_engine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ class GLTextureBuffer : public TextureBuffer {
void setData(const std::vector<std::array<glm::vec3, 4>>& data) override;

void setFilterMode(FilterMode newMode) override;
void* getNativeHandle() override;
ImTextureID getNativeHandle() override;
uint32_t getNativeBufferID() override;

std::vector<float> getDataScalar() override;
Expand Down
2 changes: 1 addition & 1 deletion include/polyscope/render/opengl/gl_engine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ class GLTextureBuffer : public TextureBuffer {
void setData(const std::vector<std::array<glm::vec3, 4>>& data) override;

void setFilterMode(FilterMode newMode) override;
void* getNativeHandle() override;
ImTextureID getNativeHandle() override;
uint32_t getNativeBufferID() override;

std::vector<float> getDataScalar() override;
Expand Down
2 changes: 1 addition & 1 deletion src/imgui_config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ void configureImGuiStyle() {
colors[ImGuiCol_DragDropTarget] = ImVec4(1.00f, 1.00f, 0.00f, 0.90f);
colors[ImGuiCol_Tab] = ImVec4(0.27f, 0.54f, 0.42f, 0.83f);
colors[ImGuiCol_TabHovered] = ImVec4(0.34f, 0.68f, 0.53f, 0.83f);
colors[ImGuiCol_TabActive] = ImVec4(0.38f, 0.76f, 0.58f, 0.83f);
colors[ImGuiCol_TabSelected] = ImVec4(0.38f, 0.76f, 0.58f, 0.83f);
}


Expand Down
2 changes: 1 addition & 1 deletion src/render/mock_opengl/mock_gl_engine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ void GLTextureBuffer::setFilterMode(FilterMode newMode) {
checkGLError();
}

void* GLTextureBuffer::getNativeHandle() { return nullptr; }
ImTextureID GLTextureBuffer::getNativeHandle() { return 0; }
uint32_t GLTextureBuffer::getNativeBufferID() { return 77; };

std::vector<float> GLTextureBuffer::getDataScalar() {
Expand Down
2 changes: 1 addition & 1 deletion src/render/opengl/gl_engine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ void GLTextureBuffer::setFilterMode(FilterMode newMode) {
checkGLError();
}

void* GLTextureBuffer::getNativeHandle() { return reinterpret_cast<void*>(getHandle()); }
ImTextureID GLTextureBuffer::getNativeHandle() { return getHandle(); }

uint32_t GLTextureBuffer::getNativeBufferID() { return static_cast<uint32_t>(getHandle()); };

Expand Down