Updated ImGui.

This commit is contained in:
Branimir Karadžić
2017-06-02 10:31:01 -07:00
parent b0f8c68f29
commit 49bcdcfa5c
5 changed files with 11 additions and 10 deletions

View File

@@ -1,4 +1,4 @@
// dear imgui, v1.50 WIP
// dear imgui, v1.50
// (main code and documentation)
// See ImGui::ShowTestWindow() in imgui_demo.cpp for demo code.
@@ -280,8 +280,9 @@
stb_textedit.h
stb_truetype.h
Don't overwrite imconfig.h if you have made modification to your copy.
Check the "API BREAKING CHANGES" sections for a list of occasional API breaking changes. If you have a problem with a function, search for its name
in the code, there will likely be a comment about it. Please report any issue to the GitHub page!
If you have a problem with a missing function/symbols, search for its name in the code, there will likely be a comment about it.
Check the "API BREAKING CHANGES" sections for a list of occasional API breaking changes.
Please report any issue to the GitHub page!
Q: What is ImTextureID and how do I display an image?
A: ImTextureID is a void* used to pass renderer-agnostic texture references around until it hits your render function.

View File

@@ -1,4 +1,4 @@
// dear imgui, v1.50 WIP
// dear imgui, v1.50
// (headers)
// See imgui.cpp file for documentation.
@@ -16,7 +16,7 @@
#include <stddef.h> // ptrdiff_t, NULL
#include <string.h> // memset, memmove, memcpy, strlen, strchr, strcpy, strcmp
#define IMGUI_VERSION "1.50 WIP"
#define IMGUI_VERSION "1.50"
// Define attributes of all API symbols declarations, e.g. for DLL under Windows.
#ifndef IMGUI_API
@@ -1316,7 +1316,7 @@ struct ImFontAtlas
// Pitch = Width * BytesPerPixels
IMGUI_API void GetTexDataAsAlpha8(unsigned char** out_pixels, int* out_width, int* out_height, int* out_bytes_per_pixel = NULL); // 1 byte per-pixel
IMGUI_API void GetTexDataAsRGBA32(unsigned char** out_pixels, int* out_width, int* out_height, int* out_bytes_per_pixel = NULL); // 4 bytes-per-pixel
void SetTexID(void* id) { TexID = id; }
void SetTexID(ImTextureID id) { TexID = id; }
// Helpers to retrieve list of common Unicode ranges (2 value per range, values are inclusive, zero-terminated list)
// NB: Make sure that your string are UTF-8 and NOT in your local code page. See FAQ for details.
@@ -1329,7 +1329,7 @@ struct ImFontAtlas
// Members
// (Access texture data via GetTexData*() calls which will setup a default font for you.)
void* TexID; // User data to refer to the texture once it has been uploaded to user's graphic systems. It ia passed back to you during rendering.
ImTextureID TexID; // User data to refer to the texture once it has been uploaded to user's graphic systems. It is passed back to you during rendering via the ImDrawCmd structure.
unsigned char* TexPixelsAlpha8; // 1 component per pixel, each component is unsigned 8-bit. Total size = TexWidth * TexHeight
unsigned int* TexPixelsRGBA32; // 4 component per pixel, each component is unsigned 8-bit. Total size = TexWidth * TexHeight * 4
int TexWidth; // Texture width calculated during Build().

View File

@@ -1,4 +1,4 @@
// dear imgui, v1.50 WIP
// dear imgui, v1.50
// (demo code)
// Message to the person tempted to delete this file when integrating ImGui into their code base:

View File

@@ -1,4 +1,4 @@
// dear imgui, v1.50 WIP
// dear imgui, v1.50
// (drawing and font code)
// Contains implementation for

View File

@@ -1,4 +1,4 @@
// dear imgui, v1.50 WIP
// dear imgui, v1.50
// (internals)
// You may use this file to debug, understand or extend ImGui features but we don't provide any guarantee of forward compatibility!