Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: vrm-c/UniVRM
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.112.0
Choose a base ref
...
head repository: vrm-c/UniVRM
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing 1,931 changed files with 176,086 additions and 48,264 deletions.
23 changes: 11 additions & 12 deletions .github/ISSUE_TEMPLATE/------bug-report-ja--.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
---
name: バグ報告 (Bug report(ja))
about: 改善のためのレポートを作成します
title: ''
labels: 'bug'
assignees: ''

title: ""
labels: "bug"
assignees: ""
---

## 環境情報

- UniVRM version: `0.81.0`
- Unity version: `Unity-2019.4`
- OS: `Windows 10`
- UniVRM version: `0.123.0`
- Unity version: `Unity-2021.3`
- OS: `Windows 11`

## バグについて

* バグの内容
* ConsoleLog
* スクリーンショット
* 再現方法
* エラーの発生するファイル(ここに貼り付けても差し支えの無いもの)
- バグの内容
- ConsoleLog
- スクリーンショット
- 再現方法
- エラーの発生するファイル(ここに貼り付けても差し支えの無いもの)
5 changes: 2 additions & 3 deletions .github/ISSUE_TEMPLATE/-----feature-request.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
name: 機能追加 Feature request
about: 機能追加要望 Suggest an idea for this project
title: ''
assignees: ''

title: ""
assignees: ""
---
23 changes: 11 additions & 12 deletions .github/ISSUE_TEMPLATE/bug-report-------en--.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: 'bug'
assignees: ''

title: ""
labels: "bug"
assignees: ""
---

## Environments (please complete the following information):

- UniVRM version: `0.81.0`
- Unity version: `Unity-2019.4`
- OS: `Windows 10`
- UniVRM version: `0.123.0`
- Unity version: `Unity-2021.3`
- OS: `Windows 11`

## Describe the bug

* A clear and concise description of what the bug is.
* ConsoleLog
* ScreenShot
* Reproduction procedure
* File that causes an error (those that can be pasted here)
- A clear and concise description of what the bug is.
- ConsoleLog
- ScreenShot
- Reproduction procedure
- File that causes an error (those that can be pasted here)
117 changes: 117 additions & 0 deletions .github/workflows/build-webgl.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
name: WebGL to gh-page

on:
workflow_dispatch:
# push:
# branches:
# - workflow-webgl-wip

env:
UNITY_PROJECT_PATH: .

defaults:
run:
shell: bash

permissions:
contents: read
pages: write
id-token: write

jobs:
build:
runs-on: [self-hosted, Windows, X64, Unity]
timeout-minutes: 60
steps:
- id: checkout
uses: actions/checkout@v4
with:
submodules: recursive
lfs: true

- name: Detect Unity Version
id: detect-unity-version
run: |
PROJECT_VERSION_PATH="${{ env.UNITY_PROJECT_PATH }}/ProjectSettings/ProjectVersion.txt"
UNITY_HUB="C:\Program Files\Unity Hub\Unity Hub.exe"
UNITY_VERSION=`cat ${PROJECT_VERSION_PATH} | sed -n -E "s/^m_EditorVersion:\s+//p" | head -n 1`
UNITY_CHANGESET=`cat ${PROJECT_VERSION_PATH} | sed -n -E "s/^m_EditorVersionWithRevision:\s+\S+\s+\((\S+)\)/\1/p" | head -n 1`
UNITY_EDITOR_EXECUTABLE=`"${UNITY_HUB}" -- --headless editors --installed | \
sed -n -E "s/^${UNITY_VERSION} , installed at //p" | \
head -n 1`
if [ -z "${UNITY_EDITOR_EXECUTABLE}" ]; then
echo "Unity ${UNITY_VERSION} is not installed."
exit 1
# コマンドラインからのインストールは Unity 3.7.0 時点では UAC 必須で難しい
UNITY_INSTALL_COMMAND="\"${UNITY_HUB}\" -- --headless install \
--version ${UNITY_VERSION} \
--changeset ${UNITY_CHANGESET} \
--module windows-il2cpp \
--childModules"
fi
echo "${UNITY_EDITOR_EXECUTABLE} is installed."
echo "unity-editor-executable=${UNITY_EDITOR_EXECUTABLE}" >> "${GITHUB_OUTPUT}"
# URP
- name: Build VRM10Viewer
id: build-webgl-VRM10Viewer
run: |
# build to Build/VRM10Viewer
"${{ steps.detect-unity-version.outputs.unity-editor-executable }}" \
-batchmode -quit \
-silent-crashes \
-projectPath "${{ env.UNITY_PROJECT_PATH }}" \
-executeMethod "UniVRM10.DevOnly.BuildClass.BuildWebGL_VRM10Viewer" \
-logFile webgl-VRM10Viewer.log
echo "Success to WebGL VRM10Viewer."
# はじめに built-in RenderPipeline にして一度終わる。然るのちに
- name: Build SimpleViewer
id: build-webgl-SimpleViewer
run: |
"${{ steps.detect-unity-version.outputs.unity-editor-executable }}" \
-batchmode -quit \
-silent-crashes \
-projectPath "${{ env.UNITY_PROJECT_PATH }}" \
-executeMethod "VRM.DevOnly.BuildClass.SwitchBuiltinPipeline"
echo "Success to Switch built-in RenderPipeline."
# build to Build/SimpleViewer
"${{ steps.detect-unity-version.outputs.unity-editor-executable }}" \
-batchmode -quit \
-silent-crashes \
-projectPath "${{ env.UNITY_PROJECT_PATH }}" \
-executeMethod "VRM.DevOnly.BuildClass.BuildWebGL_SimpleViewer" \
-logFile webgl-SimpleViewer.log
echo "Success to WebGL SimpleViewer."
# make index
cat << __HTML__ > Build/index.html
<h2>$GITHUB_SHA</h2>
<ul>
<li>URP<a href="./VRM10Viewer/">VRM10Viewer</a></li>
<li>Built-in<a href="./SimpleViewer/">SimpleViewer</a></li>
</ul>
__HTML__
- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
path: Build

