Skip to content

Commit

Permalink
5.6.0-r.10.1
Browse files Browse the repository at this point in the history
  • Loading branch information
srl87 committed Feb 26, 2024
1 parent d4ee04b commit 78fec28
Show file tree
Hide file tree
Showing 30 changed files with 509 additions and 337 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class HandRaycastPointerEditor : UnityEditor.Editor
/// HandRaycastPointer options
SerializedProperty m_Hand, m_UsePose, m_PinchStrength, m_PinchRelease, m_AlwaysEnable;
/// Interactive area options
SerializedProperty m_EnablePinchArea, m_LeftInteractive, m_RightInteractive, m_TopInteractive, m_ButtomInteractive;
SerializedProperty m_EnablePinchArea, m_LeftInteractive, m_RightInteractive, m_TopInteractive, m_BottomInteractive;

private void OnEnable()
{
Expand All @@ -49,7 +49,7 @@ private void OnEnable()
m_LeftInteractive = serializedObject.FindProperty("m_LeftInteractive");
m_RightInteractive = serializedObject.FindProperty("m_RightInteractive");
m_TopInteractive = serializedObject.FindProperty("m_TopInteractive");
m_ButtomInteractive = serializedObject.FindProperty("m_ButtomInteractive");
m_BottomInteractive = serializedObject.FindProperty("m_BottomInteractive");
}
bool PhysicsRaycasterOptions = false, RayOptions = true, HandOptions = true, AreaOptions = true;
public override void OnInspectorGUI()
Expand Down Expand Up @@ -115,7 +115,7 @@ public override void OnInspectorGUI()
EditorGUILayout.PropertyField(m_LeftInteractive);
EditorGUILayout.PropertyField(m_RightInteractive);
EditorGUILayout.PropertyField(m_TopInteractive);
EditorGUILayout.PropertyField(m_ButtomInteractive);
EditorGUILayout.PropertyField(m_BottomInteractive);
}
EditorGUILayout.LabelField("", GUI.skin.horizontalSlider);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ private void Validate()
public float TopInteractive { get { return m_TopInteractive; } set { m_TopInteractive = value; } }
[SerializeField]
[Range(0, .5f)]
private float m_ButtomInteractive = 0.3f;
public float ButtomInteractive { get { return m_ButtomInteractive; } set { m_ButtomInteractive = value; } }
private float m_BottomInteractive = 0.3f;
public float BottomInteractive { get { return m_BottomInteractive; } set { m_BottomInteractive = value; } }
#endregion

private Vector3 origin = Vector3.zero, direction = Vector3.zero;
Expand Down Expand Up @@ -179,7 +179,7 @@ private bool IsInteractiveArea()
{
Vector3 pixelPosition = Camera.main.WorldToViewportPoint(Pointer.transform.position);
return pixelPosition.x > m_LeftInteractive && pixelPosition.x < m_RightInteractive &&
pixelPosition.y > m_ButtomInteractive && pixelPosition.y < m_TopInteractive;
pixelPosition.y > m_BottomInteractive && pixelPosition.y < m_TopInteractive;
}
return true;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Buttom
m_Text: Bottom
--- !u!222 &261203
CanvasRenderer:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -6838,7 +6838,7 @@ GameObject:
m_Component:
- component: {fileID: 1652283539}
m_Layer: 5
m_Name: Buttom
m_Name: Bottom
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -10459,8 +10459,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 114305613345136316}
m_HandleRect: {fileID: 224225765845599858}
m_Direction: 2
m_Value: -0.0000004455121
m_Size: 0.5430327
m_Value: -0.00000011137802
m_Size: 0.5422854
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
Expand Down Expand Up @@ -11102,7 +11102,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -0.000019073486, y: 137.00005}
m_AnchoredPosition: {x: -0.000019073486, y: 137.00003}
m_SizeDelta: {x: 0, y: 300}
m_Pivot: {x: 0, y: 1}
--- !u!224 &224701558979040588
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class HandPinchArea : MonoBehaviour
private Image image;
private RectTransform rectTransform;
private float m_Left = 0;
private float m_Buttom = 0;
private float m_Bottom = 0;
private float m_Right = 0;
private float m_Top = 0;
private bool isShowArea = false;
Expand All @@ -29,7 +29,7 @@ private void Awake()
if (leftHandRay != null || rightHandRay != null)
{
m_Left = leftHandRay.LeftInteractive < rightHandRay.LeftInteractive ? leftHandRay.LeftInteractive : rightHandRay.LeftInteractive;
m_Buttom = leftHandRay.ButtomInteractive < rightHandRay.ButtomInteractive ? leftHandRay.ButtomInteractive : rightHandRay.ButtomInteractive;
m_Bottom = leftHandRay.BottomInteractive < rightHandRay.BottomInteractive ? leftHandRay.BottomInteractive : rightHandRay.BottomInteractive;
m_Right = leftHandRay.RightInteractive > rightHandRay.RightInteractive ? leftHandRay.RightInteractive : rightHandRay.RightInteractive;
m_Top = leftHandRay.TopInteractive > rightHandRay.TopInteractive ? leftHandRay.TopInteractive : rightHandRay.TopInteractive;
}
Expand All @@ -44,7 +44,7 @@ private void Update()
return;
}

