Merge pull request #2142 from ousttrue/doc/v0_114_0

UniVRM-0.114.0
2026-04-18 03:27:22 -05:00 · 2023-08-22 15:22:00 +09:00 · 2023-08-22 15:22:00 +09:00 · 2fd81cb173
commit 2fd81cb173
parent d90b26b987 14a273d629
6 changed files with 239 additions and 155 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -1,4 +1,4 @@
-{
+{
    "files.exclude":
    {
        "**/.DS_Store":true,
@ -51,5 +51,8 @@
        "ProjectSettings/":true,
        "temp/":true,
        "Temp/":true
-    }
+    },
+    "cSpell.words": [
+        "UNIVRM"
+    ]
 }
--- a/docs/html_template.html
+++ b/docs/html_template.html
@ -0,0 +1,100 @@
+<html>
+    <body>
+        <head>
+            <style type="text/css">
+            html,
+            body {
+                    {
+                    color: black;
+                    background-color: white;
+                    width: 100%;
+                    height: 100%;
+
+                    display: flex;
+                    flex-direction: column;
+                }
+            }
+
+            main {
+                    {
+                    display: flex;
+                    justify-content: center;
+                    align-items: center;
+                    flex-grow: 1;
+                }
+            }
+
+            .btn {
+                    {
+                    margin: 1em;
+                    color: white;
+                    background-color: green;
+                    padding: 0.5em;
+                    border-radius: 0.3em;
+                    text-decoration: none;
+                }
+            }
+
+            .btn.unity2019 {
+                    {
+                    background-color: gray;
+                }
+            }
+
+            .btn h1 {
+                    {
+                    text-align: center;
+                }
+            }
+
+            .btn h2 {
+                    {
+                    text-align: center;
+                }
+            }
+            </style>
+        </head>
+        <header></header>
+        <main>
+            <a href="https://github.com/vrm-c/UniVRM/releases/download/v${version}/VRM-${version}_${hash4}.unitypackage" class="btn">
+                <div>
+                    <h1>VRM-${version}</h1>
+                    <div>for vrm-1.0</div>
+                    <div>Unity-2020.3 or later</div>
+                </div>
+            </a>
+            <a href="https://github.com/vrm-c/UniVRM/releases/download/v${version}/UniVRM-${version}_${hash4}.unitypackage" class="btn">
+                <div>
+                    <h1>UniVRM-${version}</h1>
+                    <div>for vrm-0.x</div>
+                    <div>Unity-2020.3 or later</div>
+                </div>
+            </a>
+            <a href="https://github.com/vrm-c/UniVRM/releases/download/v0.111.0/UniVRM-0.111.0_b413.unitypackage" class="btn unity2019">
+                <div>
+                    <h1>UniVRM-0.111.0</h1>
+                    <div>for vrm-0.x</div>
+                    <div>Final version for Unity-2020.3</div>
+                </div>
+            </a>
+            <a href="https://github.com/vrm-c/UniVRM/releases/download/v0.99.4/UniVRM-0.99.4_8d33.unitypackage" class="btn unity2019">
+                <div>
+                    <h1>UniVRM-0.99.4</h1>
+                    <div>for vrm-0.x</div>
+                    <div>Final version for Unity-2019.4</div>
+                </div>
+            </a>
+        </main>
+        <nav>
+            API Document
+            <ul>
+                <li>
+                    <a href="./ja/">日本語</a>
+                </li>
+                <li>
+                    <a href="./en/">English</a>
+                </li>
+            </ul>
+        </nav>
+    </body>
+</html>
--- a/docs/index.html
+++ b/docs/index.html
@ -1,82 +1,100 @@
 <html>
