Feat: AvatarModel: 新增 TransformOrigin & 渲染过程多线程优化

Dituon · Oct 18, 2023 · c529521 · c529521
1 parent bfadd6d
commit c529521
Show file tree

Hide file tree

Showing 13 changed files with 267 additions and 217 deletions.
diff --git a/data/xmmt.dituon.petpet/ask/data.json b/data/xmmt.dituon.petpet/ask/data.json
@@ -4,53 +4,36 @@
 		"type":"TO",
 		"posType":"ZOOM",
 		"pos":[-0,100,600,600],
-		"style":[],
 		"fit":"COVER",
-		"opacity":1,
-		"rotate":false,
-		"round":false,
-		"avatarOnTop":false}],
+		"avatarOnTop":false
+	}],
 	"text":[
 		{
 			"text":"$txt1[$to]不知道哦。",			
 			"pos":[300,640],
 			"color":"#ffffff",
 			"size":26,
 			"align":"CENTER",
-			"wrap":"NONE",
-			"style":"PLAIN",
-			"strokeColor":null,
-			"strokeSize":1
+			"style":"PLAIN"
 		},{
 			"text":"$txt1[$to]",
 			"pos":[300,600],
 			"color":"#f0bf6e",
 			"size":23,
 			"align":"CENTER",
-			"wrap":"BREAK",
-			"style":"BOLD",
-			"strokeColor":null,
-			"strokeSize":1
+			"style":"BOLD"
 		},{
 			"text":"让$txt1[$to]告诉你吧",
 			"pos":[10,50],
 			"color":"#191919",
 			"size":40,
-			"align":"LEFT",
-			"wrap":"NONE",
-			"style":"PLAIN",
-			"strokeColor":null,
-			"strokeSize":1
+			"align":"LEFT"
 		},{
 			"text":"啊这，ta说不知道",
 			"pos":[10,750],
 			"color":"#191919",
 			"size":40,
-			"align":"LEFT",
-			"wrap":"NONE",
-			"style":"PLAIN",
-			"strokeColor":null,
-			"strokeSize":1
+			"align":"LEFT"
 		}],
 	"alias":["问问"],
 	"inRandomList":false

diff --git a/data/xmmt.dituon.petpet/brain/data.json b/data/xmmt.dituon.petpet/brain/data.json
@@ -7,8 +7,6 @@
             "pos": [[70,0,180,180],[70,0,180,180],[70,0,180,180],[70,0,180,180],[70,0,180,180],[70,0,180,180],[70,0,180,180],[70,0,180,180],[70,0,180,180],[70,0,180,180],[70,0,180,180],[70,0,180,180],[70,0,180,180],[70,0,180,180],[70,0,180,180],[70,0,180,180],[70,0,180,180],[70,0,180,180],[70,0,180,180],[70,0,180,180],[70,0,180,180],[70,0,180,180],[70,0,180,180],[70,0,180,180],[70,0,180,180],[70,0,180,180],[70,0,180,180],[70,0,180,180],[70,0,180,180],[70,0,180,180],[70,0,180,180],[70,0,180,180]],
             "style": [],
             "opacity": 0.5,
-            "rotate": false,
-            "round": false,
             "avatarOnTop": true,
 			"fit": "COVER"
         }

diff --git a/data/xmmt.dituon.petpet/cast/data.json b/data/xmmt.dituon.petpet/cast/data.json
@@ -3,8 +3,6 @@
     "avatar": [{
         "type": "TO",
         "pos":  [-16, 301, 158, 158],
-        "round": true,
-        "rotate": true,
         "angle": 288,
         "avatarOnTop": false
     }],

