Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: typescript build issues utils #924

Merged
merged 3 commits into from
Feb 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 22 additions & 16 deletions src/devtools/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -187,23 +187,29 @@ export function registerTresDevtools(app: DevtoolsApp, tres: TresContext) {
}

if (instance.isScene) {
payload.state.info = {
objects: instance.children.length,
memory: calculateMemoryUsage(instance),
calls: tres.renderer.value.info.render.calls,
triangles: tres.renderer.value.info.render.triangles,
points: tres.renderer.value.info.render.points,
lines: tres.renderer.value.info.render.lines,
payload.state = {
...payload.state,
state: [
{
key: 'Scene Info',
value: {
objects: instance.children.length,
memory: calculateMemoryUsage(instance),
calls: tres.renderer.value.info.render.calls,
triangles: tres.renderer.value.info.render.triangles,
points: tres.renderer.value.info.render.points,
lines: tres.renderer.value.info.render.lines,
},
},
{
key: 'Programs',
value: tres.renderer.value.info.programs?.map(program => ({
...program,
programName: program.name,
})) || [],
},
],
}
payload.state.programs = tres.renderer.value.info.programs?.map(program => ({
key: program.name,
value: {
...program,
vertexShader: program.vertexShader,
attributes: program.getAttributes(),
uniforms: program.getUniforms(),
},
})) || []
}
}
})
Expand Down
9 changes: 6 additions & 3 deletions src/utils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -459,9 +459,12 @@ export function setPixelRatio(renderer: { setPixelRatio?: (dpr: number) => void,

let newDpr = 0

if (userDpr && is.arr(userDpr) && userDpr.length >= 2) {
const [min, max] = userDpr
newDpr = MathUtils.clamp(systemDpr, min, max)
if (userDpr && is.arr(userDpr)) {
const dprArray = userDpr as [number, number]
if (dprArray.length >= 2) {
const [min, max] = dprArray
newDpr = MathUtils.clamp(systemDpr, min, max)
}
}
else if (is.num(userDpr)) { newDpr = userDpr }
else { newDpr = systemDpr }
Expand Down
5 changes: 3 additions & 2 deletions src/utils/primitive/createRetargetingProxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ export function createRetargetingProxy<T extends Record<string | number | symbol
return _target[prop]
},
set(_: any, prop: K, val: T[K]) {
if (setters[prop]) {
setters[prop](val, _target, proxy, setTarget)
const setter = setters[prop]
if (setter && typeof setter === 'function') {
setter(val, _target, proxy, setTarget)
}
else {
_target[prop] = val
Expand Down