pattern #74

Merged
ksenia_mikhailova merged 1 commits from bx-1480-constructor into dev 2024-09-24 16:17:05 +03:00
5 changed files with 30 additions and 24 deletions
Showing only changes of commit 13b6be05e0 - Show all commits

View File

@ -349,7 +349,8 @@ button {
&_color { &_color {
@apply w-full; @apply w-full;
.color_picker { .color_picker,
.list_picker {
@apply ml-4; @apply ml-4;
} }
} }

View File

@ -34,7 +34,7 @@ onUnmounted(() => {
<div class="list_picker" ref="picker"> <div class="list_picker" ref="picker">
<div class="list_picker-selected" @click="open ? toggleOpen(!is_open) : onClick(props.color)" <div class="list_picker-selected" @click="open ? toggleOpen(!is_open) : onClick(props.color)"
:class="[{ 'list_picker-selected__active': active }]"> :class="[{ 'list_picker-selected__active': active }]">
pick <NuxtImg :src="getFilename(patterns[1].name)" />
</div> </div>
<div class="list_picker-changer" v-if="is_open"> <div class="list_picker-changer" v-if="is_open">
<div class="list_picker-list"> <div class="list_picker-list">

View File

@ -1,10 +1,12 @@
export const patterns = [ export const patterns = [
{ name: 'no pattern', }, { name: 'Без узора', },
{ name: 'pattern1', filename: 'tile1.png' }, { name: 'Узор 1', filename: 'tile1.png' },
{ name: 'pattern2', filename: 'tile1.png' }, { name: 'Еще раз узор 1', filename: 'tile1.png' },
] ]
export const getFilename = (name: patternTypes) => { export const getFilename = (name: patternTypes) => {
return `/pattern/${patterns.find(el => el.name == name)?.filename}` const el = patterns.find(el => el.name == name)
if (!el || !el.filename) return undefined
return `/pattern/${el?.filename}`
} }
export type patternTypes = typeof patterns[number]['name'] export type patternTypes = typeof patterns[number]['name']

View File

@ -13,7 +13,7 @@ export const use_fence_section = () => useState<number>('fence_section', () => m
export const use_remove_pillar = () => useState<boolean>('remove_pillar', () => false) export const use_remove_pillar = () => useState<boolean>('remove_pillar', () => false)
export const use_pillar_color = () => useState<ralTypes>('pillar_color') export const use_pillar_color = () => useState<ralTypes>('pillar_color')
export const use_lamelle_color = () => useState<ralTypes>('lamelle_color') export const use_lamelle_color = () => useState<ralTypes>('lamelle_color')
export const use_pattern = () => useState<patternTypes>('pattern') export const use_pattern = () => useState<patternTypes>('pattern', () => 'Без узора')
export const use_section_count = () => useState('section_count', () => n) export const use_section_count = () => useState('section_count', () => n)
export const use_extra_section = () => useState('extra_section', () => 0) export const use_extra_section = () => useState('extra_section', () => 0)
export const use_total_length = () => useState('total_length', () => (((min + 104) * n) + 104) * 0.001) export const use_total_length = () => useState('total_length', () => (((min + 104) * n) + 104) * 0.001)

View File

@ -1,6 +1,6 @@
import { Color, DoubleSide, MeshBasicMaterial, MeshStandardMaterial, RepeatWrapping, TextureLoader, Vector2 } from "three" import { Color, DoubleSide, MeshBasicMaterial, MeshStandardMaterial, RepeatWrapping, Texture, TextureLoader, Vector2 } from "three"
import { useLoader, type TresLoader } from '@tresjs/core' import { useLoader, type TresLoader } from '@tresjs/core'
import { getFilename, type patternTypes } from "~/components/pattern" import { getFilename, patterns, type patternTypes } from "~/components/pattern"
const set_metaril_func = (scene: any, material: any) => { const set_metaril_func = (scene: any, material: any) => {
scene.children.forEach((el: any) => { scene.children.forEach((el: any) => {
@ -12,13 +12,15 @@ const set_metaril_func = (scene: any, material: any) => {
set_metaril_func(el, material) set_metaril_func(el, material)
}) })
} }
// const texture = await useLoader(TextureLoader, '/fence_one/svg_tile1.svg');
// const get_texture = async () => { const loaded_patterns: { [key: string]: any } = {}
// const texture = await useLoader(TextureLoader, '/fence_one/tile1.png'); for (let index = 0; index < patterns.length; index++) {
// return texture const element = patterns[index];
// } const filename = getFilename(element.name)
// const texture = await get_texture() if (filename) {
// texture.wrapT = RepeatWrapping; loaded_patterns[filename] = useLoader(TextureLoader, filename)
}
}
export const set_material = (scene: any, color: any, pattern: { pattern: patternTypes, count: number } | undefined = undefined) => { export const set_material = (scene: any, color: any, pattern: { pattern: patternTypes, count: number } | undefined = undefined) => {
let c = color let c = color
@ -35,15 +37,16 @@ export const set_material = (scene: any, color: any, pattern: { pattern: pattern
if (pattern && pattern.pattern !== undefined) { if (pattern && pattern.pattern !== undefined) {
const filename = getFilename(pattern.pattern) const filename = getFilename(pattern.pattern)
const texture = useLoader(TextureLoader, filename) if (filename) {
texture.then(res => { const texture = loaded_patterns[filename]
texture.then((res: Texture) => {
res.wrapT = RepeatWrapping; res.wrapT = RepeatWrapping;
res.repeat.set(1, pattern.count); res.repeat.set(1, pattern.count);
res.needsUpdate = true res.needsUpdate = true
// return res
material.alphaMap = res material.alphaMap = res
}) })
} }
}
set_metaril_func(scene, material) set_metaril_func(scene, material)
} }