-<body>
-
-    <head>
-        <style type="text/css">
+    <body>
+        <head>
+            <style type="text/css">
            html,
            body {
-                color: black;
-                background-color: white;
-                width: 100%;
-                height: 100%;
+                    {
+                    color: black;
+                    background-color: white;
+                    width: 100%;
+                    height: 100%;

-                display: flex;
-                flex-direction: column;
+                    display: flex;
+                    flex-direction: column;
+                }
            }

            main {
-                display: flex;
-                justify-content: center;
-                align-items: center;
-                flex-grow: 1;
+                    {
+                    display: flex;
+                    justify-content: center;
+                    align-items: center;
+                    flex-grow: 1;
+                }
            }

            .btn {
-                margin: 1em;
-                color: white;
-                background-color: green;
-                padding: 0.5em;
-                border-radius: 0.3em;
-                text-decoration: none;
+                    {
+                    margin: 1em;
+                    color: white;
+                    background-color: green;
+                    padding: 0.5em;
+                    border-radius: 0.3em;
+                    text-decoration: none;
+                }
            }

            .btn.unity2019 {
-                background-color: gray;
+                    {
+                    background-color: gray;
+                }
            }

            .btn h1 {
-                text-align: center;
+                    {
+                    text-align: center;
+                }
            }

            .btn h2 {
-                text-align: center;
+                    {
+                    text-align: center;
+                }
            }
-        </style>
-    </head>
-    <header>
-
-    </header>
-    <main>
-        <a href="https://github.com/vrm-c/UniVRM/releases/download/v0.113.0/VRM-0.113.0_0165.unitypackage" class="btn">
-            <div>
-                <h1>VRM-0.113.0</h1>
-                <div>for vrm-1.0</div>
-                <div>Unity-2020.3 or later</div>
-            </div>
-        </a>
-
-        <a href="https://github.com/vrm-c/UniVRM/releases/download/v0.113.0/UniVRM-0.113.0_0165.unitypackage" class="btn">
-            <div>
-                <h1>UniVRM-0.113.0</h1>
-                <div>for vrm-0.x</div>
-                <div>Unity-2020.3 or later</div>
-            </div>
-        </a>
-
-        <a href="https://github.com/vrm-c/UniVRM/releases/download/v0.99.4/UniVRM-0.99.4_8d33.unitypackage" class="btn unity2019">
-            <div>
-                <h1>UniVRM-0.99.4</h1>
-                <div>for vrm-0.x</div>
-                <div>Final version for Unity-2019.4</div>
-            </div>
-        </a>
-    </main>
-    <nav>
-        API Document
-        <ul>
-            <li><a href="./ja/">日本語</a></li>
-            <li><a href="./en/">English</a></li>
-        </ul>
-    </nav>
-</body>
+            </style>
+        </head>
+        <header></header>
+        <main>
+            <a href="https://github.com/vrm-c/UniVRM/releases/download/v0.114.0/VRM-0.114.0_0.11.unitypackage" class="btn">
+                <div>
+                    <h1>VRM-0.114.0</h1>
+                    <div>for vrm-1.0</div>
+                    <div>Unity-2020.3 or later</div>
+                </div>
+            </a>
+            <a href="https://github.com/vrm-c/UniVRM/releases/download/v0.114.0/UniVRM-0.114.0_0.11.unitypackage" class="btn">
+                <div>
+                    <h1>UniVRM-0.114.0</h1>
+                    <div>for vrm-0.x</div>
+                    <div>Unity-2020.3 or later</div>
+                </div>
+            </a>
+            <a href="https://github.com/vrm-c/UniVRM/releases/download/v0.111.0/UniVRM-0.111.0_b413.unitypackage" class="btn unity2019">
+                <div>
+                    <h1>UniVRM-0.111.0</h1>
+                    <div>for vrm-0.x</div>
+                    <div>Final version for Unity-2020.3</div>
+                </div>
+            </a>
+            <a href="https://github.com/vrm-c/UniVRM/releases/download/v0.99.4/UniVRM-0.99.4_8d33.unitypackage" class="btn unity2019">
+                <div>
+                    <h1>UniVRM-0.99.4</h1>
+                    <div>for vrm-0.x</div>
+                    <div>Final version for Unity-2019.4</div>
+                </div>
+            </a>
+        </main>
+        <nav>
+            API Document
+            <ul>
+                <li>
+                    <a href="./ja/">日本語</a>
+                </li>
+                <li>
+                    <a href="./en/">English</a>
+                </li>
+            </ul>
+        </nav>
+    </body>
 </html>
