dash-3d-tmp
/
model-converter
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Resized maps no longer change textures, only mtl

This commit is contained in:
Thomas Forgione 2018-06-21 14:13:34 +02:00
parent 2b9a1064a7
commit 973810b776
No known key found for this signature in database
GPG Key ID: 203DAEA747F48F41
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/model/mod.rs
View File

@ -102,7 +102,7 @@ pub struct Model {
pub materials: HashMap<String, Material>,
/// Map associating the name of a texture and the real texture.
pub textures: HashMap<String, (Rc<SrgbTexture2d>, Vector3<f32>)>,
pub textures: HashMap<String, Rc<SrgbTexture2d>>,
/// The list of parts of the model.
pub parts: Vec<Part>,
@ -544,15 +544,15 @@ impl Model {
/// Builds the SrgbTextures for rendering.
pub fn build_texture_for_material(&mut self, material: &Material, renderer: &Renderer) {
if let Some((path, size)) = material.textures.get("map_Kd") {
if let Some((path, _)) = material.textures.get("map_Kd") {
let texture = renderer.make_texture(path);
// Don't need to insert multiple times the same texture
self.textures.entry(path.to_owned()).or_insert((Rc::new(texture), *size));
self.textures.entry(path.to_owned()).or_insert(Rc::new(texture));
};
}
/// Returns the rendering texture.
pub fn get_texture_by_name(&self, name: &str) -> Option<&(Rc<SrgbTexture2d>, Vector3<f32>)> {
pub fn get_texture_by_name(&self, name: &str) -> Option<&Rc<SrgbTexture2d>> {
self.textures.get(name)
}
@ -562,7 +562,7 @@ impl Model {
}
/// Returns a ref mut to the table of textures.
pub fn textures_mut(&mut self) -> &mut HashMap<String, (Rc<SrgbTexture2d>, Vector3<f32>)> {
pub fn textures_mut(&mut self) -> &mut HashMap<String, Rc<SrgbTexture2d>> {
&mut self.textures
}
}

4
src/renderer.rs
View File

@ -181,8 +181,8 @@ impl Renderer {
fn get_texture_of_part<'a>(&self, model: &'a Model, part: &Part) -> Option<(&'a SrgbTexture2d, Vector3<f32>)> {
if let Some(ref material_name) = part.material_name {
if let Some(ref material) = model.materials.get(material_name) {
if let Some((texture, _)) = material.textures.get("map_Kd") {
if let Some((texture, size)) = model.get_texture_by_name(texture) {
if let Some((texture, size)) = material.textures.get("map_Kd") {
if let Some(texture) = model.get_texture_by_name(texture) {
Some((texture, *size))
} else {
None