Skip to content

Commit

Permalink
Merge pull request #1313 from ousttrue/doc/update_20211015
Browse files Browse the repository at this point in the history
Doc/update 20211015
  • Loading branch information
PoChang007 committed Oct 15, 2021
2 parents b407190 + b1cd946 commit 098eabc
Show file tree
Hide file tree
Showing 38 changed files with 1,379 additions and 561 deletions.
12 changes: 6 additions & 6 deletions docs/_templates/layout.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{% extends "!layout.html" %}

{% block sidebartitle %}
{%- if language != "en" %}
<a href="{{ pathto('../en/', 1) }}{{ pathto(pagename, 0, '.') }}">English</a>
{%- endif %}
{%- if language != "ja" %}
<a href="{{ pathto('../ja/', 1) }}{{ pathto(pagename, 0, '.') }}">日本語</a>
{%- endif %}
{%- if language != "en" %}
[日本語] <a href="{{ pathto('../en/', 1) }}{{ pathto(pagename, 0, '.') }}">English</a>
{%- endif %}
{%- if language != "ja" %}
<a href="{{ pathto('../ja/', 1) }}{{ pathto(pagename, 0, '.') }}">日本語</a> [English]
{%- endif %}
{{ super() }}
{% endblock %}
8 changes: 4 additions & 4 deletions docs/gltf/0_36_update.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ GLTFの仕様に準拠しました。
* extraはextrasの間違い
* imageはnameを持っていた

```json
```js
json.images[i].extra.name
```

変更後

```json
```js
json.images[i].name
```

Expand All @@ -25,12 +25,12 @@ GLTFの仕様に準拠しました。
* targetにextrasは不許可
* https://github.com/KhronosGroup/glTF/issues/1036#issuecomment-314078356

```json
```js
json.meshes[i].primitives[j].targets[k].extra.name
```

変更後

```json
```js
json.meshes[i].primitives[j].extras.targetNames[k]
```
5 changes: 2 additions & 3 deletions docs/gltf/0_82_glb_import.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# GlbImport(0.82)
`0.82.1` の API です。
`0.82.0` の場合は更新をお願いします。
# GlbImport(0.82) GltfData
from: `0.82.1`

以下のステップでロードします。

Expand Down
30 changes: 18 additions & 12 deletions docs/locale/en/LC_MESSAGES/build.po
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: UniVRM Programming Document \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-10-11 16:50+0900\n"
"POT-Creation-Date: 2021-10-15 15:45+0900\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand All @@ -20,47 +20,53 @@ msgstr ""

#: ../../build.md:1
msgid "アプリケーションのビルド"
msgstr ""
msgstr "Build Application"

#: ../../build.md:3
msgid "ビルドに含めるシェーダー"
msgid "UniVRMを使うアプリケーションのビルドに関する注意事項"
msgstr ""

#: ../../build.md:5
msgid "ビルドに含めるシェーダー"
msgstr "Shaders to include in the build"

#: ../../build.md:7
msgid ""
"`Project Settings = Graphics - Always Included Shaders` "
"などに設定して、ビルドに含まれるようにしてください。"
msgstr ""
"Set `Project Settings = Graphics - Always Included Shaders` to included "
"in the build"

#: ../../build.md:7
#: ../../build.md:9
msgid "Unlit"
msgstr ""

#: ../../build.md:9
#: ../../build.md:11
msgid "`Assets\\VRMShaders\\GLTF\\UniUnlit\\Resources\\UniGLTF\\UniUnlit.shader`"
msgstr ""

#: ../../build.md:11
#: ../../build.md:13
msgid "MToon"
msgstr ""

#: ../../build.md:13
#: ../../build.md:15
msgid "`Assets\\VRMShaders\\VRM\\MToon\\MToon\\Resources\\Shaders\\MToon.shader`"
msgstr ""

#: ../../build.md:15
#: ../../build.md:17
msgid "ランタイム import/export 時のテクスチャー変換用のシェーダー"
msgstr ""
msgstr "Shaders for texture conversion during runtime import/export"

#: ../../build.md:17
#: ../../build.md:19
msgid "`Assets\\VRMShaders\\GLTF\\IO\\Resources\\UniGLTF\\NormalMapExporter.shader`"
msgstr ""

