Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-09-14 23:10:46 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

controlRigInitialRotations = null

Browse Source 
* 順番
* null 引き数の省略
This commit is contained in:
ousttrue
2022-11-28 17:06:31 +09:00
parent 60ecc165c8
commit 02ea223822
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterImpl.cs
View File

@@ -40,7 +40,7 @@ namespace UniVRM10
var materialGenerator = GetMaterialDescriptorGenerator(renderPipeline);
using (var loader = new Vrm10Importer(result, controlRigInitialRotations: null, externalObjectMap: extractedObjects, materialGenerator: materialGenerator))
using (var loader = new Vrm10Importer(result, externalObjectMap: extractedObjects, materialGenerator: materialGenerator))
{
// settings TextureImporters
foreach (var textureInfo in loader.TextureDescriptorGenerator.Get().GetEnumerable())

2
Assets/VRM10/Runtime/IO/Vrm10.cs
View File

@@ -275,7 +275,7 @@ namespace UniVRM10
throw new ArgumentNullException(nameof(vrm10Data));
}
using (var loader = new Vrm10Importer(vrm10Data, controlRigGenerationOption.ToInitialRotations(), materialGenerator: materialGenerator))
using (var loader = new Vrm10Importer(vrm10Data, materialGenerator: materialGenerator, controlRigInitialRotations: controlRigGenerationOption.ToInitialRotations()))
{
// 1. Load meta information if callback was available.
if (vrmMetaInformationCallback != null)

4
Assets/VRM10/Runtime/IO/Vrm10Importer.cs
View File

@@ -28,10 +28,10 @@ namespace UniVRM10
public Vrm10Importer(
Vrm10Data vrm,
IReadOnlyDictionary<HumanBodyBones, Quaternion> controlRigInitialRotations,
IReadOnlyDictionary<SubAssetKey, UnityEngine.Object> externalObjectMap = null,
ITextureDeserializer textureDeserializer = null,
IMaterialDescriptorGenerator materialGenerator = null
IMaterialDescriptorGenerator materialGenerator = null,
IReadOnlyDictionary<HumanBodyBones, Quaternion> controlRigInitialRotations = null
)
: base(vrm.Data, externalObjectMap, textureDeserializer)
{

2
Assets/VRM10/Tests.PlayMode/MaterialTests.cs
View File

@@ -45,7 +45,7 @@ namespace UniVRM10.Test
private (GameObject, IReadOnlyList<VRMShaders.MaterialFactory.MaterialLoadInfo>) ToUnity(Vrm10Data data)
{
// Model => Unity
using (var loader = new Vrm10Importer(data, null))
using (var loader = new Vrm10Importer(data))
{
var loaded = loader.Load();
return (loaded.gameObject, loader.MaterialFactory.Materials);

2
Assets/VRM10/Tests/LoadTests.cs
View File

@@ -19,7 +19,7 @@ namespace UniVRM10.Test
// empty thumbnail name
vrm1Data.Data.GLTF.images[index].name = null;
using (var loader = new Vrm10Importer(vrm1Data, null))
using (var loader = new Vrm10Importer(vrm1Data))
{
loader.LoadAsync(new VRMShaders.ImmediateCaller()).Wait();
}