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

17.82bbf60e16d46d39aea0.js

@@ -3374,7 +3374,7 @@
                 })
         },
         2049: function(e, t, n) {
-            e.exports = n.p + "8f205d6811eb2231cd87b97fa86a3099.warn-button.png"
+            e.exports = n.p + "warn-button.png"
         }
     }
 ]);

数据参考/数据方面的笔记.txt

@@ -0,0 +1,197 @@
+																							datasets
+bounding_box_max和bounding_box_min对应的是cloud.js里的tightBoundingBox
+bundle_id？3
+color？"pink"
+gridmap_filename？"map.2cm.png"               http://indoor.popsmart.cn:8084/sxswsw/data/2017-11-11_06.36.39/map.2cm.png
+gridmap_orientation？0
+gridmap_origin？[-19.984063, -15.131225]
+gridmap_res？0.02
+gridmap_size？[1334, 1703]
+has_depth_images？是否有深度图
+has_images？是否有全景图
+id？43
+location？[120.58636147069285, 29.991338912466446, 0.2674398422241211]
+name：点云数据目录
+orientation？-1.5064133791782077
+point_cloud_type：数据类型，这里是点云———"POTREE"
+security: 功能权限，如：{group_read: 0, group_write: 1, can_write: false}
+site_model_entity_id？12
+title？"1111-19"
+type："NAVVIS"
+visible？如：false
+**********************************************************************************************************************************************************************************************
+																							camera_heads
+alpha_masks：null|["M1/alphamask-100-808x616-0.png", "M1/alphamask-100-808x616-1.png", "M1/alphamask-100-808x616-2.png",…]|["M2-rev0/cam0.png", "M2-rev0/cam1.png", "M2-rev0/cam2.png", "M2-rev0/cam3.png", "M2-rev0/cam4.png",…]
+blending：null|"+"
+depth_fn_format？
+depth_resolutions？0
+fn_format:？cube图， "$ID-pano-tex-$TILE.jpg"|"$ID-ladybug-$INDEX.jpg"|"$ID-ladybug-$INDEX-tex.jpg"|"$ID-cam$INDEX.jpg"|"cam/tiles/r$RES/$ID100/$ID-cam$CAM-tex-r$RES-$TILE.jpg"
+id: 1|2|3
+identifier: "pano-rev0"|"m1-rev0-preview"|"m1-rev0"
+meshes: ["pano/tiles/pano-00.obj", "pano/tiles/pano-01.obj", "pano/tiles/pano-02.obj",…]|["M1/ladybug0.obj", "M1/ladybug1.obj", "M1/ladybug2.obj", "M1/ladybug3.obj", "M1/ladybug4.obj",…]|["M1/ladybug0.obj", "M1/ladybug1.obj", "M1/ladybug2.obj", "M1/ladybug3.obj", "M1/ladybug4.obj",…]
+name: "Panorama"|"Ladybug 3 Preview"|"Ladybug 3"
+resolutions: 1
+tiles: 32|0|0|16
+**********************************************************************************************************************************************************************************************
+																							site_model
+area: 9749.732002969164
+attributes: {}
+center: [120.58631611971951, 29.991368179921004, 0]
+children: 格式和当前数据格式一致
+geometry_hash: 1891071345
+id: 1
+name: "三味书屋"
+polygon: {type: "Polygon",…}
+type: "BUILDING"
+volume: null
+z_max: null
+z_min: null		
+**********************************************************************************************************************************************************************************************
+																							tiled_maps		(应该是地图数据)
+bundle_id: 3
+file_name: "$DEPTH/$X/$Y.png"
+file_path: "data/bundle_e67bb877-9674-4549-b6c6-5edf049a8ef5/building_1/map_tiles/2"         
+floor_id: 2
+id: 5
+location: [120.58621281403158, 29.991430706723694, 0.22243994499999997]
+map_size_m: 61.44
+max_depth: 3
+orientation: 朝向，应该是quaternation                              [0.6497313898579827, 0, 0, 0.7601638777482221]
+quadtree: "fccf7fffcff3bf7f"
+tile_size_px: 256
+type: "TILED_PYRAMID"	
+**********************************************************************************************************************************************************************************************
+																							1463（初始点id）
+camera_head_id: 12
+dataset_floor_location: [-0.8071792828, -7.8391666032, 0]
+dataset_id: 61                //数据id，比如：分块了。自增1
+dataset_location: [-0.9235293705548061, -7.901821757534243, 1.7464048584209941]
+dataset_orientation: [-0.13446655377624134, 0.010837326206415367, -0.005118374440006826, 0.9908456491502733]
+file_id: "00013"                                //应该是拍摄的时候，可以分多段拍摄，每一段都是从00000开始递增
+file_path: "data/2017-11-11_06.42.12"
+floor_location: [120.58627072961269, 29.991507924850293, 0.30361461639404297]
+hidden: false
+id: 1463
+location: [120.58627208336249, 29.99150810503829, 2.050019474815037]
+orientation: 朝向，应该是quaternation								[-0.9992717488441094, 0.006889078915013335, 0.009807445534648216, 0.03622604707280119]
+site_model_entity_id: 14
+**********************************************************************************************************************************************************************************************
+																									within
+貌似移动距离比较远的时候需要用到这个数据
+**********************************************************************************************************************************************************************************************
+要下载的数据：
+camera_heads.json里：
+1. meshes，如：http://indoor.popsmart.cn:8084/sxswsw/camera_head/pano/tiles/pano-01.obj
+   目前还缺少，补充
+2. alpha_masks，http://indoor.popsmart.cn:8084/sxswsw/camera_head/+alpha_masks
+3. 发送请求filter，返回一组数据。通过id，能找到所有的信息。比如：file_path，然后从camera_heads的固定规则里找到图片
+4. "identifier": "pano-multires-rev0"———————————————————— fn_format对应的图片：32张，resolutions有个算法：getHighestRes，ID,INDEX等方面的算法：getImageFilename，file_id
+	"fn_format": "pano/tiles/r$RES/$ID100/$ID-pano-tex-r$RES-$TILE.jpg",
+	"depth_fn_format": "pano_depth/tiles/r$RES/$ID100/$ID-pano-depth-r$RES-$TILE.png",
+
+**********************************************************************************************************************************************************************************************
+左侧栏的兴趣点对应：poi_types
+
+**********************************************************************************************************************************************************************************************
+																									调试						
+core.map.tile_url
+
+
+onLoadComplete      加载完全景图
+是否有点云：t.config.showPointCloud
+
+t.prototype.mapToRepositoryEntities
+e.promiseFinally = function(t, e) {
+        return t.then((function(t) {
+            return e(),
+            t
+        }
+        )).catch((function(t) {
+            return e(),
+            Promise.reject(t)
+        }
+        ))
+    }
+**********************************************************************************************************************************************************************************************
+																									两个后端请求
+http://indoor.popsmart.cn:8084/sxswsw/api/site_model/within?location=120.58627789013173&location=29.99158123449871&location=1.149475336074829&type=FLOOR
+http://indoor.popsmart.cn:8084/sxswsw/api/images/filter?hidden=false&lat=29.991621550412095&lon=120.58615962007934&radius=20&site_model_entity=2&site_model_entity=
+**********************************************************************************************************************************************************************************************
+																									换文件名称
+0.000f190386b228875e25.js                  ——————————         0.js
+1.c1853290f670423b7527.js                  ——————————         1.js
+2.2ce6b49b8b065f35ecd0.js                  ——————————         2.js
+3.eaed849cc22768e36240.js                  ——————————         3.js
+14.4331acc2c778ecc64c4a.js                  ——————————        14.js
+15.911fc079db6705d168db.js                  ——————————        15.js
+17.82bbf60e16d46d39aea0.js                 ——————————         17.js
+18.74aff998a9a0809c55ec.js                ——————————          18.js
+19.77825ef0e44aed4d6923.js                 ——————————         19.js
+20.6b25999da18928efa560.js                 ——————————         20.js
+21.6e35bf5486d7bec96c04.js                 ——————————         21.js
+22.5e732276a454498ed917.js                 ——————————         22.js
+23.8641b8fc3d6165bb187f.js				   ——————————         23.js
+24.4b5f0f3ea342b634f9c3.js				   ——————————         24.js
+25.1f3d6c9616e13f12f5f2.js				   ——————————         25.js
+NotoSansCJKsc-Regular.3d696b37feacacc5ade6.js      ——————————         5.js
+fonts.5129d374a8ae9f620fd1.js              ——————————         8.js
+main.async.937f8f38454add70d57b.js			——————————         10.js
+vendors~main.async.cbcba49054e73e98695c.js		——————————         12.js
+PointCloud.6891a103d9b18f6f5ac7.worker.js       ——————————         PointCloud.worker.js
+
+
+
+9f295a8711d42490962d5d7eb42bfee1.pen-nib-solid.cur                            ————————————————————            pen-nib-solid.cur
+3cc6dd6b814d62e7270783a55e55773d.pen-nib-solid.png							  ————————————————————            pen-nib-solid.png
+a4a8aed5ebf7004a129844882204bbb4.rotate-cursor.png                            ————————————————————            rotate-cursor.png
+681aa02995db01b49b6b5e6e83b85cce.rotate-cursor.cur							  ————————————————————            rotate-cursor.cur
+
+e2266fec7968df82769dcc02eb218d15.generic_poi.png							  ————————————————————            generic_poi.png
+
+911dbf3b5d56a1cc57ae19a7671c6c85.pano_instruction_bottomMarker.png			  ————————————————————            pano_instruction_bottomMarker.png
+3ffd85dd86a402de1f828170c4c1777c.dot.png                                      ————————————————————            dot.png
+cefa3b0a823563a3f963806aeee2b100.list_instruction_start_route.png             ————————————————————            list_instruction_start_route.png
+bd1e2bece420a7fbb197868a81781f9e.pano_instruction_start_route.png             ————————————————————            pano_instruction_start_route.png
+1f93ee89d694ee48a92f0fcdd32e1245.map_instruction_start_route.png              ————————————————————            map_instruction_start_route.png
+f37f8fa9bda44f7e336cc06047b348da.list_instruction_reach_target.png            ————————————————————            list_instruction_reach_target.png
+47fcfb41157da93803056c5e50456618.pano_instruction_target_reached.png          ————————————————————            pano_instruction_target_reached.png
+1948d8fcdc35436c8556acf54aee3ec3.map_instruction_target_reached.png           ————————————————————            map_instruction_target_reached.png
+
+cf98f0467d25a11595abd53403eaaf00.location_marker.png                          ————————————————————            location_marker.png 
+cf98f0467d25a11595abd53403eaaf00.route_end.png                                ————————————————————            route_end.png 
+c963f7b7c5a8b68495d347a8e6c74433.route_start.png                              ————————————————————            route_start.png 
+
+61226493556b9325acb06ff86cbb268f.routePoint_map_activeFloor.png               ————————————————————            routePoint_map_activeFloor.png 
+b8fc7bc95148b00a9db30132f3e3df6d.routePoint_map_fsna.png                      ————————————————————            routePoint_map_fsna.png 
+48b777f04664666d50d865f31c9c984b.routePoint_map_inactiveFloor.png             ————————————————————            routePoint_map_inactiveFloor.png 
+af15c6d6a2349058d403d4a736224a01.routePoint_panorama.png                      ————————————————————            routePoint_panorama.png 
+
+0ae72e353e12716c1d1b33208d4c0ad6.arrow.png									  ————————————————————            arrow.png 
+
+fb3ab9c94f62cf131c6573f56f3b6a21.horizontal_area_rectangle_sprite.png         ————————————————————            horizontal_area_rectangle_sprite.png 
+62fca11720049dda74b20178901ab62f.vertical_area_rectangle_sprite.png           ————————————————————            vertical_area_rectangle_sprite.png 
+
+3a167e1c80554e2dc13b68eda20db6a7.horizontal_distance_sprite.png               ————————————————————             horizontal_distance_sprite.png
+29def06d2d56645e9e7de3b76545eb4a.vertical_distance_sprite.png                 ————————————————————             vertical_distance_sprite.png
+
+f52cae0f414e4f4c6a834b1e406e35d5.horizontal_area_polygon_sprite.png			  ————————————————————             horizontal_area_polygon_sprite.png
+d582e1270c2a21f1e9dd3a4660d8723a.vertical_area_polygon_sprite.png			  ————————————————————             vertical_area_polygon_sprite.png
+
+8f205d6811eb2231cd87b97fa86a3099.warn-button.png							  ————————————————————             warn-button.png	
+
+14e42f83c89495bc6eb91ae0af686e41.gridmap.png								  ————————————————————             gridmap.png	
+
+73e183436a3300a80bd91a9900fb2110.plane_sprite_error.png						  ————————————————————             plane_sprite_error.png	
+
+81cf314660ee47ab9c04dc47bc26de4b.cursor_side.png							  ————————————————————             cursor_side.png	
+42358c64435fd5376879b55e8cd16a0d.cross_hair.png								  ————————————————————             cross_hair.png	
+
+97b12108959387b52a04a35b6db1a1fe.mag_cross_hair.png								————————————————————             mag_cross_hair.png	
+735f901d522b7d5ddbae03a04ea90bcd.save.png              							 ———————————————————— 			save.png
+ee79da0466afec3b5f9771e2fe9e43d0.delete.png            							 ———————————————————— 			delete.png
+cf8f540e8ad6b9b5240815d29ce9ffb3.visibility_off.png    							 ———————————————————— 			visibility_off.png
+53567edcbcc9783a15dbbf9d01fdf97c.map_location_marker.png                   ————————————————————          map_location_marker.png
+583917ff154f83c6f7dc2a470a8e7a01.free_distance_sprite.png                      ————————————————————          free_distance_sprite.png
+c87e88d87bbf2a8cced1ff0de447470e.circle.png									————————————————————          circle.png
+d143aded330ea211e9040fdeaad9a887.free_area_sprite.png								————————————————————          free_area_sprite.png
+f7f4580762659d45b29743dc1e15c0f4.rotation_circle.png							————————————————————          rotation_circle.png