mirror/blockbench
2
0
Fork 0
mirror of https://github.com/JannisX11/blockbench.git synced 2025-01-18 15:26:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix UV export in OBJ and Collada exporter

Browse Source
This commit is contained in:
JannisX11 2023-12-03 20:27:09 +01:00
parent 7a7fd52a77
commit 3d5f11e88b
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/io/formats/collada.js
View File

@ -185,12 +185,14 @@ var codec = new Codec('collada', {
let face = cube.faces[fkey]; let face = cube.faces[fkey];
if (face.texture === null) continue; if (face.texture === null) continue;
normals.push(...cube_face_normals[fkey]); normals.push(...cube_face_normals[fkey]);
let texture = face.getTexture();
let uv_size = [Project.getUVWidth(texture), Project.getUVHeight(texture)];
let uv_outputs = [ let uv_outputs = [
[face.uv[0] / Project.texture_width, 1 - face.uv[1] / Project.texture_height], [face.uv[0] / uv_size[0], 1 - face.uv[1] / uv_size[1]],
[face.uv[2] / Project.texture_width, 1 - face.uv[1] / Project.texture_height], [face.uv[2] / uv_size[0], 1 - face.uv[1] / uv_size[1]],
[face.uv[2] / Project.texture_width, 1 - face.uv[3] / Project.texture_height], [face.uv[2] / uv_size[0], 1 - face.uv[3] / uv_size[1]],
[face.uv[0] / Project.texture_width, 1 - face.uv[3] / Project.texture_height], [face.uv[0] / uv_size[0], 1 - face.uv[3] / uv_size[1]],
]; ];
var rot = face.rotation || 0; var rot = face.rotation || 0;
while (rot > 0) { while (rot > 0) {
@ -382,9 +384,10 @@ var codec = new Codec('collada', {
let face = mesh.faces[key]; let face = mesh.faces[key];
let vertices = face.getSortedVertices(); let vertices = face.getSortedVertices();
let tex = mesh.faces[key].getTexture(); let tex = mesh.faces[key].getTexture();
let uv_size = [Project.getUVWidth(tex), Project.getUVHeight(tex)];
vertices.forEach(vkey => { vertices.forEach(vkey => {
uv.push(face.uv[vkey][0] / Project.texture_width, 1 - face.uv[vkey][1] / Project.texture_height); uv.push(face.uv[vkey][0] / uv_size[0], 1 - face.uv[vkey][1] / uv_size[1]);
}) })
normals.push(...face.getNormal(true)); normals.push(...face.getNormal(true));

13
js/io/formats/obj.js
View File

@ -79,11 +79,13 @@ var codec = new Codec('obj', {
for (let key in element.faces) { for (let key in element.faces) {
if (element.faces[key].texture !== null) { if (element.faces[key].texture !== null) {
let face = element.faces[key]; let face = element.faces[key];
let texture = face.getTexture();
let uv_size = [Project.getUVWidth(texture), Project.getUVHeight(texture)];
let uv_outputs = []; let uv_outputs = [];
uv_outputs.push(`vt ${face.uv[0] / Project.texture_width} ${1 - face.uv[1] / Project.texture_height}`); uv_outputs.push(`vt ${face.uv[0] / uv_size[0]} ${1 - face.uv[1] / uv_size[1]}`);
uv_outputs.push(`vt ${face.uv[2] / Project.texture_width} ${1 - face.uv[1] / Project.texture_height}`); uv_outputs.push(`vt ${face.uv[2] / uv_size[0]} ${1 - face.uv[1] / uv_size[1]}`);
uv_outputs.push(`vt ${face.uv[2] / Project.texture_width} ${1 - face.uv[3] / Project.texture_height}`); uv_outputs.push(`vt ${face.uv[2] / uv_size[0]} ${1 - face.uv[3] / uv_size[1]}`);
uv_outputs.push(`vt ${face.uv[0] / Project.texture_width} ${1 - face.uv[3] / Project.texture_height}`); uv_outputs.push(`vt ${face.uv[0] / uv_size[0]} ${1 - face.uv[3] / uv_size[1]}`);
var rot = face.rotation || 0; var rot = face.rotation || 0;
while (rot > 0) { while (rot > 0) {
uv_outputs.splice(0, 0, uv_outputs.pop()); uv_outputs.splice(0, 0, uv_outputs.pop());
@ -175,9 +177,10 @@ var codec = new Codec('obj', {
let face = element.faces[key]; let face = element.faces[key];
let vertices = face.getSortedVertices().slice(); let vertices = face.getSortedVertices().slice();
let tex = element.faces[key].getTexture(); let tex = element.faces[key].getTexture();
let uv_size = [Project.getUVWidth(tex), Project.getUVHeight(tex)];
vertices.forEach(vkey => { vertices.forEach(vkey => {
output.push(`vt ${face.uv[vkey][0] / Project.texture_width} ${1 - face.uv[vkey][1] / Project.texture_height}`); output.push(`vt ${face.uv[vkey][0] / uv_size[0]} ${1 - face.uv[vkey][1] / uv_size[1]}`);
nbVertexUvs += 1; nbVertexUvs += 1;
}) })