lune-org/lune
1
1
Fork 0
mirror of https://github.com/lune-org/lune.git synced 2024-12-12 13:00:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use TerrainMaterials::from_str to parse material variant name (#118)

Browse source
This commit is contained in:
Kenneth Loeffler 2023-10-05 19:10:11 -07:00 committed by GitHub
parent e92cb4ee64
commit ede3365f64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/roblox/instance/terrain.rs
View file

@ -10,33 +10,6 @@ use super::Instance;
pub const CLASS_NAME: &str = "Terrain"; pub const CLASS_NAME: &str = "Terrain";
fn material_from_name(material_name: &str) -> Option<TerrainMaterials> {
match material_name {
"Grass" => Some(TerrainMaterials::Grass),
"Slate" => Some(TerrainMaterials::Slate),
"Concrete" => Some(TerrainMaterials::Concrete),
"Brick" => Some(TerrainMaterials::Brick),
"Sand" => Some(TerrainMaterials::Sand),
"WoodPlanks" => Some(TerrainMaterials::WoodPlanks),
"Rock" => Some(TerrainMaterials::Rock),
"Glacier" => Some(TerrainMaterials::Glacier),
"Snow" => Some(TerrainMaterials::Snow),
"Sandstone" => Some(TerrainMaterials::Sandstone),
"Mud" => Some(TerrainMaterials::Mud),
"Basalt" => Some(TerrainMaterials::Basalt),
"Ground" => Some(TerrainMaterials::Ground),
"CrackedLava" => Some(TerrainMaterials::CrackedLava),
"Asphalt" => Some(TerrainMaterials::Asphalt),
"Cobblestone" => Some(TerrainMaterials::Cobblestone),
"Ice" => Some(TerrainMaterials::Ice),
"LeafyGrass" => Some(TerrainMaterials::LeafyGrass),
"Salt" => Some(TerrainMaterials::Salt),
"Limestone" => Some(TerrainMaterials::Limestone),
"Pavement" => Some(TerrainMaterials::Pavement),
_ => None,
}
}
pub fn add_methods<'lua, M: LuaUserDataMethods<'lua, Instance>>(methods: &mut M) { pub fn add_methods<'lua, M: LuaUserDataMethods<'lua, Instance>>(methods: &mut M) {
add_class_restricted_method( add_class_restricted_method(
methods, methods,
@ -79,14 +52,12 @@ fn terrain_get_material_color(_: &Lua, this: &Instance, material: EnumItem) -> L
))); )));
} }
if let Some(terrain_material) = material_from_name(&material.name) { let terrain_material = material
Ok(material_colors.get_color(terrain_material).into()) .name
} else { .parse::<TerrainMaterials>()
Err(LuaError::RuntimeError(format!( .map_err(|err| LuaError::RuntimeError(err.to_string()))?;
"{} is not a valid Terrain material",
&material.name Ok(material_colors.get_color(terrain_material).into())
)))
}
} }
/** /**
@ -112,14 +83,10 @@ fn terrain_set_material_color(
))); )));
} }
let terrain_material = if let Some(terrain_material) = material_from_name(&material.name) { let terrain_material = material
terrain_material .name
} else { .parse::<TerrainMaterials>()
return Err(LuaError::RuntimeError(format!( .map_err(|err| LuaError::RuntimeError(err.to_string()))?;
"{} is not a valid Terrain material",
&material.name
)));
};
material_colors.set_color(terrain_material, color.into()); material_colors.set_color(terrain_material, color.into());
this.set_property("MaterialColors", Variant::MaterialColors(material_colors)); this.set_property("MaterialColors", Variant::MaterialColors(material_colors));