mirror of
https://github.com/vrm-c/UniVRM.git
synced 2026-08-27 21:34:38 -05:00
Merge branch 'master' of https://github.com/vrm-c/UniVRM into textureDeserializerInterface
This commit is contained in:
Masataka SUMI
6
.gitignore
vendored
6
.gitignore
vendored
@@ -49,10 +49,16 @@ Assets/StreamingAssets/crashlytics-build.properties
|
||||
#
|
||||
# Manually appended
|
||||
#
|
||||
|
||||
# Personal
|
||||
.idea/
|
||||
Assets/_Private/
|
||||
Assets/_Private.meta
|
||||
|
||||
# Unity
|
||||
/ProjectSettings/BurstAotSettings_StandaloneWindows.json
|
||||
|
||||
# sphinx build
|
||||
public
|
||||
*.pyc
|
||||
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
fileFormatVersion: 2
|
||||
guid: bd16aca6bf957944396bb28ff3678f05
|
||||
guid: 87fb37c3af5e8f941b873faeabf6a5f8
|
||||
folderAsset: yes
|
||||
timeCreated: 1517663952
|
||||
licenseType: Free
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
@@ -17,10 +17,10 @@ namespace UniGLTF
|
||||
///
|
||||
/// を更新し、textures の index を返す
|
||||
///
|
||||
/// もっとも根本の Exporter クラスのみが呼び出すべきである。
|
||||
/// 他の拡張機能などが呼び出すべきではない。
|
||||
///
|
||||
/// </summary>
|
||||
/// <param name="gltf"></param>
|
||||
/// <param name="bufferIndex"></param>
|
||||
/// <param name="texture"></param>
|
||||
/// <returns>gltf texture index</returns>
|
||||
public static int PushGltfTexture(ExportingGltfData data, Texture2D texture, ColorSpace textureColorSpace, ITextureSerializer textureSerializer)
|
||||
{
|
||||
|
||||
@@ -46,8 +46,6 @@ namespace UniGLTF
|
||||
private set;
|
||||
}
|
||||
|
||||
public ITextureExporter TextureExporter => m_textureExporter;
|
||||
|
||||
protected virtual IMaterialExporter CreateMaterialExporter()
|
||||
{
|
||||
return new MaterialExporter();
|
||||
@@ -65,7 +63,8 @@ namespace UniGLTF
|
||||
}
|
||||
}
|
||||
|
||||
TextureExporter m_textureExporter;
|
||||
protected ITextureExporter TextureExporter => _textureExporter;
|
||||
private TextureExporter _textureExporter;
|
||||
|
||||
GltfExportSettings m_settings;
|
||||
|
||||
@@ -236,7 +235,7 @@ namespace UniGLTF
|
||||
#region Materials and Textures
|
||||
Materials = uniqueUnityMeshes.GetUniqueMaterials().ToList();
|
||||
|
||||
m_textureExporter = new TextureExporter(textureSerializer);
|
||||
_textureExporter = new TextureExporter(textureSerializer);
|
||||
|
||||
var materialExporter = CreateMaterialExporter();
|
||||
_gltf.materials = Materials.Select(x => materialExporter.ExportMaterial(x, TextureExporter, m_settings)).ToList();
|
||||
@@ -378,7 +377,7 @@ namespace UniGLTF
|
||||
ExportExtensions(textureSerializer);
|
||||
|
||||
// Extension で Texture が増える場合があるので最後に呼ぶ
|
||||
var exported = m_textureExporter.Export();
|
||||
var exported = _textureExporter.Export();
|
||||
for (var exportedTextureIdx = 0; exportedTextureIdx < exported.Count; ++exportedTextureIdx)
|
||||
{
|
||||
var (unityTexture, colorSpace) = exported[exportedTextureIdx];
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 42aed961be744fc4b9d423ac4c29f3c9
|
||||
guid: b1162898a107f7f43aec5979932edd38
|
||||
folderAsset: yes
|
||||
timeCreated: 1545999482
|
||||
licenseType: Pro
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,9 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: fcdf450ca966f85428c238046e51c2ca
|
||||
guid: 8e2610f02b10eed49b1862c9bb5c5633
|
||||
folderAsset: yes
|
||||
timeCreated: 1534750149
|
||||
licenseType: Free
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,9 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 6dfa46c173ff021418df4bada32ddfe9
|
||||
folderAsset: yes
|
||||
timeCreated: 1517655448
|
||||
licenseType: Free
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,21 +0,0 @@
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2018 ousttrue
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
@@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 3ea85fd858590174f98cc2cd4c3e083f
|
||||
timeCreated: 1522228320
|
||||
licenseType: Free
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,8 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: be513cfaa8530114d85f1e8e0f29708a
|
||||
timeCreated: 1517370218
|
||||
licenseType: Free
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,9 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 64819743741f38e43b64a7d6add8cea9
|
||||
folderAsset: yes
|
||||
timeCreated: 1517166088
|
||||
licenseType: Free
|
||||
DefaultImporter:
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user