Skip to content

Add tint color variants for all image functions #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add tint color variants for all image functions #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b66771
Add tint color variants for all image functions
pkhead Jun 4, 2024
e9c6fef
Update editor example with a tint color option
pkhead Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion examples/editor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,14 @@ class ImageViewerWindow : public DocumentWindow
{
CurrentToolMode = ToolMode::Move;
}
ImGui::SameLine();

// temporarily reset window padding so that the
// color picker window doesn't look weird
ImVec2 windowPadding = ImGui::GetStyle().WindowPadding;
ImGui::PopStyleVar();
ImGui::ColorEdit3("Tint Color", TintColor, ImGuiColorEditFlags_NoInputs);
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, windowPadding);

ImGui::SameLine();
switch (CurrentToolMode)
Expand All @@ -114,7 +122,8 @@ class ImageViewerWindow : public DocumentWindow
ImGui::EndChild();
}

rlImGuiImageRect(&ViewTexture.texture, (int)size.x, (int)size.y, viewRect);
Color tintCol = Color { (unsigned char)(TintColor[0] * 255), (unsigned char)(TintColor[1] * 255), (unsigned char)(TintColor[2] * 255), 255 };
rlImGuiImagePro(&ViewTexture.texture, size, viewRect, tintCol);
}
ImGui::End();
ImGui::PopStyleVar();
Expand Down Expand Up @@ -183,6 +192,8 @@ class ImageViewerWindow : public DocumentWindow
Vector2 LastTarget = { 0 };
bool Dragging = false;

float TintColor[3] = { 1.0f, 1.0f, 1.0f };

bool DirtyScene = false;

enum class ToolMode
Expand Down
173 changes: 110 additions & 63 deletions rlImGui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,109 +492,151 @@ void rlImGuiShutdown(void)
GlobalContext = nullptr;
}

void rlImGuiImage(const Texture* image)
static struct ImVec4 colorVec4(Color tintColor)
{
if (!image)
return;

if (GlobalContext)
ImGui::SetCurrentContext(GlobalContext);

ImGui::Image((ImTextureID)image, ImVec2(float(image->width), float(image->height)));
return (ImVec4) {
(float)tintColor.r / 255.0f,
(float)tintColor.g / 255.0f,
(float)tintColor.b / 255.0f,
(float)tintColor.a / 255.0f,
};
}

bool rlImGuiImageButton(const char* name, const Texture* image)
static void getTexCoords(const Texture* image, Rectangle sourceRect, struct ImVec2* uv0, struct ImVec2* uv1)
{
if (sourceRect.width < 0)
{
uv0->x = -((float)sourceRect.x / image->width);
uv1->x = (uv0->x - (float)(fabs(sourceRect.width) / image->width));
}
else
{
uv0->x = (float)sourceRect.x / image->width;
uv1->x = uv0->x + (float)(sourceRect.width / image->width);
}

if (sourceRect.height < 0)
{
uv0->y = -((float)sourceRect.y / image->height);
uv1->y = (uv0->y - (float)(fabs(sourceRect.height) / image->height));
}
else
{
uv0->y = (float)sourceRect.y / image->height;
uv1->y = uv0->y + (float)(sourceRect.height / image->height);
}
}

void rlImGuiImagePro(const Texture* image, struct ImVec2 size, Rectangle sourceRect, Color tintColor)
{
if (!image)
return false;
return;

if (GlobalContext)
ImGui::SetCurrentContext(GlobalContext);

struct ImVec2 uv0, uv1;
getTexCoords(image, sourceRect, &uv0, &uv1);

return ImGui::ImageButton(name, (ImTextureID)image, ImVec2(float(image->width), float(image->height)));
ImGui::Image((ImTextureID)image, size, uv0, uv1, colorVec4(tintColor));
}

bool rlImGuiImageButtonSize(const char* name, const Texture* image, ImVec2 size)
bool rlImGuiImageButtonPro(const char* name, const Texture* image, struct ImVec2 size, Rectangle sourceRect, Color tintColor)
{
if (!image)
return false;

if (GlobalContext)
ImGui::SetCurrentContext(GlobalContext);

struct ImVec2 uv0, uv1;
getTexCoords(image, sourceRect, &uv0, &uv1);

return ImGui::ImageButton(name, (ImTextureID)image, size);
return ImGui::ImageButton(name, (ImTextureID)image, size, uv0, uv1, colorVec4(tintColor));
}

void rlImGuiImageSize(const Texture* image, int width, int height)
void rlImGuiImageTint(const Texture* image, Color tintColor)
{
if (!image)
return;

if (GlobalContext)
ImGui::SetCurrentContext(GlobalContext);

ImGui::Image((ImTextureID)image, ImVec2(float(width), float(height)));
Rectangle rec = (Rectangle) {0.0f, 0.0f, (float)image->width, (float)image->height};
return rlImGuiImagePro(image, ImVec2(float(image->width), float(image->height)), rec, tintColor);
}

void rlImGuiImageSizeV(const Texture* image, Vector2 size)
void rlImGuiImage(const Texture* image)
{
if (!image)
return;

if (GlobalContext)
ImGui::SetCurrentContext(GlobalContext);

ImGui::Image((ImTextureID)image, ImVec2(size.x, size.y));
return rlImGuiImageTint(image, WHITE);
}

