Skip to content

Commit e153fb5

Browse files
InfinaMiiInfinaMii
authored
Merge branch 'MapStudioProject:main' into linux-support
2 parents cb5eb93 + 3685289 commit e153fb5

File tree

4 files changed

+61
-98
lines changed

4 files changed

+61
-98
lines changed

‎Plugins/CafeLibrary/Bfres/Animations/MaterialAnimUI.cs‎

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -137,27 +137,7 @@ public static TreeNode GetGroupNode(BfresMaterialAnim anim, Material material, S
137137
targetParam.Name = name;
138138
if (MapStudio.UI.ImGuiHelper.ComboFromEnum<ShaderParamType>("Type", targetParam, "Type"))
139139
{
140-
if (targetParam.Type == ShaderParamType.Float) targetParam.DataValue = 0;
141-
else if (targetParam.Type == ShaderParamType.Float2) targetParam.DataValue = new float[2];
142-
else if (targetParam.Type == ShaderParamType.Float3) targetParam.DataValue = new float[3];
143-
else if (targetParam.Type == ShaderParamType.Float4) targetParam.DataValue = new float[4];
144-
else if (targetParam.Type == ShaderParamType.TexSrt ||
145-
targetParam.Type == ShaderParamType.TexSrtEx)
146-
{
147-
targetParam.DataValue = new TexSrt()
148-
{
149-
Scaling = new Syroot.Maths.Vector2F(1, 1),
150-
Rotation = 0,
151-
Translation = new Syroot.Maths.Vector2F(),
152-
Mode = TexSrtMode.ModeMaya,
153-
};
154-
}
155-
else if (targetParam.Type == ShaderParamType.Int2) targetParam.DataValue = new int[2];
156-
else if (targetParam.Type == ShaderParamType.Int3) targetParam.DataValue = new int[3];
157-
else if (targetParam.Type == ShaderParamType.Int3) targetParam.DataValue = new int[4];
158-
else if (targetParam.Type == ShaderParamType.UInt2) targetParam.DataValue = new int[2];
159-
else if (targetParam.Type == ShaderParamType.UInt3) targetParam.DataValue = new int[3];
160-
else if (targetParam.Type == ShaderParamType.UInt4) targetParam.DataValue = new int[4];
140+
161141
}
162142
}
163143

@@ -173,7 +153,30 @@ public static TreeNode GetGroupNode(BfresMaterialAnim anim, Material material, S
173153
{
174154
if (ok)
175155
{
156+
if (targetParam.Type == ShaderParamType.Float) targetParam.DataValue = 0;
157+
else if (targetParam.Type == ShaderParamType.Float2) targetParam.DataValue = new float[2];
158+
else if (targetParam.Type == ShaderParamType.Float3) targetParam.DataValue = new float[3];
159+
else if (targetParam.Type == ShaderParamType.Float4) targetParam.DataValue = new float[4];
160+
else if (targetParam.Type == ShaderParamType.TexSrt ||
161+
targetParam.Type == ShaderParamType.TexSrtEx)
162+
{
163+
targetParam.DataValue = new TexSrt()
164+
{
165+
Scaling = new Syroot.Maths.Vector2F(1, 1),
166+
Rotation = 0,
167+
Translation = new Syroot.Maths.Vector2F(),
168+
Mode = TexSrtMode.ModeMaya,
169+
};
170+
}
171+
else if (targetParam.Type == ShaderParamType.Int2) targetParam.DataValue = new int[2];
172+
else if (targetParam.Type == ShaderParamType.Int3) targetParam.DataValue = new int[3];
173+
else if (targetParam.Type == ShaderParamType.Int3) targetParam.DataValue = new int[4];
174+
else if (targetParam.Type == ShaderParamType.UInt2) targetParam.DataValue = new int[2];
175+
else if (targetParam.Type == ShaderParamType.UInt3) targetParam.DataValue = new int[3];
176+
else if (targetParam.Type == ShaderParamType.UInt4) targetParam.DataValue = new int[4];
177+
176178
targetGroup.Name = targetParam.Name;
179+
group.SubAnimGroups.Add(targetGroup);
177180
matNode.AddChild(CreateParamNodeHierachy(anim, targetParam, targetGroup, group));
178181
}
179182
});

‎Track Studio/Lib/AssimpNetter.dll‎

200 KB
Binary file not shown.

‎Track Studio/Lib/IONET.deps.json‎