#: ../../build.md:18
#: ../../build.md:20
msgid "`Assets\\VRMShaders\\GLTF\\IO\\Resources\\UniGLTF\\StandardMapExporter.shader`"
msgstr ""

#: ../../build.md:19
#: ../../build.md:21
msgid "`Assets\\VRMShaders\\GLTF\\IO\\Resources\\UniGLTF\\StandardMapImporter.shader`"
msgstr ""

70 changes: 42 additions & 28 deletions docs/locale/en/LC_MESSAGES/gltf/0_82_glb_import.po
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: UniVRM Programming Document \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-09-14 13:46+0900\n"
"POT-Creation-Date: 2021-10-15 16:47+0900\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand All @@ -19,92 +19,106 @@ msgstr ""
"Generated-By: Babel 2.9.1\n"

#: ../../gltf/0_82_glb_import.md:1
msgid "GlbImport(0.82)"
msgid "GlbImport(0.82) GltfData"
msgstr ""

#: ../../gltf/0_82_glb_import.md:2
msgid "`0.82.1` の API です。 `0.82.0` の場合は更新をお願いします。"
msgstr "If use `0.82.0`, please upgrade."
msgid "from: `0.82.1`"
msgstr ""

#: ../../gltf/0_82_glb_import.md:5
#: ../../gltf/0_82_glb_import.md:4
msgid "以下のステップでロードします。"
msgstr "GLB load is below steps."

#: ../../gltf/0_82_glb_import.md:7
#: ../../gltf/0_82_glb_import.md:6
msgid "`GLB` / `GLTF` をパースして `GltfData` を得る。"
msgstr "Parse `GLB` / `GLTF`, get a `GltfData`"

#: ../../gltf/0_82_glb_import.md:8
#: ../../gltf/0_82_glb_import.md:7
msgid ""
"`GltfData` から `Unity Hierarchy` を ロード する。`RuntimeGltfInstance` を得る。 "
"ローダーを破棄する。"
msgstr "Load `Unity Hierarchy` from the `GltfData`, get a `RuntimeGltfInstance`, dispose loader."
msgstr ""
"Load `Unity Hierarchy` from the `GltfData`, get a `RuntimeGltfInstance`, "
"dispose loader."

#: ../../gltf/0_82_glb_import.md:9
#: ../../gltf/0_82_glb_import.md:8
msgid "ロードした `RuntimeGltfInstance` 使う。`RuntimeGltfInstance` を破棄する。"
msgstr "Use the `RuntimeGltfInstance`, destroy the `RuntimeGltfInstance`."

#: ../../gltf/0_82_glb_import.md:11
#: ../../gltf/0_82_glb_import.md:10
msgid "1. パースする"
msgstr "1. Parse"

#: ../../gltf/0_82_glb_import.md:13
#: ../../gltf/0_82_glb_import.md:12
msgid "glb ファイルパスからパースする"
msgstr "Parse glb from file path"

#: ../../gltf/0_82_glb_import.md:15 ../../gltf/0_82_glb_import.md:26
#: ../../gltf/0_82_glb_import.md:14 ../../gltf/0_82_glb_import.md:25
msgid "`vrm` もこの関数を使います。"
msgstr "Use this for vrm too."

#: ../../gltf/0_82_glb_import.md:24
#: ../../gltf/0_82_glb_import.md:23
msgid "glb バイト列をパースする"
msgstr "Parse glb byte array"

#: ../../gltf/0_82_glb_import.md:35
#: ../../gltf/0_82_glb_import.md:34
msgid "gltf ファイルパスからパースする"
msgstr "Parse gltf from file path"

#: ../../gltf/0_82_glb_import.md:44
#: ../../gltf/0_82_glb_import.md:43
msgid "zip アーカイブからパースする"
msgstr "Parse gltf in zip archive from file path"

#: ../../gltf/0_82_glb_import.md:46
#: ../../gltf/0_82_glb_import.md:45
msgid "gltf と関連するファイルを zip アーカイブしたファイルをパースできます(実験)。"
msgstr "Zip archive that contains gltf and related files could parsed(expelemental)."
msgstr ""
"Zip archive that contains gltf and related files could "
"parsed(expelemental)."

