Bladeren bron

修改laser loaded触发时机

bill 2 jaren geleden
bovenliggende
commit
daa0270036

+ 0 - 539
public/static/lib/iconfont/demo.css

@@ -1,539 +0,0 @@
-/* Logo 字体 */
-@font-face {
-  font-family: "iconfont logo";
-  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
-  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
-    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
-    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
-    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
-}
-
-.logo {
-  font-family: "iconfont logo";
-  font-size: 160px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-/* tabs */
-.nav-tabs {
-  position: relative;
-}
-
-.nav-tabs .nav-more {
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  height: 42px;
-  line-height: 42px;
-  color: #666;
-}
-
-#tabs {
-  border-bottom: 1px solid #eee;
-}
-
-#tabs li {
-  cursor: pointer;
-  width: 100px;
-  height: 40px;
-  line-height: 40px;
-  text-align: center;
-  font-size: 16px;
-  border-bottom: 2px solid transparent;
-  position: relative;
-  z-index: 1;
-  margin-bottom: -1px;
-  color: #666;
-}
-
-
-#tabs .active {
-  border-bottom-color: #f00;
-  color: #222;
-}
-
-.tab-container .content {
-  display: none;
-}
-
-/* 页面布局 */
-.main {
-  padding: 30px 100px;
-  width: 960px;
-  margin: 0 auto;
-}
-
-.main .logo {
-  color: #333;
-  text-align: left;
-  margin-bottom: 30px;
-  line-height: 1;
-  height: 110px;
-  margin-top: -50px;
-  overflow: hidden;
-  *zoom: 1;
-}
-
-.main .logo a {
-  font-size: 160px;
-  color: #333;
-}
-
-.helps {
-  margin-top: 40px;
-}
-
-.helps pre {
-  padding: 20px;
-  margin: 10px 0;
-  border: solid 1px #e7e1cd;
-  background-color: #fffdef;
-  overflow: auto;
-}
-
-.icon_lists {
-  width: 100% !important;
-  overflow: hidden;
-  *zoom: 1;
-}
-
-.icon_lists li {
-  width: 100px;
-  margin-bottom: 10px;
-  margin-right: 20px;
-  text-align: center;
-  list-style: none !important;
-  cursor: default;
-}
-
-.icon_lists li .code-name {
-  line-height: 1.2;
-}
-
-.icon_lists .icon {
-  display: block;
-  height: 100px;
-  line-height: 100px;
-  font-size: 42px;
-  margin: 10px auto;
-  color: #333;
-  -webkit-transition: font-size 0.25s linear, width 0.25s linear;
-  -moz-transition: font-size 0.25s linear, width 0.25s linear;
-  transition: font-size 0.25s linear, width 0.25s linear;
-}
-
-.icon_lists .icon:hover {
-  font-size: 100px;
-}
-
-.icon_lists .svg-icon {
-  /* 通过设置 font-size 来改变图标大小 */
-  width: 1em;
-  /* 图标和文字相邻时,垂直对齐 */
-  vertical-align: -0.15em;
-  /* 通过设置 color 来改变 SVG 的颜色/fill */
-  fill: currentColor;
-  /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示
-      normalize.css 中也包含这行 */
-  overflow: hidden;
-}
-
-.icon_lists li .name,
-.icon_lists li .code-name {
-  color: #666;
-}
-
-/* markdown 样式 */
-.markdown {
-  color: #666;
-  font-size: 14px;
-  line-height: 1.8;
-}
-
-.highlight {
-  line-height: 1.5;
-}
-
-.markdown img {
-  vertical-align: middle;
-  max-width: 100%;
-}
-
-.markdown h1 {
-  color: #404040;
-  font-weight: 500;
-  line-height: 40px;
-  margin-bottom: 24px;
-}
-
-.markdown h2,
-.markdown h3,
-.markdown h4,
-.markdown h5,
-.markdown h6 {
-  color: #404040;
-  margin: 1.6em 0 0.6em 0;
-  font-weight: 500;
-  clear: both;
-}
-
-.markdown h1 {
-  font-size: 28px;
-}
-
-.markdown h2 {
-  font-size: 22px;
-}
-
-.markdown h3 {
-  font-size: 16px;
-}
-
-.markdown h4 {
-  font-size: 14px;
-}
-
-.markdown h5 {
-  font-size: 12px;
-}
-
-.markdown h6 {
-  font-size: 12px;
-}
-
-.markdown hr {
-  height: 1px;
-  border: 0;
-  background: #e9e9e9;
-  margin: 16px 0;
-  clear: both;
-}
-
-.markdown p {
-  margin: 1em 0;
-}
-
-.markdown>p,
-.markdown>blockquote,
-.markdown>.highlight,
-.markdown>ol,
-.markdown>ul {
-  width: 80%;
-}
-
-.markdown ul>li {
-  list-style: circle;
-}
-
-.markdown>ul li,
-.markdown blockquote ul>li {
-  margin-left: 20px;
-  padding-left: 4px;
-}
-
-.markdown>ul li p,
-.markdown>ol li p {
-  margin: 0.6em 0;
-}
-
-.markdown ol>li {
-  list-style: decimal;
-}
-
-.markdown>ol li,
-.markdown blockquote ol>li {
-  margin-left: 20px;
-  padding-left: 4px;
-}
-
-.markdown code {
-  margin: 0 3px;
-  padding: 0 5px;
-  background: #eee;
-  border-radius: 3px;
-}
-
-.markdown strong,
-.markdown b {
-  font-weight: 600;
-}
-
-.markdown>table {
-  border-collapse: collapse;
-  border-spacing: 0px;
-  empty-cells: show;
-  border: 1px solid #e9e9e9;
-  width: 95%;
-  margin-bottom: 24px;
-}
-
-.markdown>table th {
-  white-space: nowrap;
-  color: #333;
-  font-weight: 600;
-}
-
-.markdown>table th,
-.markdown>table td {
-  border: 1px solid #e9e9e9;
-  padding: 8px 16px;
-  text-align: left;
-}
-
-.markdown>table th {
-  background: #F7F7F7;
-}
-
-.markdown blockquote {
-  font-size: 90%;
-  color: #999;
-  border-left: 4px solid #e9e9e9;
-  padding-left: 0.8em;
-  margin: 1em 0;
-}
-
-.markdown blockquote p {
-  margin: 0;
-}
-
-.markdown .anchor {
-  opacity: 0;
-  transition: opacity 0.3s ease;
-  margin-left: 8px;
-}
-
-.markdown .waiting {
-  color: #ccc;
-}
-
-.markdown h1:hover .anchor,
-.markdown h2:hover .anchor,
-.markdown h3:hover .anchor,
-.markdown h4:hover .anchor,
-.markdown h5:hover .anchor,
-.markdown h6:hover .anchor {
-  opacity: 1;
-  display: inline-block;
-}
-
-.markdown>br,
-.markdown>p>br {
-  clear: both;
-}
-
-
-.hljs {
-  display: block;
-  background: white;
-  padding: 0.5em;
-  color: #333333;
-  overflow-x: auto;
-}
-
-.hljs-comment,
-.hljs-meta {
-  color: #969896;
-}
-
-.hljs-string,
-.hljs-variable,
-.hljs-template-variable,
-.hljs-strong,
-.hljs-emphasis,
-.hljs-quote {
-  color: #df5000;
-}
-
-.hljs-keyword,
-.hljs-selector-tag,
-.hljs-type {
-  color: #a71d5d;
-}
-
-.hljs-literal,
-.hljs-symbol,
-.hljs-bullet,
-.hljs-attribute {
-  color: #0086b3;
-}
-
-.hljs-section,
-.hljs-name {
-  color: #63a35c;
-}
-
-.hljs-tag {
-  color: #333333;
-}
-
-.hljs-title,
-.hljs-attr,
-.hljs-selector-id,
-.hljs-selector-class,
-.hljs-selector-attr,
-.hljs-selector-pseudo {
-  color: #795da3;
-}
-
-.hljs-addition {
-  color: #55a532;
-  background-color: #eaffea;
-}
-
-.hljs-deletion {
-  color: #bd2c00;
-  background-color: #ffecec;
-}
-
-.hljs-link {
-  text-decoration: underline;
-}
-
-/* 代码高亮 */
-/* PrismJS 1.15.0
-https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
-/**
- * prism.js default theme for JavaScript, CSS and HTML
- * Based on dabblet (http://dabblet.com)
- * @author Lea Verou
- */
-code[class*="language-"],
-pre[class*="language-"] {
-  color: black;
-  background: none;
-  text-shadow: 0 1px white;
-  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
-  text-align: left;
-  white-space: pre;
-  word-spacing: normal;
-  word-break: normal;
-  word-wrap: normal;
-  line-height: 1.5;
-
-  -moz-tab-size: 4;
-  -o-tab-size: 4;
-  tab-size: 4;
-
-  -webkit-hyphens: none;
-  -moz-hyphens: none;
-  -ms-hyphens: none;
-  hyphens: none;
-}
-
-pre[class*="language-"]::-moz-selection,
-pre[class*="language-"] ::-moz-selection,
-code[class*="language-"]::-moz-selection,
-code[class*="language-"] ::-moz-selection {
-  text-shadow: none;
-  background: #b3d4fc;
-}
-
-pre[class*="language-"]::selection,
-pre[class*="language-"] ::selection,
-code[class*="language-"]::selection,
-code[class*="language-"] ::selection {
-  text-shadow: none;
-  background: #b3d4fc;
-}
-
-@media print {
-
-  code[class*="language-"],
-  pre[class*="language-"] {
-    text-shadow: none;
-  }
-}
-
-/* Code blocks */
-pre[class*="language-"] {
-  padding: 1em;
-  margin: .5em 0;
-  overflow: auto;
-}
-
-:not(pre)>code[class*="language-"],
-pre[class*="language-"] {
-  background: #f5f2f0;
-}
-
-/* Inline code */
-:not(pre)>code[class*="language-"] {
-  padding: .1em;
-  border-radius: .3em;
-  white-space: normal;
-}
-
-.token.comment,
-.token.prolog,
-.token.doctype,
-.token.cdata {
-  color: slategray;
-}
-
-.token.punctuation {
-  color: #999;
-}
-
-.namespace {
-  opacity: .7;
-}
-
-.token.property,
-.token.tag,
-.token.boolean,
-.token.number,
-.token.constant,
-.token.symbol,
-.token.deleted {
-  color: #905;
-}
-
-.token.selector,
-.token.attr-name,
-.token.string,
-.token.char,
-.token.builtin,
-.token.inserted {
-  color: #690;
-}
-
-.token.operator,
-.token.entity,
-.token.url,
-.language-css .token.string,
-.style .token.string {
-  color: #9a6e3a;
-  background: hsla(0, 0%, 100%, .5);
-}
-
-.token.atrule,
-.token.attr-value,
-.token.keyword {
-  color: #07a;
-}
-
-.token.function,
-.token.class-name {
-  color: #DD4A68;
-}
-
-.token.regex,
-.token.important,
-.token.variable {
-  color: #e90;
-}
-
-.token.important,
-.token.bold {
-  font-weight: bold;
-}
-
-.token.italic {
-  font-style: italic;
-}
-
-.token.entity {
-  cursor: help;
-}

