Skip to content

Commit

Permalink
cleaned code.
Browse files Browse the repository at this point in the history
  • Loading branch information
Graham Ransom committed Nov 17, 2022
1 parent 0030f46 commit dcfc957
Show file tree
Hide file tree
Showing 6 changed files with 77 additions and 70 deletions.
14 changes: 7 additions & 7 deletions Source/.editorconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ dotnet_style_coalesce_expression = true:warning
dotnet_diagnostic.IDE0028.severity = suggestion
dotnet_style_collection_initializer = true

dotnet_diagnostic.IDE0033.severity = warning
dotnet_style_explicit_tuple_names = true:warning
dotnet_diagnostic.IDE0033.severity = error
dotnet_style_explicit_tuple_names = true:error

dotnet_diagnostic.IDE0031.severity = warning
dotnet_style_null_propagation = true:warning
Expand Down Expand Up @@ -139,9 +139,9 @@ dotnet_diagnostic.IDE0100.severity = warning
dotnet_diagnostic.IDE0110.severity = warning

# IDE0076: SuppressMessageAttribute is invalid
dotnet_diagnostic.IDE0076.severity = warning
dotnet_diagnostic.IDE0076.severity = error
# IDE0077: Avoid legacy format in SuppressMessageAttribute
dotnet_diagnostic.IDE0077.severity = warning
dotnet_diagnostic.IDE0077.severity = error

#### C# Coding Conventions ####

Expand Down Expand Up @@ -218,8 +218,8 @@ dotnet_diagnostic.IDE0058.severity = none
csharp_style_unused_value_expression_statement_preference = discard_variable:silent

# 'using' directive preferences
dotnet_diagnostic.IDE0065.severity = warning
csharp_using_directive_placement = outside_namespace:warning
dotnet_diagnostic.IDE0065.severity = error
csharp_using_directive_placement = outside_namespace:error

#### C# Formatting Rules ####

Expand Down Expand Up @@ -283,7 +283,7 @@ csharp_preserve_single_line_statements = true
# https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/style-rules/naming-rules

# IDE1006: Naming rule violation
dotnet_diagnostic.IDE1006.severity = warning
dotnet_diagnostic.IDE1006.severity = error

# Naming rules

Expand Down
19 changes: 13 additions & 6 deletions Source/CustomAvatar/Avatar/AvatarPrefab.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,13 +281,20 @@ private float GetArmSpan(VRIKManager vrikManager)
return BeatSaberUtilities.kDefaultPlayerArmSpan;
}

float leftArmLength = Vector3.Distance(leftShoulder.position, leftUpperArm.position) + Vector3.Distance(leftUpperArm.position, leftLowerArm.position) + Vector3.Distance(leftLowerArm.position, leftWrist.position) + Vector3.Distance(leftWrist.position, leftHand.position);
float rightArmLength = Vector3.Distance(rightShoulder.position, rightUpperArm.position) + Vector3.Distance(rightUpperArm.position, rightLowerArm.position) + Vector3.Distance(rightLowerArm.position, rightWrist.position) + Vector3.Distance(rightWrist.position, rightHand.position);
float shoulderToShoulderDistance = Vector3.Distance(leftShoulder.position, rightShoulder.position);

float totalLength = leftArmLength + shoulderToShoulderDistance + rightArmLength;
float totalLength = 0;
if (avatarFormat == AvatarFormat.AVATAR_FORMAT_VRM)
{
totalLength = Math.Abs((leftWrist.transform.position - rightWrist.transform.position).magnitude); //NOTE: VRM AvatarPrefab is in the 'T'-Pose.
}
else
{
float leftArmLength = Vector3.Distance(leftShoulder.position, leftUpperArm.position) + Vector3.Distance(leftUpperArm.position, leftLowerArm.position) + Vector3.Distance(leftLowerArm.position, leftWrist.position) + Vector3.Distance(leftWrist.position, leftHand.position);
float rightArmLength = Vector3.Distance(rightShoulder.position, rightUpperArm.position) + Vector3.Distance(rightUpperArm.position, rightLowerArm.position) + Vector3.Distance(rightLowerArm.position, rightWrist.position) + Vector3.Distance(rightWrist.position, rightHand.position);
float shoulderToShoulderDistance = Vector3.Distance(leftShoulder.position, rightShoulder.position);

_logger.Trace($"Measured arm span: {totalLength} m");
totalLength = leftArmLength + shoulderToShoulderDistance + rightArmLength;
}
_logger.Trace($"Measured avatar arm span: {totalLength} m");

