GitHub-Proxy/tinygltf
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git synced 2025-09-13 11:53:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reorder UVs in vacevaying order

Browse Source 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
This commit is contained in:
Arthur Brainville (Ybalrid) 2018-02-25 01:14:57 +01:00
parent 6cf0228fa7
commit a5a03a2d44
No known key found for this signature in database
GPG Key ID: BC05C4812A06BCF3
1 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
examples/raytrace/gltf-loader.cc
View File

@ -337,7 +337,7 @@ bool LoadGLTF(const std::string &filename, float scale,
std::cerr << "Unhandeled vector type for normal\n"; std::cerr << "Unhandeled vector type for normal\n";
} }
// TODO (Ybalrid) : need to order the UVs into facevarying order // Face varying comment on the normals is also true for the UVs
if (attribute.first == "TEXCOORD_0") { if (attribute.first == "TEXCOORD_0") {
std::cout << "Found texture coordinates\n"; std::cout << "Found texture coordinates\n";
@ -349,26 +349,53 @@ bool LoadGLTF(const std::string &filename, float scale,
std::cout << "TEXTCOORD is FLOAT\n"; std::cout << "TEXTCOORD is FLOAT\n";
v2fArray uvs( v2fArray uvs(
arrayAdapter<v2f>(dataPtr, count, byte_stride)); arrayAdapter<v2f>(dataPtr, count, byte_stride));
for (size_t i{0}; i < uvs.size(); ++i) {
const auto v = uvs[i];
std::cout << "uvs[" << i << "] (" << v.x << ", "
<< v.y << ")\n";
loadedMesh.facevarying_uvs.push_back(v.x); for (size_t i{0}; i < indices.size() / 3; ++i) {
loadedMesh.facevarying_uvs.push_back(v.y); // get the i'th triange's indexes
auto f0 = indices[3 * i + 0];
auto f1 = indices[3 * i + 1];
auto f2 = indices[3 * i + 2];
v2f uv0, uv1, uv2;
uv0 = uvs[f0];
uv1 = uvs[f1];
uv2 = uvs[f2];
loadedMesh.facevarying_uvs.push_back(uv0.x);
loadedMesh.facevarying_uvs.push_back(uv0.y);
loadedMesh.facevarying_uvs.push_back(uv1.x);
loadedMesh.facevarying_uvs.push_back(uv1.y);
loadedMesh.facevarying_uvs.push_back(uv2.x);
loadedMesh.facevarying_uvs.push_back(uv2.y);
} }
} break; } break;
case TINYGLTF_COMPONENT_TYPE_DOUBLE: { case TINYGLTF_COMPONENT_TYPE_DOUBLE: {
std::cout << "TEXTCOORD is DOUBLE\n"; std::cout << "TEXTCOORD is DOUBLE\n";
v2dArray uvs( v2dArray uvs(
arrayAdapter<v2d>(dataPtr, count, byte_stride)); arrayAdapter<v2d>(dataPtr, count, byte_stride));
for (size_t i{0}; i < uvs.size(); ++i) {
const auto v = uvs[i];
std::cout << "uvs[" << i << "] (" << v.x << ", "
<< v.y << ")\n";
loadedMesh.facevarying_uvs.push_back(v.x); for (size_t i{0}; i < indices.size() / 3; ++i) {
loadedMesh.facevarying_uvs.push_back(v.y); // get the i'th triange's indexes
auto f0 = indices[3 * i + 0];
auto f1 = indices[3 * i + 1];
auto f2 = indices[3 * i + 2];
v2d uv0, uv1, uv2;
uv0 = uvs[f0];
uv1 = uvs[f1];
uv2 = uvs[f2];
loadedMesh.facevarying_uvs.push_back(uv0.x);
loadedMesh.facevarying_uvs.push_back(uv0.y);
loadedMesh.facevarying_uvs.push_back(uv1.x);
loadedMesh.facevarying_uvs.push_back(uv1.y);
loadedMesh.facevarying_uvs.push_back(uv2.x);
loadedMesh.facevarying_uvs.push_back(uv2.y);
} }
} break; } break;
default: default: