Merge branch 'develop' of...

Merge branch 'develop' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/dependencies/cpp/mirrage into develop

Merge branch 'develop' of...
Merge branch 'develop' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/dependencies/cpp/mirrage into develop
97d1f27e · Florian Oetke · a2e167aa · 5d91089e · 97d1f27e
Commit 97d1f27e authored Sep 21, 2019 by Florian Oetke
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

src/mesh_converter/common.hpp src/mesh_converter/common.hpp +3 -2

No files found.
--- a/src/mesh_converter/common.hpp
+++ b/src/mesh_converter/common.hpp
@@ -28,8 +28,9 @@ namespace mirrage {

 	struct Mesh_converted_config {
 		Texture_mapping texture_mappings{
-		        {Texture_type::albedo, {1, 12}},    // aiTextureType_DIFFUSE, aiTextureType_BASE_COLOR
-		        {Texture_type::metalness, {3, 15}}, // aiTextureType_AMBIENT, aiTextureType_METALNESS
+		        {Texture_type::albedo, {1, 12}}, // aiTextureType_DIFFUSE, aiTextureType_BASE_COLOR
+		        {Texture_type::metalness,
+		         {3, 11, 15}}, // aiTextureType_AMBIENT, aiTextureType_REFLECTION aiTextureType_METALNESS
 		        {Texture_type::roughness,
 		         {7,
 		          2,