Skip to content
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

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

Merged
merged 3 commits into from
Oct 6, 2023
+10 −43
Merged

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

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3663b57
Use TerrainMaterials::from_str to parse material variant name
kennethloeffler Oct 6, 2023
92ea5bc
Merge branch 'main' into terrain-material-enum-name-fromstr
kennethloeffler Oct 6, 2023
d763ac6
Merge branch 'main' into terrain-material-enum-name-fromstr
kennethloeffler Oct 6, 2023
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
53 changes: 10 additions & 43 deletions src/roblox/instance/terrain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,33 +10,6 @@ use super::Instance;

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) {
add_class_restricted_method(
methods,
Expand Down Expand Up @@ -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) {
Ok(material_colors.get_color(terrain_material).into())
} else {
Err(LuaError::RuntimeError(format!(
"{} is not a valid Terrain material",
&material.name
)))
}
let terrain_material = material
.name
.parse::<TerrainMaterials>()
.map_err(|err| LuaError::RuntimeError(err.to_string()))?;

Ok(material_colors.get_color(terrain_material).into())
}

/**
Expand All @@ -112,14 +83,10 @@ fn terrain_set_material_color(
)));
}

let terrain_material = if let Some(terrain_material) = material_from_name(&material.name) {
terrain_material
} else {
return Err(LuaError::RuntimeError(format!(
"{} is not a valid Terrain material",
&material.name
)));
};
let terrain_material = material
.name
.parse::<TerrainMaterials>()
.map_err(|err| LuaError::RuntimeError(err.to_string()))?;

material_colors.set_color(terrain_material, color.into());
this.set_property("MaterialColors", Variant::MaterialColors(material_colors));
Expand Down