From 8a800e7aa5df8b18d815b1bab5722e48814e8999 Mon Sep 17 00:00:00 2001
From: bzt <bztemail@gmail.com>
Date: Sun, 15 Dec 2019 12:25:34 +0100
Subject: [PATCH] Removed functionality and minor material-mapping fix

---
 code/M3D/M3DMaterials.h | 6 +++---
 code/M3D/M3DWrapper.h   | 4 ++--
 code/M3D/m3d.h          | 4 +++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/code/M3D/M3DMaterials.h b/code/M3D/M3DMaterials.h
index 3d6fe246d..4aeba59e4 100644
--- a/code/M3D/M3DMaterials.h
+++ b/code/M3D/M3DMaterials.h
@@ -84,19 +84,19 @@ static const aiMatProp aiProps[] = {
 /* --- Texture Map Properties ---   !!!!! must match m3d_propertytypes !!!!! */
 static const aiMatProp aiTxProps[] = {
     { AI_MATKEY_TEXTURE_DIFFUSE(0) },                        /* m3dp_map_Kd */
-    { AI_MATKEY_TEXTURE_AMBIENT(0) },                        /* m3dp_map_Ka */
+    { AI_MATKEY_TEXTURE(aiTextureType_AMBIENT_OCCLUSION,0) },/* m3dp_map_Ka */
     { AI_MATKEY_TEXTURE_SPECULAR(0) },                       /* m3dp_map_Ks */
     { AI_MATKEY_TEXTURE_SHININESS(0) },                      /* m3dp_map_Ns */
     { AI_MATKEY_TEXTURE_EMISSIVE(0) },                       /* m3dp_map_Ke */
     { NULL, 0, 0 },                                          /* m3dp_map_Tf */
     { AI_MATKEY_TEXTURE_HEIGHT(0) },                         /* m3dp_bump */
     { AI_MATKEY_TEXTURE_OPACITY(0) },                        /* m3dp_map_d */
-    { AI_MATKEY_TEXTURE_REFLECTION(0) },                     /* m3dp_refl */
+    { AI_MATKEY_TEXTURE_NORMALS(0) },                        /* m3dp_map_N */
 
     { AI_MATKEY_TEXTURE(aiTextureType_DIFFUSE_ROUGHNESS,0) },/* m3dp_map_Pr */
     { AI_MATKEY_TEXTURE(aiTextureType_METALNESS,0) },        /* m3dp_map_Pm */
     { NULL, 0, 0 },                                          /* m3dp_map_Ps */
-    { AI_MATKEY_TEXTURE(aiTextureType_AMBIENT_OCCLUSION,0) },/* m3dp_map_Ni */
+    { AI_MATKEY_TEXTURE(aiTextureType_REFLECTION,0) },       /* m3dp_map_Ni */
     { NULL, 0, 0 },                                          /* m3dp_map_Nt */
     { NULL, 0, 0 },
     { NULL, 0, 0 },
diff --git a/code/M3D/M3DWrapper.h b/code/M3D/M3DWrapper.h
index 4ceac12ad..b4f90ff1f 100644
--- a/code/M3D/M3DWrapper.h
+++ b/code/M3D/M3DWrapper.h
@@ -53,8 +53,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string>
 
 // Assimp specific M3D configuration. Comment out these defines to remove functionality
-#define ASSIMP_USE_M3D_READFILECB
-#define M3D_ASCII
+//#define ASSIMP_USE_M3D_READFILECB
+//#define M3D_ASCII
 
 #include "m3d.h"
 
diff --git a/code/M3D/m3d.h b/code/M3D/m3d.h
index edf5d9623..d09348497 100644
--- a/code/M3D/m3d.h
+++ b/code/M3D/m3d.h
@@ -256,7 +256,7 @@ enum {
     m3dp_map_Tf,
     m3dp_map_Km, /* bump map */
     m3dp_map_D,
-    m3dp_map_il, /* reflection map */
+    m3dp_map_N,  /* normal map */
 
     m3dp_map_Pr = 192,          /* textured physical map properties */
     m3dp_map_Pm,
@@ -266,6 +266,7 @@ enum {
 };
 enum {                          /* aliases */
     m3dp_bump = m3dp_map_Km,
+    m3dp_map_il = m3dp_map_N,
     m3dp_refl = m3dp_map_Pm
 };
 
@@ -560,6 +561,7 @@ static m3dpd_t m3d_propertytypes[] = {
 
     /* aliases, note that "map_*" aliases are handled automatically */
     M3D_PROPERTYDEF(m3dpf_map, m3dp_map_Km, "bump"),
+    M3D_PROPERTYDEF(m3dpf_map, m3dp_map_N, "map_N"),/* as normal map has no scalar version, it's counterpart is 'il' */
     M3D_PROPERTYDEF(m3dpf_map, m3dp_map_Pm, "refl")
 };
 /* shape command definitions. if more commands start with the same string, the longer must come first */