@jscad/modeling 3.0.1-alpha.0 → 3.0.3-alpha.0

package/src/geometries/geom3/fromToCompactBinary.test.js

@@ -1,139 +0,0 @@
-import test from 'ava'
-
-import { fromCompactBinary, toCompactBinary, create, fromPoints } from './index.js'
-
-test('toCompactBinary: converts geom3 (default)', (t) => {
-  const geometry = create()
-  const compacted = toCompactBinary(geometry)
-  const expected = new Float32Array(
-    [
-      1, // type
-      1, 0, 0, 0, // transforms
-      0, 1, 0, 0,
-      0, 0, 1, 0,
-      0, 0, 0, 1,
-      -1, -1, -1, -1, // color
-      0 // number of vertices
-    ]
-  )
-  t.deepEqual(compacted, expected)
-})
-
-test('toCompactBinary: converts geom3 into a compact form', (t) => {
-  // two polygons; 3 vertices, 4 vertices
-  const vertices = [[[0, 0, 0], [1, 0, 0], [2, 0, 2]], [[0, 0, 0], [1, 0, 0], [2, 0, 2], [-3, 0, 3]]]
-  const geometry = fromPoints(vertices)
-  const compacted = toCompactBinary(geometry)
-  const expected = new Float32Array(
-    [
-      1, // type
-      1, 0, 0, 0, // transforms
-      0, 1, 0, 0,
-      0, 0, 1, 0,
-      0, 0, 0, 1,
-      -1, -1, -1, -1, // color
-      7, // number of vertices
-      3, // number of vertices per polygon (2)
-      4,
-      0, 0, 0, // vertices (7)
-      1, 0, 0,
-      2, 0, 2,
-      0, 0, 0,
-      1, 0, 0,
-      2, 0, 2,
-      -3, 0, 3
-    ]
-  )
-
-  t.deepEqual(compacted, expected)
-
-  // test color as well
-  geometry.color = [1, 2, 3, 4]
-  const compacted2 = toCompactBinary(geometry)
-  const expected2 = new Float32Array(
-    [
-      1, // type
-      1, 0, 0, 0, // transforms
-      0, 1, 0, 0,
-      0, 0, 1, 0,
-      0, 0, 0, 1,
-      1, 2, 3, 4, // color
-      7, // number of vertices
-      3, // number of vertices per polygon (2)
-      4,
-      0, 0, 0, // vertices (7)
-      1, 0, 0,
-      2, 0, 2,
-      0, 0, 0,
-      1, 0, 0,
-      2, 0, 2,
-      -3, 0, 3
-    ]
-  )
-
-  t.deepEqual(compacted2, expected2)
-})
-
-test('fromCompactBinary: convert a compact form into a geom3', (t) => {
-  const compactedDefault = [
-    1, // type
-    1, 0, 0, 0, // transforms
-    0, 1, 0, 0,
-    0, 0, 1, 0,
-    0, 0, 0, 1,
-    -1, -1, -1, -1, // color
-    0 // number of vertices
-  ]
-  let expected = create()
-  let geometry = fromCompactBinary(compactedDefault)
-
-  t.deepEqual(geometry, expected)
-
-  const compacted1 = [
-    1, // type
-    1, 0, 0, 0, // transforms
-    0, 1, 0, 0,
-    0, 0, 1, 0,
-    0, 0, 0, 1,
-    -1, -1, -1, -1, // color
-    7, // number of vertices
-    3, // number of vertices per polygon (2)
-    4,
-    0, 0, 0, // vertices (7)
-    1, 0, 0,
-    2, 0, 2,
-    0, 0, 0,
-    1, 0, 0,
-    2, 0, 2,
-    -3, 0, 3
-  ]
-  const vertices = [[[0, 0, 0], [1, 0, 0], [2, 0, 2]], [[0, 0, 0], [1, 0, 0], [2, 0, 2], [-3, 0, 3]]]
-  expected = fromPoints(vertices)
-  geometry = fromCompactBinary(compacted1)
-
-  t.deepEqual(geometry, expected)
-
-  // test color as well
-  const compacted2 = [
-    1, // type
-    1, 0, 0, 0, // transforms
-    0, 1, 0, 0,
-    0, 0, 1, 0,
-    0, 0, 0, 1,
-    4, 5, 6, 7, // color
-    7, // number of vertices
-    3, // number of vertices per polygon (2)
-    4,
-    0, 0, 0, // vertices (7)
-    1, 0, 0,
-    2, 0, 2,
-    0, 0, 0,
-    1, 0, 0,
-    2, 0, 2,
-    -3, 0, 3
-  ]
-  expected.color = [4, 5, 6, 7]
-  geometry = fromCompactBinary(compacted2)
-
-  t.deepEqual(geometry, expected)
-})

package/src/geometries/geom3/toCompactBinary.d.ts

@@ -1,3 +0,0 @@
-import type { Geom3 } from './type.d.ts'
-
-export function toCompactBinary(geom: Geom3): Float32Array