return totalLength;
}
Expand Down
2 changes: 1 addition & 1 deletion Source/CustomAvatar/Avatar/AvatarSpawner.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public SpawnedAvatar SpawnAvatar(AvatarPrefab avatar, IAvatarInput input, Transf

SpawnedAvatar spawnedAvatar = subContainer.InstantiateComponent<SpawnedAvatar>(avatarInstance);
spawnedAvatar.avatarFormat = avatar.avatarFormat;
if(spawnedAvatar.avatarFormat == AvatarPrefab.AvatarFormat.AVATAR_FORMAT_VRM)
if (spawnedAvatar.avatarFormat == AvatarPrefab.AvatarFormat.AVATAR_FORMAT_VRM)
spawnedAvatar.gameObject.SetActive(true);

subContainer.Bind<SpawnedAvatar>().FromInstance(spawnedAvatar);
Expand Down
6 changes: 3 additions & 3 deletions Source/CustomAvatar/Avatar/SpawnedAvatar.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public void DisableCalibrationMode()
public void SetFirstPersonVisibility(FirstPersonVisibility visibility)
{
if (avatarFormat == AvatarPrefab.AvatarFormat.AVATAR_FORMAT_CUSTOM)
{
{
switch (visibility)
{
case FirstPersonVisibility.Visible:
Expand All @@ -137,9 +137,9 @@ public void SetFirstPersonVisibility(FirstPersonVisibility visibility)
break;
}
}
else if(avatarFormat == AvatarPrefab.AvatarFormat.AVATAR_FORMAT_VRM)
else if (avatarFormat == AvatarPrefab.AvatarFormat.AVATAR_FORMAT_VRM)
{
var vrmFirstPerson = GetComponentInChildren<VRM.VRMFirstPerson>();
VRM.VRMFirstPerson vrmFirstPerson = GetComponentInChildren<VRM.VRMFirstPerson>();
if (vrmFirstPerson)
{
VRM.VRMFirstPerson.FIRSTPERSON_ONLY_LAYER = CustomAvatar.Avatar.AvatarLayers.kAlwaysVisible;
Expand Down
106 changes: 53 additions & 53 deletions Source/CustomAvatar/UI/Avatar_VRM.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@
using CustomAvatar.Player;
using HarmonyLib;
using IPA.Utilities;
using RootMotion.FinalIK;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using UniGLTF;
Expand Down Expand Up @@ -44,19 +42,20 @@ private static IMaterialDescriptorGenerator GetVrmMaterialGenerator(bool useUrp,
}
}

public struct Finger
{
public Quaternion one;
public Quaternion two;
public Quaternion three;

public Finger(Quaternion one, Quaternion two, Quaternion three)
public struct Finger
{
this.one = one;
this.two = two;
this.three = three;
public Quaternion knuckleOne;
public Quaternion knuckleTwo;
public Quaternion knuckleThree;

public Finger(Quaternion knuckleOne, Quaternion knuckleTwo, Quaternion knuckleThree)
{
this.knuckleOne = knuckleOne;
this.knuckleTwo = knuckleTwo;
this.knuckleThree = knuckleThree;
}
}
}

class HandPositionConstants
{
public static Finger index = new Finger(
Expand Down Expand Up @@ -84,9 +83,9 @@ class HandPositionConstants
new Quaternion(0.502104f, -0.1893172f, -0.1136858f, 0.8361376f),
new Quaternion(0.4902184f, -0.2618173f, -0.1572224f, 0.8163448f)
);
private static Quaternion Reflect(Quaternion quat, bool reflect)
private static Quaternion Reflect(Quaternion quat, bool bReflect)
{
if (!reflect)
if (!bReflect)
{
return quat;
}
Expand All @@ -99,34 +98,37 @@ private static Quaternion Reflect(Quaternion quat, bool reflect)
}
}

public static Vector3 ApplyToHand(Transform hand, bool right)
public static Vector3 ApplyToHand(Transform hand, bool bRightHand)
{
Vector3 offsetBetweenWristAndGrip = new Vector3();
var offsetBetweenWristAndGrip = new Vector3();
if (hand == null)
return new Vector3(); //nothing can be done.

//NOTE: Hand rotation can't be done here as the Tracking Device is mapped directly to the hand, overwriting rotations.

int nFingers = 5;
if (hand.GetChildCount() < nFingers)
nFingers = hand.GetChildCount();
if (hand.childCount < nFingers)
nFingers = hand.childCount;

float magnitude_hand_to_finger = 0.4f; //default:4cm.
float magnitude_indexfinger_beforeAfterRotation = 0.3f;//default: 3cm.
float magnitude_hand_to_finger = 0.04f; //default:4cm.
float magnitude_indexfinger_beforeAfterRotation = 0.03f;//default: 3cm.
float magnitude_first_last_fingers = 0.11f; //default 11cm.

for (int i = 0; i < nFingers; i++)
{
Transform fingey = hand.GetChild(i);
Transform finger = hand.GetChild(i); //knuckle 1

if (fingey == null)
if (finger == null)
continue; //nothing can be done.

Finger fingerThing = new Finger(Quaternion.identity, Quaternion.identity, Quaternion.identity);
var knuckleTwo = finger.GetChild(0);
var knuckleThree = knuckleTwo.GetChild(0) ?? null;

var fingerThing = new Finger(Quaternion.identity, Quaternion.identity, Quaternion.identity);
switch (i)
{
case 0:
magnitude_hand_to_finger = (hand.position - fingey.position).magnitude;
magnitude_hand_to_finger = (hand.position - finger.position).magnitude;
fingerThing = index;
break;
case 1:
Expand All @@ -145,30 +147,26 @@ public static Vector3 ApplyToHand(Transform hand, bool right)
break;
}

try
{
Vector3 before = fingey.GetChild(0).GetChild(0).position;
fingey.rotation = Reflect(fingerThing.one, right); //kuckle 1
fingey.GetChild(0).rotation = Reflect(fingerThing.two, right); //knuckle 2
fingey.GetChild(0).GetChild(0).rotation = Reflect(fingerThing.three, right); //knuckle 3
Vector3 after = fingey.GetChild(0).GetChild(0).position;
if (i == 0)
magnitude_indexfinger_beforeAfterRotation = (before - after).magnitude;
if(i == nFingers-1/*last is thumb*/)
{
magnitude_first_last_fingers = (hand.GetChild(0).position - hand.GetChild(i).position).magnitude;
}
}
catch
Vector3 before = knuckleThree ? knuckleThree.position : new Vector3(0.0f,0.0f,0.0f);
finger.rotation = Reflect(fingerThing.knuckleOne, bRightHand); //kuckle 1
if(knuckleTwo)
knuckleTwo.rotation = Reflect(fingerThing.knuckleTwo, bRightHand); //knuckle 2
if(knuckleThree)
knuckleThree.rotation = Reflect(fingerThing.knuckleThree, bRightHand); //knuckle 3
Vector3 after = knuckleThree ? knuckleThree.position : new Vector3(0.0f, 0.0f, 0.03f);
if (i == 0)
magnitude_indexfinger_beforeAfterRotation = (before - after).magnitude;

if (i == nFingers - 1/*last is thumb*/)
{

magnitude_first_last_fingers = (hand.GetChild(0).position - hand.GetChild(i).position).magnitude;
}
}

/*calculate center of grip*/
float coeff = right ? 1 : -1;
offsetBetweenWristAndGrip.x = coeff * (magnitude_indexfinger_beforeAfterRotation/2);
offsetBetweenWristAndGrip.y = 0.75f*magnitude_hand_to_finger;
float sign = bRightHand ? 1 : -1;
offsetBetweenWristAndGrip.x = sign * (magnitude_indexfinger_beforeAfterRotation / 2);
offsetBetweenWristAndGrip.y = 0.75f * magnitude_hand_to_finger;
offsetBetweenWristAndGrip.z = -magnitude_first_last_fingers;

return offsetBetweenWristAndGrip;
Expand All @@ -184,9 +182,9 @@ private async static Task<AvatarPrefab> LoadVRM(string path, IProgress<float> pr
{
//Shaders for VRM Avatars (Beat Saber Specific)
Debug.Log("Load AssetBundle: vrmmaterialchange_bs_shaders.assets");
var shadersBundleCreateRequest = AssetBundle.LoadFromStreamAsync(Assembly.GetExecutingAssembly().GetManifestResourceStream("CustomAvatar.Resources.vrmmaterialchange_bs_shaders.assets"));
var assetBundle = shadersBundleCreateRequest.assetBundle;
var assetBundleRequest = assetBundle.LoadAllAssetsAsync<Shader>();
AssetBundleCreateRequest shadersBundleCreateRequest = AssetBundle.LoadFromStreamAsync(Assembly.GetExecutingAssembly().GetManifestResourceStream("CustomAvatar.Resources.vrmmaterialchange_bs_shaders.assets"));
AssetBundle assetBundle = shadersBundleCreateRequest.assetBundle;
AssetBundleRequest assetBundleRequest = assetBundle.LoadAllAssetsAsync<Shader>();
assetBundle = shadersBundleCreateRequest.assetBundle;
ExternalAssets.ExternalAssetsHelper.LoadExternalAssets(assetBundle);
assetBundle.Unload(false);
Expand All @@ -196,9 +194,11 @@ private async static Task<AvatarPrefab> LoadVRM(string path, IProgress<float> pr
if (result)
ExternalAssets.ShaderHelper.AddExternalShader("VRM/MToon", result); //Replace "VRM/Toon" Shader with BeatSaber/MToon shader.

#if USE_VRM_10 //NOTE: Cannot use as VRM1.0 requires Shader MToon10, which has not yet been converted to Beatsaber [and thus is white-out'ed].
result = ExternalAssets.ShaderHelper.Find("VRM/UnlitTexture");
if (result)
ExternalAssets.ShaderHelper.AddExternalShader("VRM10/MToon10", result); //Replace "VRM/Toon" Shader with BeatSaber/MToon shader.
#endif
}

#if USE_VRM_10 //NOTE: Cannot use as VRM1.0 requires Shader MToon10, which has not yet been converted to Beatsaber [and thus is white-out'ed].
Expand All @@ -211,14 +211,14 @@ private async static Task<AvatarPrefab> LoadVRM(string path, IProgress<float> pr
VRM.VRMFirstPerson.FIRSTPERSON_ONLY_LAYER = CustomAvatar.Avatar.AvatarLayers.kAlwaysVisible;
VRM.VRMFirstPerson.THIRDPERSON_ONLY_LAYER = CustomAvatar.Avatar.AvatarLayers.kOnlyInThirdPerson;

VrmUtility.MaterialGeneratorCallback materialCallback = (VRM.glTF_VRM_extensions vrm) => GetVrmMaterialGenerator(true, vrm);
IMaterialDescriptorGenerator materialCallback(VRM.glTF_VRM_extensions vrm) => GetVrmMaterialGenerator(true, vrm);
RuntimeGltfInstance instance = await VrmUtility.LoadAsync(path, null, materialCallback);
#endif

var firstPerson = instance.GetComponent<VRMFirstPerson>();
VRMFirstPerson firstPerson = instance.GetComponent<VRMFirstPerson>();
firstPerson.Setup();

var animator = instance.GetComponent<Animator>();
Animator animator = instance.GetComponent<Animator>();

GameObject obj = null;

Expand All @@ -237,7 +237,7 @@ private async static Task<AvatarPrefab> LoadVRM(string path, IProgress<float> pr
#endif
//instance.gameObject.SetActive(false); //don't set the prefab object as active. it will be instantiated later.

var ik = instance.gameObject.AddComponent<VRIKManager>();
VRIKManager ik = instance.gameObject.AddComponent<VRIKManager>();
ik.AutoDetectReferences();

ik.references_leftThigh.Rotate(new Vector3(-0.1f, 0f, 0f), Space.World);
Expand Down Expand Up @@ -265,7 +265,7 @@ private async static Task<AvatarPrefab> LoadVRM(string path, IProgress<float> pr
ik.solver_rightArm_target = rightHandTarget.transform;

Transform vrmFirstPersonHeadBone = firstPerson.FirstPersonBone;
var vrmFirstPersonOffset = firstPerson.FirstPersonOffset;
Vector3 vrmFirstPersonOffset = firstPerson.FirstPersonOffset;

var head = new GameObject("Head");
head.transform.SetParent(avatar.transform);
Expand All @@ -277,7 +277,7 @@ private async static Task<AvatarPrefab> LoadVRM(string path, IProgress<float> pr

ik.solver_spine_headTarget = headViewpoint.transform;

var descriptor = avatar.AddComponent<AvatarDescriptor>();
AvatarDescriptor descriptor = avatar.AddComponent<AvatarDescriptor>();
VRMMeta meta = instance.GetComponent<VRMMeta>();
if (meta == null)
{
Expand Down
Binary file modified ThirdParty/CombinedVRMDll.dll
View file
Binary file not shown.

0 comments on commit dcfc957

Please sign in to comment.