Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/guangdong_museum

web/public/static/css/main.css

@@ -7087,4 +7087,6 @@ a.hasHover.tag-link:hover {
     width:1px; height:1px;
     background:#fff;
     position: absolute;
+    color:#000;
+    font-size:50px
 }

web/public/static/js/main_2020_show.js

@@ -85,9 +85,13 @@ var initMenu = function(){
         var object = new THREE.CSS3DObject( element );
         
         object.position.copy(info.position) 
-        object.scale.copy(info.scale)
+        //object.scale.copy(info.scale)
         object.rotation.fromArray(info.rotation)
         
+        element.style.width = info.scale.x * 1000 + 'px';
+        element.style.height = info.scale.y * 1000 + 'px';
+        
+        
         scene2.add( object );
         info.object = object
     })
@@ -58723,7 +58727,7 @@ function initTransitionPass(THREE){
         function getObjectCSSMatrix( matrix, cameraCSSMatrix ) {
 
             var elements = matrix.elements;
-            var matrix3d = 'matrix3d(' +
+            /* var matrix3d = 'matrix3d(' +
                 epsilon( elements[ 0 ] ) + ',' +
                 epsilon( elements[ 1 ] ) + ',' +
                 epsilon( elements[ 2 ] ) + ',' +
@@ -58740,8 +58744,25 @@ function initTransitionPass(THREE){
                 epsilon( elements[ 13 ] ) + ',' +
                 epsilon( elements[ 14 ] ) + ',' +
                 epsilon( elements[ 15 ] ) +
+            ')'; */
+            var matrix3d = 'matrix3d(' +
+                epsilon( elements[ 0 ] )  + ',' +
+                epsilon( elements[ 1 ] ) + ',' +
+                epsilon( elements[ 2 ] ) + ',' +
+                epsilon( elements[ 3 ] ) + ',' +
+                epsilon( - elements[ 4 ] ) + ',' +
+                epsilon( - elements[ 5 ] ) + ',' +
+                epsilon( - elements[ 6 ] ) + ',' +
+                epsilon( - elements[ 7 ] ) + ',' +
+                epsilon( elements[ 8 ] ) + ',' +
+                epsilon( elements[ 9 ] ) + ',' +
+                epsilon( elements[ 10 ] ) + ',' +
+                epsilon( elements[ 11 ] ) + ',' +
+                epsilon( elements[ 12 ] ) + ',' +
+                epsilon( elements[ 13 ] ) + ',' +
+                epsilon( elements[ 14 ] ) + ',' +
+                epsilon( elements[ 15 ] ) +
             ')';
-
             if ( isIE ) {
 
                 return 'translate(-50%,-50%)' +
@@ -58779,8 +58800,8 @@ function initTransitionPass(THREE){
 
                 } else {
 
-                    style = getObjectCSSMatrix( object.matrixWorld, cameraCSSMatrix );
-
+                    //style = getObjectCSSMatrix( object.matrixWorld, cameraCSSMatrix );
+                    style = getObjectCSSMatrix( object.matrixWorld, cameraCSSMatrix ) + " scale(0.001)"; //许钟文 加 object.baseScale针对小数，先在elem放大，然后这里缩小
                 }
 
                 var element = object.element;