From 70188c56235ea70462ad305c64574e3af454b069 Mon Sep 17 00:00:00 2001 From: ocornut Date: Thu, 22 Jan 2015 11:03:24 +0100 Subject: [PATCH] Added comments --- imgui.cpp | 4 ++-- imgui.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/imgui.cpp b/imgui.cpp index 8f1c16ca..bf4397f6 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -89,8 +89,8 @@ // Load texture unsigned char* pixels; - int width, height; - io.Fonts->GetTexDataAsRGBA32(pixels, &width, &height); + int width, height, bytes_per_pixels; + io.Fonts->GetTexDataAsRGBA32(pixels, &width, &height, &bytes_per_pixels); // TODO: copy texture to graphics memory. // TODO: store your texture pointer/identifier in 'io.Fonts->TexID' diff --git a/imgui.h b/imgui.h index b77df3c4..c807d2f3 100644 --- a/imgui.h +++ b/imgui.h @@ -773,6 +773,7 @@ struct ImFontAtlas // User is in charge of copying the pixels into graphics memory, then call SetTextureUserID() // After loading the texture into your graphic system, store your texture handle in 'TexID' (ignore if you aren't using multiple fonts nor images) // RGBA32 format is provided for convenience and high compatibility, but note that all RGB pixels are white, so 75% of the memory is wasted. + // 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 IMGUI_API void SetTexID(void* id) { TexID = id; }