mns/mns-mini-zabor
mns
/
mns-mini-zabor
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #84

Merged
ksenia_mikhailova merged 141 commits from dev into main 2024-10-03 15:30:24 +03:00
Conversation 0 Commits 141 Files Changed 62 +10 -6
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8d4df6d76c - Show all commits

4
components/model/diagram.vue
View File

@ -25,8 +25,8 @@ const { scene: verh } = await useGLTF('/models_exp/verh.glb')
const lamelle_color = use_lamelle_color() const lamelle_color = use_lamelle_color()
const pillar_color = use_pillar_color() const pillar_color = use_pillar_color()
set_material(planki, getColorHexFromRal(lamelle_color.value)); set_material(planki, getColorHexFromRal(lamelle_color.value), undefined, false);
[stolb, verh, krepleniye_planok].map(el => set_material(el, getColorHexFromRal(pillar_color.value))) [stolb, verh, krepleniye_planok].map(el => set_material(el, getColorHexFromRal(pillar_color.value), undefined, false))
</script> </script>
<template> <template>

12
utils/material.ts
View File

@ -76,13 +76,17 @@ const m_onBeforeCompile = (shader: WebGLProgramParameters) => {
); );
}; };
export const set_material = ( export const set_material = (
scene: any, scene: any,
color: any, color: any,
pattern: { pattern: patternIds, count: number } | undefined = undefined) => { pattern: { pattern: patternIds, count: number } | undefined = undefined,
noise_material: boolean = true,
) => {
let c = color let c = color
const material = noiseMaterial.clone() const material = noiseMaterial.clone()
material.color = new Color(c || '#9c9c00') material.color = new Color(c || '#9c9c00')
material.onBeforeCompile = m_onBeforeCompile if (noise_material) {
material.onBeforeCompile = m_onBeforeCompile
}
const promises = [] const promises = []
if (pattern && pattern.pattern !== undefined) { if (pattern && pattern.pattern !== undefined) {