matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

misc: Fix sim.partNeighbors table being 0-indexed, rename SIM_MAXVELOCITY to MAX_VELOCITY

Browse Source
This commit is contained in:
jacob1 2023-10-08 12:18:57 -04:00
parent 7541273640
commit dd5e5b1f3a
No known key found for this signature in database
GPG Key ID: 4E58A32D510E1995
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SimulationConfig.h
View File

@ -31,7 +31,7 @@ constexpr int MAXSIGNS = 16;
constexpr int ISTP = CELL / 2; constexpr int ISTP = CELL / 2;
constexpr float CFDS = 4.0f / CELL; constexpr float CFDS = 4.0f / CELL;
constexpr float SIM_MAXVELOCITY = 1e4f; constexpr float MAX_VELOCITY = 1e4f;
//Air constants //Air constants
constexpr float AIR_TSTEPP = 0.3f; constexpr float AIR_TSTEPP = 0.3f;

4
src/lua/LuaScriptInterface.cpp
View File

@ -1233,7 +1233,7 @@ void LuaScriptInterface::initSimulationAPI()
SETCONSTF(l, MIN_PRESSURE); SETCONSTF(l, MIN_PRESSURE);
SETCONST(l, ISTP); SETCONST(l, ISTP);
SETCONSTF(l, CFDS); SETCONSTF(l, CFDS);
SETCONSTF(l, SIM_MAXVELOCITY); SETCONSTF(l, MAX_VELOCITY);
SETCONST(l, TOOL_HEAT); SETCONST(l, TOOL_HEAT);
SETCONST(l, TOOL_COOL); SETCONST(l, TOOL_COOL);
@ -1370,7 +1370,7 @@ void LuaScriptInterface::set_map(int x, int y, int width, int height, float valu
int LuaScriptInterface::simulation_partNeighbours(lua_State * l) int LuaScriptInterface::simulation_partNeighbours(lua_State * l)
{ {
lua_newtable(l); lua_newtable(l);
int id = 0; int id = 1;
int x = lua_tointeger(l, 1), y = lua_tointeger(l, 2), r = lua_tointeger(l, 3), rx, ry, n; int x = lua_tointeger(l, 1), y = lua_tointeger(l, 2), r = lua_tointeger(l, 3), rx, ry, n;
if(lua_gettop(l) == 5) // this is one more than the number of arguments because a table has just been pushed onto the stack with lua_newtable(l); if(lua_gettop(l) == 5) // this is one more than the number of arguments because a table has just been pushed onto the stack with lua_newtable(l);
{ {

8
src/simulation/Simulation.cpp
View File

@ -2864,11 +2864,11 @@ killed:
} }
else else
{ {
if (mv > SIM_MAXVELOCITY) if (mv > MAX_VELOCITY)
{ {
parts[i].vx *= SIM_MAXVELOCITY/mv; parts[i].vx *= MAX_VELOCITY/mv;
parts[i].vy *= SIM_MAXVELOCITY/mv; parts[i].vy *= MAX_VELOCITY/mv;
mv = SIM_MAXVELOCITY; mv = MAX_VELOCITY;
} }
// interpolate to see if there is anything in the way // interpolate to see if there is anything in the way
dx = parts[i].vx*ISTP/mv; dx = parts[i].vx*ISTP/mv;

2
src/simulation/elements/VSNS.cpp
View File

@ -109,7 +109,7 @@ static int update(UPDATE_FUNC_ARGS)
if (TYP(r) == PT_FILT) if (TYP(r) == PT_FILT)
{ {
int vel = parts[ID(r)].ctype - 0x10000000; int vel = parts[ID(r)].ctype - 0x10000000;
if (vel >= 0 && vel < SIM_MAXVELOCITY) if (vel >= 0 && vel < MAX_VELOCITY)
{ {
doDeserialization = true; doDeserialization = true;
Vs = float(vel); Vs = float(vel);