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

Fix the loading of normals by putting them into facevarying order

Browse Source 
Signed-off by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
This commit is contained in:
Arthur Brainville (Ybalrid) 2018-02-24 21:52:53 +01:00
parent 0da2b35085
commit 8eb0fbb3d4
No known key found for this signature in database
GPG Key ID: BC05C4812A06BCF3
2 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,10 +5,7 @@
#define TINYGLTF_IMPLEMENTATION #define TINYGLTF_IMPLEMENTATION
#include <tiny_gltf.h> #include <tiny_gltf.h>
using std::out_of_range;
namespace example { namespace example {
static std::string GetFilePathExtension(const std::string &FileName) { static std::string GetFilePathExtension(const std::string &FileName) {
if (FileName.find_last_of(".") != std::string::npos) if (FileName.find_last_of(".") != std::string::npos)
return FileName.substr(FileName.find_last_of(".") + 1); return FileName.substr(FileName.find_last_of(".") + 1);
@ -157,6 +154,7 @@ bool LoadGLTF(const std::string &filename, float scale,
std::cout << "current attribute has count " << count std::cout << "current attribute has count " << count
<< " and stride " << byte_stride << " bytes\n"; << " and stride " << byte_stride << " bytes\n";
std::cout << "attribute string is : " << attribute.first << '\n';
if (attribute.first == "POSITION") { if (attribute.first == "POSITION") {
std::cout << "found position attribute\n"; std::cout << "found position attribute\n";
@ -231,14 +229,33 @@ bool LoadGLTF(const std::string &filename, float scale,
std::cout << "normal vec3\n"; std::cout << "normal vec3\n";
v3fArray normals( v3fArray normals(
arrayAdapter<v3f>(dataPtr, count, byte_stride)); arrayAdapter<v3f>(dataPtr, count, byte_stride));
for (size_t i{0}; i < normals.size(); ++i) {
const auto v = normals[i];
std::cout << '(' << v.x << ", " << v.y << ", " << v.z
<< ")\n";
loadedMesh.facevarying_normals.push_back(v.x); // IMPORTANT: We need to reorder normals (and texture
loadedMesh.facevarying_normals.push_back(v.y); // coordinates into "facevarying" order) for each face
loadedMesh.facevarying_normals.push_back(v.z); for (size_t i{0}; i < indices.size() / 3; ++i) {
// 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];
// get the 3 normal vectors for that face
v3f n0, n1, n2;
n0 = normals[f0];
n1 = normals[f1];
n2 = normals[f2];
std::cout << "got the 3 normals!\n";
// Put them in the array in the correct order
loadedMesh.facevarying_normals.push_back(n0.x);
loadedMesh.facevarying_normals.push_back(n0.y);
loadedMesh.facevarying_normals.push_back(n0.z);
loadedMesh.facevarying_normals.push_back(n1.x);
loadedMesh.facevarying_normals.push_back(n1.y);
loadedMesh.facevarying_normals.push_back(n2.z);
loadedMesh.facevarying_normals.push_back(n2.x);
loadedMesh.facevarying_normals.push_back(n2.y);
loadedMesh.facevarying_normals.push_back(n2.z);
} }
} break; } break;
case TINYGLTF_TYPE_VEC4: case TINYGLTF_TYPE_VEC4:
@ -254,6 +271,7 @@ bool LoadGLTF(const std::string &filename, float scale,
} }
} }
// TODO (Ybalrid) : need to order the UVs into facevarying order
if (attribute.first == "TEXCOORD_0") { if (attribute.first == "TEXCOORD_0") {
std::cout << "Found texture coordinates\n"; std::cout << "Found texture coordinates\n";
@ -265,7 +283,8 @@ bool LoadGLTF(const std::string &filename, float scale,
arrayAdapter<v2f>(dataPtr, count, byte_stride)); arrayAdapter<v2f>(dataPtr, count, byte_stride));
for (size_t i{0}; i < uvs.size(); ++i) { for (size_t i{0}; i < uvs.size(); ++i) {
const auto v = uvs[i]; const auto v = uvs[i];
std::cout << '(' << v.x << ", " << v.y << ")\n"; std::cout << "uvs[" << i << "] (" << v.x << ", " << v.y
<< ")\n";
loadedMesh.facevarying_uvs.push_back(v.x); loadedMesh.facevarying_uvs.push_back(v.x);
loadedMesh.facevarying_uvs.push_back(v.y); loadedMesh.facevarying_uvs.push_back(v.y);
@ -276,7 +295,8 @@ bool LoadGLTF(const std::string &filename, float scale,
arrayAdapter<v2d>(dataPtr, count, byte_stride)); arrayAdapter<v2d>(dataPtr, count, byte_stride));
for (size_t i{0}; i < uvs.size(); ++i) { for (size_t i{0}; i < uvs.size(); ++i) {
const auto v = uvs[i]; const auto v = uvs[i];
std::cout << '(' << v.x << ", " << v.y << ")\n"; std::cout << "uvs[" << i << "] (" << v.x << ", " << v.y
<< ")\n";
loadedMesh.facevarying_uvs.push_back(v.x); loadedMesh.facevarying_uvs.push_back(v.x);
loadedMesh.facevarying_uvs.push_back(v.y); loadedMesh.facevarying_uvs.push_back(v.y);
@ -350,7 +370,7 @@ bool LoadGLTF(const std::string &filename, float scale,
meshes->push_back(loadedMesh); meshes->push_back(loadedMesh);
ret = true; ret = true;
} }
// std::cerr << "LoadGLTF() function is not yet implemented!" << std::endl;
return ret; return ret;
} } // namespace example
} // namespace example } // namespace example

5
examples/raytrace/gltf-loader.h
View File

@ -32,7 +32,10 @@ struct arrayAdapter {
T operator[](size_t pos) const { T operator[](size_t pos) const {
if (pos >= elemCount) if (pos >= elemCount)
throw std::out_of_range( throw std::out_of_range(
"Tried to access beyond the last element of an array adapter"); "Tried to access beyond the last element of an array adapter with "
"count " +
std::to_string(elemCount) + " while getting elemnet number " +
std::to_string(pos));
return *(reinterpret_cast<const T *>(dataPtr + pos * stride)); return *(reinterpret_cast<const T *>(dataPtr + pos * stride));
} }
}; };