Skip to content

Fix bug in SetLayer and SetLayerThickness #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hamdav wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix bug in SetLayer and SetLayerThickness #95

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions S4/main_lua.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1446,20 +1446,20 @@ static int S4L_Simulation_SetLayer(lua_State *L){
S4_real thickness = luaL_checknumber(L, 3);

name = luaL_checklstring(L, 2, NULL);
const char *matname = luaL_checklstring(L, 4, NULL);
S4_MaterialID M = S4_Simulation_GetMaterialByName(S, matname);
if(M < 0){
S4L_error(L, "SetLayer: Unknown material '%s'.", matname);
}
layer = S4_Simulation_GetLayerByName(S, name);
if(layer < 0){
const char *matname = luaL_checklstring(L, 4, NULL);
S4_MaterialID M = S4_Simulation_GetMaterialByName(S, matname);
if(M < 0){
S4L_error(L, "SetLayer: Unknown material '%s'.", matname);
}
layer = S4_Simulation_SetLayer(S, -1, name, &thickness, -1, M);
if(layer < 0){
S4L_error(L, "SetLayer: There was a problem allocating the layer named '%s'.", name);
return 0;
}
}else{
S4_Simulation_SetLayer(S, layer, NULL, &thickness, -1, -1);
S4_Simulation_SetLayer(S, layer, NULL, &thickness, -1, M);
}
return 0;
}
Expand All @@ -1474,11 +1474,11 @@ static int S4L_Simulation_SetLayerThickness(lua_State *L){
if(layer < 0){
S4L_error(L, "SetLayerThickness: S4_Layer named '%s' not found.", name);
}else{
S4_real thick = luaL_checknumber(L, 3);
if(thick < 0){
S4_real thickness = luaL_checknumber(L, 3);
if(thickness < 0){
S4L_error(L, "SetLayerThickness: Thickness must be non-negative.");
}
S4_Simulation_SetLayer(S, layer, NULL, &thick, -1, -1);
Simulation_ChangeLayerThickness(S, &S->layer[layer], &thickness);
}
return 0;
}
Expand Down