首页 发现 帮助
注册 登录
chenzhiguang
/
bigSceneEdit_java
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

1

xzw 5 年之前
父节点
5095440e76
当前提交
a43178ba8f
共有 5 个文件被更改，包括 147 次插入 和 24 次删除
合并视图 显示文件统计
  1. 29 1
      css/main.css
  2. 6 4
      edit.html
  3. 2 0
      index.html
  4. 52 9
      js/main_2020_edit.js
  5. 58 10
      js/main_2020_show.js

+ 29 - 1
css/main.css
查看文件 

@@ -7054,4 +7054,32 @@ a.hasHover.tag-link:hover {
 
     #gui-name {
 
     #gui-name {
 
         font-size: 14px;
 
         font-size: 14px;
 
     }
 
     }
 
-}
 
+}
 
+
 
+
 
+
 
+
 
+
 
+#hot{ 
+	padding: 0;
 
+	position: relative;
 
+	width: 100%;
 
+	height: 100%;
 
+    pointer-events:none; 
+	z-index: 101; 
+}
 
+#hot>div{
 
+    position: absolute;
 
+    z-index: 999;
 
+    color: #fff;
 
+    -webkit-user-select: none;
 
+    -moz-user-select: none;
 
+    -ms-user-select: none;
 
+    user-select: none;
 
+    border-radius: 5px;
 
+    background-color: rgba(34, 34, 34, 0.3);
 
+    display:none;
 
+    padding:10px;
 
+    transform:translate(20px, -50%);
 
+}    
+

+ 6 - 4
edit.html
查看文件 

@@ -100,6 +100,8 @@
 
                     <!-- 画布区域 -->
 
                     <!-- 画布区域 -->
 
                     <div class="webgl-inside">
 
                     <div class="webgl-inside">
 
                         <div class="content">
 
                         <div class="content">
 
+                            <div id="hot"> 
+                            </div>
 
                             <div id="popup">
 
                             <div id="popup">
 
                                 <div class="popup-content">
 
                                 <div class="popup-content">
 
 
 
@@ -1390,17 +1392,17 @@
 
     </div>
 
     </div>
 
 
 
     <script> 
     <script> 
-        
+        /*
 
         //本地:
 
         //本地:
 
         var token ="eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhZG1pbiIsInJvbGUiOm51bGwsIm1hbmFnZXIiOm51bGwsImlkIjoxLCJ1c2VyTmFtZSI6ImFkbWluIiwiZXhwIjoxNTk3MTA5MDk0LCJpYXQiOjE1OTcwMjI2OTQsImp0aSI6ImY4YzI1MTcyLWM0NmUtNGNmYi04MjRhLWJkMmU2YWRmOWVjZSJ9.kUEmWOCJ0WONTkUI1vTToLePfzgbLiWwhU5nEWIsvlg"
 
         var token ="eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhZG1pbiIsInJvbGUiOm51bGwsIm1hbmFnZXIiOm51bGwsImlkIjoxLCJ1c2VyTmFtZSI6ImFkbWluIiwiZXhwIjoxNTk3MTA5MDk0LCJpYXQiOjE1OTcwMjI2OTQsImp0aSI6ImY4YzI1MTcyLWM0NmUtNGNmYi04MjRhLWJkMmU2YWRmOWVjZSJ9.kUEmWOCJ0WONTkUI1vTToLePfzgbLiWwhU5nEWIsvlg"
 
         var ceshi = 'http://47.107.252.54:8105';
 
         var ceshi = 'http://47.107.252.54:8105';
 
-        /*
 
+        
         //大场景: 
         //大场景: 
         var ceshi = 'http://47.107.252.54:8105';
 
         var ceshi = 'http://47.107.252.54:8105';
 
         var token = window.localStorage.dcj_token 
         var token = window.localStorage.dcj_token 
         if (!token) {
 
         if (!token) {
 
            window.location.href = '../list/index.html'
 
            window.location.href = '../list/index.html'
 
-        }
 
+        }*/
 
         
         
         
         
         //军史馆:
 
         //军史馆:
 
