Skip to content

Feature/vrm1 #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sh-akira wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Feature/vrm1 #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4e7b0a9
LoadVRMからLoadVRMMetaに名前を変更
nagatsuki Nov 17, 2024
22fa758
.gitignoreにTrackerPositions.jsonを追加
nagatsuki Nov 17, 2024
2c06eb4
typo修正
nagatsuki Nov 23, 2024
7373f69
FastSpringBone10.csprojをリポジトリから除外
nagatsuki Dec 13, 2024
76658c3
WIP: VRM 1.0対応
nagatsuki Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ Backup*
Assets/ExternalPlugins/uOSC*
Assets/ExternalPlugins/MidiJack*
Assets/ExternalPlugins/EasyDeviceDiscoveryProtocol*
FastSpringBone*csproj
DepthFirstScheduler*csproj
MeshUtility*csproj
MToon*csproj
Expand Down Expand Up @@ -96,4 +97,5 @@ sysinfo.txt
*.unitypackage
common.json
Assets/_TerrainAutoUpgrade/
.vsconfig
.vsconfig
/TrackerPositions.json
38 changes: 19 additions & 19 deletions Assets/Scripts/Avatar/DynamicOVRLipSync.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Linq;
using UnityEngine;
using VRM;
using UniVRM10;

namespace VMC
{
Expand Down Expand Up @@ -83,25 +83,25 @@ void Update()
OVRLipSync.Frame frame = GetCurrentPhonemeFrame();
if (frame != null)
{
//あ OVRLipSync.Viseme.aa; BlendShapePreset.A;
//い OVRLipSync.Viseme.ih; BlendShapePreset.I;
//う OVRLipSync.Viseme.ou; BlendShapePreset.U;
//え OVRLipSync.Viseme.E; BlendShapePreset.E;
//お OVRLipSync.Viseme.oh; BlendShapePreset.O;
var presets = new BlendShapePreset[] {
BlendShapePreset.A,
BlendShapePreset.I,
BlendShapePreset.U,
BlendShapePreset.E,
BlendShapePreset.O,
};
//あ OVRLipSync.Viseme.aa; ExpressionPreset.aa;
//い OVRLipSync.Viseme.ih; ExpressionPreset.ih;
//う OVRLipSync.Viseme.ou; ExpressionPreset.ou;
//え OVRLipSync.Viseme.E; ExpressionPreset.ee;
//お OVRLipSync.Viseme.oh; ExpressionPreset.oh;
var presets = new ExpressionPreset[] {
ExpressionPreset.aa,
ExpressionPreset.ih,
ExpressionPreset.ou,
ExpressionPreset.ee,
ExpressionPreset.oh,
};
var visemes = new float[] {
frame.Visemes[(int)OVRLipSync.Viseme.aa],
frame.Visemes[(int)OVRLipSync.Viseme.ih],
frame.Visemes[(int)OVRLipSync.Viseme.ou],
frame.Visemes[(int)OVRLipSync.Viseme.E],
frame.Visemes[(int)OVRLipSync.Viseme.oh],
};
frame.Visemes[(int)OVRLipSync.Viseme.aa],
frame.Visemes[(int)OVRLipSync.Viseme.ih],
frame.Visemes[(int)OVRLipSync.Viseme.ou],
frame.Visemes[(int)OVRLipSync.Viseme.E],
frame.Visemes[(int)OVRLipSync.Viseme.oh],
};

int maxindex = 0;
float maxvisemes = 0;
Expand Down
10 changes: 5 additions & 5 deletions Assets/Scripts/Avatar/EyeTracking/EyeTracking_Tobii.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,16 @@ private void Calibration(GameObject currentModel, bool fromSetting)
LookTarget.transform.parent = MonitorPosition.transform;
LookTarget.transform.localRotation = Quaternion.identity;
LookTarget.transform.localPosition = new Vector3(0, 0, 0f);
var vrmLookAtHead = currentModel.GetComponent<VRM.VRMLookAtHead>();
//var vrmLookAtHead = currentModel.GetComponent<VRM.VRMLookAtHead>();
if (faceBeforeApply != null) faceController.BeforeApply -= faceBeforeApply;
faceBeforeApply = () =>
{
if (LookTarget == null) return;
if (vrmLookAtHead.Head == null) return;
//if (vrmLookAtHead.Head == null) return;
if (isValidPosition == false) return;
vrmLookAtHead.Target = LookTarget.transform;
vrmLookAtHead.LookWorldPosition();
vrmLookAtHead.Target = null;
//vrmLookAtHead.Target = LookTarget.transform;
//vrmLookAtHead.LookWorldPosition();
//vrmLookAtHead.Target = null;
};
faceController.BeforeApply += faceBeforeApply;
StartPos = LookTarget.transform.localPosition;
Expand Down
9 changes: 5 additions & 4 deletions Assets/Scripts/Avatar/EyeTracking/EyeTracking_ViveProEye.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Collections.Generic;
using UnityEngine;
using UnityMemoryMappedFile;
using UniVRM10;
using ViveSR.anipal.Eye;

namespace VMC
Expand Down Expand Up @@ -88,16 +89,16 @@ private void ModelInitialize(GameObject currentModel)
LookTarget.transform.parent = MonitorPosition.transform;
LookTarget.transform.localRotation = Quaternion.identity;
LookTarget.transform.localPosition = new Vector3(0, 0, 1f); //すべて0地点にすると目が荒ぶる
var vrmLookAtHead = currentModel.GetComponent<VRM.VRMLookAtHead>();
var vrm10Instance = currentModel.GetComponent<Vrm10Instance>();
if (faceBeforeApply != null) faceController.BeforeApply -= faceBeforeApply;
faceBeforeApply = () =>
{
if ((SRanipal_Eye_Framework.Status != SRanipal_Eye_Framework.FrameworkStatus.WORKING &&
SRanipal_Eye_Framework.Status != SRanipal_Eye_Framework.FrameworkStatus.NOT_SUPPORT) ||
SRanipal_Eye_Framework.Status == SRanipal_Eye_Framework.FrameworkStatus.NOT_SUPPORT || enabled == false) return;
vrmLookAtHead.Target = LookTarget.transform;
vrmLookAtHead.LookWorldPosition();
vrmLookAtHead.Target = null;
//vrm10Instance.LookAtTarget = LookTarget.transform;
//vrmLookAtHead.LookWorldPosition();
//vrm10Instance.LookAtTarget = null;
};
faceController.BeforeApply += faceBeforeApply;
StartPos = LookTarget.transform.localPosition;
Expand Down
Loading