# Deployment job
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
needs: build
runs-on: ubuntu-latest
name: Deploy
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
7 changes: 6 additions & 1 deletion .github/workflows/close-expired-issues.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
name: Expired Issues Closure

on:
workflow_dispatch:
schedule:
- cron: 0 5 * * *

permissions:
issues: write
pull-requests: write

jobs:
cycle-weekly-close:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Close expired "stale" issues
uses: piroor/close-expired-issues-based-on-label@master
110 changes: 110 additions & 0 deletions .github/workflows/create-unitypackage.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
name: Create UnityPackage

on:
workflow_dispatch:
# push:
# branches:
# - workflow-wip-2

env:
UNITY_PROJECT_PATH: .

defaults:
run:
shell: bash

jobs:
create-unitypackage:
runs-on: [self-hosted, Windows, X64, Unity]
timeout-minutes: 60
steps:
- id: checkout
uses: actions/checkout@v4
with:
submodules: recursive
lfs: true

- name: Detect Unity Version
id: detect-unity-version
run: |
PROJECT_VERSION_PATH="${{ env.UNITY_PROJECT_PATH }}/ProjectSettings/ProjectVersion.txt"
UNITY_HUB="C:\Program Files\Unity Hub\Unity Hub.exe"
UNITY_VERSION=`cat ${PROJECT_VERSION_PATH} | sed -n -E "s/^m_EditorVersion:\s+//p" | head -n 1`
UNITY_CHANGESET=`cat ${PROJECT_VERSION_PATH} | sed -n -E "s/^m_EditorVersionWithRevision:\s+\S+\s+\((\S+)\)/\1/p" | head -n 1`
UNITY_EDITOR_EXECUTABLE=`"${UNITY_HUB}" -- --headless editors --installed | \
sed -n -E "s/^${UNITY_VERSION} , installed at //p" | \
head -n 1`
if [ -z "${UNITY_EDITOR_EXECUTABLE}" ]; then
echo "Unity ${UNITY_VERSION} is not installed."
exit 1
# コマンドラインからのインストールは Unity 3.7.0 時点では UAC 必須で難しい
UNITY_INSTALL_COMMAND="\"${UNITY_HUB}\" -- --headless install \
--version ${UNITY_VERSION} \
--changeset ${UNITY_CHANGESET} \
--module windows-il2cpp \
--childModules"
fi
echo "${UNITY_EDITOR_EXECUTABLE} is installed."
echo "unity-editor-executable=${UNITY_EDITOR_EXECUTABLE}" >> "${GITHUB_OUTPUT}"
- name: Run EditMode Tests
id: run-edit-mode-tests
run: |
echo "Run EditMode Tests..."
# RunEditModeTests の実行の結果、終了コードが 0 でない場合でもテストの結果を表示したいので set +e して一時的に回避する
set +e
"${{ steps.detect-unity-version.outputs.unity-editor-executable }}" \
-batchmode \
-silent-crashes \
-projectPath "${{ env.UNITY_PROJECT_PATH }}" \
-executeMethod "UniGLTF.TestRunner.RunEditModeTests" \
-logFile run-edit-mode-tests.log \
-testRunnerNUnitXmlFile run-edit-mode-tests.xml
RET=$?
set -e
echo "Output Log..."
cat run-edit-mode-tests.log | egrep "^\[\[TestRunnerLog\]\]"
# TODO: テスト結果を NUnit3 形式の run-edit-mode-tests.xml から読み込んで表示する
if [ ${RET:-1} -eq 0 ]; then
echo "Test succeeded."
exit 0
else
echo "Test failed."
exit 1
fi
- name: Upload test results
if: ${{ always() }}
uses: actions/upload-artifact@v4
with:
name: run-edit-mode-tests.xml
path: ${{ env.UNITY_PROJECT_PATH }}/run-edit-mode-tests.xml

- name: Create UnityPackage
id: create-unitypackage
run: |
"${{ steps.detect-unity-version.outputs.unity-editor-executable }}" \
-batchmode \
-silent-crashes \
-projectPath "${{ env.UNITY_PROJECT_PATH }}" \
-executeMethod "VRM.DevOnly.PackageExporter.VRMExportUnityPackage.CreateUnityPackageWithBuild" \
-logFile create-unitypackage.log
echo "Success to create UnityPackage."
- name: Upload UnityPackage
uses: actions/upload-artifact@v4
with:
name: unitypackage
path: ${{ env.UNITY_PROJECT_PATH }}/*.unitypackage




24 changes: 24 additions & 0 deletions .github/workflows/label_checker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Breaking changes label checker

on:
pull_request:
types:
- synchronize
- labeled
- unlabeled
- opened
- reopened

permissions:
statuses: write

jobs:
check-label:
runs-on: ubuntu-latest
name: Breaking changes label checker
steps:
- name: Failed if not labeled
if: "!(contains(github.event.pull_request.labels.*.name, 'Breaking changes') || contains(github.event.pull_request.labels.*.name, 'Non breaking changes'))"
run: |
echo "::error::Please label \"Breaking changes\" or \"Non breaking changes\"."
exit 1
29 changes: 0 additions & 29 deletions .github/workflows/sphinx.yml

This file was deleted.

5 changes: 5 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"recommendations": [
"visualstudiotoolsforunity.vstuc"
]
}
Loading