freealise commited on
Commit
4f9528c
·
verified ·
1 Parent(s): 8552426

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +17 -4
app.py CHANGED
@@ -694,6 +694,7 @@ async(c, o, p, d, n, m, s)=>{
694
  BABYLON.Engine.LastCreatedScene.meshes[BABYLON.Engine.LastCreatedScene.meshes.length-1].visibility = 0.9999;
695
 
696
  window.md = false;
 
697
  window.compass = document.getElementById("compass");
698
  window.x = 0;
699
  window.y = 0;
@@ -703,8 +704,8 @@ async(c, o, p, d, n, m, s)=>{
703
  window.ctx = null;
704
  window.video = document.getElementById("depth_video").getElementsByTagName("video")[0];
705
  window.parallax = 0;
706
- window.xdir = new BABYLON.Vector3(1, 0, 0);
707
- window.rdir = new BABYLON.Vector3(1, 0, 0);
708
 
709
  document.getElementById("model3D").getElementsByTagName("canvas")[0].addEventListener('pointermove', function(evt) {
710
  if (md === true) {
@@ -715,7 +716,7 @@ async(c, o, p, d, n, m, s)=>{
715
  x = parseInt(evt.clientX - evt.target.getBoundingClientRect().x);
716
  y = parseInt(evt.clientY - evt.target.getBoundingClientRect().y);
717
 
718
- if (Math.abs(x-xold)>16 || Math.abs(y-yold)>16) {
719
  if (Math.abs(BABYLON.Engine.LastCreatedScene.activeCamera.radius) > (1.57-0.157)*16) {
720
  BABYLON.Engine.LastCreatedScene.activeCamera.radius = (1.57-0.157)*16;
721
  } else {
@@ -737,15 +738,28 @@ async(c, o, p, d, n, m, s)=>{
737
  });
738
  document.getElementById("model3D").getElementsByTagName("canvas")[0].addEventListener('pointerup', function() {
739
  md = false;
 
740
  });
741
  document.getElementById("model3D").getElementsByTagName("canvas")[0].addEventListener('pointercancel', function() {
742
  md = false;
 
743
  });
744
  document.getElementById("model3D").getElementsByTagName("canvas")[0].addEventListener('pointerleave', function() {
745
  md = false;
 
746
  });
747
  document.getElementById("model3D").getElementsByTagName("canvas")[0].addEventListener('pointerout', function() {
748
  md = false;
 
 
 
 
 
 
 
 
 
 
749
  });
750
 
751
 
@@ -1301,7 +1315,6 @@ with gr.Blocks(css=css, js=js, head=head) as demo:
1301
  rdir = BABYLON.Engine.LastCreatedScene.activeCamera.getDirection(xdir);
1302
  BABYLON.Engine.LastCreatedScene.meshes[BABYLON.Engine.LastCreatedScene.meshes.length-1].position.x = parallax * rdir.x;
1303
  BABYLON.Engine.LastCreatedScene.meshes[BABYLON.Engine.LastCreatedScene.meshes.length-1].position.z = parallax * rdir.z;
1304
- alert(BABYLON.Engine.LastCreatedScene.meshes[BABYLON.Engine.LastCreatedScene.meshes.length-1].position);
1305
  this.parentNode.childNodes[2].innerText = parallax;
1306
  '/><span>0.0</span></span><br/>
1307
  <span><label for='contrast' style='width:8em'>Contrast</label><input id='contrast' type='range' style='width:128px;height:1em;' value='1.0' min='0' max='2' step='0.001' oninput='
 
694
  BABYLON.Engine.LastCreatedScene.meshes[BABYLON.Engine.LastCreatedScene.meshes.length-1].visibility = 0.9999;
695
 
696
  window.md = false;
697
+ window.rd = false;
698
  window.compass = document.getElementById("compass");
699
  window.x = 0;
700
  window.y = 0;
 
704
  window.ctx = null;
705
  window.video = document.getElementById("depth_video").getElementsByTagName("video")[0];
706
  window.parallax = 0;
707
+ window.xdir = new BABYLON.Vector3(0, 0, 1);
708
+ window.rdir = new BABYLON.Vector3(0, 0, 1);
709
 
710
  document.getElementById("model3D").getElementsByTagName("canvas")[0].addEventListener('pointermove', function(evt) {
711
  if (md === true) {
 
716
  x = parseInt(evt.clientX - evt.target.getBoundingClientRect().x);
717
  y = parseInt(evt.clientY - evt.target.getBoundingClientRect().y);
718
 
719
+ if (rd === true && Math.abs(x-xold)>16 || Math.abs(y-yold)>16) {
720
  if (Math.abs(BABYLON.Engine.LastCreatedScene.activeCamera.radius) > (1.57-0.157)*16) {
721
  BABYLON.Engine.LastCreatedScene.activeCamera.radius = (1.57-0.157)*16;
722
  } else {
 
738
  });
739
  document.getElementById("model3D").getElementsByTagName("canvas")[0].addEventListener('pointerup', function() {
740
  md = false;
741
+ rd = false;
742
  });
743
  document.getElementById("model3D").getElementsByTagName("canvas")[0].addEventListener('pointercancel', function() {
744
  md = false;
745
+ rd = false;
746
  });
747
  document.getElementById("model3D").getElementsByTagName("canvas")[0].addEventListener('pointerleave', function() {
748
  md = false;
749
+ rd = false;
750
  });
751
  document.getElementById("model3D").getElementsByTagName("canvas")[0].addEventListener('pointerout', function() {
752
  md = false;
753
+ rd = false;
754
+ });
755
+ document.getElementById("model3D").getElementsByTagName("canvas")[0].addEventListener('contextmenu', function() {
756
+ rd = true;
757
+ });
758
+ document.getElementById("model3D").getElementsByTagName("canvas")[0].addEventListener('gesturestart', function() {
759
+ rd = true;
760
+ });
761
+ document.getElementById("model3D").getElementsByTagName("canvas")[0].addEventListener('gestureend', function() {
762
+ rd = false;
763
  });
764
 
765
 
 
1315
  rdir = BABYLON.Engine.LastCreatedScene.activeCamera.getDirection(xdir);
1316
  BABYLON.Engine.LastCreatedScene.meshes[BABYLON.Engine.LastCreatedScene.meshes.length-1].position.x = parallax * rdir.x;
1317
  BABYLON.Engine.LastCreatedScene.meshes[BABYLON.Engine.LastCreatedScene.meshes.length-1].position.z = parallax * rdir.z;
 
1318
  this.parentNode.childNodes[2].innerText = parallax;
1319
  '/><span>0.0</span></span><br/>
1320
  <span><label for='contrast' style='width:8em'>Contrast</label><input id='contrast' type='range' style='width:128px;height:1em;' value='1.0' min='0' max='2' step='0.001' oninput='