From a28bf729b90afc99362fed8ccca9c2b6e9551258 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Tue, 11 Apr 2023 15:25:02 +0900 Subject: [PATCH 1/4] =?UTF-8?q?ITextureDeserializer=20=E3=81=AE=E8=AA=AC?= =?UTF-8?q?=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/api/0_106_spring_manual_update.md | 2 +- docs/api/0_76_texture_deserializer.md | 61 ++++++++++++++++++++++++++ docs/api/index.md | 1 + 3 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 docs/api/0_76_texture_deserializer.md diff --git a/docs/api/0_106_spring_manual_update.md b/docs/api/0_106_spring_manual_update.md index 2e2820372..b9862bdfe 100644 --- a/docs/api/0_106_spring_manual_update.md +++ b/docs/api/0_106_spring_manual_update.md @@ -1,4 +1,4 @@ -# v0.106 SpringBone の手動更新 +# `v0.106` SpringBone の手動更新 from {doc}`v0.106.0` diff --git a/docs/api/0_76_texture_deserializer.md b/docs/api/0_76_texture_deserializer.md new file mode 100644 index 000000000..0d1ef3f09 --- /dev/null +++ b/docs/api/0_76_texture_deserializer.md @@ -0,0 +1,61 @@ +# `v0.76` ITextureDeserializer(テクスチャーローダー) + +このインタフェースを使うとテクスチャーロードをカスタマイズできます。 + +## UnityTextureDeserializer + +UniVRM の実装は、`UnityTextureDeserializer` です。 + + + +[ImageConversion.LoadImage](https://docs.unity3d.com/ja/2020.3/ScriptReference/ImageConversion.LoadImage.html) を使用して `png` や `jpeg` をロードできます。 +通常の `glTF` はテクスチャー形式として `png` と `jpeg` を格納できます。 + +`ImageConversion.LoadImage` はメインスレッドをブロックします。 +大きなテクスチャーや大量のテクスチャーをロードすると画面が固まることがあります。 + +`png` や `jpeg` から `raw pixel` を取得する部分をスレッドに乗せて非同期処理にすることで +パフォーマンスを向上させる余地があります。 + +## 差し替え方法 + +`new UniGLTF.ImporterContext` の引き数で指定することができます。 + +```cs + public ImporterContext( + GltfData data, + IReadOnlyDictionary externalObjectMap = null, + ITextureDeserializer textureDeserializer = null, // 👈 これ + IMaterialDescriptorGenerator materialGenerator = null) +``` + +`new VRM.VRMImporterContext` の引き数で指定することができます。 + +```cs + public VRMImporterContext( + VRMData data, + IReadOnlyDictionary externalObjectMap = null, + ITextureDeserializer textureDeserializer = null, // 👈 これ + IMaterialDescriptorGenerator materialGenerator = null, + bool loadAnimation = false) +``` + +`new UniVRM10.Vrm10Importer` の引き数で指定することができます。 + +```cs + public Vrm10Importer( + Vrm10Data vrm, + IReadOnlyDictionary externalObjectMap = null, + ITextureDeserializer textureDeserializer = null, // 👈 これ + IMaterialDescriptorGenerator materialGenerator = null, + bool useControlRig = false + ) +``` + +## UnityAsyncImageLoader に置き換える例 + +ISSUE に使用例をいただきました。 + + + +[UnityAsyncImageLoader](https://github.com/Looooong/UnityAsyncImageLoader)を使ってパフォーマンスを向上できます。 diff --git a/docs/api/index.md b/docs/api/index.md index d52114535..b2b1b3b35 100644 --- a/docs/api/index.md +++ b/docs/api/index.md @@ -26,4 +26,5 @@ fast_spring_bone 0_95_highlevel 0_96_1_use_gamma_colorspace 0_106_spring_manual_update +0_76_texture_deserializer ``` From 306fad4d49a0cfcefa7a7ed6bd823b2e470eb411 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Tue, 11 Apr 2023 15:35:33 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=E8=8B=B1=E8=A8=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/0_106_spring_manual_update.po | 10 +- .../api/0_76_texture_deserializer.po | 96 +++++++ .../en/LC_MESSAGES/release/100/v0.109.0.po | 262 ++++++++++++++++++ .../locale/en/LC_MESSAGES/release_template.po | 58 +++- 4 files changed, 411 insertions(+), 15 deletions(-) create mode 100644 docs/locale/en/LC_MESSAGES/api/0_76_texture_deserializer.po create mode 100644 docs/locale/en/LC_MESSAGES/release/100/v0.109.0.po diff --git a/docs/locale/en/LC_MESSAGES/api/0_106_spring_manual_update.po b/docs/locale/en/LC_MESSAGES/api/0_106_spring_manual_update.po index 9621c204c..ce3118688 100644 --- a/docs/locale/en/LC_MESSAGES/api/0_106_spring_manual_update.po +++ b/docs/locale/en/LC_MESSAGES/api/0_106_spring_manual_update.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: UniVRM Programming \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-11-09 19:00+0900\n" +"POT-Creation-Date: 2023-04-11 15:28+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,7 +19,8 @@ msgstr "" "Generated-By: Babel 2.9.1\n" #: ../../api/0_106_spring_manual_update.md:1 -msgid "v0.106 SpringBone の手動更新" +#, fuzzy +msgid "`v0.106` SpringBone の手動更新" msgstr "v0.106 SpringBone manual update" #: ../../api/0_106_spring_manual_update.md:3 @@ -44,4 +45,7 @@ msgstr "You can call it like this:" #: ../../api/0_106_spring_manual_update.md:22 msgid "spring.ManualUpdate を使う前に spring.m_updateType を `Manual` に設定する必要があります。" -msgstr "You need to set spring.m_updateType to `Manual` before using spring.ManualUpdate." +msgstr "" +"You need to set spring.m_updateType to `Manual` before using " +"spring.ManualUpdate." + diff --git a/docs/locale/en/LC_MESSAGES/api/0_76_texture_deserializer.po b/docs/locale/en/LC_MESSAGES/api/0_76_texture_deserializer.po new file mode 100644 index 000000000..4df3eb208 --- /dev/null +++ b/docs/locale/en/LC_MESSAGES/api/0_76_texture_deserializer.po @@ -0,0 +1,96 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) 2021, VRM Consortium +# This file is distributed under the same license as the UniVRM Programming +# package. +# FIRST AUTHOR , 2023. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: UniVRM Programming \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-04-11 15:28+0900\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.9.1\n" + +#: ../../api/0_76_texture_deserializer.md:1 +msgid "`v0.76` ITextureDeserializer(テクスチャーローダー)" +msgstr "`v0.76` ITextureDeserializer(Texture Loader)" + +#: ../../api/0_76_texture_deserializer.md:3 +msgid "このインタフェースを使うとテクスチャーロードをカスタマイズできます。" +msgstr "This interface allows you to customize texture loading." + +#: ../../api/0_76_texture_deserializer.md:5 +msgid "UnityTextureDeserializer" +msgstr "" + +#: ../../api/0_76_texture_deserializer.md:7 +msgid "UniVRM の実装は、`UnityTextureDeserializer` です。" +msgstr "UniVRM implementation is `UnityTextureDeserializer`." + +#: ../../api/0_76_texture_deserializer.md:9 +msgid "" +msgstr "" + +#: ../../api/0_76_texture_deserializer.md:11 +msgid "" +"[ImageConversion.LoadImage](https://docs.unity3d.com/ja/2020.3/ScriptReference/ImageConversion.LoadImage.html)" +" を使用して `png` や `jpeg` をロードできます。 通常の `glTF` はテクスチャー形式として `png` と `jpeg` " +"を格納できます。" +msgstr "" +"[ImageConversion.LoadImage](https://docs.unity3d.com/ja/2020.3/ScriptReference/ImageConversion.LoadImage.html)" +"can be used to load `png` and `jpeg`. Normal `glTF` supports `png` and `jpeg` as texture formats" +" can be stored." + +#: ../../api/0_76_texture_deserializer.md:14 +msgid "" +"`ImageConversion.LoadImage` はメインスレッドをブロックします。 " +"大きなテクスチャーや大量のテクスチャーをロードすると画面が固まることがあります。" +msgstr "" +"`ImageConversion.LoadImage` blocks the main thread." +"The screen may freeze when loading large textures or a large number of textures." + +#: ../../api/0_76_texture_deserializer.md:17 +msgid "" +"`png` や `jpeg` から `raw pixel` を取得する部分をスレッドに乗せて非同期処理にすることで " +"パフォーマンスを向上させる余地があります。" +msgstr "By putting the part that acquires `raw pixel` from `png` or `jpeg` on a thread and making it asynchronous +can improve performance." + +#: ../../api/0_76_texture_deserializer.md:20 +msgid "差し替え方法" +msgstr "Replacement method" + +#: ../../api/0_76_texture_deserializer.md:22 +msgid "`new UniGLTF.ImporterContext` の引き数で指定することができます。" +msgstr "`new UniGLTF.ImporterContext` Arguments can be specified." + +#: ../../api/0_76_texture_deserializer.md:32 +msgid "`new VRM.VRMImporterContext` の引き数で指定することができます。" +msgstr "`new VRM.VRMImporterContext` Arguments can be specified." + +#: ../../api/0_76_texture_deserializer.md:43 +msgid "`new UniVRM10.Vrm10Importer` の引き数で指定することができます。" +msgstr "`new UniVRM10.Vrm10Importer` Arguments can be specified." + +#: ../../api/0_76_texture_deserializer.md:55 +msgid "UnityAsyncImageLoader に置き換える例" +msgstr "Example to replace with UnityAsyncImageLoader" + +#: ../../api/0_76_texture_deserializer.md:57 +msgid "ISSUE に使用例をいただきました。" +msgstr "I got a usage example in ISSUE." + +#: ../../api/0_76_texture_deserializer.md:59 +msgid "" +msgstr "" + +#: ../../api/0_76_texture_deserializer.md:61 +msgid "[UnityAsyncImageLoader](https://github.com/Looooong/UnityAsyncImageLoader)を使ってパフォーマンスを向上できます。" +msgstr "You can use [UnityAsyncImageLoader](https://github.com/Looooong/UnityAsyncImageLoader) to improve performance." diff --git a/docs/locale/en/LC_MESSAGES/release/100/v0.109.0.po b/docs/locale/en/LC_MESSAGES/release/100/v0.109.0.po new file mode 100644 index 000000000..dacae8f01 --- /dev/null +++ b/docs/locale/en/LC_MESSAGES/release/100/v0.109.0.po @@ -0,0 +1,262 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) 2021, VRM Consortium +# This file is distributed under the same license as the UniVRM Programming +# package. +# FIRST AUTHOR , 2023. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: UniVRM Programming \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-04-11 15:28+0900\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 2.9.1\n" + +#: ../../release/100/v0.109.0.md:1 +msgid "v0.109.0: experimental VRMC_vrm_animation" +msgstr "" + +#: ../../release/100/v0.109.0.md:3 +msgid "for Unity-2020.3 or later" +msgstr "" + +#: ../../release/100/v0.109.0.md:4 +msgid "" +msgstr "" + +#: ../../release/100/v0.109.0.md:6 +msgid "bug fix" +msgstr "" + +#: ../../release/100/v0.109.0.md:8 +msgid "" +"[[\\#2006](https://github.com/vrm-c/UniVRM/pull/2006)] " +"[1.0][meta][import] copyright の import が無い" +msgstr "" + +#: ../../release/100/v0.109.0.md:10 +msgid "importer" +msgstr "" + +#: ../../release/100/v0.109.0.md:11 +msgid "" +"[[\\#1975](https://github.com/vrm-c/UniVRM/pull/1975)] " +"ランタイムロードの非同期アクセスで例外が発生する問題の修正" +msgstr "" + +#: ../../release/100/v0.109.0.md:12 +msgid "" +"[[\\#1964](https://github.com/vrm-c/UniVRM/pull/1964)] Add " +"ITextureDeserializer parameter to high-level load APIs" +msgstr "" + +#: ../../release/100/v0.109.0.md:14 +msgid "exporter" +msgstr "" + +#: ../../release/100/v0.109.0.md:15 +msgid "[[\\#2012](https://github.com/vrm-c/UniVRM/pull/2012)] to warning" +msgstr "" + +#: ../../release/100/v0.109.0.md:16 +msgid "" +"[[\\#2009](https://github.com/vrm-c/UniVRM/pull/2009)] ArrayProperty name" +" `Element 0` to `{Array.Name}[0]`" +msgstr "" + +#: ../../release/100/v0.109.0.md:17 +msgid "" +"[[\\#1978](https://github.com/vrm-c/UniVRM/pull/1978)] Fix exporter " +"texture leak" +msgstr "" + +#: ../../release/100/v0.109.0.md:18 +msgid "" +"[[\\#1955](https://github.com/vrm-c/UniVRM/pull/1955)] Disabled renderers" +" no longer get exported" +msgstr "" + +#: ../../release/100/v0.109.0.md:20 +msgid "spring bone" +msgstr "" + +#: ../../release/100/v0.109.0.md:21 +msgid "" +"[[\\#1976](https://github.com/vrm-c/UniVRM/pull/1976)] Change " +"FastSpringBoneService ExecutionOrder To 11010" +msgstr "" + +#: ../../release/100/v0.109.0.md:22 +msgid "" +"[[\\#1952](https://github.com/vrm-c/UniVRM/pull/1952)] Add limit break " +"sliders to spring bone joint properties" +msgstr "" + +#: ../../release/100/v0.109.0.md:24 +msgid "experimental VRMC_vrm_animation" +msgstr "" + +#: ../../release/100/v0.109.0.md:25 +msgid "" +"[[\\#2000](https://github.com/vrm-c/UniVRM/pull/2000)] [experimental" +"][vrm-animation] vrm animation の試験実装" +msgstr "" + +#: ../../release/100/v0.109.0.md:26 +msgid "" +"[[\\#1996](https://github.com/vrm-c/UniVRM/pull/1996)] ITPoseProvider " +"を縮小。EuclideanTransform 導入" +msgstr "" + +#: ../../release/100/v0.109.0.md:27 +msgid "" +"[[\\#1992](https://github.com/vrm-c/UniVRM/pull/1992)] [sample] " +"VRM10Retarget の実装" +msgstr "" + +#: ../../release/100/v0.109.0.md:28 +msgid "" +"[[\\#1990](https://github.com/vrm-c/UniVRM/pull/1990)] IControlRigGetter " +"と IControlRigSetter を追加" +msgstr "" + +#: ../../release/100/v0.109.0.md:29 +msgid "" +"[[\\#1989](https://github.com/vrm-c/UniVRM/pull/1989)] [API Breaking " +"Change] Vrm10RuntimeControlRig は、正規化されたTPoseを受け取る責務に特化" +msgstr "" + +#: ../../release/100/v0.109.0.md:30 +msgid "" +"[[\\#1988](https://github.com/vrm-c/UniVRM/pull/1988)] ControlRig " +"関連を浅い階層に移動" +msgstr "" + +#: ../../release/100/v0.109.0.md:31 +msgid "[[\\#1983](https://github.com/vrm-c/UniVRM/pull/1983)] update json schema" +msgstr "" + +#: ../../release/100/v0.109.0.md:32 +msgid "" +"[[\\#1970](https://github.com/vrm-c/UniVRM/pull/1970)] Add defines of " +"VRM-1.0 humanoid bone specification" +msgstr "" + +#: ../../release/100/v0.109.0.md:33 +msgid "" +"[[\\#1957](https://github.com/vrm-c/UniVRM/pull/1957)] Feature10/openxr " +"fb body tracking" +msgstr "" + +#: ../../release/100/v0.109.0.md:35 +msgid "sample" +msgstr "" + +#: ../../release/100/v0.109.0.md:36 +msgid "" +"[[\\#2015](https://github.com/vrm-c/UniVRM/pull/2015)] copy Samples to " +"Samples~" +msgstr "" + +#: ../../release/100/v0.109.0.md:37 +msgid "" +"[[\\#2014](https://github.com/vrm-c/UniVRM/pull/2014)] [sample] " +"SimpleViewer を修復(BvhImporterContext の挙動変更に追随)" +msgstr "" + +#: ../../release/100/v0.109.0.md:38 +msgid "" +"[[\\#2011](https://github.com/vrm-c/UniVRM/pull/2011)] [1.0][sample] add " +"vrm-1.0 runtime export" +msgstr "" + +#: ../../release/100/v0.109.0.md:39 +msgid "" +"[[\\#1985](https://github.com/vrm-c/UniVRM/pull/1985)] sampler の bvh load" +" の修正" +msgstr "" + +#: ../../release/100/v0.109.0.md:40 +msgid "" +"[[\\#1962](https://github.com/vrm-c/UniVRM/pull/1962)] [1.0] FirstPerson " +"セットアップ記事の更新" +msgstr "" + +#: ../../release/100/v0.109.0.md:42 +msgid "other" +msgstr "" + +#: ../../release/100/v0.109.0.md:43 +msgid "[[\\#2013](https://github.com/vrm-c/UniVRM/pull/2013)] UniVRM-0.109.0" +msgstr "" + +#: ../../release/100/v0.109.0.md:44 +msgid "" +"[[\\#2008](https://github.com/vrm-c/UniVRM/pull/2008)] Write about older " +"release versions" +msgstr "" + +#: ../../release/100/v0.109.0.md:45 +msgid "" +"[[\\#1993](https://github.com/vrm-c/UniVRM/pull/1993)] Bump markdown-it-" +"py from 2.0.0 to 2.2.0" +msgstr "" + +#: ../../release/100/v0.109.0.md:46 +msgid "" +"[[\\#2004](https://github.com/vrm-c/UniVRM/pull/2004)] Fix for failed " +"tests." +msgstr "" + +#: ../../release/100/v0.109.0.md:47 +msgid "" +"[[\\#2003](https://github.com/vrm-c/UniVRM/pull/2003)] rename " +"VRN10/Tests/Resources -> TestAssets" +msgstr "" + +#: ../../release/100/v0.109.0.md:48 +msgid "" +"[[\\#1991](https://github.com/vrm-c/UniVRM/pull/1991)] fix: Fix " +"vrmAssetPostprocessor" +msgstr "" + +#: ../../release/100/v0.109.0.md:49 +msgid "" +"[[\\#1986](https://github.com/vrm-c/UniVRM/pull/1986)] Add a LookAtOrigin" +" transform to ControlRig." +msgstr "" + +#: ../../release/100/v0.109.0.md:50 +msgid "" +"[[\\#1984](https://github.com/vrm-c/UniVRM/pull/1984)] Refactoring about " +"Vrm10 LookAtRuntime" +msgstr "" + +#: ../../release/100/v0.109.0.md:51 +msgid "[[\\#1979](https://github.com/vrm-c/UniVRM/pull/1979)] PlayMode テストの修正" +msgstr "" + +#: ../../release/100/v0.109.0.md:52 +msgid "" +"[[\\#1953](https://github.com/vrm-c/UniVRM/pull/1953)] Bump certifi from " +"2021.10.8 to 2022.12.7" +msgstr "" + +#: ../../release/100/v0.109.0.md:53 +msgid "" +"[[\\#1951](https://github.com/vrm-c/UniVRM/pull/1951)] improve release " +"template according to latest Unity" +msgstr "" + +#: ../../release/100/v0.109.0.md:54 +msgid "" +"[[\\#1950](https://github.com/vrm-c/UniVRM/pull/1950)] UniVRM-0.108.0 の " +"Release. po の修正" +msgstr "" + diff --git a/docs/locale/en/LC_MESSAGES/release_template.po b/docs/locale/en/LC_MESSAGES/release_template.po index 53acc77b5..f7e7cdd8a 100644 --- a/docs/locale/en/LC_MESSAGES/release_template.po +++ b/docs/locale/en/LC_MESSAGES/release_template.po @@ -9,25 +9,25 @@ msgid "" msgstr "" "Project-Id-Version: UniVRM Programming \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-12-19 15:03+0900\n" +"POT-Creation-Date: 2023-04-11 15:28+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.11.0\n" +"Generated-By: Babel 2.9.1\n" #: ../../release_template.md:1 msgid "Release Notes" msgstr "" #: ../../release_template.md:3 -msgid "[日本語](https://vrm-c.github.io/UniVRM/ja/release/100/v{version}.html)" +msgid "[日本語](https://vrm-c.github.io/UniVRM/ja/release/100/v${version}.html)" msgstr "" #: ../../release_template.md:4 -msgid "[English](https://vrm-c.github.io/UniVRM/en/release/100/v{version}.html)" +msgid "[English](https://vrm-c.github.io/UniVRM/en/release/100/v${version}.html)" msgstr "" #: ../../release_template.md:6 @@ -54,7 +54,7 @@ msgstr "" #: ../../release_template.md:15 msgid "" "**Download " -"[VRM-{version_hash}.unitypackage](https://github.com/vrm-c/UniVRM/releases/download/v{version}/VRM-{version_hash}.unitypackage)**" +"[VRM-${version_hash}.unitypackage](https://github.com/vrm-c/UniVRM/releases/download/v${version}/VRM-${version_hash}.unitypackage)**" msgstr "" #: ../../release_template.md:17 ../../release_template.md:27 @@ -81,7 +81,7 @@ msgstr "" #: ../../release_template.md:25 msgid "" "**Download " -"[UniVRM-{version_hash}.unitypackage](https://github.com/vrm-c/UniVRM/releases/download/v{version}/UniVRM-{version_hash}.unitypackage)**" +"[UniVRM-${version_hash}.unitypackage](https://github.com/vrm-c/UniVRM/releases/download/v${version}/UniVRM-${version_hash}.unitypackage)**" msgstr "" #: ../../release_template.md:30 @@ -113,7 +113,7 @@ msgid "com.vrmc.vrmshaders" msgstr "" #: ../../release_template.md -msgid "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRMShaders#v{version}" +msgid "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRMShaders#v${version}" msgstr "" #: ../../release_template.md @@ -121,7 +121,7 @@ msgid "com.vrmc.gltf" msgstr "" #: ../../release_template.md -msgid "https://github.com/vrm-c/UniVRM.git?path=/Assets/UniGLTF#v{version}" +msgid "https://github.com/vrm-c/UniVRM.git?path=/Assets/UniGLTF#v${version}" msgstr "" #: ../../release_template.md @@ -129,7 +129,7 @@ msgid "com.vrmc.univrm" msgstr "" #: ../../release_template.md -msgid "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRM#v{version}" +msgid "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRM#v${version}" msgstr "" #: ../../release_template.md @@ -137,7 +137,7 @@ msgid "com.vrmc.vrm" msgstr "" #: ../../release_template.md -msgid "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRM10#v{version}" +msgid "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRM10#v${version}" msgstr "" #: ../../release_template.md:44 @@ -157,7 +157,7 @@ msgid "VRM 1.0 Development Samples" msgstr "" #: ../../release_template.md:64 -msgid "[VRM_Samples-{version_hash}.unitypackage](https://github.com/vrm-c/UniVRM/releases/download/v{version}/VRM_Samples-{version_hash}.unitypackage)" +msgid "[VRM_Samples-${version_hash}.unitypackage](https://github.com/vrm-c/UniVRM/releases/download/v${version}/VRM_Samples-${version_hash}.unitypackage)" msgstr "" #: ../../release_template.md:65 @@ -165,7 +165,7 @@ msgid "VRM 0.x Development Samples" msgstr "" #: ../../release_template.md:66 -msgid "[UniVRM_Samples-{version_hash}.unitypackage](https://github.com/vrm-c/UniVRM/releases/download/v{version}/UniVRM_Samples-{version_hash}.unitypackage)" +msgid "[UniVRM_Samples-${version_hash}.unitypackage](https://github.com/vrm-c/UniVRM/releases/download/v${version}/UniVRM_Samples-${version_hash}.unitypackage)" msgstr "" #: ../../release_template.md:68 @@ -290,3 +290,37 @@ msgstr "" #~ msgid "import/export 1.0 and import 0.x" #~ msgstr "" +#~ msgid "[日本語](https://vrm-c.github.io/UniVRM/ja/release/100/v{version}.html)" +#~ msgstr "" + +#~ msgid "[English](https://vrm-c.github.io/UniVRM/en/release/100/v{version}.html)" +#~ msgstr "" + +#~ msgid "" +#~ "**Download " +#~ "[VRM-{version_hash}.unitypackage](https://github.com/vrm-c/UniVRM/releases/download/v{version}/VRM-{version_hash}.unitypackage)**" +#~ msgstr "" + +#~ msgid "" +#~ "**Download " +#~ "[UniVRM-{version_hash}.unitypackage](https://github.com/vrm-c/UniVRM/releases/download/v{version}/UniVRM-{version_hash}.unitypackage)**" +#~ msgstr "" + +#~ msgid "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRMShaders#v{version}" +#~ msgstr "" + +#~ msgid "https://github.com/vrm-c/UniVRM.git?path=/Assets/UniGLTF#v{version}" +#~ msgstr "" + +#~ msgid "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRM#v{version}" +#~ msgstr "" + +#~ msgid "https://github.com/vrm-c/UniVRM.git?path=/Assets/VRM10#v{version}" +#~ msgstr "" + +#~ msgid "[VRM_Samples-{version_hash}.unitypackage](https://github.com/vrm-c/UniVRM/releases/download/v{version}/VRM_Samples-{version_hash}.unitypackage)" +#~ msgstr "" + +#~ msgid "[UniVRM_Samples-{version_hash}.unitypackage](https://github.com/vrm-c/UniVRM/releases/download/v{version}/UniVRM_Samples-{version_hash}.unitypackage)" +#~ msgstr "" + From 4e614faca4616f91ee40b76a6a831d0be10da874 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Wed, 12 Apr 2023 13:49:45 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E3=80=82`colon=5Ffence`?= =?UTF-8?q?=20=E6=8B=A1=E5=BC=B5=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/api/0_76_texture_deserializer.md | 36 ++++++++++++++------ docs/conf.py | 48 ++++++++++++++++++--------- 2 files changed, 58 insertions(+), 26 deletions(-) diff --git a/docs/api/0_76_texture_deserializer.md b/docs/api/0_76_texture_deserializer.md index 0d1ef3f09..42176112e 100644 --- a/docs/api/0_76_texture_deserializer.md +++ b/docs/api/0_76_texture_deserializer.md @@ -1,21 +1,37 @@ # `v0.76` ITextureDeserializer(テクスチャーローダー) -このインタフェースを使うとテクスチャーロードをカスタマイズできます。 +このインタフェースを使うと, glTF のテクスチャーをロードして Unity の Texture2D を作成する工程をカスタマイズできます。 ## UnityTextureDeserializer -UniVRM の実装は、`UnityTextureDeserializer` です。 +UniVRM が使用するデフォルトの実装は `UnityTextureDeserializer` です。 -[ImageConversion.LoadImage](https://docs.unity3d.com/ja/2020.3/ScriptReference/ImageConversion.LoadImage.html) を使用して `png` や `jpeg` をロードできます。 -通常の `glTF` はテクスチャー形式として `png` と `jpeg` を格納できます。 +[ImageConversion.LoadImage](https://docs.unity3d.com/ja/2020.3/ScriptReference/ImageConversion.LoadImage.html) を使用して `png` や `jpeg` から Texture2D に変換します。 -`ImageConversion.LoadImage` はメインスレッドをブロックします。 -大きなテクスチャーや大量のテクスチャーをロードすると画面が固まることがあります。 +:::{admonition} ITextureDeserializer でパフォーマンスを改善 +Texture2D の生成には複数のステップがあります。 -`png` や `jpeg` から `raw pixel` を取得する部分をスレッドに乗せて非同期処理にすることで +- `png` や `jpeg` から `raw pixel` を取り出す +- 取り出した `raw pixel` を使って `Texture2D` を作成する + +前者をスレッドに乗せて非同期処理にすることで パフォーマンスを向上させる余地があります。 +::: + +:::{warning} +`ImageConversion.LoadImage` は `raw pixel` 取り出しと `Texture2D` 作成を一度に実行し、 +その間メインスレッドをブロックします。 +大きなテクスチャーや大量のテクスチャーをロードすると画面が固まりやすくなります。 +::: + +:::{admonition} ITextureDeserializer で対応する画像形式を拡張する +通常の `glTF` はテクスチャー画像として `png` と `jpeg` を格納できます。 + +もし、`EXT_texture_webp` `KHR_texture_basisu` などで別の形式の画像を利用する場合は +`ITextureDeserializer` で対応可能です。 +::: ## 差し替え方法 @@ -25,7 +41,7 @@ UniVRM の実装は、`UnityTextureDeserializer` です。 public ImporterContext( GltfData data, IReadOnlyDictionary externalObjectMap = null, - ITextureDeserializer textureDeserializer = null, // 👈 これ + ITextureDeserializer textureDeserializer = null, // 👈 IMaterialDescriptorGenerator materialGenerator = null) ``` @@ -35,7 +51,7 @@ UniVRM の実装は、`UnityTextureDeserializer` です。 public VRMImporterContext( VRMData data, IReadOnlyDictionary externalObjectMap = null, - ITextureDeserializer textureDeserializer = null, // 👈 これ + ITextureDeserializer textureDeserializer = null, // 👈 IMaterialDescriptorGenerator materialGenerator = null, bool loadAnimation = false) ``` @@ -46,7 +62,7 @@ UniVRM の実装は、`UnityTextureDeserializer` です。 public Vrm10Importer( Vrm10Data vrm, IReadOnlyDictionary externalObjectMap = null, - ITextureDeserializer textureDeserializer = null, // 👈 これ + ITextureDeserializer textureDeserializer = null, // 👈 IMaterialDescriptorGenerator materialGenerator = null, bool useControlRig = false ) diff --git a/docs/conf.py b/docs/conf.py index 7b4b4f45c..f7304507a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -16,42 +16,58 @@ # -- Project information ----------------------------------------------------- -project = 'UniVRM Programming' -copyright = '2021, VRM Consortium' -author = 'VRM Consortium' +project = "UniVRM Programming" +copyright = "2021, VRM Consortium" +author = "VRM Consortium" # -- General configuration --------------------------------------------------- # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. -extensions = ['myst_parser', 'gitinclude'] +extensions = ["myst_parser", "gitinclude"] +myst_enable_extensions = [ + # "amsmath", + # "attrs_inline", + "colon_fence", + # "deflist", + # "dollarmath", + # "fieldlist", + # "html_admonition", + # "html_image", + # "linkify", + # "replacements", + # "smartquotes", + # "strikethrough", + # "substitution", + # "tasklist", +] # Add any paths that contain templates here, relative to this directory. -templates_path = ['_templates'] +templates_path = ["_templates"] # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. # # This is also used if you do content translation via gettext catalogs. # Usually you set "language" from the command line for these cases. -language = 'ja' +language = "ja" # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. # This pattern also affects html_static_path and html_extra_path. -exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store'] +exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"] # -- Options for HTML output ------------------------------------------------- # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. # -html_theme = 'furo' +html_theme = "furo" html_sidebars = { - '**': [ + "**": [ "sidebar/scroll-start.html", - 'language.html', + "language.html", "sidebar/brand.html", "sidebar/search.html", "sidebar/navigation.html", @@ -63,17 +79,17 @@ html_sidebars = { # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] +html_static_path = ["_static"] -locale_dirs = ['locale/'] +locale_dirs = ["locale/"] gettext_compact = False github_url = "https://github.com/vrm-c/UniVRM" html_context = { "language": language, - 'display_github': True, - 'github_user': 'vrm-c', - 'github_repo': 'UniVRM', - 'github_version': 'master/docs/' + "display_github": True, + "github_user": "vrm-c", + "github_repo": "UniVRM", + "github_version": "master/docs/", } From 1a8b382b162044de478aa7f576103dd00484255b Mon Sep 17 00:00:00 2001 From: ousttrue Date: Wed, 12 Apr 2023 13:57:16 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=E8=8B=B1=E8=A8=B3=E3=80=81=E8=BF=BD?= =?UTF-8?q?=E9=9A=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/0_76_texture_deserializer.po | 90 +++++++++++++------ 1 file changed, 61 insertions(+), 29 deletions(-) diff --git a/docs/locale/en/LC_MESSAGES/api/0_76_texture_deserializer.po b/docs/locale/en/LC_MESSAGES/api/0_76_texture_deserializer.po index 4df3eb208..509a5da60 100644 --- a/docs/locale/en/LC_MESSAGES/api/0_76_texture_deserializer.po +++ b/docs/locale/en/LC_MESSAGES/api/0_76_texture_deserializer.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: UniVRM Programming \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-11 15:28+0900\n" +"POT-Creation-Date: 2023-04-12 13:50+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -23,7 +23,7 @@ msgid "`v0.76` ITextureDeserializer(テクスチャーローダー)" msgstr "`v0.76` ITextureDeserializer(Texture Loader)" #: ../../api/0_76_texture_deserializer.md:3 -msgid "このインタフェースを使うとテクスチャーロードをカスタマイズできます。" +msgid "このインタフェースを使うと, glTF のテクスチャーをロードして Unity の Texture2D を作成する工程をカスタマイズできます。" msgstr "This interface allows you to customize texture loading." #: ../../api/0_76_texture_deserializer.md:5 @@ -31,8 +31,8 @@ msgid "UnityTextureDeserializer" msgstr "" #: ../../api/0_76_texture_deserializer.md:7 -msgid "UniVRM の実装は、`UnityTextureDeserializer` です。" -msgstr "UniVRM implementation is `UnityTextureDeserializer`." +msgid "UniVRM が使用するデフォルトの実装は `UnityTextureDeserializer` です。" +msgstr "UniVRM default implementation is `UnityTextureDeserializer`." #: ../../api/0_76_texture_deserializer.md:9 msgid "" @@ -41,56 +41,88 @@ msgstr "" #: ../../api/0_76_texture_deserializer.md:11 msgid "" "[ImageConversion.LoadImage](https://docs.unity3d.com/ja/2020.3/ScriptReference/ImageConversion.LoadImage.html)" -" を使用して `png` や `jpeg` をロードできます。 通常の `glTF` はテクスチャー形式として `png` と `jpeg` " -"を格納できます。" +" を使用して `png` や `jpeg` から Texture2D に変換します。" msgstr "" -"[ImageConversion.LoadImage](https://docs.unity3d.com/ja/2020.3/ScriptReference/ImageConversion.LoadImage.html)" -"can be used to load `png` and `jpeg`. Normal `glTF` supports `png` and `jpeg` as texture formats" -" can be stored." +"[ImageConversion.LoadImage](https://docs.unity3d.com/ja/2020.3/ScriptReference/ImageConversion.LoadImage.html)can" +" be used to load `png` and `jpeg`." -#: ../../api/0_76_texture_deserializer.md:14 -msgid "" -"`ImageConversion.LoadImage` はメインスレッドをブロックします。 " -"大きなテクスチャーや大量のテクスチャーをロードすると画面が固まることがあります。" +#: ../../api/0_76_texture_deserializer.md:13 +msgid "ITextureDeserializer でパフォーマンスを改善" +msgstr "Improve performance with ITextureDeserializer" + +#: ../../api/0_76_texture_deserializer.md:1 +msgid "Texture2D の生成には複数のステップがあります。" +msgstr "Generating a Texture2D has multiple steps." + +#: ../../api/0_76_texture_deserializer.md:3 +msgid "`png` や `jpeg` から `raw pixel` を取り出す" +msgstr "Extract `raw pixel` from `png` or `jpeg`" + +#: ../../api/0_76_texture_deserializer.md:4 +msgid "取り出した `raw pixel` を使って `Texture2D` を作成する" +msgstr "Create a `Texture2D` using the extracted `raw pixel`" + +#: ../../api/0_76_texture_deserializer.md:6 +msgid "前者をスレッドに乗せて非同期処理にすることで パフォーマンスを向上させる余地があります。" msgstr "" -"`ImageConversion.LoadImage` blocks the main thread." -"The screen may freeze when loading large textures or a large number of textures." +"Performance can be improved by putting the raw pixel fetch on a thread to make it asynchronous." -#: ../../api/0_76_texture_deserializer.md:17 +#: ../../api/0_76_texture_deserializer.md:1 msgid "" -"`png` や `jpeg` から `raw pixel` を取得する部分をスレッドに乗せて非同期処理にすることで " -"パフォーマンスを向上させる余地があります。" -msgstr "By putting the part that acquires `raw pixel` from `png` or `jpeg` on a thread and making it asynchronous -can improve performance." +"`ImageConversion.LoadImage` は `raw pixel` 取り出しと `Texture2D` 作成を一度に実行し、 " +"その間メインスレッドをブロックします。 大きなテクスチャーや大量のテクスチャーをロードすると画面が固まりやすくなります。" +msgstr "" +"`ImageConversion.LoadImage` performs `raw pixel` extraction and `Texture2D` creation at once, " +"It blocks the main thread for the duration. " +"If you load a large texture or a large amount of textures, the screen tends to freeze." -#: ../../api/0_76_texture_deserializer.md:20 +#: ../../api/0_76_texture_deserializer.md:29 +msgid "ITextureDeserializer で対応する画像形式を拡張する" +msgstr "Extend supported image formats with ITextureDeserializer" + +#: ../../api/0_76_texture_deserializer.md:1 +msgid "通常の `glTF` はテクスチャー画像として `png` と `jpeg` を格納できます。" +msgstr "`glTF` can store `png` and `jpeg` as texture images." + +#: ../../api/0_76_texture_deserializer.md:3 +msgid "" +"もし、`EXT_texture_webp` `KHR_texture_basisu` などで別の形式の画像を利用する場合は " +"`ITextureDeserializer` で対応可能です。" +msgstr "" +"If you want to use another format image with `EXT_texture_webp` `KHR_texture_basisu` etc. " +"It can be handled by `ITextureDeserializer`." + +#: ../../api/0_76_texture_deserializer.md:36 msgid "差し替え方法" msgstr "Replacement method" -#: ../../api/0_76_texture_deserializer.md:22 +#: ../../api/0_76_texture_deserializer.md:38 msgid "`new UniGLTF.ImporterContext` の引き数で指定することができます。" msgstr "`new UniGLTF.ImporterContext` Arguments can be specified." -#: ../../api/0_76_texture_deserializer.md:32 +#: ../../api/0_76_texture_deserializer.md:48 msgid "`new VRM.VRMImporterContext` の引き数で指定することができます。" msgstr "`new VRM.VRMImporterContext` Arguments can be specified." -#: ../../api/0_76_texture_deserializer.md:43 +#: ../../api/0_76_texture_deserializer.md:59 msgid "`new UniVRM10.Vrm10Importer` の引き数で指定することができます。" msgstr "`new UniVRM10.Vrm10Importer` Arguments can be specified." -#: ../../api/0_76_texture_deserializer.md:55 +#: ../../api/0_76_texture_deserializer.md:71 msgid "UnityAsyncImageLoader に置き換える例" msgstr "Example to replace with UnityAsyncImageLoader" -#: ../../api/0_76_texture_deserializer.md:57 +#: ../../api/0_76_texture_deserializer.md:73 msgid "ISSUE に使用例をいただきました。" msgstr "I got a usage example in ISSUE." -#: ../../api/0_76_texture_deserializer.md:59 +#: ../../api/0_76_texture_deserializer.md:75 msgid "" msgstr "" -#: ../../api/0_76_texture_deserializer.md:61 +#: ../../api/0_76_texture_deserializer.md:77 msgid "[UnityAsyncImageLoader](https://github.com/Looooong/UnityAsyncImageLoader)を使ってパフォーマンスを向上できます。" -msgstr "You can use [UnityAsyncImageLoader](https://github.com/Looooong/UnityAsyncImageLoader) to improve performance." +msgstr "" +"You can use " +"[UnityAsyncImageLoader](https://github.com/Looooong/UnityAsyncImageLoader)" +" to improve performance."