Scarfski/tinygltf
1
0
Fork 0
mirror of https://github.com/syoyo/tinygltf.git synced 2026-09-17 15:54:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgraded dear imgui and ImGuizmo to the latest version

Browse Source 
The Gizmo feels a little bit nicer to use in the latest version

Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
This commit is contained in:
Arthur Brainville
2018-03-02 15:44:37 +01:00
parent 0b01361d15
commit ab156c7d18
8 changed files with 9308 additions and 4271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
examples/common/imgui/imgui_impl_btgui.cpp
View File

@@ -17,6 +17,7 @@
#include "OpenGLWindow/X11OpenGLWindow.h"
#endif
#include <imgui_internal.h>
#include <cstdio>
#define IMGUI_B3G_CONTROL (300)
@@ -122,12 +123,12 @@ void ImGui_ImplBtGui_RenderDrawLists(ImDrawData* draw_data) {
(GLsizei)last_viewport[3]);
}
static const char* ImGui_ImplBtGui_GetClipboardText() {
static const char* ImGui_ImplBtGui_GetClipboardText(void* user_ctx) {
// @todo
return NULL; // glfwGetClipboardString(g_Window);
}
static void ImGui_ImplBtGui_SetClipboardText(const char* text) {
static void ImGui_ImplBtGui_SetClipboardText(void* user_ctx, const char* text) {
// @todo
return;
// glfwSetClipboardString(g_Window, text);
@@ -259,7 +260,7 @@ bool ImGui_ImplBtGui_Init(b3gDefaultOpenGLWindow* window) {
io.SetClipboardTextFn = ImGui_ImplBtGui_SetClipboardText;
io.GetClipboardTextFn = ImGui_ImplBtGui_GetClipboardText;
#ifdef _WIN32
//io.ImeWindowHandle = glfwGetWin32Window(g_Window);
// io.ImeWindowHandle = glfwGetWin32Window(g_Window);
#endif
#if 0
@@ -277,7 +278,7 @@ bool ImGui_ImplBtGui_Init(b3gDefaultOpenGLWindow* window) {
void ImGui_ImplBtGui_Shutdown() {
ImGui_ImplBtGui_InvalidateDeviceObjects();
ImGui::Shutdown();
ImGui::Shutdown(ImGui::GetCurrentContext());
}
void ImGui_ImplBtGui_NewFrame(int mouse_x, int mouse_y) {