dqn
/
FBX2glTF
mirror of https://github.com/facebookincubator/FBX2glTF.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21 from zellski/feat-default-to-flipped-textures 

Default to vertically flipping texture coordinates.
This commit is contained in:
Pär Winzell 2017-10-22 16:32:50 -07:00 committed by GitHub
parent e0e81404f9 998b7719cb
commit d46aeb3d46
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.cpp
View File

@ -70,7 +70,8 @@ int main(int argc, char *argv[])
"d,draco", "Apply Draco mesh compression to geometries.", "d,draco", "Apply Draco mesh compression to geometries.",
cxxopts::value<bool>(gltfOptions.useDraco)) cxxopts::value<bool>(gltfOptions.useDraco))
("flip-u", "Flip all U texture coordinates.") ("flip-u", "Flip all U texture coordinates.")
("flip-v", "Flip all V texture coordinates.") ("flip-v", "Flip all V texture coordinates (default behaviour!)")
("no-flip-v", "Suppress the default flipping of V texture coordinates")
( (
"khr-materials-common", "(WIP) Use KHR_materials_common extensions to specify Unlit/Lambert/Blinn/Phong shaders.", "khr-materials-common", "(WIP) Use KHR_materials_common extensions to specify Unlit/Lambert/Blinn/Phong shaders.",
cxxopts::value<bool>(gltfOptions.useKHRMatCom)) cxxopts::value<bool>(gltfOptions.useKHRMatCom))
@ -131,7 +132,12 @@ Copyright (c) 2016-2017 Oculus VR, LLC.
texturesTransforms.emplace_back([](Vec2f uv) { return Vec2f(1.0f - uv[0], uv[1]); }); texturesTransforms.emplace_back([](Vec2f uv) { return Vec2f(1.0f - uv[0], uv[1]); });
} }
if (options.count("flip-v") > 0) { if (options.count("flip-v") > 0) {
fmt::printf("Note: The --flip-v command switch is now default behaviour.\n");
}
if (options.count("no-flip-v") == 0) {
texturesTransforms.emplace_back([](Vec2f uv) { return Vec2f(uv[0], 1.0f - uv[1]); }); texturesTransforms.emplace_back([](Vec2f uv) { return Vec2f(uv[0], 1.0f - uv[1]); });
} else if (verboseOutput) {
fmt::printf("Suppressing --flip-v transformation of texture coordinates.\n");
} }
if (options.count("keepAttribute")) { if (options.count("keepAttribute")) {