Skip to content

Commit

Permalink
Merge pull request #66 from MidraLab/fix/bug
Browse files Browse the repository at this point in the history
CIのバグ対応
  • Loading branch information
ayutaz authored Jan 19, 2025
2 parents 9d6bcfb + b80eb5b commit 511994e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 24 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/edit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
# 条件付きでUnityテストを実行
- name: Unityテストを実行
if: ${{ steps.script_changes.outputs.scripts == 'true' }}
if: ${{ steps.script_changes.outputs.scripts == 'true' && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) }}
uses: game-ci/unity-test-runner@v4
env:
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
Expand Down
23 changes: 0 additions & 23 deletions Assets/uDesktopMascot/Scripts/Utility/LoadVRM.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System;
using System.IO;
using System.Linq;
using System.Threading;
using Cysharp.Threading.Tasks;
using UnityEngine;
Expand Down Expand Up @@ -132,28 +131,6 @@ private static GameObject LoadDefaultModel()
return model;
}

/// <summary>
/// モデルのHipボーンを探す
/// </summary>
/// <param name="rootTransform"></param>
/// <returns></returns>
public static Transform FindHipBone(Transform rootTransform)
{
// VRMの場合、腰のボーンは "Joints/Hips" や "Root" などの名前であることが多い
// まずは "Hips" という名前のボーンを探します
Transform hipTransform = rootTransform.Find("Hips");
if (hipTransform != null)
{
return hipTransform;
}

// 見つからない場合、全ての子孫を探索します
hipTransform = rootTransform.GetComponentsInChildren<Transform>()
.FirstOrDefault(t => t.name == "Hips" || t.name == "Root" || t.name == "J_Bip_C_Hips");

return hipTransform;
}

/// <summary>
/// VRMファイルを読み込み、モデルを表示する
/// </summary>
Expand Down

0 comments on commit 511994e

Please sign in to comment.