ksenia_mikhailova
/
demo-int-table
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bx-1379-redesign #15

Merged
ksenia_mikhailova merged 124 commits from bx-1379-redesign into dev 2024-09-06 15:39:13 +03:00
Conversation 0 Commits 124 Files Changed 68 +6 -6
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e62d317f1e - Show all commits

4
front/index.html
View File

@ -1,8 +1,8 @@
<!doctype html> <!doctype html>
<html lang="en"> <html lang="ru">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" />
<title>Проекты Кустарщины</title> <title>Проекты Кустарщины</title>
</head> </head>
<body> <body>

5
front/src/components/Promo/load_models.vue
View File

@ -1,5 +1,5 @@
<script setup lang="ts"> <script setup lang="ts">
import { onMounted, onUnmounted, reactive, Ref, ref, watch } from 'vue'; import { getCurrentInstance, onMounted, onUnmounted, reactive, Ref, ref, watch } from 'vue';
import { import {
Box3, Color, DoubleSide, Group, Mesh, PlaneGeometry, Box3, Color, DoubleSide, Group, Mesh, PlaneGeometry,
MeshStandardMaterial, MeshStandardMaterialParameters, MeshStandardMaterial, MeshStandardMaterialParameters,
@ -278,7 +278,6 @@ watch(() => [props.source, process_loading.value], ([source, process]) => {
} }
sidebar.close() sidebar.close()
loadModels() loadModels()
} }
}) })
@ -422,7 +421,7 @@ onUnmounted(() => {
}) })
</script> </script>
<template> <template>
<TresGroup name="loaded"> <TresGroup name="loaded" :key="props.source">
<Env v-bind="envVars" /> <Env v-bind="envVars" />
<!-- <PostProcessing /> --> <!-- <PostProcessing /> -->
<template v-for="item in models"> <template v-for="item in models">

3
front/src/components/Promo/main.vue
View File

@ -87,7 +87,8 @@ onMounted(() => {
<TresPerspectiveCamera :position="cameraPosition" ref="camera" /> <TresPerspectiveCamera :position="cameraPosition" ref="camera" />
<OrbitControls v-bind="controlsState" @change="onChange" make-default /> <OrbitControls v-bind="controlsState" @change="onChange" make-default />
<Suspense> <Suspense>
<LoadModels :source="source" :loaded="set_model_load_status" :loaded_pan="loadedPan" /> <LoadModels :source="source" :loaded="set_model_load_status" :loaded_pan="loadedPan"
:key="source" />
</Suspense> </Suspense>
</TresCanvas> </TresCanvas>
<div class="homelink" :class="[{ open: sidebar.is_open }]"> <div class="homelink" :class="[{ open: sidebar.is_open }]">