#: ../../gltf/0_82_glb_import.md:55
#: ../../gltf/0_82_glb_import.md:54
msgid "ファイルパスの拡張子でパースする"
msgstr "Parse by file extension"

#: ../../gltf/0_82_glb_import.md:57
#: ../../gltf/0_82_glb_import.md:56
msgid "サンプルの `SimpleViewer` を参考にしてください。"
msgstr "See `SimpleViewer` sample."

#: ../../gltf/0_82_glb_import.md:67
#: ../../gltf/0_82_glb_import.md:66
msgid "2. ロードする"
msgstr "2. Load"

#: ../../gltf/0_82_glb_import.md:69
#: ../../gltf/0_82_glb_import.md:68
msgid "sync"
msgstr ""

#: ../../gltf/0_82_glb_import.md:84
#: ../../gltf/0_82_glb_import.md:83
msgid "async"
msgstr ""

#: ../../gltf/0_82_glb_import.md:99
#: ../../gltf/0_82_glb_import.md:98
msgid "materialGenerator で URP 用のマテリアルをロードする"
msgstr "Load URP material by materialGenerator argument"

#: ../../gltf/0_82_glb_import.md:101
#: ../../gltf/0_82_glb_import.md:100
msgid "`materialGenerator` 引き数(省略可能)を指定することで URP マテリアルを生成するようにカスタムできます。"
msgstr "You can load URP materials by setting the `materialGenerator` Argument (optional)."
msgstr ""
"You can load URP materials by setting the `materialGenerator` Argument "
"(optional)."

#: ../../gltf/0_82_glb_import.md:115
#: ../../gltf/0_82_glb_import.md:114
msgid "3. インスタンスを使用する"
msgstr "3. Use instance"

#: ../../gltf/0_82_glb_import.md:124
#: ../../gltf/0_82_glb_import.md:123
msgid "使用後に以下のように破棄してください。関連する Asset(Texture, Material, Meshなど)も破棄されます。"
msgstr "Destroy after use and discard related assets (textures, materials, meshes, etc.)"
msgstr ""
"Destroy after use and discard related assets (textures, materials, "
"meshes, etc.)"

#~ msgid "GlbImport(0.82)"
#~ msgstr ""

#~ msgid "`0.82.1` の API です。 `0.82.0` の場合は更新をお願いします。"
#~ msgstr "If use `0.82.0`, please upgrade."

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: UniVRM Programming Document \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-09-14 13:46+0900\n"
"POT-Creation-Date: 2021-10-15 15:45+0900\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand All @@ -18,59 +18,51 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.9.1\n"

#: ../../history.md:1
msgid "Version"
#: ../../gltf/index.md:1
msgid "glTF"
msgstr ""

#: ../../history.md
#: ../../gltf/index.md
msgid "version"
msgstr ""

#: ../../history.md
#: ../../gltf/index.md
msgid "v0.82.1"
msgstr ""

#: ../../history.md
#: ../../gltf/index.md
msgid "`materialGenerator(URP対応)` 引き数と `VrmData`"
msgstr "`materialGenerator(for URP)` argument and `VrmData`"
msgstr ""

#: ../../history.md
#: ../../gltf/index.md
msgid "v0.79"
msgstr ""

#: ../../history.md
#: ../../gltf/index.md
msgid "`GltfData`"
msgstr ""

#: ../../history.md
#: ../../gltf/index.md
msgid "v0.77"
msgstr ""

#: ../../history.md
#: ../../gltf/index.md
msgid "`RuntimeGltfInstance`"
msgstr ""

#: ../../history.md
#: ../../gltf/index.md
msgid "v0.68"
msgstr ""

#: ../../history.md
#: ../../gltf/index.md
msgid "`GltfParser`"
msgstr ""

#: ../../history.md
#: ../../gltf/index.md
msgid "v0.63.2"
msgstr ""

#: ../../history.md
#: ../../gltf/index.md
msgid "gltf の extension の実装方法を変更"
msgstr "Update gltf extensions implementation"

#: ../../history.md
msgid "v0.56"
msgstr ""

#: ../../history.md
msgid "BlendShapeKey の仕様変更"
msgstr "Update BlendShapeKey spec"

Loading

0 comments on commit 098eabc

Please sign in to comment.