xzw 5 yıl önce
ebeveyn
işleme
4d537a894c
2 değiştirilmiş dosya ile 26 ekleme ve 7 silme
  1. 13 4
      js/main_2020_edit.js
  2. 13 3
      js/main_2020_show.js

+ 13 - 4
js/main_2020_edit.js

@@ -14780,8 +14780,13 @@ function o(a, s, l) {
         "use strict";
         function n(e, t, i) {
             this.sid = e,
-            this.position = this.conversionArray(t.position),
-            this.rotation = this.conversionArray(t.rotation),
+            this.position = this.conversionArray(t.position) 
+            
+            if(t.quaternion){
+                this.quaternion = t.quaternion;
+            }else{
+                this.rotation = this.conversionArray(t.rotation) 
+            }
             this.link = t.link,
             this.model = i,
             this.size = t.size;
@@ -14838,8 +14843,12 @@ function o(a, s, l) {
             }))
               , t = parseFloat(window.MP_PREFETCHED_MODELDATA.hotIconScale);
             e.dynamic = !0,
-            e.position.copy((new g.Vector3).fromArray(this.position)),
-            e.rotation.copy((new g.Euler).fromArray(this.rotation)),
+            e.position.copy((new g.Vector3).fromArray(this.position));
+            if(this.quaternion){
+                e.quaternion.copy(this.quaternion)
+            }else{
+                e.rotation.copy((new g.Euler).fromArray(this.rotation));
+            }
             t && e.scale.set(t, t, t),
             e.name = this.sid,
             e.type = "hotSprite",

+ 13 - 3
js/main_2020_show.js

@@ -15360,8 +15360,14 @@ window.Modernizr = function(n, e, t) {
 		function hot(sid,d,model){
 			this.sid = sid;
             this.position = this.conversionArray(d.position); 
-			this.rotation = this.conversionArray(d.rotation); 
-			this.link = d.link;
+			if(d.quaternion){
+                this.quaternion = d.quaternion;
+            }else{
+                this.rotation = this.conversionArray(d.rotation) 
+            }
+            
+            
+            this.link = d.link;
 			this.model = model;
 			this.size = d.size;
             
@@ -15420,7 +15426,11 @@ window.Modernizr = function(n, e, t) {
             var hotIconScale = parseFloat(window.MP_PREFETCHED_MODELDATA.hotIconScale);
 			sprite.dynamic = true; 
 			sprite.position.copy(new r.Vector3().fromArray(this.position));
-            sprite.rotation.copy(new r.Euler().fromArray(this.rotation));
+            if(this.quaternion){
+                sprite.quaternion.copy(this.quaternion)
+            }else{
+                sprite.rotation.copy((new r.Euler).fromArray(this.rotation));
+            }
             hotIconScale && sprite.scale.set(hotIconScale, hotIconScale, hotIconScale)
 			// this.size && sprite.scale.set(this.size,this.size,this.size);
 			sprite.name = this.sid;