Skip to content

Commit fde9c51

Browse files
committed
Allow overriding cursor/ray visibility
1 parent 00e42eb commit fde9c51

File tree

3 files changed

+9
-21
lines changed

3 files changed

+9
-21
lines changed

Assets/RayCursor/Scripts/CursorObject.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public class CursorObject : MonoBehaviour
3030
private float baseRadius;
3131

3232
public Color autoColor;
33+
public bool showCursor = true;
3334

3435

3536
public void Start()
@@ -38,7 +39,6 @@ public void Start()
3839
baseLightIntensity = LightIntensity;
3940
baseRadius = Radius;
4041
}
41-
4242

4343
public Vector3 Position
4444
{
@@ -73,8 +73,6 @@ public Color Color
7373
}
7474
}
7575

76-
77-
7876
public bool Visible
7977
{
8078
get { return GetComponent<MeshRenderer>().enabled; }
@@ -85,10 +83,12 @@ public bool Visible
8583
}
8684
}
8785

88-
89-
9086
public void SetVisibility(float visibility, bool transparent = false)
9187
{
88+
if (!showCursor)
89+
{
90+
return;
91+
}
9292
//cursor.Radius = Mathf.Lerp(baseCursorRadius * 0.1f, baseCursorRadius, visibility);
9393
Color c = Color.Lerp(autoColor, baseColor, visibility);
9494
c.a = transparent ? Mathf.Lerp(0, 1, visibility) : 1;

Assets/RayCursor/Scripts/RayCursor.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public class RayCursor : MonoBehaviour
6767
public bool rayFiltered;
6868

6969
public float minHighlightDist = 100f;
70+
public bool showCursor = true;
7071

7172
// Start is called before the first frame update
7273
void Start()
@@ -252,8 +253,8 @@ public override void Init()
252253

253254
cursor.Distance = CurrentDistance;
254255

255-
ray.Visible = true;
256-
cursor.Visible = true;
256+
ray.Visible = true && cursorManager.showCursor;
257+
cursor.Visible = true && cursorManager.showCursor;
257258

258259
}
259260

Assets/RayCursor/Scripts/RayObject.cs

+1-14
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ public void Start()
4444
parent = transform.parent.gameObject;
4545
}
4646

47-
4847
public GameObject Parent
4948
{
5049
get { return parent; }
@@ -60,9 +59,6 @@ public GameObject Parent
6059
}
6160
}
6261

63-
64-
65-
6662
public bool FilterEnabled
6763
{
6864
set
@@ -78,7 +74,6 @@ public bool FilterEnabled
7874
get { return oneEuroFilter != null; }
7975
}
8076

81-
8277
public float FilterMinCutoff
8378
{
8479
get { return minCutoff; }
@@ -101,8 +96,6 @@ public float FilterBeta
10196
}
10297
}
10398

104-
105-
10699
public void Update()
107100
{
108101
if (oneEuroFilter != null)
@@ -111,8 +104,6 @@ public void Update()
111104
transform.position = parent.transform.position;
112105
}
113106
}
114-
115-
116107

117108
public float Distance
118109
{
@@ -126,8 +117,6 @@ public float Distance
126117
lineRenderer.SetPosition(1, Vector3.forward * 1000);
127118
}
128119
}
129-
130-
131120

132121
public bool HideRayAfterCursor
133122
{
@@ -139,8 +128,6 @@ public bool HideRayAfterCursor
139128
}
140129
}
141130

142-
143-
144131
public bool Visible
145132
{
146133
get { return lineRenderer.enabled; }
@@ -151,4 +138,4 @@ public bool Visible
151138
}
152139

153140
}
154-
}
141+
}

0 commit comments

Comments
 (0)