fix: texture mapping in JuiceBox and node deletion bug in hierarchy
Build and Deploy / build-and-push (push) Failing after 20s
Build and Deploy / build-and-push (push) Failing after 20s
This commit is contained in:
@@ -62,6 +62,10 @@ export const JuiceBox = forwardRef<THREE.Group, any>(({
|
||||
ctx.fillText("REFRESHING FRUIT DRINK", 256, 150);
|
||||
}
|
||||
const tex = new THREE.CanvasTexture(canvas);
|
||||
tex.colorSpace = THREE.SRGBColorSpace;
|
||||
tex.wrapS = tex.wrapT = THREE.RepeatWrapping;
|
||||
tex.repeat.set(-1, -1);
|
||||
tex.offset.set(1, 1);
|
||||
tex.needsUpdate = true;
|
||||
return tex;
|
||||
}, [color, map]);
|
||||
@@ -72,7 +76,8 @@ export const JuiceBox = forwardRef<THREE.Group, any>(({
|
||||
const tex = loader.load(map);
|
||||
tex.colorSpace = THREE.SRGBColorSpace;
|
||||
tex.wrapS = tex.wrapT = THREE.RepeatWrapping;
|
||||
tex.repeat.set(uvScale, uvScale);
|
||||
tex.repeat.set(-uvScale, -uvScale);
|
||||
tex.offset.set(1, 1);
|
||||
return tex;
|
||||
}, [map, uvScale]);
|
||||
|
||||
|
||||
@@ -244,6 +244,18 @@ export const ModelViewer = forwardRef<THREE.Group, ModelViewerProps>(({ object,
|
||||
}
|
||||
}, [object, sceneObjects]);
|
||||
|
||||
// Hide deleted meshes
|
||||
useEffect(() => {
|
||||
if (object && sceneObjects) {
|
||||
const activeIds = new Set(sceneObjects.map(obj => obj.id));
|
||||
meshCache.current.forEach((mesh, id) => {
|
||||
if (!activeIds.has(id)) {
|
||||
mesh.visible = false;
|
||||
}
|
||||
});
|
||||
}
|
||||
}, [object, sceneObjects]);
|
||||
|
||||
if (!object) return null;
|
||||
|
||||
const meshObjects = sceneObjects.filter(obj => obj.type === 'mesh');
|
||||
|
||||
+14
-1
@@ -1715,7 +1715,20 @@ export default function Editor() {
|
||||
};
|
||||
|
||||
const deleteObjects = () => {
|
||||
updateSceneObjects(prev => prev.filter(obj => !selectedIds.includes(obj.id)));
|
||||
updateSceneObjects(prev => {
|
||||
let idsToDelete = [...selectedIds];
|
||||
let added = true;
|
||||
while (added) {
|
||||
added = false;
|
||||
prev.forEach(obj => {
|
||||
if (obj.parentId && idsToDelete.includes(obj.parentId) && !idsToDelete.includes(obj.id)) {
|
||||
idsToDelete.push(obj.id);
|
||||
added = true;
|
||||
}
|
||||
});
|
||||
}
|
||||
return prev.filter(obj => !idsToDelete.includes(obj.id));
|
||||
});
|
||||
setSelectedIds([]);
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user