@tolokoban/tgd 2.0.20 → 2.0.23

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (319) hide show
  1. package/lib/dist/buffer/buffer.js +2 -2
  2. package/lib/dist/camera/camera-node.d.ts +2 -2
  3. package/lib/dist/camera/camera-node.d.ts.map +1 -1
  4. package/lib/dist/camera/camera-node.js +4 -4
  5. package/lib/dist/camera/camera-orthographic.d.ts.map +1 -1
  6. package/lib/dist/camera/camera-orthographic.js +6 -5
  7. package/lib/dist/camera/camera-perspective.d.ts.map +1 -1
  8. package/lib/dist/camera/camera-perspective.js +12 -31
  9. package/lib/dist/camera/camera.d.ts +10 -61
  10. package/lib/dist/camera/camera.d.ts.map +1 -1
  11. package/lib/dist/camera/camera.js +21 -259
  12. package/lib/dist/camera/index.d.ts +0 -1
  13. package/lib/dist/camera/index.d.ts.map +1 -1
  14. package/lib/dist/camera/index.js +1 -2
  15. package/lib/dist/canvas/gizmo/gizmo.d.ts.map +1 -1
  16. package/lib/dist/canvas/gizmo/gizmo.js +19 -21
  17. package/lib/dist/canvas/gizmo/painter/tips.js +16 -16
  18. package/lib/dist/code/color.d.ts +12 -0
  19. package/lib/dist/code/color.d.ts.map +1 -0
  20. package/lib/dist/code/color.js +26 -0
  21. package/lib/dist/code/consts.d.ts +16 -0
  22. package/lib/dist/code/consts.d.ts.map +1 -0
  23. package/lib/dist/code/consts.js +20 -0
  24. package/lib/dist/code/coords.d.ts +46 -0
  25. package/lib/dist/code/coords.d.ts.map +1 -0
  26. package/lib/dist/code/coords.js +95 -0
  27. package/lib/dist/code/index.d.ts +6 -0
  28. package/lib/dist/code/index.d.ts.map +1 -0
  29. package/lib/dist/code/index.js +6 -0
  30. package/lib/dist/code/random.d.ts +8 -0
  31. package/lib/dist/code/random.d.ts.map +1 -0
  32. package/lib/dist/code/random.js +13 -0
  33. package/lib/dist/code/transfo.d.ts +8 -0
  34. package/lib/dist/code/transfo.d.ts.map +1 -0
  35. package/lib/dist/code/transfo.js +19 -0
  36. package/lib/dist/color/color.js +10 -10
  37. package/lib/dist/context/animation/animation-manager.js +3 -3
  38. package/lib/dist/context/context.d.ts +6 -0
  39. package/lib/dist/context/context.d.ts.map +1 -1
  40. package/lib/dist/context/context.js +44 -25
  41. package/lib/dist/controller/camera/orbit.d.ts +10 -2
  42. package/lib/dist/controller/camera/orbit.d.ts.map +1 -1
  43. package/lib/dist/controller/camera/orbit.js +70 -57
  44. package/lib/dist/dataset/dataset.d.ts.map +1 -1
  45. package/lib/dist/dataset/dataset.js +61 -56
  46. package/lib/dist/debug/debug.d.ts +1 -1
  47. package/lib/dist/debug/debug.d.ts.map +1 -1
  48. package/lib/dist/debug/debug.js +3 -3
  49. package/lib/dist/debug/tools.js +3 -3
  50. package/lib/dist/event/event.js +3 -2
  51. package/lib/dist/filter/blur.d.ts.map +1 -1
  52. package/lib/dist/filter/blur.js +9 -8
  53. package/lib/dist/filter/filter.d.ts.map +1 -1
  54. package/lib/dist/filter/hue-rotation.d.ts.map +1 -1
  55. package/lib/dist/filter/zoom.d.ts.map +1 -1
  56. package/lib/dist/geometry/box.d.ts +2 -1
  57. package/lib/dist/geometry/box.d.ts.map +1 -1
  58. package/lib/dist/geometry/box.js +103 -115
  59. package/lib/dist/geometry/geometry.d.ts.map +1 -1
  60. package/lib/dist/geometry/geometry.js +33 -35
  61. package/lib/dist/index.d.ts +2 -0
  62. package/lib/dist/index.d.ts.map +1 -1
  63. package/lib/dist/index.js +3 -1
  64. package/lib/dist/input/keyboard.js +8 -8
  65. package/lib/dist/input/pointer.d.ts.map +1 -1
  66. package/lib/dist/input/pointer.js +30 -33
  67. package/lib/dist/interface/transformable.d.ts +7 -1
  68. package/lib/dist/interface/transformable.d.ts.map +1 -1
  69. package/lib/dist/loader/asset.js +2 -2
  70. package/lib/dist/loader/binary.js +6 -6
  71. package/lib/dist/loader/image.js +9 -9
  72. package/lib/dist/loader/index.d.ts +1 -0
  73. package/lib/dist/loader/index.d.ts.map +1 -1
  74. package/lib/dist/loader/index.js +2 -1
  75. package/lib/dist/loader/video.d.ts +6 -0
  76. package/lib/dist/loader/video.d.ts.map +1 -0
  77. package/lib/dist/loader/video.js +23 -0
  78. package/lib/dist/log.d.ts +1 -1
  79. package/lib/dist/log.d.ts.map +1 -1
  80. package/lib/dist/log.js +13 -13
  81. package/lib/dist/material/diffuse.d.ts +2 -2
  82. package/lib/dist/material/diffuse.d.ts.map +1 -1
  83. package/lib/dist/material/diffuse.js +6 -5
  84. package/lib/dist/math/common.test.d.ts +2 -0
  85. package/lib/dist/math/common.test.d.ts.map +1 -0
  86. package/lib/dist/math/common.test.js +22 -0
  87. package/lib/dist/math/index.d.ts +0 -1
  88. package/lib/dist/math/index.d.ts.map +1 -1
  89. package/lib/dist/math/index.js +1 -2
  90. package/lib/dist/math/mat3.d.ts +40 -16
  91. package/lib/dist/math/mat3.d.ts.map +1 -1
  92. package/lib/dist/math/mat3.js +124 -97
  93. package/lib/dist/math/mat3.test.d.ts +2 -0
  94. package/lib/dist/math/mat3.test.d.ts.map +1 -0
  95. package/lib/dist/math/mat3.test.js +32 -0
  96. package/lib/dist/math/mat4.d.ts +54 -121
  97. package/lib/dist/math/mat4.d.ts.map +1 -1
  98. package/lib/dist/math/mat4.js +167 -288
  99. package/lib/dist/math/quat.d.ts +6 -3
  100. package/lib/dist/math/quat.d.ts.map +1 -1
  101. package/lib/dist/math/quat.js +41 -72
  102. package/lib/dist/math/quat.test.d.ts +1 -0
  103. package/lib/dist/math/quat.test.d.ts.map +1 -1
  104. package/lib/dist/math/quat.test.js +81 -27
  105. package/lib/dist/math/transfo.d.ts +32 -5
  106. package/lib/dist/math/transfo.d.ts.map +1 -1
  107. package/lib/dist/math/transfo.js +126 -39
  108. package/lib/dist/math/vec2.js +6 -6
  109. package/lib/dist/math/vec3.d.ts +11 -3
  110. package/lib/dist/math/vec3.d.ts.map +1 -1
  111. package/lib/dist/math/vec3.js +30 -17
  112. package/lib/dist/math/vec3.test.js +20 -1
  113. package/lib/dist/math/vec4.d.ts +12 -3
  114. package/lib/dist/math/vec4.d.ts.map +1 -1
  115. package/lib/dist/math/vec4.js +29 -11
  116. package/lib/dist/painter/{axis/axis.d.ts → axes/axes.d.ts} +4 -4
  117. package/lib/dist/painter/{axis/axis.d.ts.map → axes/axes.d.ts.map} +1 -1
  118. package/lib/dist/painter/{axis/axis.frag → axes/axes.frag} +0 -0
  119. package/lib/dist/painter/axes/axes.js +82 -0
  120. package/lib/dist/painter/{axis/axis.vert → axes/axes.vert} +0 -0
  121. package/lib/dist/painter/axes/index.d.ts +2 -0
  122. package/lib/dist/painter/axes/index.d.ts.map +1 -0
  123. package/lib/dist/painter/axes/index.js +2 -0
  124. package/lib/dist/painter/background/background.d.ts +3 -2
  125. package/lib/dist/painter/background/background.d.ts.map +1 -1
  126. package/lib/dist/painter/background/background.js +4 -4
  127. package/lib/dist/painter/clear.js +3 -4
  128. package/lib/dist/painter/debug/stencil/stencil.js +2 -2
  129. package/lib/dist/painter/depth.d.ts +4 -4
  130. package/lib/dist/painter/depth.d.ts.map +1 -1
  131. package/lib/dist/painter/depth.js +3 -3
  132. package/lib/dist/painter/filter/filter.d.ts +2 -2
  133. package/lib/dist/painter/filter/filter.d.ts.map +1 -1
  134. package/lib/dist/painter/filter/filter.js +33 -24
  135. package/lib/dist/painter/framebuffer.d.ts +6 -3
  136. package/lib/dist/painter/framebuffer.d.ts.map +1 -1
  137. package/lib/dist/painter/framebuffer.js +34 -27
  138. package/lib/dist/painter/group.js +6 -5
  139. package/lib/dist/painter/index.d.ts +1 -1
  140. package/lib/dist/painter/index.js +1 -1
  141. package/lib/dist/painter/mesh/mesh/mesh.d.ts +6 -5
  142. package/lib/dist/painter/mesh/mesh/mesh.d.ts.map +1 -1
  143. package/lib/dist/painter/mesh/mesh/mesh.js +27 -13
  144. package/lib/dist/painter/mesh/normals/normals.d.ts.map +1 -1
  145. package/lib/dist/painter/mesh/normals/normals.js +4 -4
  146. package/lib/dist/painter/node/node.d.ts +38 -15
  147. package/lib/dist/painter/node/node.d.ts.map +1 -1
  148. package/lib/dist/painter/node/node.js +60 -42
  149. package/lib/dist/painter/segments/segments.js +13 -13
  150. package/lib/dist/painter/skybox/skybox.d.ts +4 -0
  151. package/lib/dist/painter/skybox/skybox.d.ts.map +1 -1
  152. package/lib/dist/painter/skybox/skybox.frag +1 -2
  153. package/lib/dist/painter/skybox/skybox.js +9 -11
  154. package/lib/dist/painter/skybox/skybox.vert +6 -2
  155. package/lib/dist/painter/state/state.d.ts +4 -6
  156. package/lib/dist/painter/state/state.d.ts.map +1 -1
  157. package/lib/dist/painter/state/state.js +83 -61
  158. package/lib/dist/parser/for-each-line.d.ts.map +1 -1
  159. package/lib/dist/parser/for-each-line.js +5 -5
  160. package/lib/dist/parser/gltf/gltf.d.ts.map +1 -1
  161. package/lib/dist/parser/gltf/gltf.js +37 -37
  162. package/lib/dist/parser/gltf/parser.js +10 -11
  163. package/lib/dist/parser/mesh/wavefront.d.ts.map +1 -1
  164. package/lib/dist/parser/mesh/wavefront.js +18 -26
  165. package/lib/dist/program/program.d.ts +2 -4
  166. package/lib/dist/program/program.d.ts.map +1 -1
  167. package/lib/dist/program/program.js +26 -27
  168. package/lib/dist/{utils/ref-map.d.ts → reference-map.d.ts} +4 -4
  169. package/lib/dist/reference-map.d.ts.map +1 -0
  170. package/lib/dist/reference-map.js +52 -0
  171. package/lib/dist/shader/code.d.ts +2 -2
  172. package/lib/dist/shader/code.d.ts.map +1 -1
  173. package/lib/dist/shader/code.js +12 -12
  174. package/lib/dist/shader/fragment.js +6 -6
  175. package/lib/dist/shader/vertex.js +6 -6
  176. package/lib/dist/table/table.d.ts.map +1 -1
  177. package/lib/dist/table/table.js +7 -4
  178. package/lib/dist/texture/index.d.ts +1 -1
  179. package/lib/dist/texture/index.d.ts.map +1 -1
  180. package/lib/dist/texture/index.js +2 -2
  181. package/lib/dist/texture/{textureCube.d.ts → texture-cube.d.ts} +1 -1
  182. package/lib/dist/texture/texture-cube.d.ts.map +1 -0
  183. package/lib/dist/texture/texture-cube.js +69 -0
  184. package/lib/dist/texture/texture2d.d.ts +6 -3
  185. package/lib/dist/texture/texture2d.d.ts.map +1 -1
  186. package/lib/dist/texture/texture2d.js +30 -12
  187. package/lib/dist/types/elements.js +2 -2
  188. package/lib/dist/types/guards.d.ts.map +1 -1
  189. package/lib/dist/types/guards.js +36 -37
  190. package/lib/dist/types/index.d.ts +1 -1
  191. package/lib/dist/types/index.d.ts.map +1 -1
  192. package/lib/dist/types/index.js +2 -2
  193. package/lib/dist/types/{textureCube.d.ts → texture-cube.d.ts} +1 -1
  194. package/lib/dist/types/texture-cube.d.ts.map +1 -0
  195. package/lib/dist/types/texture-cube.js +2 -0
  196. package/lib/dist/types/webgl.d.ts +5 -4
  197. package/lib/dist/types/webgl.d.ts.map +1 -1
  198. package/lib/dist/types/webgl.js +37 -30
  199. package/lib/dist/utils/action/camera.d.ts.map +1 -1
  200. package/lib/dist/utils/action/camera.js +15 -26
  201. package/lib/dist/utils/action/transfo.d.ts +3 -0
  202. package/lib/dist/utils/action/transfo.d.ts.map +1 -0
  203. package/lib/dist/utils/action/transfo.js +18 -0
  204. package/lib/dist/utils/action/vector.d.ts.map +1 -1
  205. package/lib/dist/utils/action/vector.js +11 -11
  206. package/lib/dist/utils/assert.d.ts.map +1 -1
  207. package/lib/dist/utils/assert.js +2 -2
  208. package/lib/dist/utils/bbox.test.js +18 -19
  209. package/lib/dist/utils/canvas.d.ts +3 -3
  210. package/lib/dist/utils/canvas.d.ts.map +1 -1
  211. package/lib/dist/utils/canvas.js +14 -14
  212. package/lib/dist/utils/{ease-func/ease-func.d.ts → easing-function/easing-function.d.ts} +1 -1
  213. package/lib/dist/utils/easing-function/easing-function.d.ts.map +1 -0
  214. package/lib/dist/utils/easing-function/easing-function.js +142 -0
  215. package/lib/dist/utils/easing-function/index.d.ts +2 -0
  216. package/lib/dist/utils/easing-function/index.d.ts.map +1 -0
  217. package/lib/dist/utils/easing-function/index.js +2 -0
  218. package/lib/dist/utils/framebuffer.js +2 -2
  219. package/lib/dist/utils/fullscreen.d.ts +1 -1
  220. package/lib/dist/utils/fullscreen.d.ts.map +1 -1
  221. package/lib/dist/utils/fullscreen.js +19 -19
  222. package/lib/dist/utils/index.d.ts +2 -1
  223. package/lib/dist/utils/index.d.ts.map +1 -1
  224. package/lib/dist/utils/index.js +3 -2
  225. package/lib/dist/utils/math.d.ts +4 -2
  226. package/lib/dist/utils/math.d.ts.map +1 -1
  227. package/lib/dist/utils/math.js +12 -4
  228. package/lib/dist/utils/pbo.d.ts.map +1 -1
  229. package/lib/dist/utils/pbo.js +3 -3
  230. package/lib/dist/{ref-map.d.ts → utils/reference-map.d.ts} +4 -4
  231. package/lib/dist/utils/reference-map.d.ts.map +1 -0
  232. package/lib/dist/utils/reference-map.js +52 -0
  233. package/lib/dist/utils/state/blend.d.ts +5 -5
  234. package/lib/dist/utils/state/blend.d.ts.map +1 -1
  235. package/lib/dist/utils/state/blend.js +10 -10
  236. package/lib/dist/utils/state/depth.d.ts +2 -2
  237. package/lib/dist/utils/state/depth.d.ts.map +1 -1
  238. package/lib/dist/utils/state/depth.js +5 -5
  239. package/lib/dist/utils/state/stencil.js +9 -9
  240. package/lib/dist/utils/template.js +3 -3
  241. package/lib/dist/utils/webgl.js +5 -5
  242. package/lib/dist/vao/vao.d.ts.map +1 -1
  243. package/lib/dist/vao/vao.js +13 -9
  244. package/lib/dist/webgl/texture/texture2d.js +2 -2
  245. package/package.json +1 -1
  246. package/lib/dist/geometry/place.d.ts +0 -12
  247. package/lib/dist/geometry/place.d.ts.map +0 -1
  248. package/lib/dist/geometry/place.js +0 -145
  249. package/lib/dist/math/math.d.ts +0 -9
  250. package/lib/dist/math/math.d.ts.map +0 -1
  251. package/lib/dist/math/math.js +0 -13
  252. package/lib/dist/painter/axis/axis.js +0 -82
  253. package/lib/dist/painter/axis/index.d.ts +0 -2
  254. package/lib/dist/painter/axis/index.d.ts.map +0 -1
  255. package/lib/dist/painter/axis/index.js +0 -2
  256. package/lib/dist/painter/debug/stencil.d.ts +0 -11
  257. package/lib/dist/painter/debug/stencil.d.ts.map +0 -1
  258. package/lib/dist/painter/debug/stencil.js +0 -41
  259. package/lib/dist/painter/framebuffer-old.d.ts +0 -38
  260. package/lib/dist/painter/framebuffer-old.d.ts.map +0 -1
  261. package/lib/dist/painter/framebuffer-old.js +0 -102
  262. package/lib/dist/painter/framebuffer.backup.d.ts +0 -39
  263. package/lib/dist/painter/framebuffer.backup.d.ts.map +0 -1
  264. package/lib/dist/painter/framebuffer.backup.js +0 -122
  265. package/lib/dist/painter/mesh/hull/hull.d.ts +0 -12
  266. package/lib/dist/painter/mesh/hull/hull.d.ts.map +0 -1
  267. package/lib/dist/painter/mesh/hull/hull.js +0 -11
  268. package/lib/dist/painter/node.d.ts +0 -32
  269. package/lib/dist/painter/node.d.ts.map +0 -1
  270. package/lib/dist/painter/node.js +0 -73
  271. package/lib/dist/ref-map.d.ts.map +0 -1
  272. package/lib/dist/ref-map.js +0 -52
  273. package/lib/dist/resource/index.d.ts +0 -5
  274. package/lib/dist/resource/index.d.ts.map +0 -1
  275. package/lib/dist/resource/index.js +0 -5
  276. package/lib/dist/resource/program.d.ts +0 -10
  277. package/lib/dist/resource/program.d.ts.map +0 -1
  278. package/lib/dist/resource/program.js +0 -19
  279. package/lib/dist/resource/resource.d.ts +0 -17
  280. package/lib/dist/resource/resource.d.ts.map +0 -1
  281. package/lib/dist/resource/resource.js +0 -52
  282. package/lib/dist/resource/texture2d.d.ts +0 -10
  283. package/lib/dist/resource/texture2d.d.ts.map +0 -1
  284. package/lib/dist/resource/texture2d.js +0 -19
  285. package/lib/dist/resource/textureCube.d.ts +0 -9
  286. package/lib/dist/resource/textureCube.d.ts.map +0 -1
  287. package/lib/dist/resource/textureCube.js +0 -16
  288. package/lib/dist/scene/scene-node.d.ts +0 -8
  289. package/lib/dist/scene/scene-node.d.ts.map +0 -1
  290. package/lib/dist/scene/scene-node.js +0 -13
  291. package/lib/dist/texture/texture2dArray.d.ts +0 -43
  292. package/lib/dist/texture/texture2dArray.d.ts.map +0 -1
  293. package/lib/dist/texture/texture2dArray.js +0 -112
  294. package/lib/dist/texture/textureCube.d.ts.map +0 -1
  295. package/lib/dist/texture/textureCube.js +0 -69
  296. package/lib/dist/types/context.d.ts +0 -27
  297. package/lib/dist/types/context.d.ts.map +0 -1
  298. package/lib/dist/types/context.js +0 -2
  299. package/lib/dist/types/texture2d.d.ts +0 -51
  300. package/lib/dist/types/texture2d.d.ts.map +0 -1
  301. package/lib/dist/types/texture2d.js +0 -2
  302. package/lib/dist/types/textureCube.d.ts.map +0 -1
  303. package/lib/dist/types/textureCube.js +0 -2
  304. package/lib/dist/uniform/uniform-buffer-object.d.ts +0 -49
  305. package/lib/dist/uniform/uniform-buffer-object.d.ts.map +0 -1
  306. package/lib/dist/uniform/uniform-buffer-object.js +0 -93
  307. package/lib/dist/utils/ease-func/ease-func.d.ts.map +0 -1
  308. package/lib/dist/utils/ease-func/ease-func.js +0 -142
  309. package/lib/dist/utils/ease-func/index.d.ts +0 -2
  310. package/lib/dist/utils/ease-func/index.d.ts.map +0 -1
  311. package/lib/dist/utils/ease-func/index.js +0 -2
  312. package/lib/dist/utils/fetch/fetch.d.ts +0 -2
  313. package/lib/dist/utils/fetch/fetch.d.ts.map +0 -1
  314. package/lib/dist/utils/fetch/fetch.js +0 -5
  315. package/lib/dist/utils/fetch/index.d.ts +0 -2
  316. package/lib/dist/utils/fetch/index.d.ts.map +0 -1
  317. package/lib/dist/utils/fetch/index.js +0 -2
  318. package/lib/dist/utils/ref-map.d.ts.map +0 -1
  319. package/lib/dist/utils/ref-map.js +0 -52
