@tresjs/core
Advanced tools
Comparing version 3.2.1-next.1 to 3.2.1-next.2
/** | ||
* name: @tresjs/core | ||
* version: v3.2.1-next.1 | ||
* version: v3.2.1-next.2 | ||
* (c) 2023 | ||
@@ -8,3 +8,3 @@ * description: Declarative ThreeJS using Vue Components | ||
*/ | ||
import { ref as h, computed as A, watchEffect as D, onUnmounted as N, shallowRef as F, watch as te, reactive as ue, readonly as le, provide as I, inject as ce, createRenderer as fe, defineComponent as U, useSlots as me, getCurrentInstance as J, onMounted as pe, openBlock as ve, createElementBlock as de, normalizeStyle as ge, h as K, Fragment as ye } from "vue"; | ||
import { ref as h, computed as A, watchEffect as D, onUnmounted as N, shallowRef as F, watch as te, reactive as ue, readonly as le, provide as I, inject as ce, createRenderer as fe, defineComponent as U, useSlots as pe, getCurrentInstance as J, onMounted as me, openBlock as ve, createElementBlock as de, normalizeStyle as ge, h as K, Fragment as ye } from "vue"; | ||
import * as we from "three"; | ||
@@ -21,6 +21,6 @@ import { PerspectiveCamera as W, OrthographicCamera as Ce, Camera as _e, Clock as Pe, Vector3 as Ee, Color as R, REVISION as Me, SRGBColorSpace as Ae, ACESFilmicToneMapping as be, PCFSoftShadowMap as ke, WebGLRenderer as z, LoadingManager as De, TextureLoader as Oe, Vector2 as xe, Raycaster as he, BufferAttribute as Be, Scene as Le } from "three"; | ||
}, f = (s) => { | ||
const c = s instanceof _e ? s : t.value.find((m) => m.uuid === s); | ||
const c = s instanceof _e ? s : t.value.find((p) => p.uuid === s); | ||
if (!c) | ||
return; | ||
const i = t.value.filter(({ uuid: m }) => m !== c.uuid); | ||
const i = t.value.filter(({ uuid: p }) => p !== c.uuid); | ||
t.value = [c, ...i]; | ||
@@ -59,3 +59,3 @@ }; | ||
isActive: $e | ||
}), pt = !0, X = "[TresJS ▲ ■ ●] "; | ||
}), mt = !0, X = "[TresJS ▲ ■ ●] "; | ||
function B() { | ||
@@ -233,7 +233,7 @@ function e(r, a) { | ||
const c = (Array.isArray(n) ? n : [n]).map( | ||
(i) => new Promise((m, u) => { | ||
(i) => new Promise((p, u) => { | ||
f.load( | ||
i, | ||
(l) => { | ||
l.scene && Object.assign(l, Ze(l.scene)), m(l); | ||
l.scene && Object.assign(l, Ze(l.scene)), p(l); | ||
}, | ||
@@ -269,3 +269,3 @@ r, | ||
aoMap: i, | ||
alphaMap: m, | ||
alphaMap: p, | ||
matcap: u | ||
@@ -280,3 +280,3 @@ } = e; | ||
aoMap: i ? await r(i) : null, | ||
alphaMap: m ? await r(m) : null, | ||
alphaMap: p ? await r(p) : null, | ||
matcap: u ? await r(u) : null | ||
@@ -287,6 +287,6 @@ }; | ||
const et = (e, { renderer: n, camera: t, raycaster: r }) => { | ||
const a = A(() => n.value.domElement), { x: o, y: f } = je({ target: a }), { width: s, height: c, top: i, left: m } = He(a), u = ({ x: d, y: E }) => { | ||
const a = A(() => n.value.domElement), { x: o, y: f } = je({ target: a }), { width: s, height: c, top: i, left: p } = He(a), u = ({ x: d, y: E }) => { | ||
if (a.value) | ||
return { | ||
x: (d - m.value) / s.value * 2 - 1, | ||
x: (d - p.value) / s.value * 2 - 1, | ||
y: -((E - i.value) / c.value) * 2 + 1 | ||
@@ -365,3 +365,3 @@ }; | ||
) | ||
), { onClick: i, onPointerMove: m } = et(c, n); | ||
), { onClick: i, onPointerMove: p } = et(c, n); | ||
i(({ intersects: l, event: g }) => { | ||
@@ -372,3 +372,3 @@ var y; | ||
let u; | ||
return m(({ intersects: l, event: g }) => { | ||
return p(({ intersects: l, event: g }) => { | ||
var _, b, M, k; | ||
@@ -395,3 +395,3 @@ const y = (_ = l == null ? void 0 : l[0]) == null ? void 0 : _.object, { pointerLeave: v, pointerEnter: C, pointerMove: w } = t; | ||
aspectRatio: c | ||
}, m = F(e), { | ||
}, p = F(e), { | ||
camera: u, | ||
@@ -412,3 +412,3 @@ cameras: l, | ||
sizes: i, | ||
scene: m, | ||
scene: p, | ||
camera: u, | ||
@@ -433,3 +433,3 @@ cameras: le(l), | ||
const wt = nt; | ||
let G = null, p = null; | ||
let G = null, m = null; | ||
const { logError: ee } = B(), at = { | ||
@@ -455,18 +455,18 @@ createElement(e, n, t, r) { | ||
insert(e, n) { | ||
var t, r, a, o, f, s, c, i, m; | ||
if (n && n.isScene && (p = n), (((t = e == null ? void 0 : e.__vnode) == null ? void 0 : t.type) === "TresGroup" || ((r = e == null ? void 0 : e.__vnode) == null ? void 0 : r.type) === "TresObject3D") && n === null && !((o = (a = e == null ? void 0 : e.__vnode) == null ? void 0 : a.ctx) != null && o.asyncResolved)) { | ||
var t, r, a, o, f, s, c, i, p; | ||
if (n && n.isScene && (m = n), (((t = e == null ? void 0 : e.__vnode) == null ? void 0 : t.type) === "TresGroup" || ((r = e == null ? void 0 : e.__vnode) == null ? void 0 : r.type) === "TresObject3D") && n === null && !((o = (a = e == null ? void 0 : e.__vnode) == null ? void 0 : a.ctx) != null && o.asyncResolved)) { | ||
G = e; | ||
return; | ||
} else | ||
(f = e == null ? void 0 : e.__vnode) != null && f.type.includes("Controls") && n === null && (G = p); | ||
(f = e == null ? void 0 : e.__vnode) != null && f.type.includes("Controls") && n === null && (G = m); | ||
if (n || (n = G), e != null && e.isObject3D) { | ||
if (e != null && e.isCamera) { | ||
if (!(p != null && p.userData.tres__registerCamera)) | ||
if (!(m != null && m.userData.tres__registerCamera)) | ||
throw "could not find tres__registerCamera on scene's userData"; | ||
(c = p == null ? void 0 : (s = p.userData).tres__registerCamera) == null || c.call(s, e); | ||
(c = m == null ? void 0 : (s = m.userData).tres__registerCamera) == null || c.call(s, e); | ||
} | ||
if (e != null && e.onClick || e != null && e.onPointerMove || e != null && e.onPointerEnter || e != null && e.onPointerLeave) { | ||
if (!(p != null && p.userData.tres__registerAtPointerEventHandler)) | ||
if (!(m != null && m.userData.tres__registerAtPointerEventHandler)) | ||
throw "could not find tres__registerAtPointerEventHandler on scene's userData"; | ||
(m = p == null ? void 0 : (i = p.userData).tres__registerAtPointerEventHandler) == null || m.call(i, e); | ||
(p = m == null ? void 0 : (i = m.userData).tres__registerAtPointerEventHandler) == null || p.call(i, e); | ||
} | ||
@@ -482,16 +482,16 @@ } | ||
var u, l; | ||
const m = i; | ||
i.userData.tres__materialViaProp || (u = m.material) == null || u.dispose(), i.userData.tres__geometryViaProp || (l = m.geometry) == null || l.dispose(); | ||
}, o = p == null ? void 0 : p.userData.tres__deregisterAtPointerEventHandler, f = p == null ? void 0 : p.userData.tres__deregisterBlockingObjectAtPointerEventHandler, s = (i) => { | ||
var m, u; | ||
const p = i; | ||
i.userData.tres__materialViaProp || (u = p.material) == null || u.dispose(), i.userData.tres__geometryViaProp || (l = p.geometry) == null || l.dispose(); | ||
}, o = m == null ? void 0 : m.userData.tres__deregisterAtPointerEventHandler, f = m == null ? void 0 : m.userData.tres__deregisterBlockingObjectAtPointerEventHandler, s = (i) => { | ||
var p, u; | ||
if (!f) | ||
throw "could not find tres__deregisterBlockingObjectAtPointerEventHandler on scene's userData"; | ||
if ((u = p == null ? void 0 : (m = p.userData).tres__deregisterBlockingObjectAtPointerEventHandler) == null || u.call(m, i), !o) | ||
if ((u = m == null ? void 0 : (p = m.userData).tres__deregisterBlockingObjectAtPointerEventHandler) == null || u.call(p, i), !o) | ||
throw "could not find tres__deregisterAtPointerEventHandler on scene's userData"; | ||
(i != null && i.onClick || i != null && i.onPointerMove || i != null && i.onPointerEnter || i != null && i.onPointerLeave) && (o == null || o(i)); | ||
}, c = (i) => { | ||
const m = p == null ? void 0 : p.userData.tres__deregisterCamera; | ||
if (!m) | ||
const p = m == null ? void 0 : m.userData.tres__deregisterCamera; | ||
if (!p) | ||
throw "could not find tres__deregisterCamera on scene's userData"; | ||
i.isCamera && (m == null || m(i)); | ||
i.isCamera && (p == null || p(i)); | ||
}; | ||
@@ -510,6 +510,6 @@ r.traverse((i) => { | ||
if (e.isObject3D && i === "blocks-pointer-events") { | ||
r || r === "" ? (o = p == null ? void 0 : (a = p.userData).tres__registerBlockingObjectAtPointerEventHandler) == null || o.call(a, e) : (s = p == null ? void 0 : (f = p.userData).tres__deregisterBlockingObjectAtPointerEventHandler) == null || s.call(f, e); | ||
r || r === "" ? (o = m == null ? void 0 : (a = m.userData).tres__registerBlockingObjectAtPointerEventHandler) == null || o.call(a, e) : (s = m == null ? void 0 : (f = m.userData).tres__deregisterBlockingObjectAtPointerEventHandler) == null || s.call(f, e); | ||
return; | ||
} | ||
let m = T(i), u = c == null ? void 0 : c[m]; | ||
let p = T(i), u = c == null ? void 0 : c[p]; | ||
if (i === "args") { | ||
@@ -531,10 +531,10 @@ const g = e, y = t ?? [], v = r ?? [], C = e.userData.tres__name || e.type; | ||
const g = i.split("-"); | ||
u = g.reduce((y, v) => y[T(v)], c), i = g.pop(), m = i.toLowerCase(), u != null && u.set || (c = g.reduce((y, v) => y[T(v)], c)); | ||
u = g.reduce((y, v) => y[T(v)], c), i = g.pop(), p = i.toLowerCase(), u != null && u.set || (c = g.reduce((y, v) => y[T(v)], c)); | ||
} | ||
let l = r; | ||
if (l === "" && (l = !0), Z(u)) { | ||
Array.isArray(l) ? e[m](...l) : e[m](l); | ||
Array.isArray(l) ? e[p](...l) : e[p](l); | ||
return; | ||
} | ||
!(u != null && u.set) && !Z(u) ? c[m] = l : u.constructor === l.constructor && (u != null && u.copy) ? u == null || u.copy(l) : Array.isArray(l) ? u.set(...l) : !u.isColor && u.setScalar ? u.setScalar(l) : u.set(l); | ||
!(u != null && u.set) && !Z(u) ? c[p] = l : u.constructor === l.constructor && (u != null && u.copy) ? u == null || u.copy(l) : Array.isArray(l) ? u.set(...l) : !u.isColor && u.setScalar ? u.setScalar(l) : u.set(l); | ||
} | ||
@@ -585,15 +585,15 @@ }, | ||
ae(); | ||
const o = me(), f = J(), s = (m) => U({ | ||
const o = pe(), f = J(), s = (p) => U({ | ||
setup() { | ||
const u = J(); | ||
return Object.assign(u.appContext, f.appContext), Object.assign(u.provides, u.appContext.provides), I("useTres", m), I("extend", q), () => K(ye, null, o != null && o.default ? o.default() : []); | ||
return Object.assign(u.appContext.app, f.appContext.app), Object.assign(u.provides, u.appContext.provides), I("useTres", p), I("extend", q), () => K(ye, null, o != null && o.default ? o.default() : []); | ||
} | ||
}), c = (m) => { | ||
const u = s(m); | ||
}), c = (p) => { | ||
const u = s(p); | ||
ot(K(u), a.value); | ||
}, i = A(() => n.disableRender); | ||
return pe(() => { | ||
const m = r, u = rt({ | ||
return me(() => { | ||
const p = r, u = rt({ | ||
scene: a.value, | ||
canvas: m, | ||
canvas: p, | ||
windowSize: n.windowSize, | ||
@@ -629,3 +629,3 @@ disableRender: i, | ||
), C()); | ||
}), (m, u) => (ve(), de("canvas", { | ||
}), (p, u) => (ve(), de("canvas", { | ||
ref_key: "canvas", | ||
@@ -638,3 +638,3 @@ ref: r, | ||
height: "100%", | ||
position: m.windowSize ? "fixed" : "relative", | ||
position: p.windowSize ? "fixed" : "relative", | ||
top: 0, | ||
@@ -667,3 +667,3 @@ left: 0, | ||
q as extend, | ||
pt as isProd, | ||
mt as isProd, | ||
Ne as normalizeColor, | ||
@@ -670,0 +670,0 @@ vt as normalizeVectorFlexibleParam, |
{ | ||
"name": "@tresjs/core", | ||
"type": "module", | ||
"version": "3.2.1-next.1", | ||
"version": "3.2.1-next.2", | ||
"packageManager": "pnpm@8.3.1", | ||
@@ -6,0 +6,0 @@ "description": "Declarative ThreeJS using Vue Components", |
Sorry, the diff of this file is not supported yet
380084