bx-1379-redesign #15

Merged
ksenia_mikhailova merged 124 commits from bx-1379-redesign into dev 2024-09-06 15:39:13 +03:00
3 changed files with 9 additions and 10 deletions
Showing only changes of commit 64b9290f37 - Show all commits

View File

@ -34,6 +34,7 @@ $white: #fff;
background-color: var(--primary-color); background-color: var(--primary-color);
color: $white; color: $white;
cursor: pointer; cursor: pointer;
font-weight: bold;
&.disabled { &.disabled {
opacity: 0.5; opacity: 0.5;

View File

@ -18,8 +18,6 @@ const loadModels = async () => {
const element = raw_dataStore.data.elements[index]; const element = raw_dataStore.data.elements[index];
const item = {} as model3DType const item = {} as model3DType
if (element.name == 'ground') continue
item.modelUrl = `${IMAGE_URL}/${element.model_file}` item.modelUrl = `${IMAGE_URL}/${element.model_file}`
let { scene: loaded_scene } = await useGLTF(item.modelUrl) let { scene: loaded_scene } = await useGLTF(item.modelUrl)
item.modelFile = loaded_scene item.modelFile = loaded_scene

View File

@ -177,10 +177,10 @@ const loadModels = async () => {
if (!find_element) continue if (!find_element) continue
if (find_element && !(find_element as Group).isGroup) { if (find_element && !(find_element as Group).isGroup) {
const world_position = new Vector3(); const world_position = new Vector3();
const size = new Vector3() const size = new Vector3();
const boundingBox = ((find_element as Mesh).geometry.boundingBox as any) const boundingBox = ((find_element as Mesh).geometry.boundingBox as any)
boundingBox.getCenter(world_position); boundingBox.getCenter(world_position);
boundingBox.getCenter(size); boundingBox.getSize(size);
(find_element as Mesh).localToWorld(world_position); (find_element as Mesh).localToWorld(world_position);
const point = point_mesh_obj.clone() const point = point_mesh_obj.clone()
@ -277,10 +277,10 @@ watch(() => sidebar.is_open && sidebar.id_clickable, () => {
el.getWorldPosition(target_vector); el.getWorldPosition(target_vector);
target_vector.setComponent(1, raw_dataStore.data.min_distance > 50 ? raw_dataStore.data.min_distance / 7 : 1) target_vector.setComponent(1, raw_dataStore.data.min_distance > 50 ? raw_dataStore.data.min_distance / 7 : 1)
const d = raw_dataStore.data.max_distance * 0.5; const d = raw_dataStore.data.max_distance * 0.25;
const lerp_vector = new Vector3() const lerp_vector = new Vector3()
lerp_vector.lerpVectors(camera.value?.position, target_vector, 0.5).multiply(new Vector3(1, 2, 1)) lerp_vector.lerpVectors(camera.value?.position, target_vector, 0.5)
// lerp_vector.setComponent(1, d) lerp_vector.setComponent(1, d)
// const multiply = new Vector3(1.25, 1, 1.25) // const multiply = new Vector3(1.25, 1, 1.25)
const multiply = new Vector3(1, 1, 1) const multiply = new Vector3(1, 1, 1)
@ -294,7 +294,7 @@ watch(() => sidebar.is_open && sidebar.id_clickable, () => {
camera.value?.position camera.value?.position
&& ( && (
camera.value?.position.distanceTo(lerp_move) > d camera.value?.position.distanceTo(lerp_move) > d
|| camera.value?.position.distanceTo(target_move) > 10 || camera.value?.position.distanceTo(target_move) > raw_dataStore.data.min_distance
) )
) { ) {
set_moveto(smooth_target, lerp_vector) set_moveto(smooth_target, lerp_vector)
@ -462,11 +462,11 @@ onUnmounted(() => {
<TresObject3D v-bind="item.clone()" :ref="clickable_refs[i]" /> <TresObject3D v-bind="item.clone()" :ref="clickable_refs[i]" />
</template> </template>
<TresMesh :position="point_1"> <TresMesh :position="point_1">
<TresBoxGeometry :args="[0.1, 0.1, 0.1]" /> <TresSphereGeometry :args="[0.1, 32,32]" />
<TresMeshStandardMaterial color="violet" /> <TresMeshStandardMaterial color="violet" />
</TresMesh> </TresMesh>
<TresMesh :position="point_2"> <TresMesh :position="point_2">
<TresBoxGeometry :args="[0.1, 0.1, 0.1]" /> <TresSphereGeometry :args="[0.1, 32,32]" />
<TresMeshStandardMaterial color="darkgreen" /> <TresMeshStandardMaterial color="darkgreen" />
</TresMesh> </TresMesh>
</TresGroup> </TresGroup>