From 0baa2d46e6d8cbfa33c32b09eab8526ff6c319ae Mon Sep 17 00:00:00 2001 From: Dario Manesku Date: Wed, 6 Aug 2014 01:44:00 +0100 Subject: [PATCH] Cleanup. --- examples/common/imgui/imgui.cpp | 1 - examples/common/imgui/imgui.h | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/examples/common/imgui/imgui.cpp b/examples/common/imgui/imgui.cpp index add0db119..c26b011f3 100644 --- a/examples/common/imgui/imgui.cpp +++ b/examples/common/imgui/imgui.cpp @@ -28,7 +28,6 @@ #include #include #include -#include #include "../entry/dbg.h" #include "imgui.h" diff --git a/examples/common/imgui/imgui.h b/examples/common/imgui/imgui.h index d497ec6de..37407729f 100644 --- a/examples/common/imgui/imgui.h +++ b/examples/common/imgui/imgui.h @@ -26,6 +26,8 @@ #ifndef IMGUI_H_HEADER_GUARD #define IMGUI_H_HEADER_GUARD +#include + #define IMGUI_MBUT_LEFT 0x01 #define IMGUI_MBUT_RIGHT 0x02 @@ -105,6 +107,6 @@ void imguiColorWheel(float _rgb[3], bool _respectIndentation = false, bool _enab void imguiColorWheel(const char* _str, float _rgb[3], bool& _activated, bool _enabled = true); void imguiImage(bgfx::TextureHandle _image, float _lod, int32_t _width, int32_t _height, ImguiImageAlign::Enum _align = ImguiImageAlign::LeftIndented); -void imguiImage(bgfx::TextureHandle _image, float _lod, float _width, float _aspect, ImguiImageAlign::Enum _align = ImguiImageAlign::LeftIndented); //_width is in [0.0-1.0] range. +void imguiImage(bgfx::TextureHandle _image, float _lod, float _scale, float _aspect, ImguiImageAlign::Enum _align = ImguiImageAlign::LeftIndented); //_scale is in [0.0-1.0] range. #endif // IMGUI_H_HEADER_GUARD