djsundog
/
obj2gltf
mirror of https://github.com/CesiumGS/obj2gltf.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reset vertex count properly

This commit is contained in:
Sean Lilley 2018-10-10 18:27:56 -04:00
parent 0197ffa15f
commit a87087b0dd
4 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.md
View File

@ -1,6 +1,10 @@
Change Log Change Log
========== ==========
### 2.3.1 2018-10-11
* Fixed handling of objs with interleaved materials. [#155](https://github.com/AnalyticalGraphicsInc/obj2gltf/pull/155)
### 2.3.0 2018-09-19 ### 2.3.0 2018-09-19
* Fixed handling of objs with mismatching attribute layouts. [#153](https://github.com/AnalyticalGraphicsInc/obj2gltf/pull/153) * Fixed handling of objs with mismatching attribute layouts. [#153](https://github.com/AnalyticalGraphicsInc/obj2gltf/pull/153)

1
lib/loadObj.js
View File

@ -135,6 +135,7 @@ function loadObj(objPath, options) {
for (var i = 0; i < primitivesLength; ++i) { for (var i = 0; i < primitivesLength; ++i) {
if (primitives[i].material === material) { if (primitives[i].material === material) {
primitive = primitives[i]; primitive = primitives[i];
vertexCount = primitive.positions.length / 3;
return; return;
} }
} }

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "obj2gltf", "name": "obj2gltf",
"version": "2.3.0", "version": "2.3.1",
"description": "Convert OBJ model format to glTF", "description": "Convert OBJ model format to glTF",
"license": "Apache-2.0", "license": "Apache-2.0",
"contributors": [ "contributors": [

8
specs/lib/loadObjSpec.js
View File

@ -309,6 +309,14 @@ describe('loadObj', function() {
expect(primitives[0].material).toBe('Red'); expect(primitives[0].material).toBe('Red');
expect(primitives[1].material).toBe('Green'); expect(primitives[1].material).toBe('Green');
expect(primitives[2].material).toBe('Blue'); expect(primitives[2].material).toBe('Blue');
var expectedIndices = [0, 1, 2, 0, 2, 3, 4, 5, 6, 4, 6, 7];
var length = expectedIndices.length;
for (var i = 0; i < 3; ++i) {
for (var j = 0; j < length; ++j) {
expect(primitives[i].indices.get(j)).toBe(expectedIndices[j]);
}
}
}), done).toResolve(); }), done).toResolve();
}); });