diff --git a/data/xmmt.dituon.petpet/genshin_start/data.json b/data/xmmt.dituon.petpet/genshin_start/data.json
@@ -1 +1,14 @@
-{"type":"IMG","avatar":[{"type":"TO","posType":"DEFORM","pos":[[1,126],[42,377],[552,303],[545,1],[423,95]],"style":[],"opacity":1,"rotate":false,"round":false,"avatarOnTop":false}],"text":[],"alias":["启动"],"inRandomList":false}
+{
+    "type": "IMG",
+    "avatar": [
+        {
+            "type": "TO",
+            "posType": "DEFORM",
+            "pos": [[1, 126], [42, 377], [552, 303],[545, 1],[423, 95]],
+            "avatarOnTop": false
+        }
+    ],
+    "text": [],
+    "alias": ["启动"],
+    "inRandomList": false
+}
diff --git a/data/xmmt.dituon.petpet/join/data.json b/data/xmmt.dituon.petpet/join/data.json
@@ -1 +1,13 @@
-{"type":"IMG","avatar":[{"type":"TO","posType":"ZOOM","pos":[76,94,429,429],"style":[],"opacity":1,"rotate":false,"round":true,"avatarOnTop":false}],"text":[],"alias":["加入"],"inRandomList":false}
+{
+    "type": "IMG",
+    "avatar": [
+        {
+            "type": "TO",
+            "pos": [76, 94, 429, 429],
+            "avatarOnTop":false
+        }
+    ],
+    "text": [],
+    "alias": ["加入"],
+    "inRandomList": false
+}
diff --git a/data/xmmt.dituon.petpet/kita/data.json b/data/xmmt.dituon.petpet/kita/data.json
@@ -1 +1,49 @@
-{"type": "GIF","avatar": [{"type": "TO","posType": "DEFORM","pos": [[[2,2],[1,146],[216,146],[214,1],[316,170]],[[2,2],[1,146],[216,146],[214,1],[315,169]],[[2,2],[1,146],[216,146],[214,1],[315,171]],[[3,2],[1,146],[218,145],[215,1],[314,171]],[[2,2],[1,146],[216,146],[214,1],[315,173]],[[4,1],[1,144],[216,145],[215,2],[315,174]],[[1,9],[7,155],[219,145],[213,1],[311,174]],[[1,34],[23,178],[236,146],[195,1],[290,174]],[[1,33],[23,178],[239,146],[199,1],[288,173]],[[1,33],[23,178],[239,146],[199,1],[288,172]],[[1,35],[21,182],[233,147],[204,1],[290,173]],[[1,33],[23,178],[239,146],[199,1],[289,173]],[[1,33],[23,178],[239,146],[199,1],[289,172]],[[1,33],[23,178],[239,146],[199,1],[289,172]],[[1,33],[23,178],[239,146],[199,1],[289,174]],[[1,33],[23,178],[239,146],[199,1],[289,172]],[[1,33],[23,178],[239,146],[199,1],[288,171]],[[1,33],[23,178],[239,146],[199,1],[288,173]],[[1,33],[23,178],[239,146],[199,1],[289,173]],[[1,34],[21,180],[240,149],[205,1],[291,173]],[[1,12],[8,158],[222,143],[213,1],[308,184]],[[1,3],[1,148],[213,144],[214,1],[317,188]],[[1,3],[1,148],[216,144],[214,1],[317,188]],[[1,3],[1,148],[216,144],[214,1],[317,188]],[[1,3],[1,148],[216,144],[214,1],[317,188]],[[1,3],[1,148],[216,144],[214,1],[317,189]],[[0,0],[0,0],[0,0],[0,0],[0,0]],[[0,0],[0,0],[0,0],[0,0],[0,0]],[[0,0],[0,0],[0,0],[0,0],[0,0]],[[0,0],[0,0],[0,0],[0,0],[0,0]]],"style": [],"rotate": false,"round": false,"avatarOnTop": false}],"text": [],"alias": ["喜多", "展示"],"inRandomList": true,"delay": 300}
+{
+    "type": "GIF",
+    "avatar": [
+        {
+            "type": "TO",
+            "posType": "DEFORM",
+            "pos":[
+                [[2, 2], [1, 146], [216, 146], [214, 1], [316, 170]],
+                [[2, 2], [1, 146], [216, 146], [214, 1], [315, 169]],
+                [[2, 2], [1, 146], [216, 146], [214, 1], [315, 171]],
+                [[3, 2], [1, 146], [218, 145], [215, 1], [314, 171]],
+                [[2, 2], [1, 146], [216, 146], [214, 1], [315, 173]],
+                [[4, 1], [1, 144], [216, 145], [215, 2], [315, 174]],
+                [[1, 9], [7, 155], [219, 145], [213, 1], [311, 174]],
+                [[1, 34], [23, 178], [236, 146], [195, 1], [290, 174]],
+                [[1, 33], [23, 178], [239, 146], [199, 1], [288, 173]],
+                [[1, 33], [23, 178], [239, 146], [199, 1], [288, 172]],
+                [[1, 35], [21, 182], [233, 147], [204, 1], [290, 173]],
+                [[1, 33], [23, 178], [239, 146], [199, 1], [289, 173]],
+                [[1, 33], [23, 178], [239, 146], [199, 1], [289, 172]],
+                [[1, 33], [23, 178], [239, 146], [199, 1], [289, 172]],
+                [[1, 33], [23, 178], [239, 146], [199, 1], [289, 174]],
+                [[1, 33], [23, 178], [239, 146], [199, 1], [289, 172]],
+                [[1, 33], [23, 178], [239, 146], [199, 1], [288, 171]],
+                [[1, 33], [23, 178], [239, 146], [199, 1], [288, 173]],
+                [[1, 33], [23, 178], [239, 146], [199, 1], [289, 173]],
+                [[1, 34], [21, 180], [240, 149], [205, 1], [291, 173]],
+                [[1, 12], [8, 158], [222, 143], [213, 1], [308, 184]],
+                [[1, 3], [1, 148], [213, 144], [214, 1], [317, 188]],
+                [[1, 3], [1, 148], [216, 144], [214, 1], [317, 188]],
+                [[1, 3], [1, 148], [216, 144], [214, 1], [317, 188]],
+                [[1, 3], [1, 148], [216, 144], [214, 1], [317, 188]],
+                [[1, 3], [1, 148], [216, 144], [214, 1], [317, 189]],
+                [[0, 0], [0, 0], [0, 0], [0, 0], [0, 0]],
+                [[0, 0], [0, 0], [0, 0], [0, 0], [0, 0]],
+                [[0, 0], [0, 0], [0, 0], [0, 0], [0, 0]],
+                [[0, 0], [0, 0], [0, 0], [0, 0], [0, 0]]
+            ],
+            "avatarOnTop": false
+        }
+    ],
+    "text": [],
+    "alias": [
+        "喜多",
+        "展示"
+    ],
+    "inRandomList": true,
+    "delay": 300
+}
diff --git a/data/xmmt.dituon.petpet/record/data.json b/data/xmmt.dituon.petpet/record/data.json
@@ -4,8 +4,8 @@
         "type": "TO",
         "pos": [[99,97,218,218],[99,97,218,218],[99,97,218,218],[99,97,218,218],
         [99,97,218,218],[99,97,218,218],[99,97,218,218],[99,97,218,218]],
-        "round": true,
         "rotate": true,
+        "origin": "CENTER",
         "avatarOnTop": false
     }],
     "text": [],

diff --git a/data/xmmt.dituon.petpet/roll/data.json b/data/xmmt.dituon.petpet/roll/data.json
@@ -7,8 +7,8 @@
         [87, 77, 220, 220], [96, 85, 220, 220], [92, 79, 220, 220], [92, 78, 220, 220],
         [92, 75, 220, 220], [92, 75, 220, 220], [93, 76, 220, 220], [90, 80, 220, 220]
       ],
-      "round": true,
       "rotate": true,
+      "origin": "CENTER",
       "avatarOnTop": false
     }
   ],

diff --git a/data/xmmt.dituon.petpet/twist/data.json b/data/xmmt.dituon.petpet/twist/data.json
@@ -7,8 +7,8 @@
         [25, 66, 80, 80], [25, 66, 80, 80], [23, 68, 80, 80],
         [20, 69, 80, 80], [22, 68, 80, 80]
       ],
-      "round": true,
       "rotate": true,
+      "origin": "CENTER",
       "avatarOnTop": false
     }
   ],