mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-22 16:02:54 +02:00
Code Issues Projects Releases Wiki Activity

Fix prop sampling ignoring temperature scale

Browse Source 
So it would always sample in K. For example, sampling something with a temp of 20C would sample the string "295.15" without specifying a scale, which would then translate to 295.15C once OK'd.
This commit is contained in:
Tamás Bálint Misius
2025-02-15 20:44:17 +01:00
parent bca4d66ace
commit f15ecdd09b
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/game/tool/PropertyTool.cpp
View File

@@ -3,6 +3,7 @@
#include "gui/Style.h"
#include "gui/game/Brush.h"
#include "gui/game/GameModel.h"
#include "gui/game/GameController.h"
#include "gui/interface/Window.h"
#include "gui/interface/Button.h"
#include "gui/interface/Textbox.h"
@@ -10,6 +11,7 @@
#include "simulation/Simulation.h"
#include "simulation/SimulationData.h"
#include "graphics/Graphics.h"
#include "Format.h"
#include <SDL.h>
class PropertyWindow: public ui::Window
@@ -102,7 +104,18 @@ std::optional<std::pair<int, String>> PropertyWindow::TakePropertyFrom(const Sim
}
auto value = toolConfiguration->changeProperty.Get(sim, *i);
auto &prop = Particle::GetProperties()[toolConfiguration->changeProperty.propertyIndex];
return std::pair{ toolConfiguration->changeProperty.propertyIndex, prop.ToString(value) };
String valueString;
if (prop.Name == "temp")
{
StringBuilder sb;
format::RenderTemperature(sb, std::get<float>(value), GameController::Ref().GetTemperatureScale());
valueString = sb.Build();
}
else
{
valueString = prop.ToString(value);
}
return std::pair{ toolConfiguration->changeProperty.propertyIndex, valueString };
}
void PropertyWindow::HandlePropertyChange()