Doni/ModelHandle
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct line processing.

Browse Source
This commit is contained in:
kovacsv 2023-10-24 20:07:40 +02:00
parent 040ef5aa77
commit 0319fd4b32
3 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/engine/import/importerobj.js
View File

@ -394,7 +394,8 @@ export class ImporterObj extends ImporterBase
let vertices = []; let vertices = [];
for (let i = 0; i < parameters.length; i++) { for (let i = 0; i < parameters.length; i++) {
let vertexIndex = this.GetRelativeIndex (parseInt (parameters[i], 10), this.globalVertices.length); let vertexParams = parameters[i].split ('/');
let vertexIndex = this.GetRelativeIndex (parseInt (vertexParams[0], 10), this.globalVertices.length);
let meshVertexIndex = this.currentMeshConverter.AddVertex (vertexIndex, this.globalVertices); let meshVertexIndex = this.currentMeshConverter.AddVertex (vertexIndex, this.globalVertices);
if (meshVertexIndex === null) { if (meshVertexIndex === null) {
this.SetError ('Invalid vertex index.'); this.SetError ('Invalid vertex index.');

11
test/testfiles/obj/lines_with_vt.obj Normal file
View File

@ -0,0 +1,11 @@
v 0.0 0.0 0.0
v 1.0 0.0 0.0
v 1.0 1.0 0.0
v 0.0 1.0 0.0
v 0.0 0.0 1.0
v 1.0 0.0 1.0
v 1.0 1.0 1.0
v 0.0 1.0 1.0
l 1/1 2/2
l 3/3 4/4
l 5/5 6/6 7/7 8/8 5/5

33
test/tests/importerobj_test.js
View File

@ -685,6 +685,39 @@ describe ('Obj Importer', function () {
}); });
}); });
it ('lines_with_vt.obj', function (done) {
ImportObjFile ('lines_with_vt.obj', function (model) {
assert.ok (OV.CheckModel (model));
assert.deepStrictEqual (ModelToObject (model), {
name : '',
materials : [
{ name : '' }
],
meshes : [
{
name : '',
lines : [
{
vertices : [0, 0, 0, 1, 0, 0],
mat : 0
},
{
vertices : [1, 1, 0, 0, 1, 0],
mat : 0
},
{
vertices : [0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1],
mat : 0
}
],
triangles : []
}
]
});
done ();
});
});
it ('lines_in_meshes.obj', function (done) { it ('lines_in_meshes.obj', function (done) {
ImportObjFile ('lines_in_meshes.obj', function (model) { ImportObjFile ('lines_in_meshes.obj', function (model) {
assert.ok (OV.CheckModel (model)); assert.ok (OV.CheckModel (model));