@@ -1408,7 +1410,7 @@
 
         var token = window.localStorage.bigscenetoken 
         var token = window.localStorage.bigscenetoken 
         if (!token) {
 
         if (!token) {
 
            window.location.href = "http://192.168.0.44:8101/bigscene/#/"
 
            window.location.href = "http://192.168.0.44:8101/bigscene/#/"
 
-        }*/
 
+        }

+ 2 - 0
index.html
查看文件 

@@ -48,6 +48,8 @@
 
 </head>
 
 </head>
 
 
 
 <body>
 
 <body>
 
+    <div id="hot"> 
+    </div>
 
     <div id="popup">
 
     <div id="popup">
 
         <div class="popup-content">
 
         <div class="popup-content">

+ 52 - 9
js/main_2020_edit.js
查看文件 

@@ -6874,7 +6874,7 @@ function o(a, s, l) {
 
                     }
 
                     }
 
                     $(".model-title").text(i.name);
 
                     $(".model-title").text(i.name);
 
                     var t = M.pageTitle;
 
                     var t = M.pageTitle;
 
-                    2 !== S.valueFromHash("mls", 0) && (t = i.name),
 
+                    2 !== S.valueFromHash("mls", 0) && i.name && (t = i.name),
 
                     document.title = t,
 
                     document.title = t,
 
                     S.isMobile() ? $("#gui-fullscreen").css("display", "none") : ($("[rel=tooltip]").tooltip({
 
                     S.isMobile() ? $("#gui-fullscreen").css("display", "none") : ($("[rel=tooltip]").tooltip({
 
                         delay: {
 
                         delay: {
 
@@ -14788,7 +14788,7 @@ function o(a, s, l) {
 
         "use strict";
 
         "use strict";
 
         function n(e, t, i) {
 
         function n(e, t, i) {
 
             this.sid = e,
 
             this.sid = e,
 
-            this.position = this.conversionArray(t.position) 
+            this.position = (new g.Vector3).fromArray( this.conversionArray(t.position) )
 
             
             
             if(t.quaternion){
 
             if(t.quaternion){
 
                 this.quaternion = t.quaternion;
 
                 this.quaternion = t.quaternion;
 
@@ -14802,6 +14802,7 @@ function o(a, s, l) {
 
             this.styleTex = [] // 存储热点icon的图片 [{src:...}, {src:...} ] 最多两个，里面是带有src的object, 可以是img
 
             this.styleTex = [] // 存储热点icon的图片 [{src:...}, {src:...} ] 最多两个，里面是带有src的object, 可以是img
 
              
              
             this.build()
 
             this.build()
 
+            t.infoAttribute && t.infoAttribute.title && this.createTitleElem(t.infoAttribute.title)
 
             this.changeTex()
 
             this.changeTex()
 
         }
 
         }
 
         var g = e("three")
 
         var g = e("three")
 
@@ -14810,6 +14811,7 @@ function o(a, s, l) {
 
           , v = e("../enum/Viewmode")
 
           , v = e("../enum/Viewmode")
 
           , d = e("../objects/Panorama")
 
           , d = e("../objects/Panorama")
 
           , o = e("../util/texture")
 
           , o = e("../util/texture")
 
+          , math = e("../util/math")
 
           , p = new g.Raycaster
 
           , p = new g.Raycaster
 
           , a = new g.PlaneBufferGeometry(g_HotMeshSize.g_HotMeshWidth,g_HotMeshSize.g_HotMeshHeight,1,1)
 
           , a = new g.PlaneBufferGeometry(g_HotMeshSize.g_HotMeshWidth,g_HotMeshSize.g_HotMeshHeight,1,1)
 
            
            
@@ -14851,7 +14853,7 @@ function o(a, s, l) {
 
             }))
 
             }))
 
               , t = parseFloat(window.MP_PREFETCHED_MODELDATA.hotIconScale);
 
               , t = parseFloat(window.MP_PREFETCHED_MODELDATA.hotIconScale);
 
             e.dynamic = !0,
 
             e.dynamic = !0,
 
-            e.position.copy((new g.Vector3).fromArray(this.position));
 
+            e.position.copy(this.position);
 
             if(this.quaternion){
 
             if(this.quaternion){
 
                 e.quaternion.copy(this.quaternion)
 
                 e.quaternion.copy(this.quaternion)
 
             }else{
 
             }else{
 
@@ -14868,6 +14870,22 @@ function o(a, s, l) {
 
             
             
             
             
         }
 
         }
 
+        n.prototype.createTitleElem = function(title){
 
+            var root = $("#hot");
 
+            var elem = $(`<div> ${title}</div>`)
 
+            root.append(elem);
 
+            this.titleElem = elem;
 
+        } 
+        n.prototype.showTitle = function(){
 
+            if(!this.titleElem)return;
 
+            var pos = math.getPos2d(this.position, player.camera, $("#player")[0])
 
+            this.titleElem.css( { "left" : `${pos.pos.x}px`,  "top": `${pos.pos.y}px ` });
 
+            this.titleElem.css("display","block");
 
+        } 
+        n.prototype.hideTitle = function(){
 
+            if(!this.titleElem)return;
 
+            this.titleElem.css("display","none");
 
+        }
 
         ,
 
         ,
 
         n.prototype.closestPanoTowardTag = function(e, t) {
 
         n.prototype.closestPanoTowardTag = function(e, t) {
 
             var i = []
 
             var i = []
 
@@ -14984,8 +15002,8 @@ function o(a, s, l) {
 
                 return e;
 
                 return e;
 
             var t = [];
 
             var t = [];
 
             for (var i in e)
 
             for (var i in e)
 
-                t.push(parseFloat(e[i]));
 
-            return t
 
+                t.push(parseFloat(e[i])); 
+            return t   
         }
 
         }
 
          
          
         
         
@@ -14998,7 +15016,8 @@ function o(a, s, l) {
 
         "../enum/Viewmode": 51,
 
         "../enum/Viewmode": 51,
 
         "../objects/Panorama": 148,
 
         "../objects/Panorama": 148,
 
         "../util/texture": 194,
 
         "../util/texture": 194,
 
-        "../settings": 166
 
+        "../settings": 166,
 
+        "../util/math": 190,
 
     }],
 
     }],
 
     123: [function(M, R, e) {
 
     123: [function(M, R, e) {
 
         (function(e) {
 
         (function(e) {
 
@@ -20856,7 +20875,7 @@ function o(a, s, l) {
 
                     this.emit(W.ViewChanged)
 
                     this.emit(W.ViewChanged)
 
                     //add:
 
                     //add:
 
                     if (window.panoVisiSet && panoVisiSet.setPanoVisible) panoVisiSet.updateFootIconSize();
 
                     if (window.panoVisiSet && panoVisiSet.setPanoVisible) panoVisiSet.updateFootIconSize();
 
- 
+                    this.intersectHot && this.intersectHot.showTitle()
 
                     
                     
                 }
 
                 }
 
                 this.model.supportsTiles && (this.updateTileDownloader(F),
 
                 this.model.supportsTiles && (this.updateTileDownloader(F),
 
@@ -21099,6 +21118,7 @@ function o(a, s, l) {
 
                     window.hotIntersect = !1)
 
                     window.hotIntersect = !1)
 
                     return;
 
                     return;
 
                 }
 
                 }
 
+                this.intersectHot && this.intersectHot.hideTitle() 
                 if (0 === n.length)
 
                 if (0 === n.length)
 
                     return this.intersectHot = null,
 
                     return this.intersectHot = null,
 
                     "add" != g_HotStatus && $("#player").css("cursor", ""),
 
                     "add" != g_HotStatus && $("#player").css("cursor", ""),
 
@@ -21106,7 +21126,9 @@ function o(a, s, l) {
 
                      
                      
                 var o = n[0];
 
                 var o = n[0];
 
                 if ("hotSprite" == o.object.type){
 
                 if ("hotSprite" == o.object.type){
 
-                    return this.intersectHot = o.object.belongHot, $(`.toolRight .spotList ul li[data-spid=${this.intersectHot.sid}]`).addClass("active"),
 
+                    return this.intersectHot = o.object.belongHot,
 
+                    this.intersectHot.showTitle(),
 
+                    $(`.toolRight .spotList ul li[data-spid=${this.intersectHot.sid}]`).addClass("active"),
 
                     void $("#player").css("cursor", "pointer"); 
                     void $("#player").css("cursor", "pointer"); 
                 }
 
                 }
 
                 $(".toolRight .spotList ul li").removeClass("active")
 
                 $(".toolRight .spotList ul li").removeClass("active")
 
@@ -28801,7 +28823,28 @@ function o(a, s, l) {
 
                     i.set(t.x, t.y, -1)
 
                     i.set(t.x, t.y, -1)
 
                 }
 
                 }
 
                 n && i.normalize()
 
                 n && i.normalize()
 
-            }
 
+            },
 
+            //add:
 
+            getPos2d : function(point, camera, dom){
 
+                var camera = camera ;
 
+                var dom = dom;
 
+                var pos = point.clone().project(camera)	//比之前hotspot的计算方式写得简单  project用于3转2(求法同shader)； unproject用于2转3 :new r.Vector3(e.x, e.y, -1).unproject(this.camera);
 
+                
+                var x,y;
 
+                x = (pos.x + 1) / 2 * dom.clientWidth;
 
+                y = (1 - (pos.y + 1) / 2) * dom.clientHeight; 
+          
+                var inSight = x <= dom.clientWidth &&  x >= 0 
+                            && y <= dom.clientHeight &&  y >= 0 
+             
+            
+                return {
 
+                    pos: new THREE.Vector2(x,y),
 
+                    vector:  pos,
 
+                    trueSide : pos.z<1, //trueSide为false时，即使在屏幕范围内可见，也是反方向的另一个不可以被渲染的点   参见Tag.update
 
+                    inSight : inSight	//在屏幕范围内可见
 
+                };
 
+            },
 
         }
 
         }
 
     }
 
     }
 
     , {
 
     , {

+ 58 - 10
js/main_2020_show.js
查看文件 

@@ -6544,8 +6544,8 @@ window.Modernizr = function(n, e, t) {
 
                 $(".model-title").text(e.name);
 
                 $(".model-title").text(e.name);
 
                 var i = Q.pageTitle;
 
                 var i = Q.pageTitle;
 
                 // 2 !== K.valueFromHash("mls", 0) && (i = e.name + " - " + i),
 
                 // 2 !== K.valueFromHash("mls", 0) && (i = e.name + " - " + i),
 
-                2 !== K.valueFromHash("mls", 0) && (i = e.name),
 
-                document.title = i,
 
+                2 !== K.valueFromHash("mls", 0) && i.name && (i = e.name),
 
+                document.title = i ,
 
                 K.isMobile() ? $("#gui-fullscreen").css("display", "none") : ($("[rel=tooltip]").tooltip({
 
                 K.isMobile() ? $("#gui-fullscreen").css("display", "none") : ($("[rel=tooltip]").tooltip({
 
                     delay: {
 
                     delay: {
 
                         show: 50,
 
                         show: 50,
 
@@ -15365,7 +15365,7 @@ window.Modernizr = function(n, e, t) {
 
         "use strict";
 
         "use strict";
 
 		function hot(sid,d,model){
 
 		function hot(sid,d,model){
 
 			this.sid = sid;
 
 			this.sid = sid;
 
-            this.position = this.conversionArray(d.position); 
+            this.position = (new r.Vector3).fromArray( this.conversionArray(d.position) )
 
 			if(d.quaternion){
 
 			if(d.quaternion){
 
                 this.quaternion = d.quaternion;
 
                 this.quaternion = d.quaternion;
 
             }else{
 
             }else{
 
@@ -15380,6 +15380,7 @@ window.Modernizr = function(n, e, t) {
 
             this.styleTex = [] // 存储热点icon的图片 [{src:...}, {src:...} ] 最多两个，里面是带有src的object, 可以是img
 
             this.styleTex = [] // 存储热点icon的图片 [{src:...}, {src:...} ] 最多两个，里面是带有src的object, 可以是img
 
             
             
 			this.build();
 
 			this.build();
 
+            d.infoAttribute && d.infoAttribute.title && this.createTitleElem(d.infoAttribute.title)
 
             this.changeTex()
 
             this.changeTex()
 
 		}
 
 		}
 
 		var r = e("three")
 
 		var r = e("three")
 
@@ -15387,6 +15388,7 @@ window.Modernizr = function(n, e, t) {
 
 		, a = e("../settings")
 
 		, a = e("../settings")
 
 		, s = e("../enum/Viewmode")
 
 		, s = e("../enum/Viewmode")
 
 		, p = e("../objects/Panorama")
 
 		, p = e("../objects/Panorama")
 
+        , math = e("../util/math")
 
         , te = e("../util/texture");
 
         , te = e("../util/texture");
 
         var raycaster = new r.Raycaster;
 
         var raycaster = new r.Raycaster;
 
         //热点大小
 
         //热点大小
 
@@ -15431,7 +15433,7 @@ window.Modernizr = function(n, e, t) {
 
             var sprite = new r.Mesh( geometry, shaderMaterial );
 
             var sprite = new r.Mesh( geometry, shaderMaterial );
 
             var hotIconScale = parseFloat(window.MP_PREFETCHED_MODELDATA.hotIconScale);
 
             var hotIconScale = parseFloat(window.MP_PREFETCHED_MODELDATA.hotIconScale);
 
 			sprite.dynamic = true; 
 			sprite.dynamic = true; 
-			sprite.position.copy(new r.Vector3().fromArray(this.position));
 
+			sprite.position.copy(this.position);
 
             if(this.quaternion){
 
             if(this.quaternion){
 
                 sprite.quaternion.copy(this.quaternion)
 
                 sprite.quaternion.copy(this.quaternion)
 
             }else{
 
             }else{
 
@@ -15447,7 +15449,24 @@ window.Modernizr = function(n, e, t) {
 
             this.model.add(sprite); 
             this.model.add(sprite); 
             g_HotMeshes.push(sprite);
 
             g_HotMeshes.push(sprite);
 
 		}
 
 		}
 
-		
+        hot.prototype.createTitleElem = function(title){
 
+            var root = $("#hot");
 
+            var elem = $(`<div> ${title}</div>`)
 
+            root.append(elem);
 
+            this.titleElem = elem;
 
+        } 
+        hot.prototype.showTitle = function(){
 
+            if(!this.titleElem)return;
 
+            var pos = math.getPos2d(this.position, player.camera, $("#player")[0])
 
+            this.titleElem.css( { "left" : `${pos.pos.x}px`,  "top": `${pos.pos.y}px ` });
 
+            this.titleElem.css("display","block");
 
+        } 
+        hot.prototype.hideTitle = function(){
 
+            if(!this.titleElem)return;
 
+            this.titleElem.css("display","none");
 
+        }
 
+        
+        
 		hot.prototype.closestPanoTowardTag = function(e, t) {
 
 		hot.prototype.closestPanoTowardTag = function(e, t) {
 
 			var i = []
 
 			var i = []
 
 			  , o = []
 
 			  , o = []
 
@@ -15614,7 +15633,8 @@ window.Modernizr = function(n, e, t) {
 
 		"../enum/Viewmode":51,
 
 		"../enum/Viewmode":51,
 
 		"../objects/Panorama":148,
 
 		"../objects/Panorama":148,
 
 		"../util/texture":194,
 
 		"../util/texture":194,
 
-		"../settings":166
 
+		"../settings":166,
 
+        "../util/math": 190,
 
 	}], 
 	}], 
 	/************************************创建热点模型************************************ */
 
 	/************************************创建热点模型************************************ */
 
     123: [function(e, t, i) {//tag
 
     123: [function(e, t, i) {//tag
 
@@ -21745,8 +21765,11 @@ window.Modernizr = function(n, e, t) {
 
                     this.updateFromControls(i),
 
                     this.updateFromControls(i),
 
                     this.getCurrentNodePanos(t),
 
                     this.getCurrentNodePanos(t),
 
                     this.hasChanged(e) && (this.lastChangeTime = Date.now(),
 
                     this.hasChanged(e) && (this.lastChangeTime = Date.now(),
 
-                    !this.mouseDown && this.containsMouse && this.updateIntersect(),
 
-                    this.emit(w.ViewChanged)),
 
+                        !this.mouseDown && this.containsMouse && this.updateIntersect(),
 
+                        this.emit(w.ViewChanged),
 
+                        this.intersectHot && this.intersectHot.showTitle()
 
+                    
+                    ),
 
                     this.model.supportsTiles && (this.updateTileDownloader(t),
 
                     this.model.supportsTiles && (this.updateTileDownloader(t),
 
                     this.updatePanoRenderer(t)),
 
                     this.updatePanoRenderer(t)),
 
                     this.updatePreRendering(t),
 
                     this.updatePreRendering(t),
 
@@ -22007,7 +22030,7 @@ window.Modernizr = function(n, e, t) {
 
                     console.log(points[0]);
 
                     console.log(points[0]);
 
                     points.length >= 1? ($('#player').css('cursor', 'cell'),window.hotPointPos = points[0].point): ($('#player').css('cursor', 'not-allowed'), window.hotPointsPos = false)
 
                     points.length >= 1? ($('#player').css('cursor', 'cell'),window.hotPointPos = points[0].point): ($('#player').css('cursor', 'not-allowed'), window.hotPointsPos = false)
 
                 }
 
                 }
 
-				
+				this.intersectHot && this.intersectHot.hideTitle() 
                 if (0 === n.length){
 
                 if (0 === n.length){
 
 					this.intersectHot = null;  //add
 
 					this.intersectHot = null;  //add
 
 					if(g_HotStatus!="add") $("#player").css("cursor","");
 
 					if(g_HotStatus!="add") $("#player").css("cursor","");
 
@@ -22017,9 +22040,11 @@ window.Modernizr = function(n, e, t) {
 
                 var o = n[0];
 
                 var o = n[0];
 
 				if(o.object.type == "hotSprite"){ //add
 
 				if(o.object.type == "hotSprite"){ //add
 
 					this.intersectHot =  o.object.belongHot; 
 					this.intersectHot =  o.object.belongHot; 
+                    this.intersectHot.showTitle() 
 					$("#player").css("cursor","pointer");
 
 					$("#player").css("cursor","pointer");
 
 					return;
 
 					return;
 
 				}
 
 				}
 
+                
 				this.intersectHot = null;
 
 				this.intersectHot = null;
 
                 
                 
                 var intersect = this.hoverOverlay(this.overlayGroup && o && o.object.parent.parent == this.overlayGroup && o.object)
 
                 var intersect = this.hoverOverlay(this.overlayGroup && o && o.object.parent.parent == this.overlayGroup && o.object)
 
@@ -30089,7 +30114,30 @@ window.Modernizr = function(n, e, t) {
 
                     i.set(t.x, t.y, -1)
 
                     i.set(t.x, t.y, -1)
 
                 }
 
                 }
 
                 n && i.normalize()
 
                 n && i.normalize()
 
-            }
 
+            },
 
+            //add:
 
+            getPos2d : function(point, camera, dom){
 
+                var camera = camera ;
 
+                var dom = dom;
 
+                var pos = point.clone().project(camera)	//比之前hotspot的计算方式写得简单  project用于3转2(求法同shader)； unproject用于2转3 :new r.Vector3(e.x, e.y, -1).unproject(this.camera);
 
+                
+                var x,y;
 
+                x = (pos.x + 1) / 2 * dom.clientWidth;
 
+                y = (1 - (pos.y + 1) / 2) * dom.clientHeight; 
+          
+                var inSight = x <= dom.clientWidth &&  x >= 0 
+                            && y <= dom.clientHeight &&  y >= 0 
+             
+            
+                return {
 
+                    pos: new THREE.Vector2(x,y),
 
+                    vector:  pos,
 
+                    trueSide : pos.z<1, //trueSide为false时，即使在屏幕范围内可见，也是反方向的另一个不可以被渲染的点   参见Tag.update
 
+                    inSight : inSight	//在屏幕范围内可见
 
+                };
 
+            } 
+         
+            
         }
 
         }
 
     }
 
     }
 
     , {
 
     , {