From e4a661a23fc133276e23189df7d8034db8d52f56 Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Mon, 12 Aug 2024 12:50:52 +0300 Subject: [PATCH] size check --- front/src/components/Promo/load_models.vue | 13 ++++++++++--- front/src/components/Promo/main.vue | 9 +++++++++ front/src/components/Promo/sidebar.vue | 15 ++++++++++++++- 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/front/src/components/Promo/load_models.vue b/front/src/components/Promo/load_models.vue index 95eaf6b..b094551 100644 --- a/front/src/components/Promo/load_models.vue +++ b/front/src/components/Promo/load_models.vue @@ -42,17 +42,23 @@ const groundTexture = await useTexture({ }) const timer = ref(10) -let int +let int:any; // renderer.value.capabilities.maxTextures = 4 renderer.value.capabilities.maxTextureSize = 512 renderer.value.capabilities.precision = 'lowp' +const mobileAndTabletCheck = () => { + let check = false; + (function (a) { if (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test(a) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0, 4))) check = true; })(navigator.userAgent || navigator.vendor || window.opera); + return check; +}; + const loadModels = async () => { const res = await fetch(`${SERVER_URL}/api/obj/scene/${props.source}`) const raw_data = await res.json() as scene3D - envVars.focus = raw_data.max_distance * 0.5 + envVars.focus = raw_data.max_distance * 0.75 if (raw_data.env) { Object.assign(envVars, raw_data.env) } else { @@ -70,7 +76,8 @@ const loadModels = async () => { camera.value?.position.set(1, 1, 1); controls.value.enabled = false; - (controls.value as any).minDistance = raw_data.min_distance; + // console.log(mobileAndTabletCheck() ? raw_data.min_distance * 0.5 : raw_data.min_distance); + (controls.value as any).minDistance = mobileAndTabletCheck() ? raw_data.min_distance * 0.5 : raw_data.min_distance; (controls.value as any).maxDistance = raw_data.max_distance; (controls.value as any)._needsUpdate = true; (controls.value as any).update() diff --git a/front/src/components/Promo/main.vue b/front/src/components/Promo/main.vue index ff6542f..93e9f05 100644 --- a/front/src/components/Promo/main.vue +++ b/front/src/components/Promo/main.vue @@ -105,6 +105,11 @@ watch(() => route.params.target, () => { svg { font-size: 3rem; padding: 1.5rem; + + @media(max-width:768px) { + font-size: 2rem; + padding: 1rem; + } } a { @@ -115,6 +120,10 @@ watch(() => route.params.target, () => { line-height: 1; font-size: 0; display: block; + + @media(max-width:768px) { + margin-top: 1rem; + } } } \ No newline at end of file diff --git a/front/src/components/Promo/sidebar.vue b/front/src/components/Promo/sidebar.vue index cd7f512..469dc35 100644 --- a/front/src/components/Promo/sidebar.vue +++ b/front/src/components/Promo/sidebar.vue @@ -56,6 +56,11 @@ const sidebar_obj = ref() padding: 3rem 2rem 2rem; + @media(max-width:768px) { + padding-left: 0.5rem; + padding-right: 0.5rem; + } + &.open { right: 0 } @@ -66,6 +71,10 @@ const sidebar_obj = ref() top: 0.5rem; font-size: 2rem; color: black; + + @media(max-width:768px) { + lefT: 0.5rem; + } } &-content { @@ -99,7 +108,11 @@ const sidebar_obj = ref() h3 { font-size: 1.5rem; - font-weight: bold + font-weight: bold; + + @media(max-width:768px) { + font-size: 1rem; + } } .btn {