--- a/docs/release/112/v0.114.0.md
+++ b/docs/release/112/v0.114.0.md
@ -0,0 +1,39 @@
+# v0.114.0 VrmAnimation Interface 
+
+* [[\#2130](https://github.com/vrm-c/UniVRM/pull/2130)] [API Behaviour Breaking Change] Don't change raw blendshapes immediately when calling `Vrm10RuntimeExpression.SetWeights()`
+
+## Optimize
+
+* [[\#2135](https://github.com/vrm-c/UniVRM/pull/2135)] Optimize `MorphTargetBindingMerger` with minimum `Dictionary` usage
+* Merge branch 'master' of https://github.com/vrm-c/UniVRM into expressionFaster
+* [[\#2129](https://github.com/vrm-c/UniVRM/pull/2129)] Speed up ExpressionKey's comparison.
+* [[\#2128](https://github.com/vrm-c/UniVRM/pull/2128)] Add Vrm10RuntimeExpression.SetWeightNonAlloc method
+
+## VrmAnimation Interface 
+
+VRM10Viewer/VRM10Retarget.cs で行っていた Animation から Vrm にポーズをコピーする処理は、
+Vrm10Runtime.Process で実行できるようになりました。
+`Assets\VRM10\Runtime\Components\Vrm10Runtime\Vrm10Runtime.cs`
+
+VrmAnimation の Expression 値のアニメーションを Transform の x 値の移動で代用する実装は、
+Unity の AnimationClip の float 値になりました。
+`Assets\VRM10\Runtime\Components\VrmAnimationInstance\Vrm10AnimationInstance.cs`
+
+* [[\#2140](https://github.com/vrm-c/UniVRM/pull/2140)] sample の retarget を更新。
+* [[\#2138](https://github.com/vrm-c/UniVRM/pull/2138)] LookAt の整理
+* [[\#2137](https://github.com/vrm-c/UniVRM/pull/2137)] ILookAtEyeDirectionProvider を LookAt フォルダーに移動
+* [[\#2134](https://github.com/vrm-c/UniVRM/pull/2134)] [VrmAnimation] Expression 周りの整理など
+* [[\#2132](https://github.com/vrm-c/UniVRM/pull/2132)] [vrma] retarget phase を Vrm10Runtime.Process の先頭に移動
+* [[\#2124](https://github.com/vrm-c/UniVRM/pull/2124)] VrmAnimation の Expression は float field に変更
+
+## Other
+
+* [[\#2141](https://github.com/vrm-c/UniVRM/pull/2141)] UniVRM-0.114.0
+* [[\#2136](https://github.com/vrm-c/UniVRM/pull/2136)] remove unused
+* [[\#2131](https://github.com/vrm-c/UniVRM/pull/2131)] Add `ReplaceResource` Method to `RuntimeGltfInstance`
+* [[\#2127](https://github.com/vrm-c/UniVRM/pull/2127)] Bump tornado from 6.3.2 to 6.3.3
+* [[\#2114](https://github.com/vrm-c/UniVRM/pull/2114)] Auto detect render pipelines
+* [[\#2116](https://github.com/vrm-c/UniVRM/pull/2116)] EditorImport時、ユーザーが任意のMaterialDescriptorGeneratorを差し込むための拡張の窓を追加
+* [[\#2123](https://github.com/vrm-c/UniVRM/pull/2123)] Remove linq snippets disused on unity update
+* [[\#2117](https://github.com/vrm-c/UniVRM/pull/2117)] UniVRM-0.113.0
+* Merge remote-tracking branch 'upstream/master' into material_desc_generator_factory
--- a/docs/release_gen.py
+++ b/docs/release_gen.py
@ -20,14 +20,17 @@ HERE = pathlib.Path(__file__).absolute().parent
 UNIVRM_VERSION = HERE.parent / "Assets/VRM/Runtime/Format/VRMVersion.cs"
 MERGE_PATTERN = re.compile(r"Merge pull request #(\d+)")
 TEMPLATE = HERE / "release_template.md"
+HTML_TEMPLATE = HERE / "html_template.html"
+RELEASE_NOTE_DIR = "112"


-def gen(version: str, hash: str):
+def gen(template: str, version: str, hash: str):
    version_hash = f"{version}_{hash[0:4]}"
-    template = TEMPLATE.read_text(encoding="utf-8")
    values = {
        "version": version,
        "version_hash": version_hash,
+        "hash4": version_hash[0:4],
+        "dir": RELEASE_NOTE_DIR,
    }

    def replace(m: re.Match):
@ -56,9 +59,9 @@ def get_hash(repo, tag_name) -> str:


 def copy_release_md(version: str, hash: str):
-    text = gen(version, hash)
    import pyperclip

+    text = gen(TEMPLATE.read_text(encoding="utf-8"), version, hash)
    pyperclip.copy(text)
    print("copy to clipboard")

@ -75,17 +78,20 @@ def change_log(repo: git.repo.Repo, version: str):
    w.write("\n")
    for item in repo.iter_commits(rev=rev):
        if len(item.parents) > 1:
-            m = MERGE_PATTERN.match(item.message)
+            msg = item.message
+            if isinstance(msg, bytes):
+                msg = msg.decode("utf-8")
+            m = MERGE_PATTERN.match(msg)
            if m:
                # merge commit
                pr = m[1]
-                lines = item.message.split("\n")
+                lines = msg.split("\n")

                w.write(
                    f"* [[\\#{pr}](https://github.com/vrm-c/UniVRM/pull/{pr})] {lines[2]}\n"
                )
            else:
-                w.write(f"* {item.message}")
+                w.write(f"* {msg}")
    return w.getvalue()


@ -115,94 +121,12 @@ if __name__ == "__main__":
    # 1.
    copy_release_md(f"{version}", hash)
    # 2.
-    release = HERE / f"release/112/v{version}.md"
+    release = HERE / f"release/{RELEASE_NOTE_DIR}/v{version}.md"
    if not release.exists():
        text = change_log(repo, f"{version}")
        release.write_text(text, encoding="utf-8")
    # 3.
    (HERE / "index.html").write_text(
-        f"""<html>
-<body>
-
-    <head>
-        <style type="text/css">
-            html,
-            body {{
-                color: black;
-                background-color: white;
-                width: 100%;
-                height: 100%;
-
-                display: flex;
-                flex-direction: column;
-            }}
-
-            main {{
-                display: flex;
-                justify-content: center;
-                align-items: center;
-                flex-grow: 1;
-            }}
-
-            .btn {{
-                margin: 1em;
-                color: white;
-                background-color: green;
-                padding: 0.5em;
-                border-radius: 0.3em;
-                text-decoration: none;
-            }}
-
-            .btn.unity2019 {{
-                background-color: gray;
-            }}
-
-            .btn h1 {{
-                text-align: center;
-            }}
-
-            .btn h2 {{
-                text-align: center;
-            }}
-        </style>
-    </head>
-    <header>
-
-    </header>
-    <main>
-        <a href="https://github.com/vrm-c/UniVRM/releases/download/v{version}/VRM-{version}_{hash[0:4]}.unitypackage" class="btn">
-            <div>
-                <h1>VRM-{version}</h1>
-                <div>for vrm-1.0</div>
-                <div>Unity-2020.3 or later</div>
-            </div>
-        </a>
-
-        <a href="https://github.com/vrm-c/UniVRM/releases/download/v{version}/UniVRM-{version}_{hash[0:4]}.unitypackage" class="btn">
-            <div>
-                <h1>UniVRM-{version}</h1>
-                <div>for vrm-0.x</div>
-                <div>Unity-2020.3 or later</div>
-            </div>
-        </a>
-
-        <a href="https://github.com/vrm-c/UniVRM/releases/download/v0.99.4/UniVRM-0.99.4_8d33.unitypackage" class="btn unity2019">
-            <div>
-                <h1>UniVRM-0.99.4</h1>
-                <div>for vrm-0.x</div>
-                <div>Final version for Unity-2019.4</div>
-            </div>
-        </a>
-    </main>
-    <nav>
-        API Document
-        <ul>
-            <li><a href="./ja/">日本語</a></li>
-            <li><a href="./en/">English</a></li>
-        </ul>
-    </nav>
-</body>
-</html>
-""",
+        gen(HTML_TEMPLATE.read_text(encoding="utf-8"), f"{version}", hash),
        encoding="utf-8",
    )
--- a/docs/release_template.md
+++ b/docs/release_template.md
@ -1,7 +1,7 @@
 ## Release Notes

- [日本語](https://vrm-c.github.io/UniVRM/ja/release/100/v${version}.html)
- [English](https://vrm-c.github.io/UniVRM/en/release/100/v${version}.html)
+- [日本語](https://vrm-c.github.io/UniVRM/ja/release/${dir}/v${version}.html)
+- [English](https://vrm-c.github.io/UniVRM/en/release/${dir}/v${version}.html)

 ## Installation