rectTransform.anchorMin = new Vector2(m_Left, m_Buttom);
rectTransform.anchorMin = new Vector2(m_Left, m_Bottom);
rectTransform.anchorMax = new Vector2(m_Right, m_Top);
rectTransform.offsetMin = Vector2.zero;
rectTransform.offsetMax = Vector2.zero;
Expand All @@ -58,9 +58,9 @@ public void OnLeftValueChange(float vlaue)
{
leftHandRay.LeftInteractive = rightHandRay.LeftInteractive = m_Left = vlaue;
}
public void OnButtomValueChange(float vlaue)
public void OnBottomValueChange(float vlaue)
{
leftHandRay.ButtomInteractive = rightHandRay.ButtomInteractive = m_Buttom = vlaue;
leftHandRay.BottomInteractive = rightHandRay.BottomInteractive = m_Bottom = vlaue;
}
public void OnRightValueChange(float vlaue)
{
Expand All @@ -74,9 +74,9 @@ public void OnLeftValueChange(Text text)
{
text.text = m_Left.ToString("F2");
}
public void OnButtomValueChange(Text text)
public void OnBottomValueChange(Text text)
{
text.text = m_Buttom.ToString("F2");
text.text = m_Bottom.ToString("F2");
}
public void OnRightValueChange(Text text)
{
Expand Down
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
6 changes: 3 additions & 3 deletions com.htc.upm.wave.essence/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "com.htc.upm.wave.essence",
"displayName": "VIVE Wave XR Plugin - Essence",
"version": "5.6.0-r.10",
"version": "5.6.0-r.10.1",
"unity": "2019.4",
"description": "The \"VIVE Wave XR Plugin - Essence\" package built on top of the \"VIVE Wave XR Plugin - Native\" package.The package provides rich features that make your developerment easier.\n\nYou can view the documentation for additional information.\n\n",
"keywords": [
Expand All @@ -15,8 +15,8 @@
"url": "https://www.htc.com"
},
"dependencies": {
"com.htc.upm.wave.xrsdk": "5.6.0-r.10",
"com.htc.upm.wave.native": "5.6.0-r.10"
"com.htc.upm.wave.xrsdk": "5.6.0-r.10.1",
"com.htc.upm.wave.native": "5.6.0-r.10.1"
},
"samples": [
{
Expand Down
2 changes: 1 addition & 1 deletion com.htc.upm.wave.essence/package.tm1.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions com.htc.upm.wave.native/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "com.htc.upm.wave.native",
"displayName": "VIVE Wave XR Plugin - Native",
"version": "5.6.0-r.10",
"version": "5.6.0-r.10.1",
"unity": "2019.4",
"description": "The \"VIVE Wave XR Plugin - Native\" package provides the wraper of WaveVR.\n\nView the documentation for additional information.\n\n",
"keywords": [
Expand All @@ -15,7 +15,7 @@
"url": "https://www.htc.com"
},
"dependencies": {
"com.htc.upm.wave.xrsdk": "5.6.0-r.10"
"com.htc.upm.wave.xrsdk": "5.6.0-r.10.1"
},
"samples": [
{
Expand Down
2 changes: 1 addition & 1 deletion com.htc.upm.wave.native/package.tm1.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion com.htc.upm.wave.xrsdk/Runtime/GitIgnored/Resources.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

{

"commit": "cf093118a38a00b2363023ca0f96c5706bb792fc",
"commit": "99e1117706883d3cc49e6a0c731df33ecd3cae32",

"abbreviated_commit": "cf093118a",
"abbreviated_commit": "99e111770",

"refs": "HEAD -> master, origin/master, origin/HEAD"

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions com.htc.upm.wave.xrsdk/Runtime/WaveXRSpectatorCamera.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using UnityEngine;

namespace Wave.XR {

namespace Wave.XR
{
public sealed class WaveXRSpectatorCamera : MonoBehaviour
{
WaveXRSpectatorCameraHandle handle;
private WaveXRSpectatorCameraHandle handle;

public void SetHandle(WaveXRSpectatorCameraHandle handle)
{
Expand Down
Loading

0 comments on commit 78fec28

Please sign in to comment.