File diff suppressed because it is too large
+ 0 - 3385
public/static/lib/iconfont/demo_index.html


+ 0 - 571
public/static/lib/iconfont/iconfont.css

@@ -1,571 +0,0 @@
-@font-face {
-  font-family: "iconfont"; /* Project id 2596172 */
-  src: url('iconfont.woff2?t=1659061669448') format('woff2'),
-       url('iconfont.woff?t=1659061669448') format('woff'),
-       url('iconfont.ttf?t=1659061669448') format('truetype');
-}
-
-.iconfont {
-  font-family: "iconfont" !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-.icon-show_share:before {
-  content: "\e690";
-}
-
-.icon-show_more_ruler:before {
-  content: "\e67b";
-}
-
-.icon-transparency:before {
-  content: "\e6d7";
-}
-
-.icon-mosaic_e:before {
-  content: "\e6d2";
-}
-
-.icon-eraser:before {
-  content: "\e6d3";
-}
-
-.icon-video2:before {
-  content: "\e6d4";
-}
-
-.icon-down:before {
-  content: "\e6d5";
-}
-
-.icon-qingkong-copy-copy:before {
-  content: "\e68f";
-}
-
-.icon-_qq:before {
-  content: "\e64b";
-}
-
-.icon-_friend:before {
-  content: "\e64c";
-}
-
-.icon-link1:before {
-  content: "\e6ff";
-}
-
-.icon-icon_share_facebook:before {
-  content: "\e745";
-}
-
-.icon-icon_share_whatsapp:before {
-  content: "\e746";
-}
-
-.icon-_wechat:before {
-  content: "\e64a";
-}
-
-.icon-watermark:before {
-  content: "\e6cb";
-}
-
-.icon-camera_h:before {
-  content: "\e6c7";
-}
-
-.icon-a-1V1:before {
-  content: "\e6c8";
-}
-
-.icon-hengbiaoEN:before {
-  content: "\e6b9";
-}
-
-.icon-hot_spot:before {
-  content: "\e6b8";
-}
-
-.icon-foot:before {
-  content: "\e6ba";
-}
-
-.icon-music-t:before {
-  content: "\e6b7";
-}
-
-.icon-yes:before {
-  content: "\e6b5";
-}
-
-.icon-no:before {
-  content: "\e6b6";
-}
-
-.icon-floor_rename:before {
-  content: "\e75b";
-}
-
-.icon-play_stop:before {
-  content: "\e6b4";
-}
-
-.icon-scene_auto:before {
-  content: "\e721";
-}
-
-.icon-compass:before {
-  content: "\e6b3";
-}
-
-.icon-h-d:before {
-  content: "\e6b2";
-}
-
-.icon-scene_screen:before {
-  content: "\e717";
-}
-
-.icon-scene_full:before {
-  content: "\e712";
-}
-
-.icon-scene_window:before {
-  content: "\e713";
-}
-
-.icon-_back:before {
-  content: "\e609";
-}
-
-.icon-show_back:before {
-  content: "\e678";
-}
-
-.icon-show_more_share:before {
-  content: "\e680";
-}
-
-.icon-show_more_finish:before {
-  content: "\e67a";
-}
-
-.icon-show_more_music:before {
-  content: "\e67c";
-}
-
-.icon-show_map_collect:before {
-  content: "\e679";
-}
-
-.icon-data-j:before {
-  content: "\e6b1";
-}
-
-.icon-cancel:before {
-  content: "\e688";
-}
-
-.icon-affirm:before {
-  content: "\e689";
-}
-
-.icon-checkbox_p:before {
-  content: "\e6b0";
-}
-
-.icon-left:before {
-  content: "\e6ae";
-}
-
-.icon-right:before {
-  content: "\e6af";
-}
-
-.icon-_loading_:before {
-  content: "\e627";
-}
-
-.icon-show_function_collect:before {
-  content: "\e687";
-}
-
-.icon-show_more:before {
-  content: "\e67e";
-}
-
-.icon-d-r:before {
-  content: "\e68d";
-}
-
-.icon-up-a:before {
-  content: "\e68e";
-}
-
-.icon-fanzhuan:before {
-  content: "\e6fa";
-}
-
-.icon-cad-neiqiang:before {
-  content: "\e698";
-}
-
-.icon-cad-waiqiang:before {
-  content: "\e69a";
-}
-
-.icon-cad-shuangkaimen:before {
-  content: "\e69b";
-}
-
-.icon-cad-zimumen:before {
-  content: "\e69c";
-}
-
-.icon-cad-men:before {
-  content: "\e69d";
-}
-
-.icon-cad-yimen:before {
-  content: "\e69e";
-}
-
-.icon-cad-zhediemen:before {
-  content: "\e69f";
-}
-
-.icon-cad-luodichuang:before {
-  content: "\e6a0";
-}
-
-.icon-cad-chuang:before {
-  content: "\e6a1";
-}
-
-.icon-cad-piaochuang:before {
-  content: "\e6a2";
-}
-
-.icon-cad-uxingchuang:before {
-  content: "\e6a4";
-}
-
-.icon-cad-lxingchuang:before {
-  content: "\e6a5";
-}
-
-.icon-cad-lpiaochuang:before {
-  content: "\e6a6";
-}
-
-.icon-cad-upiaochuang:before {
-  content: "\e6a7";
-}
-
-.icon-cad-liang:before {
-  content: "\e6a8";
-}
-
-.icon-cad-yandao:before {
-  content: "\e6a9";
-}
-
-.icon-cad-zhuzi:before {
-  content: "\e6aa";
-}
-
-.icon-cad-dianti:before {
-  content: "\e6ab";
-}
-
-.icon-cad-loudao:before {
-  content: "\e6ac";
-}
-
-.icon-cad-dange:before {
-  content: "\e6ad";
-}
-
-.icon-cad-yakou:before {
-  content: "\e699";
-}
-
-.icon-more:before {
-  content: "\e600";
-}
-
-.icon-mosaic1:before {
-  content: "\e697";
-}
-
-.icon-hengbiaoCN:before {
-  content: "\e6a3";
-}
-
-.icon-nor:before {
-  content: "\e696";
-}
-
-.icon-checkbox1:before {
-  content: "\e65d";
-}
-
-.icon-rotate:before {
-  content: "\e695";
-}
-
-.icon-adapt:before {
-  content: "\e692";
-}
-
-.icon-recover:before {
-  content: "\e693";
-}
-
-.icon-repeal:before {
-  content: "\e694";
-}
-
-.icon-reset:before {
-  content: "\e65a";
-}
-
-.icon-course1:before {
-  content: "\e68c";
-}
-
-.icon-publish:before {
-  content: "\e68a";
-}
-
-.icon-save:before {
-  content: "\e68b";
-}
-
-.icon-checkbox:before {
-  content: "\e649";
-}
-
-.icon-mosaic:before {
-  content: "\e646";
-}
-
-.icon-media:before {
-  content: "\e647";
-}
-
-.icon-pic:before {
-  content: "\e648";
-}
-
-.icon-eye_f:before {
-  content: "\e644";
-}
-
-.icon-eye_c:before {
-  content: "\e645";
-}
-
-.icon-size-o:before {
-  content: "\e640";
-}
-
-.icon-size-f:before {
-  content: "\e641";
-}
-
-.icon-magnify:before {
-  content: "\e642";
-}
-
-.icon-reduce:before {
-  content: "\e643";
-}
-
-.icon-video1:before {
-  content: "\e63b";
-}
-
-.icon-uploading_s:before {
-  content: "\e63c";
-}
-
-.icon-path:before {
-  content: "\e63d";
-}
-
-.icon-record:before {
-  content: "\e63e";
-}
-
-.icon-clear:before {
-  content: "\e63f";
-}
-
-.icon-pause:before {
-  content: "\e636";
-}
-
-.icon-preview:before {
-  content: "\e63a";
-}
-
-.icon-full:before {
-  content: "\e638";
-}
-
-.icon-add:before {
-  content: "\e631";
-}
-
-.icon-del:before {
-  content: "\e632";
-}
-
-.icon-close:before {
-  content: "\e633";
-}
-
-.icon-web:before {
-  content: "\e635";
-}
-
-.icon-music:before {
-  content: "\e637";
-}
-
-.icon-uploading1:before {
-  content: "\e639";
-}
-
-.icon-state_e:before {
-  content: "\e624";
-}
-
-.icon-state_f:before {
-  content: "\e625";
-}
-
-.icon-state_s:before {
-  content: "\e626";
-}
-
-.icon-vip_uploading:before {
-  content: "\e623";
-}
-
-.icon-eye-n:before {
-  content: "\e621";
-}
-
-.icon-eye-s:before {
-  content: "\e622";
-}
-
-.icon-course:before {
-  content: "\e620";
-}
-
-.icon-edit:before {
-  content: "\e61f";
-}
-
-.icon-help:before {
-  content: "\e615";
-}
-
-.icon-rule:before {
-  content: "\e617";
-}
-
-.icon-link:before {
-  content: "\e618";
-}
-
-.icon-uploading:before {
-  content: "\e619";
-}
-
-.icon-vr:before {
-  content: "\e61a";
-}
-
-.icon-complete:before {
-  content: "\e61b";
-}
-
-.icon-download:before {
-  content: "\e61c";
-}
-
-.icon-pull-down:before {
-  content: "\e61d";
-}
-
-.icon-pull-up:before {
-  content: "\e61e";
-}
-
-.icon-updown:before {
-  content: "\e613";
-}
-
-.icon-scene:before {
-  content: "\e614";
-}
-
-.icon-message:before {
-  content: "\e60c";
-}
-
-.icon-basic:before {
-  content: "\e60d";
-}
-
-.icon-hotspot:before {
-  content: "\e60e";
-}
-
-.icon-guide:before {
-  content: "\e60f";
-}
-
-.icon-wander:before {
-  content: "\e610";
-}
-
-.icon-house:before {
-  content: "\e611";
-}
-
-.icon-video:before {
-  content: "\e612";
-}
-
-.icon-show_3d_normal:before {
-  content: "\e677";
-}
-
-.icon-show_plane_normal:before {
-  content: "\e67d";
-}
-
-.icon-show_roaming_selected:before {
-  content: "\e682";
-}
-
-.icon-show_plane_selected:before {
-  content: "\e684";
-}
-
-.icon-show_3d_selected:before {
-  content: "\e685";
-}
-
-.icon-show_roaming_normal:before {
-  content: "\e686";
-}
-

File diff suppressed because it is too large
+ 0 - 1
public/static/lib/iconfont/iconfont.js


+ 0 - 982
public/static/lib/iconfont/iconfont.json

@@ -1,982 +0,0 @@
-{
-  "id": "2596172",
-  "name": "四维看看编辑器V4",
-  "font_family": "iconfont",
-  "css_prefix_text": "icon-",
-  "description": "四维看看编辑器设计优化",
-  "glyphs": [
-    {
-      "icon_id": "20600368",
-      "name": "show_share",
-      "font_class": "show_share",
-      "unicode": "e690",
-      "unicode_decimal": 59024
-    },
-    {
-      "icon_id": "19543928",
-      "name": "show_more_ruler",
-      "font_class": "show_more_ruler",
-      "unicode": "e67b",
-      "unicode_decimal": 59003
-    },
-    {
-      "icon_id": "30499411",
-      "name": "transparency",
-      "font_class": "transparency",
-      "unicode": "e6d7",
-      "unicode_decimal": 59095
-    },
-    {
-      "icon_id": "30490892",
-      "name": "mosaic_e",
-      "font_class": "mosaic_e",
-      "unicode": "e6d2",
-      "unicode_decimal": 59090
-    },
-    {
-      "icon_id": "30490893",
-      "name": "eraser",
-      "font_class": "eraser",
-      "unicode": "e6d3",
-      "unicode_decimal": 59091
-    },
-    {
-      "icon_id": "30490894",
-      "name": "video",
-      "font_class": "video2",
-      "unicode": "e6d4",
-      "unicode_decimal": 59092
-    },
-    {
-      "icon_id": "30490946",
-      "name": "down",
-      "font_class": "down",
-      "unicode": "e6d5",
-      "unicode_decimal": 59093
-    },
-    {
-      "icon_id": "3141534",
-      "name": "清空",
-      "font_class": "qingkong-copy-copy",
-      "unicode": "e68f",
-      "unicode_decimal": 59023
-    },
-    {
-      "icon_id": "7878582",
-      "name": "QQ",
-      "font_class": "_qq",
-      "unicode": "e64b",
-      "unicode_decimal": 58955
-    },
-    {
-      "icon_id": "7878584",
-      "name": "朋友",
-      "font_class": "_friend",
-      "unicode": "e64c",
-      "unicode_decimal": 58956
-    },
-    {
-      "icon_id": "14887802",
-      "name": "link",
-      "font_class": "link1",
-      "unicode": "e6ff",
-      "unicode_decimal": 59135
-    },
-    {
-      "icon_id": "26296900",
-      "name": "icon_share_facebook",
-      "font_class": "icon_share_facebook",
-      "unicode": "e745",
-      "unicode_decimal": 59205
-    },
-    {
-      "icon_id": "26296901",
-      "name": "icon_share_whatsapp",
-      "font_class": "icon_share_whatsapp",
-      "unicode": "e746",
-      "unicode_decimal": 59206
-    },
-    {
-      "icon_id": "7878583",
-      "name": "微信",
-      "font_class": "_wechat",
-      "unicode": "e64a",
-      "unicode_decimal": 58954
-    },
-    {
-      "icon_id": "30230568",
-      "name": "watermark",
-      "font_class": "watermark",
-      "unicode": "e6cb",
-      "unicode_decimal": 59083
-    },
-    {
-      "icon_id": "30230353",
-      "name": "camera_h",
-      "font_class": "camera_h",
-      "unicode": "e6c7",
-      "unicode_decimal": 59079
-    },
-    {
-      "icon_id": "30230374",
-      "name": "1V1",
-      "font_class": "a-1V1",
-      "unicode": "e6c8",
-      "unicode_decimal": 59080
-    },
-    {
-      "icon_id": "12324810",
-      "name": "横标EN",
-      "font_class": "hengbiaoEN",
-      "unicode": "e6b9",
-      "unicode_decimal": 59065
-    },
-    {
-      "icon_id": "22788718",
-      "name": "hot_spot",
-      "font_class": "hot_spot",
-      "unicode": "e6b8",
-      "unicode_decimal": 59064
-    },
-    {
-      "icon_id": "29982018",
-      "name": "foot",
-      "font_class": "foot",
-      "unicode": "e6ba",
-      "unicode_decimal": 59066
-    },
-    {
-      "icon_id": "29365471",
-      "name": "music-t",
-      "font_class": "music-t",
-      "unicode": "e6b7",
-      "unicode_decimal": 59063
-    },
-    {
-      "icon_id": "29346730",
-      "name": "yes",
-      "font_class": "yes",
-      "unicode": "e6b5",
-      "unicode_decimal": 59061
-    },
-    {
-      "icon_id": "29346731",
-      "name": "no",
-      "font_class": "no",
-      "unicode": "e6b6",
-      "unicode_decimal": 59062
-    },
-    {
-      "icon_id": "20764383",
-      "name": "floor_rename",
-      "font_class": "floor_rename",
-      "unicode": "e75b",
-      "unicode_decimal": 59227
-    },
-    {
-      "icon_id": "29255507",
-      "name": "play_stop",
-      "font_class": "play_stop",
-      "unicode": "e6b4",
-      "unicode_decimal": 59060
-    },
-    {
-      "icon_id": "16303117",
-      "name": "scene_auto",
-      "font_class": "scene_auto",
-      "unicode": "e721",
-      "unicode_decimal": 59169
-    },
-    {
-      "icon_id": "28895680",
-      "name": "compass",
-      "font_class": "compass",
-      "unicode": "e6b3",
-      "unicode_decimal": 59059
-    },
-    {
-      "icon_id": "28351771",
-      "name": "h-d",
-      "font_class": "h-d",
-      "unicode": "e6b2",
-      "unicode_decimal": 59058
-    },
-    {
-      "icon_id": "16270567",
-      "name": "scene_screen",
-      "font_class": "scene_screen",
-      "unicode": "e717",
-      "unicode_decimal": 59159
-    },
-    {
-      "icon_id": "15936377",
-      "name": "scene_full",
-      "font_class": "scene_full",
-      "unicode": "e712",
-      "unicode_decimal": 59154
-    },
-    {
-      "icon_id": "15936378",
-      "name": "scene_window",
-      "font_class": "scene_window",
-      "unicode": "e713",
-      "unicode_decimal": 59155
-    },
-    {
-      "icon_id": "7857935",
-      "name": "返回",
-      "font_class": "_back",
-      "unicode": "e609",
-      "unicode_decimal": 58889
-    },
-    {
-      "icon_id": "20066553",
-      "name": "show_back",
-      "font_class": "show_back",
-      "unicode": "e678",
-      "unicode_decimal": 59000
-    },
-    {
-      "icon_id": "20066555",
-      "name": "show_more_share",
-      "font_class": "show_more_share",
-      "unicode": "e680",
-      "unicode_decimal": 59008
-    },
-    {
-      "icon_id": "19543927",
-      "name": "show_more_finish",
-      "font_class": "show_more_finish",
-      "unicode": "e67a",
-      "unicode_decimal": 59002
-    },
-    {
-      "icon_id": "19543929",
-      "name": "show_more_music",
-      "font_class": "show_more_music",
-      "unicode": "e67c",
-      "unicode_decimal": 59004
-    },
-    {
-      "icon_id": "19543926",
-      "name": "show_map_collect",
-      "font_class": "show_map_collect",
-      "unicode": "e679",
-      "unicode_decimal": 59001
-    },
-    {
-      "icon_id": "27985200",
-      "name": "data-j",
-      "font_class": "data-j",
-      "unicode": "e6b1",
-      "unicode_decimal": 59057
-    },
-    {
-      "icon_id": "26690641",
-      "name": "cancel",
-      "font_class": "cancel",
-      "unicode": "e688",
-      "unicode_decimal": 59016
-    },
-    {
-      "icon_id": "26690677",
-      "name": "affirm",
-      "font_class": "affirm",
-      "unicode": "e689",
-      "unicode_decimal": 59017
-    },
-    {
-      "icon_id": "27896904",
-      "name": "checkbox_p",
-      "font_class": "checkbox_p",
-      "unicode": "e6b0",
-      "unicode_decimal": 59056
-    },
-    {
-      "icon_id": "27765016",
-      "name": "left",
-      "font_class": "left",
-      "unicode": "e6ae",
-      "unicode_decimal": 59054
-    },
-    {
-      "icon_id": "27765017",
-      "name": "right",
-      "font_class": "right",
-      "unicode": "e6af",
-      "unicode_decimal": 59055
-    },
-    {
-      "icon_id": "7858065",
-      "name": "loading",
-      "font_class": "_loading_",
-      "unicode": "e627",
-      "unicode_decimal": 58919
-    },
-    {
-      "icon_id": "20066572",
-      "name": "show_function_collect",
-      "font_class": "show_function_collect",
-      "unicode": "e687",
-      "unicode_decimal": 59015
-    },
-    {
-      "icon_id": "19543931",
-      "name": "show_more",
-      "font_class": "show_more",
-      "unicode": "e67e",
-      "unicode_decimal": 59006
-    },
-    {
-      "icon_id": "26914809",
-      "name": "d-r",
-      "font_class": "d-r",
-      "unicode": "e68d",
-      "unicode_decimal": 59021
-    },
-    {
-      "icon_id": "26914810",
-      "name": "up-a",
-      "font_class": "up-a",
-      "unicode": "e68e",
-      "unicode_decimal": 59022
-    },
-    {
-      "icon_id": "14510564",
-      "name": "edit_mirror",
-      "font_class": "fanzhuan",
-      "unicode": "e6fa",
-      "unicode_decimal": 59130
-    },
-    {
-      "icon_id": "27294582",
-      "name": "neiqiang",
-      "font_class": "cad-neiqiang",
-      "unicode": "e698",
-      "unicode_decimal": 59032
-    },
-    {
-      "icon_id": "27294583",
-      "name": "waiqiang",
-      "font_class": "cad-waiqiang",
-      "unicode": "e69a",
-      "unicode_decimal": 59034
-    },
-    {
-      "icon_id": "27294616",
-      "name": "shuangkaimen",
-      "font_class": "cad-shuangkaimen",
-      "unicode": "e69b",
-      "unicode_decimal": 59035
-    },
-    {
-      "icon_id": "27294617",
-      "name": "zimumen",
-      "font_class": "cad-zimumen",
-      "unicode": "e69c",
-      "unicode_decimal": 59036
-    },
-    {
-      "icon_id": "27294618",
-      "name": "men",
-      "font_class": "cad-men",
-      "unicode": "e69d",
-      "unicode_decimal": 59037
-    },
-    {
-      "icon_id": "27294620",
-      "name": "yimen",
-      "font_class": "cad-yimen",
-      "unicode": "e69e",
-      "unicode_decimal": 59038
-    },
-    {
-      "icon_id": "27294621",
-      "name": "zhediemen",
-      "font_class": "cad-zhediemen",
-      "unicode": "e69f",
-      "unicode_decimal": 59039
-    },
-    {
-      "icon_id": "27294699",
-      "name": "luodichuang",
-      "font_class": "cad-luodichuang",
-      "unicode": "e6a0",
-      "unicode_decimal": 59040
-    },
-    {
-      "icon_id": "27294700",
-      "name": "chuang",
-      "font_class": "cad-chuang",
-      "unicode": "e6a1",
-      "unicode_decimal": 59041
-    },
-    {
-      "icon_id": "27294701",
-      "name": "piaochuang",
-      "font_class": "cad-piaochuang",
-      "unicode": "e6a2",
-      "unicode_decimal": 59042
-    },
-    {
-      "icon_id": "27294702",
-      "name": "uxingchuang",
-      "font_class": "cad-uxingchuang",
-      "unicode": "e6a4",
-      "unicode_decimal": 59044
-    },
-    {
-      "icon_id": "27294703",
-      "name": "lxingchuang",
-      "font_class": "cad-lxingchuang",
-      "unicode": "e6a5",
-      "unicode_decimal": 59045
-    },
-    {
-      "icon_id": "27294704",
-      "name": "lpiaochuang",
-      "font_class": "cad-lpiaochuang",
-      "unicode": "e6a6",
-      "unicode_decimal": 59046
-    },
-    {
-      "icon_id": "27294705",
-      "name": "upiaochuang",
-      "font_class": "cad-upiaochuang",
-      "unicode": "e6a7",
-      "unicode_decimal": 59047
-    },
-    {
-      "icon_id": "27294743",
-      "name": "liang",
-      "font_class": "cad-liang",
-      "unicode": "e6a8",
-      "unicode_decimal": 59048
-    },
-    {
-      "icon_id": "27294744",
-      "name": "yandao",
-      "font_class": "cad-yandao",
-      "unicode": "e6a9",
-      "unicode_decimal": 59049
-    },
-    {
-      "icon_id": "27294745",
-      "name": "zhuzi",
-      "font_class": "cad-zhuzi",
-      "unicode": "e6aa",
-      "unicode_decimal": 59050
-    },
-    {
-      "icon_id": "27294746",
-      "name": "dianti",
-      "font_class": "cad-dianti",
-      "unicode": "e6ab",
-      "unicode_decimal": 59051
-    },
-    {
-      "icon_id": "27294747",
-      "name": "loudao",
-      "font_class": "cad-loudao",
-      "unicode": "e6ac",
-      "unicode_decimal": 59052
-    },
-    {
-      "icon_id": "27297593",
-      "name": "dange",
-      "font_class": "cad-dange",
-      "unicode": "e6ad",
-      "unicode_decimal": 59053
-    },
-    {
-      "icon_id": "27294584",
-      "name": "yakou",
-      "font_class": "cad-yakou",
-      "unicode": "e699",
-      "unicode_decimal": 59033
-    },
-    {
-      "icon_id": "11304931",
-      "name": "more read",
-      "font_class": "more",
-      "unicode": "e600",
-      "unicode_decimal": 58880
-    },
-    {
-      "icon_id": "27264933",
-      "name": "mosaic",
-      "font_class": "mosaic1",
-      "unicode": "e697",
-      "unicode_decimal": 59031
-    },
-    {
-      "icon_id": "12324809",
-      "name": "横标CN",
-      "font_class": "hengbiaoCN",
-      "unicode": "e6a3",
-      "unicode_decimal": 59043
-    },
-    {
-      "icon_id": "27200779",
-      "name": "nor",
-      "font_class": "nor",
-      "unicode": "e696",
-      "unicode_decimal": 59030
-    },
-    {
-      "icon_id": "25671886",
-      "name": "checkbox",
-      "font_class": "checkbox1",
-      "unicode": "e65d",
-      "unicode_decimal": 58973
-    },
-    {
-      "icon_id": "27198807",
-      "name": "rotate",
-      "font_class": "rotate",
-      "unicode": "e695",
-      "unicode_decimal": 59029
-    },
-    {
-      "icon_id": "27198774",
-      "name": "adapt",
-      "font_class": "adapt",
-      "unicode": "e692",
-      "unicode_decimal": 59026
-    },
-    {
-      "icon_id": "27198776",
-      "name": "recover",
-      "font_class": "recover",
-      "unicode": "e693",
-      "unicode_decimal": 59027
-    },
-    {
-      "icon_id": "27198777",
-      "name": "repeal",
-      "font_class": "repeal",
-      "unicode": "e694",
-      "unicode_decimal": 59028
-    },
-    {
-      "icon_id": "25654903",
-      "name": "reset",
-      "font_class": "reset",
-      "unicode": "e65a",
-      "unicode_decimal": 58970
-    },
-    {
-      "icon_id": "26971297",
-      "name": "course",
-      "font_class": "course1",
-      "unicode": "e68c",
-      "unicode_decimal": 59020
-    },
-    {
-      "icon_id": "26950708",
-      "name": "publish",
-      "font_class": "publish",
-      "unicode": "e68a",
-      "unicode_decimal": 59018
-    },
-    {
-      "icon_id": "26950711",
-      "name": "save",
-      "font_class": "save",
-      "unicode": "e68b",
-      "unicode_decimal": 59019
-    },
-    {
-      "icon_id": "23842269",
-      "name": "sel",
-      "font_class": "checkbox",
-      "unicode": "e649",
-      "unicode_decimal": 58953
-    },
-    {
-      "icon_id": "23786361",
-      "name": "mosaic",
-      "font_class": "mosaic",
-      "unicode": "e646",
-      "unicode_decimal": 58950
-    },
-    {
-      "icon_id": "23786362",
-      "name": "media",
-      "font_class": "media",
-      "unicode": "e647",
-      "unicode_decimal": 58951
-    },
-    {
-      "icon_id": "23786363",
-      "name": "pic",
-      "font_class": "pic",
-      "unicode": "e648",
-      "unicode_decimal": 58952
-    },
-    {
-      "icon_id": "23783948",
-      "name": "eye_f",
-      "font_class": "eye_f",
-      "unicode": "e644",
-      "unicode_decimal": 58948
-    },
-    {
-      "icon_id": "23783949",
-      "name": "eye_c",
-      "font_class": "eye_c",
-      "unicode": "e645",
-      "unicode_decimal": 58949
-    },
-    {
-      "icon_id": "23783512",
-      "name": "size-o",
-      "font_class": "size-o",
-      "unicode": "e640",
-      "unicode_decimal": 58944
-    },
-    {
-      "icon_id": "23783513",
-      "name": "size-f",
-      "font_class": "size-f",
-      "unicode": "e641",
-      "unicode_decimal": 58945
-    },
-    {
-      "icon_id": "23783514",
-      "name": "magnify",
-      "font_class": "magnify",
-      "unicode": "e642",
-      "unicode_decimal": 58946
-    },
-    {
-      "icon_id": "23783515",
-      "name": "reduce",
-      "font_class": "reduce",
-      "unicode": "e643",
-      "unicode_decimal": 58947
-    },
-    {
-      "icon_id": "23781429",
-      "name": "video",
-      "font_class": "video1",
-      "unicode": "e63b",
-      "unicode_decimal": 58939
-    },
-    {
-      "icon_id": "23781430",
-      "name": "uploading_s",
-      "font_class": "uploading_s",
-      "unicode": "e63c",
-      "unicode_decimal": 58940
-    },
-    {
-      "icon_id": "23781431",
-      "name": "path",
-      "font_class": "path",
-      "unicode": "e63d",
-      "unicode_decimal": 58941
-    },
-    {
-      "icon_id": "23781432",
-      "name": "record",
-      "font_class": "record",
-      "unicode": "e63e",
-      "unicode_decimal": 58942
-    },
-    {
-      "icon_id": "23781433",
-      "name": "clear",
-      "font_class": "clear",
-      "unicode": "e63f",
-      "unicode_decimal": 58943
-    },
-    {
-      "icon_id": "23773343",
-      "name": "pause",
-      "font_class": "pause",
-      "unicode": "e636",
-      "unicode_decimal": 58934
-    },
-    {
-      "icon_id": "23773344",
-      "name": "preview",
-      "font_class": "preview",
-      "unicode": "e63a",
-      "unicode_decimal": 58938
-    },
-    {
-      "icon_id": "23773141",
-      "name": "full",
-      "font_class": "full",
-      "unicode": "e638",
-      "unicode_decimal": 58936
-    },
-    {
-      "icon_id": "23773068",
-      "name": "add",
-      "font_class": "add",
-      "unicode": "e631",
-      "unicode_decimal": 58929
-    },
-    {
-      "icon_id": "23773069",
-      "name": "del",
-      "font_class": "del",
-      "unicode": "e632",
-      "unicode_decimal": 58930
-    },
-    {
-      "icon_id": "23773070",
-      "name": "close",
-      "font_class": "close",
-      "unicode": "e633",
-      "unicode_decimal": 58931
-    },
-    {
-      "icon_id": "23773072",
-      "name": "web",
-      "font_class": "web",
-      "unicode": "e635",
-      "unicode_decimal": 58933
-    },
-    {
-      "icon_id": "23773074",
-      "name": "music",
-      "font_class": "music",
-      "unicode": "e637",
-      "unicode_decimal": 58935
-    },
-    {
-      "icon_id": "23773076",
-      "name": "uploading",
-      "font_class": "uploading1",
-      "unicode": "e639",
-      "unicode_decimal": 58937
-    },
-    {
-      "icon_id": "22132762",
-      "name": "state_e",
-      "font_class": "state_e",
-      "unicode": "e624",
-      "unicode_decimal": 58916
-    },
-    {
-      "icon_id": "22132763",
-      "name": "state_f",
-      "font_class": "state_f",
-      "unicode": "e625",
-      "unicode_decimal": 58917
-    },
-    {
-      "icon_id": "22132764",
-      "name": "state_s",
-      "font_class": "state_s",
-      "unicode": "e626",
-      "unicode_decimal": 58918
-    },
-    {
-      "icon_id": "22130256",
-      "name": "vip_uploading",
-      "font_class": "vip_uploading",
-      "unicode": "e623",
-      "unicode_decimal": 58915
-    },
-    {
-      "icon_id": "22099675",
-      "name": "eye-n",
-      "font_class": "eye-n",
-      "unicode": "e621",
-      "unicode_decimal": 58913
-    },
-    {
-      "icon_id": "22099676",
-      "name": "eye-s",
-      "font_class": "eye-s",
-      "unicode": "e622",
-      "unicode_decimal": 58914
-    },
-    {
-      "icon_id": "22099634",
-      "name": "course",
-      "font_class": "course",
-      "unicode": "e620",
-      "unicode_decimal": 58912
-    },
-    {
-      "icon_id": "22099525",
-      "name": "edit",
-      "font_class": "edit",
-      "unicode": "e61f",
-      "unicode_decimal": 58911
-    },
-    {
-      "icon_id": "22099475",
-      "name": "help",
-      "font_class": "help",
-      "unicode": "e615",
-      "unicode_decimal": 58901
-    },
-    {
-      "icon_id": "22099478",
-      "name": "rule",
-      "font_class": "rule",
-      "unicode": "e617",
-      "unicode_decimal": 58903
-    },
-    {
-      "icon_id": "22099479",
-      "name": "link",
-      "font_class": "link",
-      "unicode": "e618",
-      "unicode_decimal": 58904
-    },
-    {
-      "icon_id": "22099480",
-      "name": "uploading",
-      "font_class": "uploading",
-      "unicode": "e619",
-      "unicode_decimal": 58905
-    },
-    {
-      "icon_id": "22099481",
-      "name": "vr",
-      "font_class": "vr",
-      "unicode": "e61a",
-      "unicode_decimal": 58906
-    },
-    {
-      "icon_id": "22099484",
-      "name": "complete",
-      "font_class": "complete",
-      "unicode": "e61b",
-      "unicode_decimal": 58907
-    },
-    {
-      "icon_id": "22099499",
-      "name": "download",
-      "font_class": "download",
-      "unicode": "e61c",
-      "unicode_decimal": 58908
-    },
-    {
-      "icon_id": "22099518",
-      "name": "pull-down",
-      "font_class": "pull-down",
-      "unicode": "e61d",
-      "unicode_decimal": 58909
-    },
-    {
-      "icon_id": "22099519",
-      "name": "pull-up",
-      "font_class": "pull-up",
-      "unicode": "e61e",
-      "unicode_decimal": 58910
-    },
-    {
-      "icon_id": "22099070",
-      "name": "updown",
-      "font_class": "updown",
-      "unicode": "e613",
-      "unicode_decimal": 58899
-    },
-    {
-      "icon_id": "22099071",
-      "name": "scene",
-      "font_class": "scene",
-      "unicode": "e614",
-      "unicode_decimal": 58900
-    },
-    {
-      "icon_id": "22099025",
-      "name": "message",
-      "font_class": "message",
-      "unicode": "e60c",
-      "unicode_decimal": 58892
-    },
-    {
-      "icon_id": "22099028",
-      "name": "basic",
-      "font_class": "basic",
-      "unicode": "e60d",
-      "unicode_decimal": 58893
-    },
-    {
-      "icon_id": "22099032",
-      "name": "hotspot",
-      "font_class": "hotspot",
-      "unicode": "e60e",
-      "unicode_decimal": 58894
-    },
-    {
-      "icon_id": "22099035",
-      "name": "guide",
-      "font_class": "guide",
-      "unicode": "e60f",
-      "unicode_decimal": 58895
-    },
-    {
-      "icon_id": "22099060",
-      "name": "wander",
-      "font_class": "wander",
-      "unicode": "e610",
-      "unicode_decimal": 58896
-    },
-    {
-      "icon_id": "22099068",
-      "name": "house",
-      "font_class": "house",
-      "unicode": "e611",
-      "unicode_decimal": 58897
-    },
-    {
-      "icon_id": "22099069",
-      "name": "video",
-      "font_class": "video",
-      "unicode": "e612",
-      "unicode_decimal": 58898
-    },
-    {
-      "icon_id": "20066551",
-      "name": "show_3d_normal",
-      "font_class": "show_3d_normal",
-      "unicode": "e677",
-      "unicode_decimal": 58999
-    },
-    {
-      "icon_id": "20066554",
-      "name": "show_plane_normal",
-      "font_class": "show_plane_normal",
-      "unicode": "e67d",
-      "unicode_decimal": 59005
-    },
-    {
-      "icon_id": "20066556",
-      "name": "show_roaming_selected",
-      "font_class": "show_roaming_selected",
-      "unicode": "e682",
-      "unicode_decimal": 59010
-    },
-    {
-      "icon_id": "20066557",
-      "name": "show_plane_selected",
-      "font_class": "show_plane_selected",
-      "unicode": "e684",
-      "unicode_decimal": 59012
-    },
-    {
-      "icon_id": "20066558",
-      "name": "show_3d_selected",
-      "font_class": "show_3d_selected",
-      "unicode": "e685",
-      "unicode_decimal": 59013
-    },
-    {
-      "icon_id": "20066559",
-      "name": "show_roaming_normal",
-      "font_class": "show_roaming_normal",
-      "unicode": "e686",
-      "unicode_decimal": 59014
-    }
-  ]
-}

BIN
public/static/lib/iconfont/iconfont.ttf


BIN
public/static/lib/iconfont/iconfont.woff


BIN
public/static/lib/iconfont/iconfont.woff2


+ 68 - 36
public/static/lib/potree/potree.js

@@ -63072,7 +63072,7 @@ void main() {
         var boundingBox = new Box3();
         pointclouds.forEach(pointcloud=>{
             pointcloud.updateBound();
-            boundingBox.union(pointcloud.bound);
+            boundingBox.union(pointcloud.bound2);
         });
         var boundSize = boundingBox.getSize(new Vector3);
         var center = boundingBox.getCenter(new Vector3);
@@ -63341,7 +63341,17 @@ void main() {
             var pointcloudLoaded = 0;
             var panosLoaded = 0;
             var pointcloudLoadDone = function(){//点云cloud.js加载完毕后 
-                viewer.updateModelBound();
+                 
+            };
+            
+            
+            var panosLoadDone = function(){   
+                 
+                viewer.images360.loadDone(); 
+                viewer.scene.add360Images(viewer.images360); 
+                viewer.mapViewer.addListener(viewer.images360);
+                
+                viewer.updateModelBound(); //需等pano加载完
                 let {boundSize, center} = viewer.bound;
                
                 Potree.Log(`中心点: ${math.toPrecision(center.toArray(),2)}, boundSize: ${math.toPrecision(boundSize.toArray(),2)} ` , null, 12);
@@ -63366,16 +63376,6 @@ void main() {
                     Potree.Log('loadPointCloudDone  点云加载完毕', null, 10);  
                 }    
                 
-            };
-            
-            
-            var panosLoadDone = function(){   
-                
-                
-                viewer.images360.loadDone(); 
-                viewer.scene.add360Images(viewer.images360); 
-                viewer.mapViewer.addListener(viewer.images360);
-                
                 
                 {//初始位置 
                     var urlFirstView = false;
@@ -70019,11 +70019,26 @@ void main() {
         updateBound(){
             var boundingBox_ = this.pcoGeometry.tightBoundingBox.clone().applyMatrix4(this.matrixWorld);
             this.bound = boundingBox_;
+            this.bound2 = this.getBoundWithPanos();
         }
+        
+        getBoundWithPanos(){//确保pano在内的bound 
+            let bound = this.bound.clone();
+            this.panos.forEach(pano=>{
+                let panoBound = new Box3;
+                panoBound.expandByPoint(pano.position);
+                panoBound.expandByVector(new Vector3(.1,.1,.1));//give pano a margin
+                bound.union(panoBound);
+            }); 
+            return bound
+        }
+        
+        
+        
         getPanosBound(){
             if(this.panos.length > 0){
                 let minSize = new Vector3(1,1,1);
-                this.panosBound = math.getBoundByPoints(this.panos.map(e=>e.position), minSize);
+                this.panosBound = math.getBoundByPoints(this.panos.map (e=>e.position), minSize);
             }else {
                 this.panosBound = null;
             } 
@@ -81647,7 +81662,7 @@ void main() {
     		let startQuaternion, endQuaternion, endTarget = null ;
              
             
-    		if(info.target ){
+    		if(info.target && !info.target.equals(endPosition)){ //注:若target和position相同,没有意义,算出来的quaternion和最后lookAt(target)的效果不同,所以不使用
     			endTarget = new Vector3().copy(info.target);  
                 endQuaternion = math.getQuaFromPosAim(endPosition,endTarget); 
     		}else if(info.quaternion){
@@ -87165,9 +87180,12 @@ void main() {
                     float distance = (depth.g + depth.r / 256.) * 255.;  //为什么要乘以255 
                     
                     if(distance == 0.0){//漫游点底部识别不到的区域,给一个地板高度 
-                         if(uv2.y > 0.75)distance = height / dir.y; 
+                         if(uv2.y > 0.75) distance = height / dir.y; 
                          else distance = 100000.0;//给个超级远的值
                     } 
+                    
+                    if(distance == 0.0)distance = 100000.0;//给个超级远的值
+                    
                     depthValue.x = distance;
                     
                    // return  r[1] + r[0] / 256  
@@ -87187,7 +87205,8 @@ void main() {
             
             void main()
             {
-                
+                vec3 vWorldPosition0N = normalize(vWorldPosition0);
+                vec3 vWorldPosition1N = normalize(vWorldPosition0);
                 /* vec2 samplerCoord0 = getSamplerCoord(vWorldPosition0.xyz);
                 vec2 samplerCoord1 = getSamplerCoord(vWorldPosition1.xyz);  
                 vec4 colorFromPano0=texture2D(pano0Map,samplerCoord0);
@@ -87195,9 +87214,9 @@ void main() {
                 
                 vec4 colorFromPano0 = vec4(0.0,0.0,0.0,0.0);
                 if(progress < 1.0){//通常是1
-                    colorFromPano0=textureCube(pano0Map,vWorldPosition0.xyz);
+                    colorFromPano0=textureCube(pano0Map,vWorldPosition0N.xyz);
                 }
-                vec4 colorFromPano1=textureCube(pano1Map,vWorldPosition1.xyz);
+                vec4 colorFromPano1=textureCube(pano1Map,vWorldPosition1N.xyz);
  
                 gl_FragColor=mix(colorFromPano0,colorFromPano1,progress);
               
@@ -87217,9 +87236,9 @@ void main() {
                     vec4 eyePos = inverseProjectionMatrix * clipPos;
                     vec2 depth0 = vec2(0.0,0.0); 
                     if(progress < 1.0){
-                        depth0 = getDepth(vWorldPosition0, depthMap0, cameraHeight0, eyePos);
+                        depth0 = getDepth(vWorldPosition0N, depthMap0, cameraHeight0, eyePos);
                     }
-                    vec2 depth1 = getDepth(vWorldPosition1, depthMap1, cameraHeight1, eyePos);
+                    vec2 depth1 = getDepth(vWorldPosition1N, depthMap1, cameraHeight1, eyePos);
                     
                     /* if(progress < 1.0 && depth1.x == 0.0 && depth0.x > 0.0){
                         gl_FragDepthEXT = depth0.y; 
@@ -87279,7 +87298,7 @@ void main() {
                 
                 viewer.addEventListener('camera_changed', (e)=>{
                     //this.uniforms.projectionMatrix.value.copy(e.camera.projectionMatrix) 
-                    this.uniforms.inverseProjectionMatrix.value.copy(e.camera.projectionMatrixInverse);
+                    e.camera && this.uniforms.inverseProjectionMatrix.value.copy(e.camera.projectionMatrixInverse);
                 });   
 
             } 
@@ -90301,7 +90320,7 @@ void main() {
                 r && this.deactiveDescripor(r.renderTarget); 
                 r = this.activeDescripor(l);  
                 if (!r) { 
-                    var ren = this.initTiledPano(l, !1); 
+                    var ren = this.initTiledPano(l, true); 
                     r = this.initDescriptor(ren.width);
                     r.renderTarget = ren;
                 }
@@ -90406,7 +90425,7 @@ void main() {
          * @param {number} size 当前的panoSize,每个面的分辨率
          */
         
-        initTiledPano(size, t) {//创建 RenderTargetCube
+        initTiledPano(size, ifNormalFilter) {//创建 RenderTargetCube
             var renderer = this.viewer.renderer;
             var renderTarget, texture;
                 renderTarget = new WebGLCubeRenderTarget(size,{ //THREE.WebGLRenderTargetCube(size, size, {
@@ -90417,14 +90436,18 @@ void main() {
             texture.flipY = !0, 
             texture.format = RGBAFormat;
             
-            t ? (texture.generateMipmaps = !0,
+            ifNormalFilter ? (texture.generateMipmaps = !0,
             texture.magFilter = LinearFilter,
             texture.minFilter = LinearMipMapLinearFilter) 
             :  (texture.generateMipmaps = !1,
-            texture.magFilter = LinearFilter,
-            texture.minFilter = LinearFilter); 
+            texture.magFilter = LinearFilter,  //LinearFilter更清晰,但锯齿噪点严重,相当于锐化,其实失真了。对于条纹状的画面移动镜头时锯齿明显 眩晕
+            texture.minFilter = LinearFilter);   
+            
+            //平时还是直接用LinearMipMapLinearFilter,其实并非不清晰,只是没有加锐化,像加了层柔光和抗锯齿,观感更好。放大后使用LinearFilter
+            
             
             
+            renderTarget.texture = texture; //居然漏了一句,2022.10.9补
             renderer.setRenderTarget(renderTarget);
             renderer.setRenderTarget(null);
             var o = renderer.properties.get(texture); 
@@ -90904,7 +90927,7 @@ void main() {
                 if(targets[size]){
                     this.zoomRenderTarget = targets[size];
                 }else {
-                    this.zoomRenderTarget = this.initTiledPano(size, !1);
+                    this.zoomRenderTarget = this.initTiledPano(size, false  );
                     targets[size] = this.zoomRenderTarget;
                 }
                 
@@ -92569,9 +92592,8 @@ void main() {
 
         updateCube(pano0, pano1){
             
-            if(!viewer.scene.pointclouds.some(e=>!e.hasDepthTex))   return this.updateCube2(pano0, pano1) //都hasDepthTex的话
-            
             if(Potree.settings.displayMode != 'showPanos')return
+            if(!viewer.scene.pointclouds.some(e=>!e.hasDepthTex))   return this.updateCube2(pano0, pano1) //都hasDepthTex的话
             
            
             let f = (bound, size)=>{
@@ -93201,8 +93223,7 @@ void main() {
             
             //console.log('updateCube',pano0.id, pano1&&pano1.id)
             
-            let useBound = (bound, size)=>{
-               
+            let useBound = (bound, size)=>{ 
                 size = size || bound.getSize(new Vector3); 
                 let center = bound.getCenter(new Vector3);
                 size.max(new Vector3(HighMapCubeWidth,HighMapCubeWidth,HighMapCubeWidth));
@@ -93212,14 +93233,21 @@ void main() {
             };
             
             
+            let getPanoBound = (pano)=>{//因漫游点可能在点云外部,如室外平地,所以需要union进漫游点
+                let panoBound = new Box3;
+                panoBound.expandByPoint(pano.position);
+                panoBound.expandByVector(new Vector3(10,10,10));//give pano a margin
+                return pano.pointcloud.bound.clone().union(panoBound)
+            };
+            
             this.cube.geometry.dispose();
             
             if(pano1){//过渡  
                 
                 if(pano0.pointcloud != pano1.pointcloud){ //距离太远的数据集,过渡会畸变。所以扩大skybox
                     let dis = pano0.position.distanceTo(pano1.position);
-                    if(dis > 100){
-                        let bound = pano0.pointcloud.bound.clone().union(pano1.pointcloud.bound);
+                    if(dis > 100){ 
+                        let bound = getPanoBound(pano0).union(getPanoBound(pano1));
                         let size = bound.getSize(new Vector3); 
                         let max = Math.max(size.x, size.y, size.z);
                         size.set(max,max,max);
@@ -93585,7 +93613,7 @@ void main() {
                 //this.cube.position.copy(pano1.position).multiplyScalar(-100)   
             }else { 
                 
-                useBound(pano0.pointcloud.bound); 
+                useBound(getPanoBound(pano0)); 
             }
         } 
 
@@ -93783,7 +93811,7 @@ void main() {
             n.pano = null),
             e || (e = 0);
             var r = Common.sortByScore(this.panos, t, i);
-            console.log('findRankedByScore', r && r.map(u=>u.item.id + '|  ' + math.toPrecision(u.score,4) + "  | " + math.toPrecision(u.scores,4)));
+            //console.log('findRankedByScore', r && r.map(u=>u.item.id + '|  ' + math.toPrecision(u.score,4) + "  | " + math.toPrecision(u.scores,4)))
             
             
             return !r || 0 === r.length || e >= r.length ? null : (n && (n.candidates = r,
@@ -119138,12 +119166,13 @@ ENDSEC
     class Reticule extends Mesh{
         constructor(viewer){
             var defaultTex = texLoader$a.load(Potree.resourcePath+'/textures/whiteCircle.png'/* reticule-256x256.png'  */);  
+            
             super(new PlaneBufferGeometry(0.11,0.11,1,1),new MeshBasicMaterial({
                 side: DoubleSide , 
                 map: defaultTex,
                 transparent:true,
                 depthTest: !1,
-                opacity: defaultOpacity,
+                opacity: defaultOpacity, 
                 //depthWrite: !1,
             })); 
             this.name = 'reticule';
@@ -119151,6 +119180,9 @@ ENDSEC
             this.crosshairTex = texLoader$a.load(Potree.resourcePath+'/textures/reticule_cross_hair.png'); 
             this.forbitTex = texLoader$a.load(Potree.resourcePath+'/textures/pic-forbid.png'); 
             
+            this.defaultTex.anisotropy = 4; 
+            this.crosshairTex.anisotropy = 4; 
+            this.forbitTex.anisotropy = 4; 
             //this.layers.set(0/* RenderLayers.RETICULE */);
             this.renderOrder = 100;
             this.layers.set(Potree.config.renderLayers.marker);

File diff suppressed because it is too large
+ 1 - 1
public/static/lib/potree/potree.js.map