void rlImGuiImageRect(const Texture* image, int destWidth, int destHeight, Rectangle sourceRect)
bool rlImGuiImageButtonTint(const char* name, const Texture* image, Color tintColor)
{
if (!image)
return;

if (GlobalContext)
ImGui::SetCurrentContext(GlobalContext);

ImVec2 uv0;
ImVec2 uv1;
Rectangle rec = (Rectangle) {0.0f, 0.0f, (float)image->width, (float)image->height };
return rlImGuiImageButtonPro(name, image, ImVec2(float(image->width), float(image->height)), rec, tintColor);
}

if (sourceRect.width < 0)
{
uv0.x = -((float)sourceRect.x / image->width);
uv1.x = (uv0.x - (float)(fabs(sourceRect.width) / image->width));
}
else
{
uv0.x = (float)sourceRect.x / image->width;
uv1.x = uv0.x + (float)(sourceRect.width / image->width);
}
bool rlImGuiImageButton(const char* name, const Texture* image)
{
return rlImGuiImageButtonTint(name, image, WHITE);
}

if (sourceRect.height < 0)
{
uv0.y = -((float)sourceRect.y / image->height);
uv1.y = (uv0.y - (float)(fabs(sourceRect.height) / image->height));
}
else
{
uv0.y = (float)sourceRect.y / image->height;
uv1.y = uv0.y + (float)(sourceRect.height / image->height);
}
bool rlImGuiImageButtonSizeTint(const char* name, const Texture* image, struct ImVec2 size, Color tintColor)
{
Rectangle rec = (Rectangle) {0.0f, 0.0f, (float)image->width, (float)image->height };
return rlImGuiImageButtonPro(name, image, size, rec, tintColor);
}

bool rlImGuiImageButtonSize(const char* name, const Texture* image, struct ImVec2 size)
{
return rlImGuiImageButtonSizeTint(name, image, size, WHITE);
}

ImGui::Image((ImTextureID)image, ImVec2(float(destWidth), float(destHeight)), uv0, uv1);
bool rlImGuiImageButtonRect(const char* name, const Texture* image, int destWidth, int destHeight, Rectangle sourceRect)
{
return rlImGuiImageButtonPro(name, image, ImVec2(destWidth, destHeight), sourceRect, WHITE);
}

void rlImGuiImageRenderTexture(const RenderTexture* image)
void rlImGuiImageSizeTintV(const Texture* image, struct ImVec2 size, Color tintColor)
{
Rectangle rec = (Rectangle) {0.0f, 0.0f, (float)image->width, (float)image->height };
return rlImGuiImagePro(image, size, rec, tintColor);
}

void rlImGuiImageSizeTint(const Texture* image, int width, int height, Color tintColor)
{
Rectangle rec = (Rectangle) {0.0f, 0.0f, (float)image->width, (float)image->height };
return rlImGuiImagePro(image, ImVec2((float)width, (float)height), rec, tintColor);
}

void rlImGuiImageSize(const Texture* image, int width, int height)
{
return rlImGuiImageSizeTint(image, width, height, WHITE);
}

void rlImGuiImageSizeV(const Texture* image, struct ImVec2 size)
{
return rlImGuiImageSizeTintV(image, size, WHITE);
}

void rlImGuiImageRect(const Texture* image, int destWidth, int destHeight, Rectangle sourceRect)
{
return rlImGuiImagePro(image, ImVec2((float)destWidth, (float)destHeight), sourceRect, WHITE);
}

void rlImGuiImageRenderTextureTint(const RenderTexture* image, Color tintColor)
{
if (!image)
return;

if (GlobalContext)
ImGui::SetCurrentContext(GlobalContext);

rlImGuiImageRect(&image->texture, image->texture.width, image->texture.height, Rectangle{ 0,0, float(image->texture.width), -float(image->texture.height) });
rlImGuiImagePro(&image->texture, ImVec2((float)image->texture.width, (float)image->texture.height), Rectangle{ 0,0, float(image->texture.width), -float(image->texture.height) }, tintColor);
}

void rlImGuiImageRenderTextureFit(const RenderTexture* image, bool center)
void rlImGuiImageRenderTexture(const RenderTexture* image)
{
return rlImGuiImageRenderTextureTint(image, WHITE);
}

void rlImGuiImageRenderTextureFitTint(const RenderTexture* image, bool center, Color tintColor)
{
if (!image)
return;
Expand Down Expand Up @@ -622,7 +664,12 @@ void rlImGuiImageRenderTextureFit(const RenderTexture* image, bool center)
ImGui::SetCursorPosY(ImGui::GetCursorPosY() + (area.y / 2 - sizeY / 2));
}

rlImGuiImageRect(&image->texture, sizeX, sizeY, Rectangle{ 0,0, float(image->texture.width), -float(image->texture.height) });
rlImGuiImagePro(&image->texture, ImVec2((float)sizeX, (float)sizeY), Rectangle{ 0,0, float(image->texture.width), -float(image->texture.height) }, tintColor);
}

void rlImGuiImageRenderTextureFit(const RenderTexture* image, bool center)
{
return rlImGuiImageRenderTextureFitTint(image, center, WHITE);
}

// raw ImGui backend API
Expand Down
Loading