@@ -1,14 +1,20 @@
1
+ import { quat } from "gl-matrix";
2
+ import { TgdMat3 } from "./mat3.js";
1
3
  import { TgdVec3 } from "./vec3.js";
2
4
  import { TgdVec4 } from "./vec4.js";
3
- const tmpAxisX = new TgdVec3();
4
- const tmpAxisY = new TgdVec3();
5
- const tmpAxisZ = new TgdVec3();
5
+ const temporaryAxisX = new TgdVec3();
6
+ const temporaryAxisY = new TgdVec3();
7
+ const temporaryAxisZ = new TgdVec3();
8
+ const temporaryMat3 = new TgdMat3();
6
9
  export class TgdQuat extends TgdVec4 {
7
10
  static fromMatrix(mat) {
8
11
  const quat = new TgdQuat();
9
12
  quat.fromMatrix(mat);
10
13
  return quat;
11
14
  }
15
+ static fromFace(face) {
16
+ return new TgdQuat().face(face);
17
+ }
12
18
  constructor(x = 0, y = 0, z = 0, w = 1) {
13
19
  if (typeof x === "number")
14
20
  super(x, y, z, w);
@@ -18,24 +24,19 @@ export class TgdQuat extends TgdVec4 {
18
24
  clone() {
19
25
  return new TgdQuat(this);
20
26
  }
21
- multiply(quat) {
22
- const [qx, qy, qz, qw] = this;
23
- const [rx, ry, rz, rw] = quat;
24
- this[0] = rw * qx + rx * qw - ry * qz + rz * qy;
25
- this[1] = rw * qy + rx * qz + ry * qw - rz * qx;
26
- this[2] = rw * qz - rx * qy + ry * qx + rz * qw;
27
- this[3] = rw * qw - rx * qx - ry * qy - rz * qz;
27
+ multiply(q) {
28
+ quat.multiply(this, this, q);
28
29
  return this;
29
30
  }
30
- fromSlerp(a, b, t) {
31
+ fromSlerp(valueAtT0, valueAtT1, t) {
31
32
  const EPSILON = 1e-6;
32
- const [ax, ay, az, aw] = a;
33
- let [bx, by, bz, bw] = b;
33
+ const [ax, ay, az, aw] = valueAtT0;
34
+ let [bx, by, bz, bw] = valueAtT1;
34
35
  let scale0, scale1;
35
36
  // calc cosine
36
37
  let cosom = ax * bx + ay * by + az * bz + aw * bw;
37
38
  // adjust signs (if necessary)
38
- if (cosom < 0.0) {
39
+ if (cosom < 0) {
39
40
  cosom = -cosom;
40
41
  bx = -bx;
41
42
  by = -by;
@@ -43,18 +44,18 @@ export class TgdQuat extends TgdVec4 {
43
44
  bw = -bw;
44
45
  }
45
46
  // calculate coefficients
46
- if (1.0 - cosom > EPSILON) {
47
+ if (1 - cosom > EPSILON) {
47
48
  // standard case (slerp)
48
49
  const omega = Math.acos(cosom);
49
50
  const sinom = Math.sin(omega);
50
51
  const inverseSinom = 1 / sinom;
51
- scale0 = Math.sin((1.0 - t) * omega) * inverseSinom;
52
+ scale0 = Math.sin((1 - t) * omega) * inverseSinom;
52
53
  scale1 = Math.sin(t * omega) * inverseSinom;
53
54
  }
54
55
  else {
55
56
  // "from" and "to" quaternions are very close
56
57
  // ... so we can do a linear interpolation
57
- scale0 = 1.0 - t;
58
+ scale0 = 1 - t;
58
59
  scale1 = t;
59
60
  }
60
61
  // calculate final values
@@ -64,58 +65,26 @@ export class TgdQuat extends TgdVec4 {
64
65
  this.w = scale0 * aw + scale1 * bw;
65
66
  return this;
66
67
  }
67
- fromAxis(X, Y, Z) {
68
- // Algorithm in Ken Shoemake's article in 1987 SIGGRAPH course notes
69
- // article "Quaternion Calculus and Fast Animation".
70
- const fTrace = X.x + Y.y + Z.z;
71
- if (fTrace > 0.0) {
72
- // |w| > 1/2, may as well choose w > 1/2
73
- const fRoot = Math.sqrt(fTrace + 1.0); // 2w
74
- this.w = 0.5 * fRoot;
75
- const halfRoot = 0.5 / fRoot; // 1/(4w)
76
- this.x = (Y.z - Z.y) * halfRoot;
77
- this.y = (Z.x - X.z) * halfRoot;
78
- this.z = (X.y - Y.x) * halfRoot;
79
- }
80
- else {
81
- // |w| <= 1/2
82
- const axis = [X, Y, Z];
83
- let i = 0;
84
- if (Y.y > X.x)
85
- i = 1;
86
- if (Z.z > axis[i][i])
87
- i = 2;
88
- const j = (i + 1) % 3;
89
- const k = (i + 2) % 3;
90
- let fRoot = Math.sqrt(axis[i][i] - axis[j][j] - axis[k][k] + 1.0);
91
- this[i] = 0.5 * fRoot;
92
- fRoot = 0.5 / fRoot;
93
- this[3] = (axis[j][k] - axis[k][j]) * fRoot;
94
- this[j] = (axis[j][i] + axis[i][j]) * fRoot;
95
- this[k] = (axis[k][i] + axis[i][k]) * fRoot;
96
- }
97
- return this.normalize();
68
+ fromAxesTransposed([m00, m01, m02], [m10, m11, m12], [m20, m21, m22]) {
69
+ return this.fromAxes([m00, m10, m20], [m01, m11, m21], [m02, m12, m22]);
70
+ }
71
+ fromAxes(X, Y, Z) {
72
+ const [x, y, z] = Z;
73
+ quat.setAxes(this, [-x, -y, -z], X, Y);
74
+ return this;
98
75
  }
99
76
  fromMatrix(mat) {
100
- tmpAxisX.x = mat.m00;
101
- tmpAxisX.y = mat.m01;
102
- tmpAxisX.z = mat.m02;
103
- tmpAxisY.x = mat.m10;
104
- tmpAxisY.y = mat.m11;
105
- tmpAxisY.z = mat.m12;
106
- tmpAxisZ.x = mat.m20;
107
- tmpAxisZ.y = mat.m21;
108
- tmpAxisZ.z = mat.m22;
109
- return this.fromAxis(tmpAxisX, tmpAxisY, tmpAxisZ);
77
+ quat.fromMat3(this, mat);
78
+ return this;
110
79
  }
111
80
  rotateAround(axis, angleInRadians) {
112
- this.toAxisX(tmpAxisX);
113
- this.toAxisY(tmpAxisY);
114
- this.toAxisZ(tmpAxisZ);
115
- tmpAxisX.rotateAround(axis, angleInRadians);
116
- tmpAxisY.rotateAround(axis, angleInRadians);
117
- tmpAxisZ.rotateAround(axis, angleInRadians);
118
- return this.fromAxis(tmpAxisX, tmpAxisY, tmpAxisZ);
81
+ temporaryMat3
82
+ .fromQuat(this)
83
+ .toAxes(temporaryAxisX, temporaryAxisY, temporaryAxisZ);
84
+ temporaryAxisX.rotateAround(axis, angleInRadians);
85
+ temporaryAxisY.rotateAround(axis, angleInRadians);
86
+ temporaryAxisZ.rotateAround(axis, angleInRadians);
87
+ return this.fromAxes(temporaryAxisX, temporaryAxisY, temporaryAxisZ);
119
88
  }
120
89
  static rotateAroundX(angleInRadians) {
121
90
  return new TgdQuat().rotateAroundX(angleInRadians);
@@ -223,13 +192,13 @@ export class TgdQuat extends TgdVec4 {
223
192
  this.toAxisY(axisY);
224
193
  this.toAxisZ(axisZ);
225
194
  mat.m00 = axisX.x;
226
- mat.m10 = axisX.y;
227
- mat.m20 = axisX.z;
228
- mat.m01 = axisY.x;
195
+ mat.m01 = axisX.y;
196
+ mat.m02 = axisX.z;
197
+ mat.m10 = axisY.x;
229
198
  mat.m11 = axisY.y;
230
- mat.m21 = axisY.z;
231
- mat.m02 = axisZ.x;
232
- mat.m12 = axisZ.y;
199
+ mat.m12 = axisY.z;
200
+ mat.m20 = axisZ.x;
201
+ mat.m21 = axisZ.y;
233
202
  mat.m22 = axisZ.z;
234
203
  return mat;
235
204
  }
@@ -270,4 +239,4 @@ const FACES = {
270
239
  "-Z-X+Y": [+H, -H, -H, -H],
271
240
  "-Z-Y-X": [+A, +0, -A, +0],
272
241
  };
273
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"quat.js","sourceRoot":"","sources":["../../src/math/quat.ts"],"names":[],"mappings":"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AC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CAC7B,CAAA"}
242
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"quat.js","sourceRoot":"","sources":["../../src/math/quat.ts"],"names":[],"mappings":"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AC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CAC7B,CAAA"}
@@ -1,2 +1,3 @@
1
+ /** @see https://tools.glowbuzzer.com/rotationconverter */
1
2
  export {};
2
3
  //# sourceMappingURL=quat.test.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"quat.test.d.ts","sourceRoot":"","sources":["../../src/math/quat.test.ts"],"names":[],"mappings":""}
1
+ {"version":3,"file":"quat.test.d.ts","sourceRoot":"","sources":["../../src/math/quat.test.ts"],"names":[],"mappings":"AAAA,0DAA0D"}
@@ -1,33 +1,51 @@
1
+ /** @see https://tools.glowbuzzer.com/rotationconverter */
1
2
  import { TgdQuat, TgdVec3 } from ".//index.js";
3
+ function expectVector(actual, expected, precision = 5) {
4
+ expect(actual.length).toBe(expected.length);
5
+ for (const [index, x] of actual.entries())
6
+ expect(x).toBeCloseTo(expected[index], precision);
7
+ }
2
8
  describe("math/quat.ts", () => {
3
- describe("TgdQuat.fromAxis()", () => {
4
- const cases = [
5
- [
6
- [1, 0, 0],
7
- [0, 1, 0],
8
- [0, 0, 1],
9
- [0, 0, 0, 1],
10
- ],
11
- [
12
- [1, 0, 0],
13
- [0, 0, -1],
14
- [0, 1, 0],
15
- [-0.707106, 0, 0, 0.707106],
16
- ],
17
- [
18
- [1.0, 0.0, 0.0],
19
- [0.0, -0.504863, -0.863199],
20
- [0.0, 0.863199, -0.504863],
21
- [0.867428, 0, 0, -0.497562],
22
- ],
23
- ];
9
+ const cases = [
10
+ [
11
+ [-1, 0, 0],
12
+ [0, 1, 0],
13
+ [0, 0, -1],
14
+ [0, 1, 0, 0],
15
+ ],
16
+ [
17
+ [0.8, 0.4, -0.447214],
18
+ [0.4, 0.2, 0.894427],
19
+ [0.447214, -0.894427, 0],
20
+ [-0.632456, -0.316228, 0, 0.707107],
21
+ ],
22
+ [
23
+ [0.857143, -0.285714, -0.428571],
24
+ [0.171429, 0.942857, -0.285714],
25
+ [0.485714, 0.171429, 0.857143],
26
+ [0.119523, -0.239046, 0.119523, 0.956183],
27
+ ],
28
+ [
29
+ [1, 0, 0],
30
+ [0, 1, 0],
31
+ [0, 0, 1],
32
+ [0, 0, 0, 1],
33
+ ],
34
+ [
35
+ [0.965926, 0, -0.258819],
36
+ [0, 1, 0],
37
+ [0.258819, 0, 0.965926],
38
+ [0, -0.130526, 0, 0.991445],
39
+ ],
40
+ ];
41
+ describe("TgdQuat.fromAxes()", () => {
24
42
  const quat = new TgdQuat(0, 0, 0, 0);
25
43
  for (const [X, Y, Z, Q] of cases) {
26
- it(`should get ${str(Q)} from ${str(X)}, ${str(Y)} and ${str(Z)}`, () => {
44
+ it(`should get ${string_(Q)} from ${string_(X)}, ${string_(Y)} and ${string_(Z)}`, () => {
27
45
  const axisX = new TgdVec3(...X);
28
46
  const axisY = new TgdVec3(...Y);
29
47
  const axisZ = new TgdVec3(...Z);
30
- quat.fromAxis(axisX, axisY, axisZ);
48
+ quat.fromAxes(axisX, axisY, axisZ);
31
49
  const got = [quat.x, quat.y, quat.z, quat.w];
32
50
  const exp = [...Q];
33
51
  expect(got[0]).toBeCloseTo(exp[0], 5);
@@ -37,9 +55,45 @@ describe("math/quat.ts", () => {
37
55
  });
38
56
  }
39
57
  });
58
+ describe("TgdQuat.toAxisX()", () => {
59
+ const quat = new TgdQuat(0, 0, 0, 0);
60
+ for (const [X, _Y, _Z, Q] of cases) {
61
+ it(`should get ${string_(X)} from ${string_(Q)}`, () => {
62
+ quat.from(Q);
63
+ const axisX = new TgdVec3();
64
+ quat.toAxisX(axisX);
65
+ const gotX = [axisX.x, axisX.y, axisX.z];
66
+ expectVector(gotX, X, 5);
67
+ });
68
+ }
69
+ });
70
+ describe("TgdQuat.toAxisY()", () => {
71
+ const quat = new TgdQuat(0, 0, 0, 0);
72
+ for (const [_X, Y, _Z, Q] of cases) {
73
+ it(`should get ${string_(Y)} from ${string_(Q)}`, () => {
74
+ quat.from(Q);
75
+ const axisY = new TgdVec3();
76
+ quat.toAxisY(axisY);
77
+ const gotY = [axisY.x, axisY.y, axisY.z];
78
+ expectVector(gotY, Y, 5);
79
+ });
80
+ }
81
+ });
82
+ describe("TgdQuat.toAxisZ()", () => {
83
+ const quat = new TgdQuat(0, 0, 0, 0);
84
+ for (const [_X, _Y, Z, Q] of cases) {
85
+ it(`should get ${string_(Z)} from ${string_(Q)}`, () => {
86
+ quat.from(Q);
87
+ const axisZ = new TgdVec3();
88
+ quat.toAxisZ(axisZ);
89
+ const gotZ = [axisZ.x, axisZ.y, axisZ.z];
90
+ expectVector(gotZ, Z, 5);
91
+ });
92
+ }
93
+ });
40
94
  });
41
- function str(input) {
42
- const arr = Array.from(input);
43
- return `[${arr.map(n => `${n}`).join(", ")}]`;
95
+ function string_(input) {
96
+ const array = [...input];
97
+ return `[${array.map(n => `${n}`).join(", ")}]`;
44
98
  }
45
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVhdC50ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21hdGgvcXVhdC50ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFBO0FBRTVDLFFBQVEsQ0FBQyxjQUFjLEVBQUUsR0FBRyxFQUFFO0lBQzFCLFFBQVEsQ0FBQyxvQkFBb0IsRUFBRSxHQUFHLEVBQUU7UUFDaEMsTUFBTSxLQUFLLEdBT1A7WUFDQTtnQkFDSSxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDO2dCQUNULENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUM7Z0JBQ1QsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQztnQkFDVCxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQzthQUNmO1lBQ0Q7Z0JBQ0ksQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQztnQkFDVCxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7Z0JBQ1YsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQztnQkFDVCxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUMsRUFBRSxDQUFDLEVBQUUsUUFBUSxDQUFDO2FBQzlCO1lBRUQ7Z0JBQ0ksQ0FBQyxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsQ0FBQztnQkFDZixDQUFDLEdBQUcsRUFBRSxDQUFDLFFBQVEsRUFBRSxDQUFDLFFBQVEsQ0FBQztnQkFDM0IsQ0FBQyxHQUFHLEVBQUUsUUFBUSxFQUFFLENBQUMsUUFBUSxDQUFDO2dCQUMxQixDQUFDLFFBQVEsRUFBRSxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsUUFBUSxDQUFDO2FBQzlCO1NBQ0osQ0FBQTtRQUNELE1BQU0sSUFBSSxHQUFHLElBQUksT0FBTyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFBO1FBQ3BDLEtBQUssTUFBTSxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxJQUFJLEtBQUssRUFBRSxDQUFDO1lBQy9CLEVBQUUsQ0FBQyxjQUFjLEdBQUcsQ0FBQyxDQUFDLENBQUMsU0FBUyxHQUFHLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxDQUFDLENBQUMsQ0FBQyxRQUFRLEdBQUcsQ0FDeEQsQ0FBQyxDQUNKLEVBQUUsRUFBRSxHQUFHLEVBQUU7Z0JBQ04sTUFBTSxLQUFLLEdBQUcsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQTtnQkFDL0IsTUFBTSxLQUFLLEdBQUcsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQTtnQkFDL0IsTUFBTSxLQUFLLEdBQUcsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQTtnQkFDL0IsSUFBSSxDQUFDLFFBQVEsQ0FBQyxLQUFLLEVBQUUsS0FBSyxFQUFFLEtBQUssQ0FBQyxDQUFBO2dCQUNsQyxNQUFNLEdBQUcsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDLEVBQUUsSUFBSSxDQUFDLENBQUMsRUFBRSxJQUFJLENBQUMsQ0FBQyxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtnQkFDNUMsTUFBTSxHQUFHLEdBQWEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFBO2dCQUM1QixNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQTtnQkFDckMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUE7Z0JBQ3JDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFBO2dCQUNyQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQTtZQUN6QyxDQUFDLENBQUMsQ0FBQTtRQUNOLENBQUM7SUFDTCxDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQyxDQUFBO0FBRUYsU0FBUyxHQUFHLENBQUMsS0FBdUI7SUFDaEMsTUFBTSxHQUFHLEdBQUcsS0FBSyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQTtJQUM3QixPQUFPLElBQUksR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQTtBQUNqRCxDQUFDIn0=
99
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVhdC50ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21hdGgvcXVhdC50ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDBEQUEwRDtBQUUxRCxPQUFPLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLFdBQVcsQ0FBQTtBQUU1QyxTQUFTLFlBQVksQ0FBQyxNQUFnQixFQUFFLFFBQWtCLEVBQUUsU0FBUyxHQUFHLENBQUM7SUFDckUsTUFBTSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBQzNDLEtBQUssTUFBTSxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUMsSUFBSSxNQUFNLENBQUMsT0FBTyxFQUFFO1FBQ3JDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxXQUFXLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxFQUFFLFNBQVMsQ0FBQyxDQUFBO0FBQ3pELENBQUM7QUFDRCxRQUFRLENBQUMsY0FBYyxFQUFFLEdBQUcsRUFBRTtJQUMxQixNQUFNLEtBQUssR0FPUDtRQUNBO1lBQ0ksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1lBQ1YsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUNULENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztZQUNWLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1NBQ2Y7UUFDRDtZQUNJLENBQUMsR0FBRyxFQUFFLEdBQUcsRUFBRSxDQUFDLFFBQVEsQ0FBQztZQUNyQixDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsUUFBUSxDQUFDO1lBQ3BCLENBQUMsUUFBUSxFQUFFLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztZQUN4QixDQUFDLENBQUMsUUFBUSxFQUFFLENBQUMsUUFBUSxFQUFFLENBQUMs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
@@ -3,30 +3,57 @@ import { TgdMat4 } from "./mat4";
3
3
  import { TgdQuat } from "./quat";
4
4
  import { TgdVec3 } from "./vec3";
5
5
  import { TgdVec4 } from "./vec4";
6
+ export interface TgdTransfoOptions {
7
+ distance: number;
8
+ position: TgdVec3 | ArrayNumber3;
9
+ scale: TgdVec3 | ArrayNumber3;
10
+ orientation: TgdQuat | ArrayNumber4;
11
+ }
6
12
  export declare class TgdTransfo {
7
13
  private readonly _matrix;
8
14
  private readonly _position;
9
15
  private readonly _orientation;
10
16
  private readonly _scale;
11
- private readonly tmpMat3;
17
+ private _distance;
12
18
  private readonly tmpVec3;
19
+ private readonly _axisX;
20
+ private readonly _axisY;
21
+ private readonly _axisZ;
13
22
  private dirty;
14
23
  private _updateCount;
24
+ constructor(source?: TgdTransfo | Partial<TgdTransfoOptions>);
25
+ from(transfo: Readonly<TgdTransfo>): this;
26
+ fromMatrix(mat: TgdMat4 | ArrayNumber16): this;
15
27
  get updateCount(): number;
16
- get matrix(): Readonly<TgdMat4>;
28
+ get matrix(): TgdMat4;
17
29
  set matrix(value: Readonly<TgdMat4> | ArrayNumber16);
30
+ get axisX(): Readonly<TgdVec3>;
31
+ get axisY(): Readonly<TgdVec3>;
32
+ get axisZ(): Readonly<TgdVec3>;
33
+ private updateIfNeeded;
34
+ reset(): this;
35
+ get distance(): number;
36
+ set distance(value: number);
37
+ setDistance(value: number): this;
18
38
  get position(): Readonly<TgdVec3>;
19
39
  set position(value: Readonly<TgdVec3 | TgdVec4 | ArrayNumber3>);
20
- setPosition(x: number, y: number, z: number): this;
40
+ setPosition(x: number | TgdVec3 | TgdVec4 | ArrayNumber3 | ArrayNumber4, y: number, z: number): this;
41
+ /**
42
+ * When `this.distance` is not null, we are orbitiong around the `position`.
43
+ * Then, the `actualPosition` is different.
44
+ */
45
+ get actualPosition(): Readonly<TgdVec3>;
21
46
  get scale(): Readonly<TgdVec3>;
22
47
  set scale(value: Readonly<TgdVec3 | ArrayNumber3>);
23
- setScale(x: number, y: number, z: number): this;
48
+ setScale(x: number | TgdVec3 | TgdVec4 | ArrayNumber3 | ArrayNumber4, y: number, z: number): this;
24
49
  get orientation(): Readonly<TgdQuat>;
25
50
  set orientation(quat: Readonly<TgdQuat | ArrayNumber4>);
26
- setOrientation(x: number, y: number, z: number, w: number): void;
51
+ setOrientation(x: number | TgdVec4 | ArrayNumber4, y: number, z: number, w: number): this;
27
52
  orbitAroundX(angleInRadians: number): this;
28
53
  orbitAroundY(angleInRadians: number): this;
29
54
  orbitAroundZ(angleInRadians: number): this;
55
+ moveAlongAxes(dx: number, dy: number, dz: number): this;
56
+ debug(caption?: string): void;
30
57
  private setDirty;
31
58
  }
32
59
  //# sourceMappingURL=transfo.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"transfo.d.ts","sourceRoot":"","sources":["../../src/math/transfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAEpE,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAEhC,qBAAa,UAAU;IAEnB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAKvB;IACD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAuB;IACjD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA0B;IACvD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuB;IAE9C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgB;IACxC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgB;IAExC,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,YAAY,CAAI;IAExB,IAAI,WAAW,WAEd;IAED,IAAI,MAAM,IAAI,QAAQ,CAAC,OAAO,CAAC,CAyB9B;IACD,IAAI,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,aAAa,EAIlD;IAED,IAAI,QAAQ,IAAI,QAAQ,CAAC,OAAO,CAAC,CAEhC;IACD,IAAI,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,OAAO,GAAG,OAAO,GAAG,YAAY,CAAC,EAG7D;IACD,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI;IAMlD,IAAI,KAAK,IAAI,QAAQ,CAAC,OAAO,CAAC,CAE7B;IACD,IAAI,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC,EAGhD;IACD,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI;IAM/C,IAAI,WAAW,IAAI,QAAQ,CAAC,OAAO,CAAC,CAEnC;IACD,IAAI,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC,EAGrD;IACD,cAAc,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM;IAKzD,YAAY,CAAC,cAAc,EAAE,MAAM,GAAG,IAAI;IAQ1C,YAAY,CAAC,cAAc,EAAE,MAAM,GAAG,IAAI;IAQ1C,YAAY,CAAC,cAAc,EAAE,MAAM,GAAG,IAAI;IAQ1C,OAAO,CAAC,QAAQ;CAInB"}
1
+ {"version":3,"file":"transfo.d.ts","sourceRoot":"","sources":["../../src/math/transfo.ts"],"names":[],"mappings":"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"}