Ver código fonte

Merge branch 'master' of http://192.168.0.115:3000/4dkankan/laser_v1

jinx 4 anos atrás
pai
commit
319172c968
2 arquivos alterados com 7 adições e 4 exclusões
  1. 3 0
      IndoorViewerAPI.js
  2. 4 4
      api/tiled_maps

+ 3 - 0
IndoorViewerAPI.js

@@ -191458,6 +191458,9 @@ and limitations under the License.
               , u = n / e + .5 * (c - 1)
               , d = -a / e + .5 * (c - 1)
               , p = t.getTileUrl(Math.round(l), Math.round(u), Math.round(d));
+              if(p.includes("mapTest3/2") ){
+                console.log(p)
+            }
             this.mesh.renderOrder = -(1e6 - l - 100 * (t.zIndex || 0));
             var h = this.mesh.material;
             h.map = t.textureLoader.load(p, (function(t) {

+ 4 - 4
api/tiled_maps

@@ -1,14 +1,14 @@
 [{
 	"bundle_id": 3,
-	"file_path": "data/building_1/mapTest2",
+	"file_path": "data/building_1/mapTest3",
 	"file_name": "$DEPTH/$X/$Y.png",
 	"floor_id": 11,
 	"id": 5,
-	"map_size_m": 37.10058256252635,
+	"map_size_m": 123.84682999939342,
 	"max_depth": 3,
 	"quadtree": "fccf7fffcff3bf7f",
-	"location": [113.5892056859005,22.367124170442096,0.5987030136375425],
-	"orientation": [1,0,0,0],
+	"location": [113.58819689242937,22.366342173244817,100.5987030136375425],
+	"orientation": [0.7071067811865476, 0, 0, 0.7071067811865475],
 	"tile_size_px": 256,
 	"type": "TILED_PYRAMID"
 }]