Illusion/3dobs
1
0
Fork 0
mirror of https://github.com/IllusionMan1212/3dobs.git synced 2026-10-24 10:12:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

textures: add support for emission textures

Browse Source
This commit is contained in:
Illusion
2023-11-02 22:02:00 +02:00
parent eba6894a07
commit 8decddbf14
4 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/importer/obj.rs
+2 -1
View File
@@ -144,7 +144,8 @@ fn parse_mtl(path: &PathBuf, obj_textures: &mut HashMap<String, Texture>) -> Res
}
Some(MtlToken::DiffuseTexture)
| Some(MtlToken::AmbientTexture)
| Some(MtlToken::SpecularTexture) => {
| Some(MtlToken::SpecularTexture)
| Some(MtlToken::EmissiveTexture) => {
let tex_type = TextureType::from_material_str(token).unwrap();
let name = iter.next().unwrap().to_string();
src/mesh.rs
+7 -4
View File
@@ -126,7 +126,7 @@ impl Mesh {
shader.set_3fv("material.ambient", self.material.ambient_color);
shader.set_3fv("material.diffuse", self.material.diffuse_color);
shader.set_3fv("material.specular", self.material.specular_color);
shader.set_float("material.shininess", 32.0);
shader.set_float("material.shininess", self.material.specular_exponent);
shader.set_float("material.opacity", self.material.opacity);
} else {
shader.set_3fv("material.ambient", glm::vec3(0.0, 0.0, 0.0));
@@ -136,6 +136,7 @@ impl Mesh {
if show_textures {
shader.set_bool("useTextures", self.material.textures.len() > 0);
for (i, tex) in self.material.textures.iter().enumerate() {
shader.set_bool("hasEmissionTexture", false);
unsafe {
gl::ActiveTexture(gl::TEXTURE0 + i as u32);
match tex.typ {
@@ -146,11 +147,13 @@ impl Mesh {
shader.set_int("material.texture_diffuse", i as i32);
},
TextureType::Specular => {
shader.set_int("material.texture_specular{}", i as i32);
shader.set_int("material.texture_specular", i as i32);
},
_ => {
warn!("Unsupported texture type: {:?}", tex.typ);
TextureType::Emissive => {
shader.set_int("material.texture_emission", i as i32);
shader.set_bool("hasEmissionTexture", true);
},
_ => {},
}
gl::BindTexture(gl::TEXTURE_2D, tex.id);