Skip to content

コントローラーの角度制限をX軸とY軸に分けた #4

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
q1j wants to merge 1 commit into
base: main
Choose a base branch
from
Open

コントローラーの角度制限をX軸とY軸に分けた #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion Assets/Scripts/ControllerAngleChecker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,12 @@ private void CheckAngles()
var angle = Quaternion.Angle(CalibrationPositionHolder.Instance.GetRotation(playerSelection),
targetTransform.localRotation);

if (angle > Settings.System.ControllerLimitAngle)
var v = (targetTransform.localRotation * Quaternion.Inverse(CalibrationPositionHolder.Instance.GetRotation(playerSelection))).eulerAngles;
var x = v.x > 180f ? Mathf.Abs(v.x - 360f) : v.x;
var y = v.y > 180f ? Mathf.Abs(v.y - 360f) : v.y;
var z = v.z > 180f ? Mathf.Abs(v.z - 360f) : v.z;

if (x > Settings.System.ControllerLimitXAngle || y > Settings.System.ControllerLimitYAngle)
{
if (!isOutOfRange)
{
Expand Down
3 changes: 2 additions & 1 deletion Assets/Scripts/Settings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ public class System
public static SettingFloat AirBlowToWeakenWait = new("空気吹きを弱めるまでの待機時間(秒)", 2f);
public static SettingFloat TrackerLostCheckDuration = new("トラッカーが見失われたとみなすまでの時間(秒)", 1f);
public static SettingBool UsedSpaceCalibrator = new("スペースキャリブレーターを使ってトラッカーのキャリブレーションを実施した【旧トラッカーでは必須】", false);
public static SettingFloat ControllerLimitAngle = new("コントローラーの角度制限", 80f);
public static SettingFloat ControllerLimitXAngle = new("コントローラーのX軸角度制限", 80f);
public static SettingFloat ControllerLimitYAngle = new("コントローラーのY軸角度制限", 80f);
}

public class Calibration
Expand Down