合并画布代码

src/component/home/tools/patternMaking3D/three.vue

@@ -63,7 +63,7 @@ export default defineComponent({
 	},
 	props:{
 	},
-	emits:['saveProject'],
+	emits:['threeSaveProject'],
 	setup(props,{emit}) {
 		const store = useStore();
 		const data = reactive({
@@ -265,8 +265,6 @@ export default defineComponent({
 				texture.anisotropy = 32;  // 提高纹理清晰度
 				data.group?.traverse((child:any) => {
 					if (child.isMesh) {
-						// console.log(child.name)
-						// 5. 创建新材质（根据需求选择材质类型）
 						const textureWidth = texture.image.width;
 						const textureHeight = texture.image.height;
 						const box = new THREE.Box3().setFromObject(child);
@@ -278,9 +276,6 @@ export default defineComponent({
 						if(patternMaking3D.x)data.repeat.x = patternMaking3D.x
 						if(patternMaking3D.y)data.repeat.y = patternMaking3D.y
 						
-						// texture.repeat.set(1, 1); // 纹理重复次数
-						texture.repeat.set(2 - data.repeat.x, 2 - data.repeat.y); // 纹理重复次数
-						
 						const newMaterial = new THREE.MeshStandardMaterial({
 							map: texture,        // 基础颜色贴图
 							roughness: 0.7,      // 表面粗糙度 (0-1)
@@ -338,7 +333,6 @@ export default defineComponent({
 					y:data.repeat.y,
 				}
 				store.commit('setPatternMaking3D',value)
-				
 			})
 		}
 		const addModel = async (url:any)=>{
@@ -421,23 +415,23 @@ export default defineComponent({
 			await setModel(modeUrl)
 			let patternMaking3D = store.state.HomeStoreModule.patternMaking3D
 			if(patternMaking3D.url)await addMaterial({url:patternMaking3D.url})
+			changeRepeat(null)
 			data.load.state = false
 		}
 		const changeRepeat = (e:any)=>{
-			if(data.isLock)data.repeat.x = e
-			if(data.isLock)data.repeat.y = e
+			if(data.isLock && e)data.repeat.x = e
+			if(data.isLock && e)data.repeat.y = e
 			clearTimeout(dataTime.updataRepeat)
 			dataTime.updataRepeat = setTimeout(()=>{
 				data.repeat.x = data.repeat.x == 6 ? 5.999 : data.repeat.x
 				data.repeat.y = data.repeat.y == 6 ? 5.999 : data.repeat.y
-				
 				data.textureLoader.repeat.set(6 - data.repeat.x,6 - data.repeat.y); // 纹理重复次数
 				let value = {
 					x:data.repeat.x,
 					y:data.repeat.y,
 				}
 				store.commit('setPatternMaking3D',value)
-				emit('saveProject')
+				emit('threeSaveProject')
 			},1000)
 		}
 		const setLock = ()=>{