trotFunky/Toy-Raytracer
1
0
Fork 0
Code Activity

Colors: Introduce color type abstraction

Browse source 
SFML and Dear ImGui have incompatible color types, abstract them through
a new Color class which has conversions.

Centralize color constants in a namespace as well.
This commit is contained in:
trotFunky 2024-01-26 23:07:25 +00:00
parent f25a649144
commit a0bdfce61a
3 changed files with 47 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
World.cpp
View file

@ -287,13 +287,13 @@ void World::step(const float& stepTime) {
ImVec4 hoverColor;
switch ((BlockType)blockToPlace) {
case BlockType::WALL:
hoverColor = (ImVec4)ImColor(84, 56, 34);
hoverColor = (ImVec4)Colors::Wall;
break;
case BlockType::DOOR:
hoverColor = (ImVec4)ImColor(186, 152, 107);
hoverColor = (ImVec4)Colors::Door;
break;
case BlockType::WINDOW:
hoverColor = (ImVec4)ImColor(104, 123, 165);
hoverColor = (ImVec4)Colors::Window;
break;
default:
/* Default header color, it seems ? */
@ -305,13 +305,13 @@ void World::step(const float& stepTime) {
ImVec4 blockColor;
switch (currentBlock) {
case BlockType::WALL:
blockColor = (ImVec4)ImColor(84, 56, 34);
blockColor = (ImVec4)Colors::Wall;
break;
case BlockType::DOOR:
blockColor = (ImVec4)ImColor(186, 152, 107);
blockColor = (ImVec4)Colors::Door;
break;
case BlockType::WINDOW:
blockColor = (ImVec4)ImColor(104, 123, 165);
blockColor = (ImVec4)Colors::Window;
break;
default:
blockColor = (ImVec4)ImColor(188, 120, 32);