v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glTF2: export materials' normal maps

pull/1363/head
jamesgk 2017-07-26 14:42:22 -07:00
parent b7b17b03ec
commit c91e9a94da
4 changed files with 44 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/glTF2Asset.h
View File

@ -697,6 +697,7 @@ namespace glTF2
TexProperty diffuse; TexProperty diffuse;
TexProperty specular; TexProperty specular;
TexProperty emission; TexProperty emission;
Ref<Texture> normal;
bool doubleSided; bool doubleSided;
bool transparent; bool transparent;

16
code/glTF2AssetWriter.inl
View File

@ -196,14 +196,20 @@ namespace glTF2 {
} }
namespace { namespace {
inline void WriteColorOrTex(Value& obj, TexProperty& prop, const char* propName, MemoryPoolAllocator<>& al) inline void WriteTex(Value& obj, Ref<Texture> texture, const char* propName, MemoryPoolAllocator<>& al)
{ {
if (prop.texture) { if (texture) {
Value tex; Value tex;
tex.SetObject(); tex.SetObject();
tex.AddMember("index", prop.texture->index, al); tex.AddMember("index", texture->index, al);
obj.AddMember(StringRef(propName), tex, al); obj.AddMember(StringRef(propName), tex, al);
} else { }
}
inline void WriteColorOrTex(Value& obj, TexProperty& prop, const char* propName, MemoryPoolAllocator<>& al)
{
WriteTex(obj, prop.texture, propName, al);
if (!prop.texture) {
Value col; Value col;
obj.AddMember(StringRef(propName), MakeValue(col, prop.color, al), al); obj.AddMember(StringRef(propName), MakeValue(col, prop.color, al), al);
} }
@ -233,6 +239,8 @@ namespace glTF2 {
ext.SetObject(); ext.SetObject();
ext.AddMember("KHR_materials_common", v, w.mAl); ext.AddMember("KHR_materials_common", v, w.mAl);
obj.AddMember("extensions", ext, w.mAl); obj.AddMember("extensions", ext, w.mAl);
WriteTex(obj, m.normal, "normalTexture", w.mAl);
} }
namespace { namespace {

51
code/glTF2Exporter.cpp
View File

@ -240,10 +240,10 @@ namespace {
} }
} }
void glTF2Exporter::GetTexSampler(const aiMaterial* mat, TexProperty& prop) void glTF2Exporter::GetTexSampler(const aiMaterial* mat, Ref<Texture> texture)
{ {
std::string samplerId = mAsset->FindUniqueID("", "sampler"); std::string samplerId = mAsset->FindUniqueID("", "sampler");
prop.texture->sampler = mAsset->samplers.Create(samplerId); texture->sampler = mAsset->samplers.Create(samplerId);
aiTextureMapMode mapU, mapV; aiTextureMapMode mapU, mapV;
aiGetMaterialInteger(mat,AI_MATKEY_MAPPINGMODE_U_DIFFUSE(0),(int*)&mapU); aiGetMaterialInteger(mat,AI_MATKEY_MAPPINGMODE_U_DIFFUSE(0),(int*)&mapU);
@ -251,45 +251,44 @@ void glTF2Exporter::GetTexSampler(const aiMaterial* mat, TexProperty& prop)
switch (mapU) { switch (mapU) {
case aiTextureMapMode_Wrap: case aiTextureMapMode_Wrap:
prop.texture->sampler->wrapS = SamplerWrap_Repeat; texture->sampler->wrapS = SamplerWrap_Repeat;
break; break;
case aiTextureMapMode_Clamp: case aiTextureMapMode_Clamp:
prop.texture->sampler->wrapS = SamplerWrap_Clamp_To_Edge; texture->sampler->wrapS = SamplerWrap_Clamp_To_Edge;
break; break;
case aiTextureMapMode_Mirror: case aiTextureMapMode_Mirror:
prop.texture->sampler->wrapS = SamplerWrap_Mirrored_Repeat; texture->sampler->wrapS = SamplerWrap_Mirrored_Repeat;
break; break;
case aiTextureMapMode_Decal: case aiTextureMapMode_Decal:
default: default:
prop.texture->sampler->wrapS = SamplerWrap_Repeat; texture->sampler->wrapS = SamplerWrap_Repeat;
break; break;
}; };
switch (mapV) { switch (mapV) {
case aiTextureMapMode_Wrap: case aiTextureMapMode_Wrap:
prop.texture->sampler->wrapT = SamplerWrap_Repeat; texture->sampler->wrapT = SamplerWrap_Repeat;
break; break;
case aiTextureMapMode_Clamp: case aiTextureMapMode_Clamp:
prop.texture->sampler->wrapT = SamplerWrap_Clamp_To_Edge; texture->sampler->wrapT = SamplerWrap_Clamp_To_Edge;
break; break;
case aiTextureMapMode_Mirror: case aiTextureMapMode_Mirror:
prop.texture->sampler->wrapT = SamplerWrap_Mirrored_Repeat; texture->sampler->wrapT = SamplerWrap_Mirrored_Repeat;
break; break;
case aiTextureMapMode_Decal: case aiTextureMapMode_Decal:
default: default:
prop.texture->sampler->wrapT = SamplerWrap_Repeat; texture->sampler->wrapT = SamplerWrap_Repeat;
break; break;
}; };
// Hard coded Texture filtering options because I do not know where to find them in the aiMaterial. // Hard coded Texture filtering options because I do not know where to find them in the aiMaterial.
prop.texture->sampler->magFilter = SamplerMagFilter_Linear; texture->sampler->magFilter = SamplerMagFilter_Linear;
prop.texture->sampler->minFilter = SamplerMinFilter_Linear; texture->sampler->minFilter = SamplerMinFilter_Linear;
} }
void glTF2Exporter::GetMatColorOrTex(const aiMaterial* mat, TexProperty& prop, const char* propName, int type, int idx, aiTextureType tt) void glTF2Exporter::GetMatTex(const aiMaterial* mat, Ref<Texture>& texture, aiTextureType tt)
{ {
aiString tex; aiString tex;
aiColor4D col;
if (mat->GetTextureCount(tt) > 0) { if (mat->GetTextureCount(tt) > 0) {
if (mat->Get(AI_MATKEY_TEXTURE(tt, 0), tex) == AI_SUCCESS) { if (mat->Get(AI_MATKEY_TEXTURE(tt, 0), tex) == AI_SUCCESS) {
std::string path = tex.C_Str(); std::string path = tex.C_Str();
@ -298,43 +297,48 @@ void glTF2Exporter::GetMatColorOrTex(const aiMaterial* mat, TexProperty& prop, c
if (path[0] != '*') { if (path[0] != '*') {
std::map<std::string, unsigned int>::iterator it = mTexturesByPath.find(path); std::map<std::string, unsigned int>::iterator it = mTexturesByPath.find(path);
if (it != mTexturesByPath.end()) { if (it != mTexturesByPath.end()) {
prop.texture = mAsset->textures.Get(it->second); texture = mAsset->textures.Get(it->second);
} }
} }
if (!prop.texture) { if (!texture) {
std::string texId = mAsset->FindUniqueID("", "texture"); std::string texId = mAsset->FindUniqueID("", "texture");
prop.texture = mAsset->textures.Create(texId); texture = mAsset->textures.Create(texId);
mTexturesByPath[path] = prop.texture.GetIndex(); mTexturesByPath[path] = texture.GetIndex();
std::string imgId = mAsset->FindUniqueID("", "image"); std::string imgId = mAsset->FindUniqueID("", "image");
prop.texture->source = mAsset->images.Create(imgId); texture->source = mAsset->images.Create(imgId);
if (path[0] == '*') { // embedded if (path[0] == '*') { // embedded
aiTexture* tex = mScene->mTextures[atoi(&path[1])]; aiTexture* tex = mScene->mTextures[atoi(&path[1])];
uint8_t* data = reinterpret_cast<uint8_t*>(tex->pcData); uint8_t* data = reinterpret_cast<uint8_t*>(tex->pcData);
prop.texture->source->SetData(data, tex->mWidth, *mAsset); texture->source->SetData(data, tex->mWidth, *mAsset);
if (tex->achFormatHint[0]) { if (tex->achFormatHint[0]) {
std::string mimeType = "image/"; std::string mimeType = "image/";
mimeType += (memcmp(tex->achFormatHint, "jpg", 3) == 0) ? "jpeg" : tex->achFormatHint; mimeType += (memcmp(tex->achFormatHint, "jpg", 3) == 0) ? "jpeg" : tex->achFormatHint;
prop.texture->source->mimeType = mimeType; texture->source->mimeType = mimeType;
} }
} }
else { else {
prop.texture->source->uri = path; texture->source->uri = path;
} }
GetTexSampler(mat, prop); GetTexSampler(mat, texture);
} }
} }
} }
} }
}
void glTF2Exporter::GetMatColorOrTex(const aiMaterial* mat, TexProperty& prop, const char* propName, int type, int idx, aiTextureType tt)
{
aiColor4D col;
if (mat->Get(propName, type, idx, col) == AI_SUCCESS) { if (mat->Get(propName, type, idx, col) == AI_SUCCESS) {
prop.color[0] = col.r; prop.color[1] = col.g; prop.color[2] = col.b; prop.color[3] = col.a; prop.color[0] = col.r; prop.color[1] = col.g; prop.color[2] = col.b; prop.color[3] = col.a;
} }
GetMatTex(mat, prop.texture, tt);
} }
@ -357,6 +361,7 @@ void glTF2Exporter::ExportMaterials()
GetMatColorOrTex(mat, m->diffuse, AI_MATKEY_COLOR_DIFFUSE, aiTextureType_DIFFUSE); GetMatColorOrTex(mat, m->diffuse, AI_MATKEY_COLOR_DIFFUSE, aiTextureType_DIFFUSE);
GetMatColorOrTex(mat, m->specular, AI_MATKEY_COLOR_SPECULAR, aiTextureType_SPECULAR); GetMatColorOrTex(mat, m->specular, AI_MATKEY_COLOR_SPECULAR, aiTextureType_SPECULAR);
GetMatColorOrTex(mat, m->emission, AI_MATKEY_COLOR_EMISSIVE, aiTextureType_EMISSIVE); GetMatColorOrTex(mat, m->emission, AI_MATKEY_COLOR_EMISSIVE, aiTextureType_EMISSIVE);
GetMatTex(mat, m->normal, aiTextureType_NORMALS);
m->transparent = mat->Get(AI_MATKEY_OPACITY, m->transparency) == aiReturn_SUCCESS && m->transparency != 1.0; m->transparent = mat->Get(AI_MATKEY_OPACITY, m->transparency) == aiReturn_SUCCESS && m->transparency != 1.0;

4
code/glTF2Exporter.h
View File

@ -67,6 +67,7 @@ namespace glTF2
class Asset; class Asset;
struct TexProperty; struct TexProperty;
struct Node; struct Node;
struct Texture;
} }
namespace Assimp namespace Assimp
@ -100,7 +101,8 @@ namespace Assimp
void WriteBinaryData(IOStream* outfile, std::size_t sceneLength); void WriteBinaryData(IOStream* outfile, std::size_t sceneLength);
void GetTexSampler(const aiMaterial* mat, glTF2::TexProperty& prop); void GetTexSampler(const aiMaterial* mat, glTF2::Ref<glTF2::Texture> texture);
void GetMatTex(const aiMaterial* mat, glTF2::Ref<glTF2::Texture>& texture, aiTextureType tt);
void GetMatColorOrTex(const aiMaterial* mat, glTF2::TexProperty& prop, const char* propName, int type, int idx, aiTextureType tt); void GetMatColorOrTex(const aiMaterial* mat, glTF2::TexProperty& prop, const char* propName, int type, int idx, aiTextureType tt);
void ExportMetadata(); void ExportMetadata();
void ExportMaterials(); void ExportMaterials();