From 269ba00fd32c379bda0862e386ebfb3677a59fa6 Mon Sep 17 00:00:00 2001 From: RevoluPowered Date: Sun, 8 Sep 2019 18:10:12 +0100 Subject: Implemented maya stingray support --- modules/assimp/editor_scene_importer_assimp.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/assimp/editor_scene_importer_assimp.cpp b/modules/assimp/editor_scene_importer_assimp.cpp index fee2001a07..30778a182e 100644 --- a/modules/assimp/editor_scene_importer_assimp.cpp +++ b/modules/assimp/editor_scene_importer_assimp.cpp @@ -699,7 +699,6 @@ Ref EditorSceneImporterAssimp::_generate_mesh_from_surface_indices( } } - // Now process materials aiTextureType tex_diffuse = aiTextureType_DIFFUSE; { String filename, path; @@ -846,6 +845,20 @@ Ref EditorSceneImporterAssimp::_generate_mesh_from_surface_indices( } } + aiTextureType tex_ao_map = aiTextureType_AMBIENT_OCCLUSION; + { + String filename, path; + Ref texture; + AssimpImageData image_data; + + // Process texture normal map + if (AssimpUtils::GetAssimpTexture(state, ai_material, tex_ao_map, filename, path, image_data)) { + AssimpUtils::set_texture_mapping_mode(image_data.map_mode, image_data.texture); + mat->set_feature(SpatialMaterial::FEATURE_AMBIENT_OCCLUSION, true); + mat->set_texture(SpatialMaterial::TEXTURE_AMBIENT_OCCLUSION, image_data.texture); + } + } + Array array_mesh = st->commit_to_arrays(); Array morphs; morphs.resize(ai_mesh->mNumAnimMeshes); -- cgit v1.2.3