Skip to content

Add support for colors with non-standard encoding #69

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

Closed
Sixze wants to merge 1 commit into from
Closed

Add support for colors with non-standard encoding #69

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion Code/Client/Private/NetImgui_CmdPackets_DrawFrame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,14 @@ inline void ImGui_ExtractVertices(const ImDrawList& cmdList, ImguiDrawGroup& dra
for(int i(0); i<static_cast<int>(drawGroupOut.mVerticeCount); ++i)
{
const auto& Vtx = cmdList.VtxBuffer[i];
pVertices[i].mColor = Vtx.col;

// Convert colors with non-standard encoding to the encoding that the server expects
ImU32 r = (Vtx.col >> IM_COL32_R_SHIFT) & 0xFF;
ImU32 g = (Vtx.col >> IM_COL32_G_SHIFT) & 0xFF;
ImU32 b = (Vtx.col >> IM_COL32_B_SHIFT) & 0xFF;
ImU32 a = (Vtx.col >> IM_COL32_A_SHIFT) & 0xFF;
pVertices[i].mColor = r << 0 | g << 8 | b << 16 | a << 24;

pVertices[i].mUV[0] = static_cast<uint16_t>((Vtx.uv.x - static_cast<float>(ImguiVert::kUvRange_Min) + 0.5f/65535.f) * 0xFFFF / (ImguiVert::kUvRange_Max - ImguiVert::kUvRange_Min));
pVertices[i].mUV[1] = static_cast<uint16_t>((Vtx.uv.y - static_cast<float>(ImguiVert::kUvRange_Min) + 0.5f/65535.f) * 0xFFFF / (ImguiVert::kUvRange_Max - ImguiVert::kUvRange_Min));
pVertices[i].mPos[0] = Vtx.pos.x - drawGroupOut.mReferenceCoord[0];
Expand Down
Loading