lateri hace 4 años
padre
commit
a76c69ba82
Se han modificado 1 ficheros con 6 adiciones y 31 borrados
  1. 6 31
      main.js

+ 6 - 31
main.js

@@ -273,7 +273,6 @@ function init() {
 
     initMenu()
 
-    // changeSpots()
 
     lat = house.src[house.idx].view.lat
     lon = house.src[house.idx].view.lon
@@ -344,34 +343,6 @@ function init() {
 
 
 
-function changeSpots(){
-    
-    const map = new THREE.TextureLoader().load( './nanimages/point.png' );
-    const idx = house.idx
-
-    for(let i=spotGroup.children.length-1;i>=0;i--){
-        spotGroup.remove(spotGroup.children[i])
-    }       
-
-    let spots = house.src[idx].spots
-    for(let spot of spots){
-
-        const geometry = new THREE.CircleGeometry( 5, 32 );
-        const material = new THREE.MeshBasicMaterial( {map: map, color: 0xffff00,side:THREE.DoubleSide,transparent:true } );
-        
-        const circle = new THREE.Mesh( geometry, material );
-
-        circle.position.set(spot.position.x,spot.position.y,spot.position.z)
-        circle.scale.set(spot.scale.x,spot.scale.y,spot.scale.z)
-        circle.rotation.set(spot.rotate.x,spot.rotate.y,spot.rotate.z)
-
-        spotGroup.add( circle );
-    }
-
-    
-}
-
-
 function initMenu(){
     var menu=document.getElementById("menu");
     while (menu.firstChild) {
@@ -1148,8 +1119,6 @@ function setHomePosition(){
     document.getElementById('cam').style.top = top + 'px';
     document.getElementById('cam').style.right = right+ 'px';
 
-    // changeSpots()
-
     if(!isAutoPlay){
         updateMapPoint()
     }
@@ -1408,6 +1377,8 @@ var btn = new tvSysBtnBind({
     onEnterPress: function() {
     },
     onBack: function() {
+
+        
        
        if(isAutoPlay){
             isAutoPlay = false
@@ -1427,10 +1398,14 @@ var btn = new tvSysBtnBind({
 
                 document.getElementById('debug').innerHTML +="<br>" +url
 
+                return;
+
                 // window.location.replace(url)  
                 // window.location.href = url  
                 // VrBrowserToJS.vrBrowerExit()
             }
        }
+
+       return;
     }
 });