Skip to content

Commit 56fe745

Browse files
committed
Revolutionized Fading, added mouselock to simple camera look
1 parent 221a5f8 commit 56fe745

21 files changed

Lines changed: 241 additions & 60 deletions
103 KB
Binary file not shown.

Testie/Assets/Fador.cs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
using System.Collections;
2+
using System.Collections.Generic;
3+
using UnityEngine;
4+
5+
6+
public class Fador : MonoBehaviour {
7+
8+
//This class will be awesome!
9+
10+
11+
12+
13+
14+
}

Testie/Assets/Fador.cs.meta

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
1.1 KB
Binary file not shown.

Testie/Assets/seyahdoo/controlls/SuperSimpleMouseCameraRotator.cs

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,29 @@ namespace seyahdoo.controlls
88
public class SuperSimpleMouseCameraRotator : MonoBehaviour
99
{
1010

11+
public float Sensivity = 2f;
12+
public bool working = false;
13+
1114
void Update()
1215
{
1316

14-
transform.localEulerAngles += new Vector3(-Input.GetAxis("Mouse Y"), Input.GetAxis("Mouse X"), 0);
17+
if (Input.GetMouseButtonDown(0))
18+
{
19+
Cursor.lockState = CursorLockMode.Locked;
20+
working = true;
21+
}
22+
23+
if (!working) return;
1524

25+
if (Input.GetKeyDown(KeyCode.Escape))
26+
{
27+
Cursor.lockState = CursorLockMode.None;
28+
working = false;
29+
}
30+
31+
transform.localEulerAngles +=
32+
new Vector3(-Input.GetAxis("Mouse Y"), Input.GetAxis("Mouse X"), 0)
33+
* Sensivity;
1634
}
1735

1836
}

Testie/Assets/seyahdoo/crosshair/icons/crosshairaware-icon.png renamed to Testie/Assets/seyahdoo/crosshair/icons/target-icon.png

File renamed without changes.

Testie/Assets/seyahdoo/crosshair/icons/crosshairaware-icon.png.meta renamed to Testie/Assets/seyahdoo/crosshair/icons/target-icon.png.meta

File renamed without changes.

Testie/Assets/seyahdoo/fadevr/Editor/FaderInspector.cs renamed to Testie/Assets/seyahdoo/fading/Editor/FaderSingletonInspector.cs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,30 @@
77

88
using UnityEngine;
99
using UnityEditor;
10-
using seyahdoo.fadevr;
10+
using seyahdoo.fading.singleton;
1111

1212

1313
/// <summary>
1414
/// A custom inspector script for fancy controll buttons
1515
/// </summary>
16-
[CustomEditor(typeof(Fader))]
17-
public class FaderInspector : Editor
16+
[CustomEditor(typeof(FaderSingletonInspector))]
17+
public class FaderSingletonInspector : Editor
1818
{
1919

2020
public override void OnInspectorGUI()
2121
{
2222
DrawDefaultInspector();
23-
23+
24+
FaderSingleton fader = (FaderSingleton)target;
25+
2426
if (GUILayout.Button("FadeIn"))
2527
{
26-
Fader.FadeIn();
28+
fader.FadeIn();
2729
}
2830

2931
if (GUILayout.Button("FadeOut"))
3032
{
31-
Fader.FadeOut();
33+
fader.FadeOut();
3234
}
3335

3436

0 commit comments

Comments
 (0)