package/src/geometries/geom3/toCompactBinary.js

@@ -1,66 +0,0 @@
-import * as poly3 from '../poly3/index.js'
-
-/**
- * Return the given geometry in compact binary representation.
- * @param {Geom3} geometry - the geometry
- * @return {TypedArray} compact binary representation
- * @alias module:modeling/geometries/geom3.toCompactBinary
- */
-export const toCompactBinary = (geometry) => {
-  const polygons = geometry.polygons
-  const transforms = geometry.transforms
-
-  const numberOfPolygons = polygons.length
-  const numberOfVertices = polygons.reduce((count, polygon) => count + polygon.vertices.length, 0)
-  let color = [-1, -1, -1, -1]
-  if (geometry.color) color = geometry.color
-
-  // FIXME why Float32Array?
-  const compacted = new Float32Array(1 + 16 + 4 + 1 + numberOfPolygons + (numberOfVertices * 3))
-  // type + transforms + color + numberOfPolygons + numberOfVerticesPerPolygon[] + vertices data[]
-
-  compacted[0] = 1 // type code: 0 => geom2, 1 => geom3 , 2 => path2
-
-  compacted[1] = transforms[0]
-  compacted[2] = transforms[1]
-  compacted[3] = transforms[2]
-  compacted[4] = transforms[3]
-  compacted[5] = transforms[4]
-  compacted[6] = transforms[5]
-  compacted[7] = transforms[6]
-  compacted[8] = transforms[7]
-  compacted[9] = transforms[8]
-  compacted[10] = transforms[9]
-  compacted[11] = transforms[10]
-  compacted[12] = transforms[11]
-  compacted[13] = transforms[12]
-  compacted[14] = transforms[13]
-  compacted[15] = transforms[14]
-  compacted[16] = transforms[15]
-
-  compacted[17] = color[0]
-  compacted[18] = color[1]
-  compacted[19] = color[2]
-  compacted[20] = color[3]
-
-  compacted[21] = numberOfVertices
-
-  let ci = 22
-  let vi = ci + numberOfPolygons
-  polygons.forEach((polygon) => {
-    const vertices = poly3.toVertices(polygon)
-    // record the number of vertices per polygon
-    compacted[ci] = vertices.length
-    ci++
-    // convert the vertices
-    for (let i = 0; i < vertices.length; i++) {
-      const vertex = vertices[i]
-      compacted[vi + 0] = vertex[0]
-      compacted[vi + 1] = vertex[1]
-      compacted[vi + 2] = vertex[2]
-      vi += 3
-    }
-  })
-  // TODO: how about custom properties or fields ?
-  return compacted
-}

package/src/geometries/path2/fromCompactBinary.d.ts

@@ -1,3 +0,0 @@
-import type { Path2 } from './type.d.ts'
-
-export function fromCompactBinary(data: Array<number> | Float32Array | Float64Array): Path2

package/src/geometries/path2/fromCompactBinary.js

@@ -1,31 +0,0 @@
-import * as mat4 from '../../maths/mat4/index.js'
-import * as vec2 from '../../maths/vec2/index.js'
-
-import { create } from './create.js'
-
-/**
- * Create a new path from the given compact binary data.
- * @param {TypedArray} data - compact binary data
- * @returns {Path2} a new path
- * @alias module:modeling/geometries/path2.fromCompactBinary
- */
-export const fromCompactBinary = (data) => {
-  if (data[0] !== 2) throw new Error('invalid compact binary data')
-
-  const created = create()
-
-  created.transforms = mat4.clone(data.slice(1, 17))
-
-  created.isClosed = !!data[17]
-
-  for (let i = 22; i < data.length; i += 2) {
-    const point = vec2.fromValues(data[i], data[i + 1])
-    created.points.push(point)
-  }
-  // transfer known properties, i.e. color
-  if (data[18] >= 0) {
-    created.color = [data[18], data[19], data[20], data[21]]
-  }
-  // TODO: how about custom properties or fields ?
-  return created
-}

package/src/geometries/path2/fromToCompactBinary.test.js

