remove duplicate imgui function

gwdevhub · Jul 28, 2024 · c3b11b9 · c3b11b9
1 parent e371394
commit c3b11b9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/GWToolboxdll/Color.h b/GWToolboxdll/Color.h
@@ -97,14 +97,6 @@ namespace Colors {
  i[3] = static_cast<int>(color >> IM_COL32_B_SHIFT & 0xFF);
  }
 
- static void ConvertU32ToFloat4RGBA(const Color color, float* i)
- {
- i[0] = static_cast<float>(color >> IM_COL32_R_SHIFT & 0xFF) / 255.0f;
- i[1] = static_cast<float>(color >> IM_COL32_G_SHIFT & 0xFF) / 255.0f;
- i[2] = static_cast<float>(color >> IM_COL32_B_SHIFT & 0xFF) / 255.0f;
- i[3] = static_cast<float>(color >> IM_COL32_A_SHIFT & 0xFF) / 255.0f;
- }
-
  static Color ConvertInt4ToU32(const int* i)
  {
  return static_cast<Color>((i[0] & 0xFF) << IM_COL32_A_SHIFT) |

diff --git a/GWToolboxdll/Widgets/Minimap/SymbolsRenderer.cpp b/GWToolboxdll/Widgets/Minimap/SymbolsRenderer.cpp
@@ -210,9 +210,8 @@ void SymbolsRenderer::Render(IDirect3DDevice9* device)
  }
 
  const auto quest_im_color = QuestModule::GetQuestColor(quest.quest_id);
- float quest_color[4];
- Colors::ConvertU32ToFloat4RGBA(quest_im_color, quest_color);
- device->SetPixelShaderConstantF(0, quest_color, 1);
+ const auto quest_color = ImGui::ColorConvertU32ToFloat4(quest_im_color);
+ device->SetPixelShaderConstantF(0, &quest_color.x, 1);
  const GW::Vec2f qpos = { quest.marker.x, quest.marker.y };
  if (std::ranges::contains(markers_drawn, qpos))
  return; // Don't draw more than 1 marker for a position