Compare commits

...

2 Commits

Author SHA1 Message Date
Sveske Juice 3a73a81d66 Merge remote-tracking branch 'refs/remotes/origin/main' 2024-04-20 17:31:15 +02:00
Sveske Juice c200c9a2d2 tags 2024-04-20 17:31:07 +02:00
3 changed files with 9 additions and 7 deletions

View File

@ -934,7 +934,7 @@ PrefabInstance:
- target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalPosition.y
value: 4.29
value: 2.95
objectReference: {fileID: 0}
- target: {fileID: 2981308973353539976, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
@ -969,7 +969,7 @@ PrefabInstance:
- target: {fileID: 3665490202611795451, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalPosition.y
value: 4.29
value: 2.95
objectReference: {fileID: 0}
- target: {fileID: 3665490202611795451, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
@ -1004,7 +1004,7 @@ PrefabInstance:
- target: {fileID: 6115888582170302332, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.84
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: 6115888582170302332, guid: fd9f9b61c0ebb324ebc9f929e26706bc,
type: 3}

View File

@ -70,14 +70,15 @@ public class EditableArc : MonoBehaviour
Vector3 start = Quaternion.AngleAxis(rotationMinMax.x, normal) * tangent;
Vector3 end = Quaternion.AngleAxis(rotationMinMax.y, normal) * tangent;
Vector3 v1 = SamplePointOnArcAngle(start, end, visualRadius, Value.Value);
Vector3 v2 = SamplePointOnArcAngle(start, end, visualRadius, Value.Value + 0.01f);
Vector3 arcTangent = v2 - v1;
Vector3 v2 = SamplePointOnArcAngle(start, end, visualRadius, Value.Value + 1f);
Vector3 arcTangent = (v2 - v1).normalized;
Debug.DrawRay(knob.transform.position, arcTangent, Color.yellow, 5f);
Debug.Log($"tangent: {arcTangent}");
// TODO: figure out this based on camera orientation
float sign = -1f;
float delta = (Vector2.Dot(arcTangent, Vector2.up * mouseMovement.x) + Vector2.Dot(arcTangent, Vector2.right * mouseMovement.y)) * knobSensitiviy;
float delta = (Vector2.Dot(arcTangent, Vector2.up * mouseMovement.x) + Vector2.Dot(arcTangent, Vector2.right * mouseMovement.y)) * knobSensitiviy * sign;
Debug.Log(delta);
float newAngle = ClampAngle(Value.Value + delta, rotationMinMax.x, rotationMinMax.y);
Value.Value = newAngle;

View File

@ -3,7 +3,8 @@
--- !u!78 &1
TagManager:
serializedVersion: 2
tags: []
tags:
- Wall
layers:
- Default
- TransparentFX