mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-01-17 14:28:30 +01:00
Code Issues Projects Releases Wiki Activity

Add hflip and rotation parameters to sim.loadStamp

Browse Source
This commit is contained in:
Tamás Bálint Misius 2023-06-02 06:44:23 +02:00
parent 7b894a693e
commit 1a69bbfb51
No known key found for this signature in database
GPG Key ID: 5B472A12F6ECA9F2
3 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Misc.h
View File

@ -5,6 +5,19 @@
#include <cstddef>
#include <vector>
template<class Signed>
inline std::pair<Signed, Signed> floorDiv(Signed a, Signed b)
{
auto quo = a / b;
auto rem = a % b;
if (a < Signed(0) && rem)
{
quo -= Signed(1);
rem += b;
}
return { quo, rem };
}
//Linear interpolation
template <typename T> inline T LinearInterpolate(T val1, T val2, T lowerCoord, T upperCoord, T coord)
{

13
src/gui/game/GameView.cpp
View File

@ -1930,19 +1930,6 @@ void GameView::TransformSave(Mat2<int> mulToTransform)
ApplyTransformPlaceSave();
}
template<class Signed>
static std::pair<Signed, Signed> floorDiv(Signed a, Signed b)
{
auto quo = a / b;
auto rem = a % b;
if (a < Signed(0) && rem)
{
quo -= Signed(1);
rem += b;
}
return { quo, rem };
}
void GameView::ApplyTransformPlaceSave()
{
auto remX = floorDiv(placeSaveTranslate.X, CELL).second;

26
src/lua/LuaScriptInterface.cpp
View File

@ -1967,8 +1967,12 @@ int LuaScriptInterface::simulation_loadStamp(lua_State * l)
int i = -1;
int pushed = 1;
std::unique_ptr<SaveFile> tempfile;
int x = luaL_optint(l,2,0) / CELL;
int y = luaL_optint(l,3,0) / CELL;
Vec2<int> partP = {
luaL_optint(l, 2, 0),
luaL_optint(l, 3, 0),
};
auto hflip = lua_toboolean(l, 4);
auto rotation = luaL_optint(l, 5, 0) & 3; // [0, 3] rotations
auto &client = Client::Ref();
if (lua_isstring(l, 1)) //Load from 10 char name, or full filename
{
@ -1986,9 +1990,23 @@ int LuaScriptInterface::simulation_loadStamp(lua_State * l)
if (tempfile && tempfile->GetGameSave())
{
// TODO: maybe do a gameSave->Transform with a new transform argument for the lua function and the "low" [0, CELL) part of x, y
auto gameSave = tempfile->TakeGameSave();
luacon_sim->Load(gameSave.get(), !luacon_controller->GetView()->ShiftBehaviour(), { x, y });
auto [ quoX, remX ] = floorDiv(partP.X, CELL);
auto [ quoY, remY ] = floorDiv(partP.Y, CELL);
if (remX || remY || hflip || rotation)
{
auto transform = Mat2<int>::Identity;
if (hflip)
{
transform = Mat2<int>::MirrorX * transform;
}
for (auto i = 0; i < rotation; ++i)
{
transform = Mat2<int>::CCW * transform;
}
gameSave->Transform(transform, { remX, remY });
}
luacon_sim->Load(gameSave.get(), !luacon_controller->GetView()->ShiftBehaviour(), { quoX, quoY });
lua_pushinteger(l, 1);
if (gameSave->authors.size())