Lines changed: 37 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,21 @@
11
{
22
"runtimeTarget": {
3-
"name": ".NETStandard,Version=v2.1/",
3+
"name": ".NETCoreApp,Version=v5.0",
44
"signature": ""
55
},
66
"compilationOptions": {},
77
"targets": {
8-
".NETStandard,Version=v2.1": {},
9-
".NETStandard,Version=v2.1/": {
8+
".NETCoreApp,Version=v5.0": {
109
"IONET/1.0.0": {
1110
"dependencies": {
12-
"SharpGLTF.Core": "1.0.0-alpha0030"
11+
"SharpGLTF.Core": "1.0.0-alpha0030",
12+
"SharpGLTF.Toolkit": "1.0.0-alpha0030",
13+
"AssimpNetter": "5.4.3.0"
1314
},
1415
"runtime": {
1516
"IONET.dll": {}
1617
}
1718
},
18-
"Microsoft.Bcl.AsyncInterfaces/6.0.0": {
19-
"runtime": {
20-
"lib/netstandard2.1/Microsoft.Bcl.AsyncInterfaces.dll": {
21-
"assemblyVersion": "6.0.0.0",
22-
"fileVersion": "6.0.21.52210"
23-
}
24-
}
25-
},
2619
"SharpGLTF.Core/1.0.0-alpha0030": {
2720
"dependencies": {
2821
"System.Text.Json": "6.0.7"
@@ -34,81 +27,64 @@
3427
}
3528
}
3629
},
37-
"System.Buffers/4.5.1": {
38-
"runtime": {
39-
"lib/netstandard2.0/System.Buffers.dll": {
40-
"assemblyVersion": "4.0.3.0",
41-
"fileVersion": "4.6.28619.1"
42-
}
43-
}
44-
},
45-
"System.Memory/4.5.4": {
30+
"SharpGLTF.Runtime/1.0.0-alpha0030": {
4631
"dependencies": {
47-
"System.Buffers": "4.5.1",
48-
"System.Numerics.Vectors": "4.5.0",
49-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
32+
"SharpGLTF.Core": "1.0.0-alpha0030"
5033
},
5134
"runtime": {
52-
"lib/netstandard2.0/System.Memory.dll": {
53-
"assemblyVersion": "4.0.1.1",
54-
"fileVersion": "4.6.28619.1"
35+
"lib/netstandard2.1/SharpGLTF.Runtime.dll": {
36+
"assemblyVersion": "1.0.0.0",
37+
"fileVersion": "1.0.0.0"
5538
}
5639
}
5740
},
58-
"System.Numerics.Vectors/4.5.0": {
41+
"SharpGLTF.Toolkit/1.0.0-alpha0030": {
42+
"dependencies": {
43+
"SharpGLTF.Runtime": "1.0.0-alpha0030"
44+
},
5945
"runtime": {
60-
"lib/netstandard2.0/System.Numerics.Vectors.dll": {
61-
"assemblyVersion": "4.1.4.0",
62-
"fileVersion": "4.6.26515.6"
46+
"lib/netstandard2.1/SharpGLTF.Toolkit.dll": {
47+
"assemblyVersion": "1.0.0.0",
48+
"fileVersion": "1.0.0.0"
6349
}
6450
}
6551
},
6652
"System.Runtime.CompilerServices.Unsafe/6.0.0": {
6753
"runtime": {
68-
"lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.dll": {
54+
"lib/netcoreapp3.1/System.Runtime.CompilerServices.Unsafe.dll": {
6955
"assemblyVersion": "6.0.0.0",
7056
"fileVersion": "6.0.21.52210"
7157
}
7258
}
7359
},
7460
"System.Text.Encodings.Web/6.0.0": {
7561
"dependencies": {
76-
"System.Buffers": "4.5.1",
77-
"System.Memory": "4.5.4",
7862
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
7963
},
8064
"runtime": {
81-
"lib/netstandard2.0/System.Text.Encodings.Web.dll": {
65+
"lib/netcoreapp3.1/System.Text.Encodings.Web.dll": {
8266
"assemblyVersion": "6.0.0.0",
8367
"fileVersion": "6.0.21.52210"
8468
}
8569
}
8670
},
8771
"System.Text.Json/6.0.7": {
8872
"dependencies": {
89-
"Microsoft.Bcl.AsyncInterfaces": "6.0.0",
90-
"System.Buffers": "4.5.1",
91-
"System.Memory": "4.5.4",
92-
"System.Numerics.Vectors": "4.5.0",
9373
"System.Runtime.CompilerServices.Unsafe": "6.0.0",
94-
"System.Text.Encodings.Web": "6.0.0",
95-
"System.Threading.Tasks.Extensions": "4.5.4"
74+
"System.Text.Encodings.Web": "6.0.0"
9675
},
9776
"runtime": {
98-
"lib/netstandard2.0/System.Text.Json.dll": {
77+
"lib/netcoreapp3.1/System.Text.Json.dll": {
9978
"assemblyVersion": "6.0.0.0",
10079
"fileVersion": "6.0.1122.52304"
10180
}
10281
}
10382
},
104-
"System.Threading.Tasks.Extensions/4.5.4": {
105-
"dependencies": {
106-
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
107-
},
83+
"AssimpNetter/5.4.3.0": {
10884
"runtime": {
109-
"lib/netstandard2.0/System.Threading.Tasks.Extensions.dll": {
110-
"assemblyVersion": "4.2.0.1",
111-
"fileVersion": "4.6.28619.1"
85+
"AssimpNetter.dll": {
86+
"assemblyVersion": "5.4.3.0",
87+
"fileVersion": "5.4.3.0"
11288
}
11389
}
11490
}
@@ -120,40 +96,26 @@
12096
"serviceable": false,
12197
"sha512": ""
12298
},
123-
"Microsoft.Bcl.AsyncInterfaces/6.0.0": {
124-
"type": "package",
125-
"serviceable": true,
126-
"sha512": "sha512-UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==",
127-
"path": "microsoft.bcl.asyncinterfaces/6.0.0",
128-
"hashPath": "microsoft.bcl.asyncinterfaces.6.0.0.nupkg.sha512"
129-
},
13099
"SharpGLTF.Core/1.0.0-alpha0030": {
131100
"type": "package",
132101
"serviceable": true,
133102
"sha512": "sha512-HVL6PcrM0H/uEk96nRZfhtPeYvSFGHnni3g1aIckot2IWVp0jLMH5KWgaWfsatEz4Yds3XcdSLUWmJZivDBUPA==",
134103
"path": "sharpgltf.core/1.0.0-alpha0030",
135104
"hashPath": "sharpgltf.core.1.0.0-alpha0030.nupkg.sha512"
136105
},
137-
"System.Buffers/4.5.1": {
138-
"type": "package",
139-
"serviceable": true,
140-
"sha512": "sha512-Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==",
141-
"path": "system.buffers/4.5.1",
142-
"hashPath": "system.buffers.4.5.1.nupkg.sha512"
143-
},
144-
"System.Memory/4.5.4": {
106+
"SharpGLTF.Runtime/1.0.0-alpha0030": {
145107
"type": "package",
146108
"serviceable": true,
147-
"sha512": "sha512-1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==",
148-
"path": "system.memory/4.5.4",
149-
"hashPath": "system.memory.4.5.4.nupkg.sha512"
109+
"sha512": "sha512-Ysn+fyj9EVXj6mfG0BmzSTBGNi/QvcnTrMd54dBMOlI/TsMRvnOY3JjTn0MpeH2CgHXX4qogzlDt4m+rb3n4Og==",
110+
"path": "sharpgltf.runtime/1.0.0-alpha0030",
111+
"hashPath": "sharpgltf.runtime.1.0.0-alpha0030.nupkg.sha512"
150112
},
151-
"System.Numerics.Vectors/4.5.0": {
113+
"SharpGLTF.Toolkit/1.0.0-alpha0030": {
152114
"type": "package",
153115
"serviceable": true,
154-
"sha512": "sha512-QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ==",
155-
"path": "system.numerics.vectors/4.5.0",
156-
"hashPath": "system.numerics.vectors.4.5.0.nupkg.sha512"
116+
"sha512": "sha512-nsoJWAFhXgEky9bVCY0zLeZVDx+S88u7VjvuebvMb6dJiNyFOGF6FrrMHiJe+x5pcVBxxlc3VoXliBF7r/EqYA==",
117+
"path": "sharpgltf.toolkit/1.0.0-alpha0030",
118+
"hashPath": "sharpgltf.toolkit.1.0.0-alpha0030.nupkg.sha512"
157119
},
158120
"System.Runtime.CompilerServices.Unsafe/6.0.0": {
159121
"type": "package",
@@ -176,12 +138,10 @@
176138
"path": "system.text.json/6.0.7",
177139
"hashPath": "system.text.json.6.0.7.nupkg.sha512"
178140
},
179-
"System.Threading.Tasks.Extensions/4.5.4": {
180-
"type": "package",
181-
"serviceable": true,
182-
"sha512": "sha512-zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==",
183-
"path": "system.threading.tasks.extensions/4.5.4",
184-
"hashPath": "system.threading.tasks.extensions.4.5.4.nupkg.sha512"
141+
"AssimpNetter/5.4.3.0": {
142+
"type": "reference",
143+
"serviceable": false,
144+
"sha512": ""
185145
}
186146
}
187147
}

‎Track Studio/Lib/IONET.dll‎

14.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)