openharmony/third_party_meshoptimizer
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_meshoptimizer.git synced 2026-07-19 20:03:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #796 from zeux/js-lockfix

Browse Source 
js: Fix vertex_lock support for simplifyWithAttributes
This commit is contained in:
Arseny Kapoulkine
2024-10-24 08:12:31 -07:00
committed by GitHub
parent 7bade0ac62 790e67e709
commit 458922511c
4 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/meshopt_simplifier.js
+2 -1
View File
@@ -278,7 +278,8 @@ var MeshoptSimplifier = (function () {
assert(vertex_attributes instanceof Float32Array);
assert(vertex_attributes.length % vertex_attributes_stride == 0);
assert(vertex_attributes_stride >= 0);
assert(vertex_lock == null || vertex_lock.length == vertex_positions.length);
assert(vertex_lock == null || vertex_lock instanceof Uint8Array);
assert(vertex_lock == null || vertex_lock.length == vertex_positions.length / vertex_positions_stride);
assert(target_index_count >= 0 && target_index_count <= indices.length);
assert(target_index_count % 3 == 0);
assert(target_error >= 0);
js/meshopt_simplifier.module.d.ts
Vendored
+1 -1
View File
@@ -27,7 +27,7 @@ export const MeshoptSimplifier: {
vertex_attributes: Float32Array,
vertex_attributes_stride: number,
attribute_weights: number[],
vertex_lock: boolean[] | null,
vertex_lock: Uint8Array | null,
target_index_count: number,
target_error: number,
flags?: Flags[]
js/meshopt_simplifier.module.js
+2 -1
View File
@@ -277,7 +277,8 @@ var MeshoptSimplifier = (function () {
assert(vertex_attributes instanceof Float32Array);
assert(vertex_attributes.length % vertex_attributes_stride == 0);
assert(vertex_attributes_stride >= 0);
assert(vertex_lock == null || vertex_lock.length == vertex_positions.length);
assert(vertex_lock == null || vertex_lock instanceof Uint8Array);
assert(vertex_lock == null || vertex_lock.length == vertex_positions.length / vertex_positions_stride);
assert(target_index_count >= 0 && target_index_count <= indices.length);
assert(target_index_count % 3 == 0);
assert(target_error >= 0);
js/meshopt_simplifier.test.js
+17
View File
@@ -114,6 +114,23 @@ var tests = {
assert.deepEqual(res[0], expected);
},
simplifyLockFlags: function () {
// 0
// 1 2
// 3 4 5
var indices = new Uint32Array([0, 2, 1, 1, 2, 3, 3, 2, 4, 2, 5, 4]);
var positions = new Float32Array([0, 2, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 2, 0, 0]);
var locks = new Uint8Array([1, 1, 1, 1, 0, 1]); // only vertex 4 can move
var res = simplifier.simplifyWithAttributes(indices, positions, 3, new Float32Array(), 1, [], locks, 3, 0.01);
var expected = new Uint32Array([0, 2, 1, 1, 2, 3, 2, 5, 3]);
assert.deepEqual(res[0], expected);
assert.equal(res[1], 0); // error
},
getScale: function () {
var positions = new Float32Array([0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 3]);