@@ -1,114 +0,0 @@
-import test from 'ava'
-
-import { fromCompactBinary, toCompactBinary, create, fromPoints } from './index.js'
-
-test('toCompactBinary: converts path2 into a compact form', (t) => {
-  const geometry1 = create()
-  const compacted1 = toCompactBinary(geometry1)
-  const expected1 = new Float32Array(
-    [
-      2, // type
-      1, 0, 0, 0, // transforms
-      0, 1, 0, 0,
-      0, 0, 1, 0,
-      0, 0, 0, 1,
-      0, // isClosed
-      -1, -1, -1, -1 // color
-    ]
-  )
-
-  t.deepEqual(compacted1, expected1)
-
-  const points = [[0, 0], [1, 0], [0, 1]]
-  const geometry2 = fromPoints({ closed: true }, points)
-  const compacted2 = toCompactBinary(geometry2)
-  const expected2 = new Float32Array(
-    [
-      2, // type
-      1, 0, 0, 0, // transforms
-      0, 1, 0, 0,
-      0, 0, 1, 0,
-      0, 0, 0, 1,
-      1, // closed/open flag
-      -1, -1, -1, -1, // color
-      0, 0, // points
-      1, 0,
-      0, 1
-    ]
-  )
-
-  t.deepEqual(compacted2, expected2)
-
-  // test color as well
-  geometry2.color = [1, 2, 3, 4]
-  const compacted3 = toCompactBinary(geometry2)
-  const expected3 = new Float32Array(
-    [
-      2, // type
-      1, 0, 0, 0, // transforms
-      0, 1, 0, 0,
-      0, 0, 1, 0,
-      0, 0, 0, 1,
-      1, // closed/open flag
-      1, 2, 3, 4, // color
-      0, 0, // points
-      1, 0,
-      0, 1
-    ]
-  )
-
-  t.deepEqual(compacted3, expected3)
-})
-
-test('fromCompactBinary: convert a compact form into a path2', (t) => {
-  const compacted1 = [
-    2, // type
-    1, 0, 0, 0, // transforms
-    0, 1, 0, 0,
-    0, 0, 1, 0,
-    0, 0, 0, 1,
-    0, // isClosed
-    -1, -1, -1, -1 // color
-  ]
-  const expected1 = create()
-  const geometry1 = fromCompactBinary(compacted1)
-
-  t.deepEqual(geometry1, expected1)
-
-  const compacted2 = [
-    2, // type
-    1, 0, 0, 0, // transforms
-    0, 1, 0, 0,
-    0, 0, 1, 0,
-    0, 0, 0, 1,
-    1, // closed/open flag
-    -1, -1, -1, -1, // color
-    0, 0, // points
-    1, 0,
-    0, 1
-  ]
-  const points = [[0, 0], [1, 0], [0, 1]]
-  const expected2 = fromPoints({ closed: true }, points)
-  const geometry2 = fromCompactBinary(compacted2)
-
-  t.deepEqual(geometry2, expected2)
-
-  // test color as well
-  const compacted3 = [
-    2, // type
-    1, 0, 0, 0, // transforms
-    0, 1, 0, 0,
-    0, 0, 1, 0,
-    0, 0, 0, 1,
-    1, // closed/open flag
-    5, 6, 7, 8, // color
-    0, 0, // points
-    1, 0,
-    0, 1
-  ]
-  const expected3 = fromPoints({ closed: true }, points)
-  expected3.color = [5, 6, 7, 8]
-  const geometry3 = fromCompactBinary(compacted3)
-
-  t.deepEqual(geometry3, expected3)
-})

package/src/geometries/path2/toCompactBinary.d.ts

@@ -1,3 +0,0 @@
-import type { Path2 } from './type.d.ts'
-
-export function toCompactBinary(geometry: Path2): Float32Array

package/src/geometries/path2/toCompactBinary.js

@@ -1,50 +0,0 @@
-/**
- * Produce a compact binary representation from the given path.
- * @param {Path2} geometry - the path geometry
- * @returns {TypedArray} compact binary representation
- * @alias module:modeling/geometries/path2.toCompactBinary
- */
-export const toCompactBinary = (geometry) => {
-  const points = geometry.points
-  const transforms = geometry.transforms
-  let color = [-1, -1, -1, -1]
-  if (geometry.color) color = geometry.color
-
-  // FIXME why Float32Array?
-  const compacted = new Float32Array(1 + 16 + 1 + 4 + (points.length * 2)) // type + transforms + isClosed + color + points data
-
-  compacted[0] = 2 // type code: 0 => geom2, 1 => geom3 , 2 => path2
-
-  compacted[1] = transforms[0]
-  compacted[2] = transforms[1]
-  compacted[3] = transforms[2]
-  compacted[4] = transforms[3]
-  compacted[5] = transforms[4]
-  compacted[6] = transforms[5]
-  compacted[7] = transforms[6]
-  compacted[8] = transforms[7]
-  compacted[9] = transforms[8]
-  compacted[10] = transforms[9]
-  compacted[11] = transforms[10]
-  compacted[12] = transforms[11]
-  compacted[13] = transforms[12]
-  compacted[14] = transforms[13]
-  compacted[15] = transforms[14]
-  compacted[16] = transforms[15]
-
-  compacted[17] = geometry.isClosed ? 1 : 0
-
-  compacted[18] = color[0]
-  compacted[19] = color[1]
-  compacted[20] = color[2]
-  compacted[21] = color[3]
-
-  for (let j = 0; j < points.length; j++) {
-    const ci = j * 2 + 22
-    const point = points[j]
-    compacted[ci] = point[0]
-    compacted[ci + 1] = point[1]
-  }
-  // TODO: how about custom properties or fields ?
-  return compacted
-}