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

不要なため、TextureDescriptor から Image file の情報を削除

Browse Source
This commit is contained in:
Masataka SUMI 2021-12-08 19:05:58 +09:00
parent c96d4c1331
commit d5f7179424
3 changed files with 2 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Assets/UniGLTF/Runtime/UniGLTF/Format/glTFTexture.cs
View File

@ -47,32 +47,6 @@ namespace UniGLTF
[JsonSchema(EnumValues = new object[] { "image/jpeg", "image/png" }, EnumSerializationType = EnumSerializationType.AsString)]
public string mimeType;
public string GetExt()
{
switch (mimeType)
{
case "image/png":
return ".png";
case "image/jpeg":
return ".jpg";
default:
if (uri.FastStartsWith("data:image/jpeg;"))
{
return ".jpg";
}
else if (uri.FastStartsWith("data:image/png;"))
{
return ".png";
}
else
{
return Path.GetExtension(uri)?.ToLowerInvariant() ?? string.Empty;
}
}
}
// empty schemas
public glTFExtension extensions;
public glTFExtension extras;

12
Assets/UniGLTF/Runtime/UniGLTF/IO/TextureIO/GltfTextureImporter.cs
View File

@ -18,9 +18,7 @@ namespace UniGLTF
{
var name = TextureImportName.GetUnityObjectName(TextureImportTypes.sRGB, uniqueName, uri);
var texDesc = new TextureDescriptor(
uniqueName,
string.Empty,
uri,
name,
Vector2.zero,
Vector2.one,
default,
@ -44,8 +42,6 @@ namespace UniGLTF
var sampler = TextureSamplerUtil.CreateSampler(data.GLTF, textureIndex);
var param = new TextureDescriptor(
name,
gltfImage.GetExt(),
gltfImage.uri,
offset, scale,
sampler,
TextureImportTypes.sRGB,
@ -64,8 +60,6 @@ namespace UniGLTF
var sampler = TextureSamplerUtil.CreateSampler(data.GLTF, textureIndex);
var param = new TextureDescriptor(
name,
gltfImage.GetExt(),
gltfImage.uri,
offset,
scale,
sampler,
@ -85,8 +79,6 @@ namespace UniGLTF
var sampler = TextureSamplerUtil.CreateSampler(data.GLTF, textureIndex);
var param = new TextureDescriptor(
name,
gltfImage.GetExt(),
gltfImage.uri,
offset,
scale,
sampler,
@ -126,8 +118,6 @@ namespace UniGLTF
var texDesc = new TextureDescriptor(
name,
".png",
null,
offset,
scale,
sampler,

6
Assets/VRMShaders/GLTF/IO/Runtime/Texture/Importer/TextureDescriptor.cs
View File

@ -21,8 +21,6 @@ namespace VRMShaders
public readonly struct TextureDescriptor
{
public readonly string UnityObjectName;
public readonly string Ext;
public readonly string Uri;
public readonly Vector2 Offset;
public readonly Vector2 Scale;
@ -46,7 +44,7 @@ namespace VRMShaders
/// </summary>
public SubAssetKey SubAssetKey => new SubAssetKey(SubAssetKey.TextureType, UnityObjectName);
public TextureDescriptor(string name, string ext, string uri, Vector2 offset, Vector2 scale, SamplerParam sampler, TextureImportTypes textureType, float metallicFactor, float roughnessFactor,
public TextureDescriptor(string name, Vector2 offset, Vector2 scale, SamplerParam sampler, TextureImportTypes textureType, float metallicFactor, float roughnessFactor,
GetTextureBytesAsync i0,
GetTextureBytesAsync i1,
GetTextureBytesAsync i2,
@ -55,8 +53,6 @@ namespace VRMShaders
GetTextureBytesAsync i5)
{
UnityObjectName = name;
Ext = ext;
Uri = uri;
Offset = offset;
Scale = scale;
Sampler = sampler;