Examples: Tweaks.

This commit is contained in:
ocornut 2015-03-09 13:05:18 +00:00
parent 7397425097
commit a3f3793cb6
5 changed files with 7 additions and 5 deletions

View File

@ -176,7 +176,7 @@ void ImGui_ImplDX9_InitFontsTexture()
g_FontTextureLoaded = true; g_FontTextureLoaded = true;
} }
bool ImGui_ImplDX9_Init(void* hwnd, IDirect3DDevice9* device, bool install_callbacks) bool ImGui_ImplDX9_Init(void* hwnd, IDirect3DDevice9* device)
{ {
g_pd3dDevice = device; g_pd3dDevice = device;
if (!QueryPerformanceFrequency((LARGE_INTEGER *)&g_TicksPerSecond)) if (!QueryPerformanceFrequency((LARGE_INTEGER *)&g_TicksPerSecond))

View File

@ -3,7 +3,7 @@
struct IDirect3DDevice9; struct IDirect3DDevice9;
bool ImGui_ImplDX9_Init(void* hwnd, IDirect3DDevice9* device, bool install_callbacks); bool ImGui_ImplDX9_Init(void* hwnd, IDirect3DDevice9* device);
void ImGui_ImplDX9_InitFontsTexture(); void ImGui_ImplDX9_InitFontsTexture();
void ImGui_ImplDX9_Shutdown(); void ImGui_ImplDX9_Shutdown();
void ImGui_ImplDX9_NewFrame(); void ImGui_ImplDX9_NewFrame();

View File

@ -61,7 +61,7 @@ int main(int argc, char** argv)
UpdateWindow(hwnd); UpdateWindow(hwnd);
// ImGui // ImGui
ImGui_ImplDX9_Init(hwnd, pd3dDevice, true); ImGui_ImplDX9_Init(hwnd, pd3dDevice);
//ImGuiIO& io = ImGui::GetIO(); //ImGuiIO& io = ImGui::GetIO();
//ImFont* my_font1 = io.Fonts->AddFontDefault(); //ImFont* my_font1 = io.Fonts->AddFontDefault();
//ImFont* my_font2 = io.Fonts->AddFontFromFileTTF("extra_fonts/Karla-Regular.ttf", 15.0f); //ImFont* my_font2 = io.Fonts->AddFontFromFileTTF("extra_fonts/Karla-Regular.ttf", 15.0f);

View File

@ -9,7 +9,8 @@ void ImGui_ImplGlfwGL3_Shutdown();
void ImGui_ImplGlfwGL3_NewFrame(); void ImGui_ImplGlfwGL3_NewFrame();
// GLFW callbacks (installed by default if you enable 'install_callbacks' during initialization) // GLFW callbacks (installed by default if you enable 'install_callbacks' during initialization)
// Provide here if you want to chain callbacks // Provided here if you want to chain callbacks.
// You can also handle inputs yourself and use those as a reference.
void ImGui_ImplGlfwGL3_MouseButtonCallback(GLFWwindow* window, int button, int action, int mods); void ImGui_ImplGlfwGL3_MouseButtonCallback(GLFWwindow* window, int button, int action, int mods);
void ImGui_ImplGlfwGL3_ScrollCallback(GLFWwindow* window, double xoffset, double yoffset); void ImGui_ImplGlfwGL3_ScrollCallback(GLFWwindow* window, double xoffset, double yoffset);
void ImGui_ImplGlFwGL3_KeyCallback(GLFWwindow* window, int key, int scancode, int action, int mods); void ImGui_ImplGlFwGL3_KeyCallback(GLFWwindow* window, int key, int scancode, int action, int mods);

View File

@ -9,7 +9,8 @@ void ImGui_ImplGlfw_Shutdown();
void ImGui_ImplGlfw_NewFrame(); void ImGui_ImplGlfw_NewFrame();
// GLFW callbacks (installed by default if you enable 'install_callbacks' during initialization) // GLFW callbacks (installed by default if you enable 'install_callbacks' during initialization)
// Provide here if you want to chain callbacks // Provided here if you want to chain callbacks.
// You can also handle inputs yourself and use those as a reference.
void ImGui_ImplGlfw_MouseButtonCallback(GLFWwindow* window, int button, int action, int mods); void ImGui_ImplGlfw_MouseButtonCallback(GLFWwindow* window, int button, int action, int mods);
void ImGui_ImplGlfw_ScrollCallback(GLFWwindow* window, double xoffset, double yoffset); void ImGui_ImplGlfw_ScrollCallback(GLFWwindow* window, double xoffset, double yoffset);
void ImGui_ImplGlFw_KeyCallback(GLFWwindow* window, int key, int scancode, int action, int mods); void ImGui_ImplGlFw_KeyCallback(GLFWwindow* window, int key, int scancode, int action, int mods);