dev #60

Merged
ksenia_mikhailova merged 48 commits from dev into main 2024-07-26 10:41:38 +03:00
2 changed files with 3 additions and 6 deletions
Showing only changes of commit 649f3e5662 - Show all commits

View File

@ -30,18 +30,15 @@ const loadAll = async () => {
back_light.value = back.children[0] back_light.value = back.children[0]
back_light.value.intensity = back_light.value.intensity * k back_light.value.intensity = back_light.value.intensity * k
back_light.value.shadow.bias = -0.01 back_light.value.shadow.bias = -0.01
// back_light.value.intensity = 250
key_light.value = key.children[0] key_light.value = key.children[0]
key_light.value.intensity = key_light.value.intensity * k key_light.value.intensity = key_light.value.intensity * k
key_light.value.shadow.bias = -0.01 key_light.value.shadow.bias = -0.01
// key_light.value.intensity = 250
key_light.value.cast_shadow = true key_light.value.cast_shadow = true
secondary_light.value = secondary.children[0] secondary_light.value = secondary.children[0]
secondary_light.value.intensity = secondary_light.value.intensity * k secondary_light.value.intensity = secondary_light.value.intensity * k
secondary_light.value.shadow.bias = -0.01 secondary_light.value.shadow.bias = -0.01
// secondary_light.value.intensity = 50
} }
const changeDistance = (v = 1) => { const changeDistance = (v = 1) => {
@ -63,7 +60,7 @@ onMounted(() => {
Загрузка 3D модели Загрузка 3D модели
</div> </div>
</template> </template>
<TresCanvas height="600" preset="realistic"> <TresCanvas height="600">
<TresPerspectiveCamera :position="[-7, 2, 4]" ref="camera" /> <TresPerspectiveCamera :position="[-7, 2, 4]" ref="camera" />
<OrbitControls v-bind="controlsState" ref="controls" make-default /> <OrbitControls v-bind="controlsState" ref="controls" make-default />
<Suspense> <Suspense>
@ -76,7 +73,7 @@ onMounted(() => {
:position="[key_light.position.x, key_light.position.y, key_light.position.z]" /> :position="[key_light.position.x, key_light.position.y, key_light.position.z]" />
<TresPointLight v-bind="secondary_light" v-if="secondary_light" <TresPointLight v-bind="secondary_light" v-if="secondary_light"
:position="[secondary_light.position.x, secondary_light.position.y, secondary_light.position.z]" /> :position="[secondary_light.position.x, secondary_light.position.y, secondary_light.position.z]" />
<TresAmbientLight :intensity="2" /> <!-- <TresAmbientLight :intensity="2" /> -->
</TresCanvas> </TresCanvas>
</ClientOnly> </ClientOnly>
<div class="canvas-icons"> <div class="canvas-icons">

View File

@ -17,4 +17,4 @@ 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)
export const use_min_length = () => useState('min_length', () => 700) export const use_min_length = () => useState('min_length', () => 700)
export const use_max_size = () => useState<number>('max_size', () => 20) export const use_max_size = () => useState<number>('max_size', () => 20)
export const use_explosion_state = () => useState<boolean>('explosion_state', () => true) export const use_explosion_state = () => useState<boolean>('explosion_state', () => false)