benkyd/tinyobjloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:syoyo/tinyobjloader into develop

Browse Source
This commit is contained in:
Syoyo Fujita
2016-08-12 20:40:16 +09:00
parent 673501749f b56fc1a0cc
commit 156b47760d
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
appveyor.yml
View File

@@ -7,7 +7,6 @@ install:
# All external dependencies are installed in C:\projects\deps # All external dependencies are installed in C:\projects\deps
####################################################################################### #######################################################################################
- mkdir C:\projects\deps - mkdir C:\projects\deps
- pushd C:\projects\deps
####################################################################################### #######################################################################################
# Install Ninja # Install Ninja
@@ -17,7 +16,6 @@ install:
- 7z x ninja.zip -oC:\projects\deps\ninja > nul - 7z x ninja.zip -oC:\projects\deps\ninja > nul
- set PATH=C:\projects\deps\ninja;%PATH% - set PATH=C:\projects\deps\ninja;%PATH%
- ninja --version - ninja --version
- popd
build_script: build_script:
- cd tests - cd tests

25
experimental/viewer.cc
View File

@@ -271,16 +271,21 @@ bool LoadObjAndConvert(float bmin[3], float bmax[3], const char* filename, int n
int f0 = idx0.vn_idx; int f0 = idx0.vn_idx;
int f1 = idx1.vn_idx; int f1 = idx1.vn_idx;
int f2 = idx2.vn_idx; int f2 = idx2.vn_idx;
assert(f0 >= 0);
assert(f1 >= 0); if (f0 >= 0 && f1 >= 0 && f2 >= 0) {
assert(f2 >= 0); assert(3*f0+2 < attrib.normals.size());
assert(3*f0+2 < attrib.normals.size()); assert(3*f1+2 < attrib.normals.size());
assert(3*f1+2 < attrib.normals.size()); assert(3*f2+2 < attrib.normals.size());
assert(3*f2+2 < attrib.normals.size()); for (int k = 0; k < 3; k++) {
for (int k = 0; k < 3; k++) { n[0][k] = attrib.normals[3*f0+k];
n[0][k] = attrib.normals[3*f0+k]; n[1][k] = attrib.normals[3*f1+k];
n[1][k] = attrib.normals[3*f1+k]; n[2][k] = attrib.normals[3*f2+k];
n[2][k] = attrib.normals[3*f2+k]; }
} else {
// compute geometric normal
CalcNormal(n[0], v[0], v[1], v[2]);
n[1][0] = n[0][0]; n[1][1] = n[0][1]; n[1][2] = n[0][2];
n[2][0] = n[0][0]; n[2][1] = n[0][1]; n[2][2] = n[0][2];
} }
} else { } else {
// compute geometric normal // compute geometric normal