Merge pull request #56 from OpenStudiosCo/feature/30-pet-wall

Pet wall minor fixes and tweaks
OpenStudiosCo · Sep 29, 2024 · 2ea7ec4 · 2ea7ec4
2 parents 0f03059 + f7db440
commit 2ea7ec4
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/docs/index.html b/docs/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><meta name="description" content="We are Open Studios. Perth based digital production studio."><title>Open Studios | Perth, Western Australia</title><link rel="apple-touch-icon" sizes="180x180" href="/assets/favicon/apple-touch-icon.png"><link rel="icon" type="image/png" sizes="32x32" href="/assets/favicon/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/assets/favicon/favicon-16x16.png"><link rel="manifest" href="/assets/favicon/site.webmanifest" crossorigin="use-credentials"><link rel="mask-icon" href="/assets/favicon/safari-pinned-tab.svg" color="#5bbad5"><meta name="msapplication-TileColor" content="#da532c"><meta name="theme-color" content="#000000"><link rel="stylesheet" href="/assets/css/keen-slider.min.css"><script async src="/assets/js/keen-slider.js"></script><link rel="stylesheet" href="/assets/css/parvus.min.css"><script src="/assets/js/parvus.min.js"></script><link rel="stylesheet" href="/assets/css/1999.css"><script src="https://www.google.com/recaptcha/api.js"></script><link rel="canonical" href="https://openstudios.xyz/"><meta property="og:title" content="Open Studios | Perth, Western Australia"><meta property="og:description" content="Welcome to Open Studios, your go-to destination for cutting-edge digital creative and technical production. Nestled in the vibrant city of Perth, Australia, we pride ourselves on being a specialized digital production studio that stands out from the crowd."><meta property="og:type" content="article"><meta property="og:image" content="https://openstudios.xyz/assets/images/virtual_office.jpg"><meta property="og:image:width" content="1024"><meta property="og:image:height" content="768"><meta name="twitter:title" content="Open Studios | Perth, Western Australia"><meta name="twitter:card" content="summary_large_image"><meta name="twitter:description" content="Welcome to Open Studios, your go-to destination for cutting-edge digital creative and technical production. Nestled in the vibrant city of Perth, Australia, we pride ourselves on being a specialized digital production studio that stands out from the crowd."><meta name="twitter:image" content="https://openstudios.xyz/assets/images/virtual_office.jpg"><script async src="https://www.googletagmanager.com/gtag/js?id=AW-983760722"></script><script>window.dataLayer = window.dataLayer || [];
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"><meta name="description" content="We are Open Studios. Perth based digital production studio."><title>Open Studios | Perth, Western Australia</title><link rel="apple-touch-icon" sizes="180x180" href="/assets/favicon/apple-touch-icon.png"><link rel="icon" type="image/png" sizes="32x32" href="/assets/favicon/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/assets/favicon/favicon-16x16.png"><link rel="manifest" href="/assets/favicon/site.webmanifest" crossorigin="use-credentials"><link rel="mask-icon" href="/assets/favicon/safari-pinned-tab.svg" color="#5bbad5"><meta name="msapplication-TileColor" content="#da532c"><meta name="theme-color" content="#000000"><link rel="stylesheet" href="/assets/css/keen-slider.min.css"><script async src="/assets/js/keen-slider.js"></script><link rel="stylesheet" href="/assets/css/parvus.min.css"><script src="/assets/js/parvus.min.js"></script><link rel="stylesheet" href="/assets/css/1999.css"><script src="https://www.google.com/recaptcha/api.js"></script><link rel="canonical" href="https://openstudios.xyz/"><meta property="og:title" content="Open Studios | Perth, Western Australia"><meta property="og:description" content="Welcome to Open Studios, your go-to destination for cutting-edge digital creative and technical production. Nestled in the vibrant city of Perth, Australia, we pride ourselves on being a specialized digital production studio that stands out from the crowd."><meta property="og:type" content="article"><meta property="og:image" content="https://openstudios.xyz/assets/images/virtual_office.jpg"><meta property="og:image:width" content="1024"><meta property="og:image:height" content="768"><meta name="twitter:title" content="Open Studios | Perth, Western Australia"><meta name="twitter:card" content="summary_large_image"><meta name="twitter:description" content="Welcome to Open Studios, your go-to destination for cutting-edge digital creative and technical production. Nestled in the vibrant city of Perth, Australia, we pride ourselves on being a specialized digital production studio that stands out from the crowd."><meta name="twitter:image" content="https://openstudios.xyz/assets/images/virtual_office.jpg"><script async src="https://www.googletagmanager.com/gtag/js?id=AW-983760722"></script><script>window.dataLayer = window.dataLayer || [];
 function gtag(){dataLayer.push(arguments);}
 gtag('js', new Date());
 

diff --git a/docs/main.js b/docs/main.js
diff --git a/src/app/events.js b/src/app/events.js
@@ -84,13 +84,7 @@ export async function handleViewportChange() {
       window.virtual_office.camera.rotation.copy( targetRotation );
 
     }
-    if ( window.virtual_office.selected.name == 'portraits' ) {
-      let [ targetPosition, targetRotation ] = window.virtual_office.scene_objects.portraits.getViewingCoords();
 
-      window.virtual_office.camera.position.copy( targetPosition );
-      window.virtual_office.camera.rotation.copy( targetRotation );
-
-    }
 
     if ( window.virtual_office.scene_objects.blog_selected_title ) {
       let meshWidth = getMeshWidth( window.virtual_office.scene_objects.blog_selected_title ) * .1;
@@ -103,7 +97,13 @@ export async function handleViewportChange() {
 
     if ( window.virtual_office.scene_objects.portraits ) {
       window.virtual_office.scene_objects.portraits.position.z = - 15 + ( ( window.virtual_office.room_depth / 8 ) * 2.5 );
-    }   
+    }
+    if ( window.virtual_office.selected.name == 'portraits' ) {
+      let [ targetPosition, targetRotation ] = window.virtual_office.scene_objects.portraits.getViewingCoords();
+
+      window.virtual_office.camera.position.copy( targetPosition );
+      window.virtual_office.camera.rotation.copy( targetRotation );
+    }
 
   }
 }

diff --git a/src/app/furniture/pets.js b/src/app/furniture/pets.js
@@ -133,8 +133,8 @@ export async function setupPortraits() {
     const distanceHorizontal = window.innerWidth / ( 2 * Math.tan( fovHorizontal / 2 ) );
 
     // Adjust distance factor based on aspect ratio
-    let distanceFactor = aspectRatio > 1 ? 0.025 : 0.065;  // Increase factor slightly for very wide screens
-    distanceFactor = aspectRatio > 2 ? 0.035 : distanceFactor;
+    let distanceFactor = aspectRatio > 1 ? 0.055 : 0.065;  // Increase factor slightly for very wide screens
+    distanceFactor = aspectRatio > 2 ? 0.055 : distanceFactor;
     distanceFactor = aspectRatio > 2.2 ? 0.045 : distanceFactor;
     distanceFactor = aspectRatio < 0.5 ? 0.65 : distanceFactor;
 

diff --git a/src/templates/2023.pug b/src/templates/2023.pug
@@ -2,7 +2,7 @@ doctype html
 html(lang='en')
     head
         meta(charset='utf-8')
-        meta(name='viewport' content='width=device-width, initial-scale=1')
+        meta(name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no')
         meta(name="description" content="We are Open Studios. Perth based digital production studio.")
 
         title Open Studios | Perth, Western Australia