Skip to content
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

reset fps monitor #123

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

reset fps monitor #123

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
48 changes: 48 additions & 0 deletions Editor/GraphyManagerEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ internal class GraphyManagerEditor : Editor
private SerializedProperty m_toggleActiveCtrl;
private SerializedProperty m_toggleActiveAlt;

private SerializedProperty m_resetFpsMonitorKeyCode;
private SerializedProperty m_resetFpsMonitorCtrl;
private SerializedProperty m_resetFpsMonitorAlt;

private SerializedProperty m_graphModulePosition;
private SerializedProperty m_graphModuleOffset;
Expand Down Expand Up @@ -166,6 +169,11 @@ private void OnEnable()
m_toggleActiveCtrl = serObj.FindProperty( "m_toggleActiveCtrl" );
m_toggleActiveAlt = serObj.FindProperty( "m_toggleActiveAlt" );

m_resetFpsMonitorKeyCode = serObj.FindProperty( "m_resetFpsMonitorKeyCode" );

m_resetFpsMonitorCtrl = serObj.FindProperty( "m_resetFpsMonitorCtrl" );
m_resetFpsMonitorAlt = serObj.FindProperty( "m_resetFpsMonitorAlt" );

m_graphModulePosition = serObj.FindProperty( "m_graphModulePosition" );

m_graphModuleOffset = serObj.FindProperty( "m_graphModuleOffset" );
Expand Down Expand Up @@ -440,6 +448,46 @@ public override void OnInspectorGUI()
);

EditorGUILayout.EndHorizontal();

EditorGUILayout.BeginHorizontal();

EditorGUIUtility.labelWidth = 130;
EditorGUIUtility.fieldWidth = 35;

EditorGUILayout.PropertyField
(
m_resetFpsMonitorKeyCode,
new GUIContent
(
text: "Reset Fps Monitor Key",
tooltip: "If ticked, it will require clicking this key and the other ones you have set up."
)
);

EditorGUIUtility.labelWidth = 30;
EditorGUIUtility.fieldWidth = 35;

m_resetFpsMonitorCtrl.boolValue = EditorGUILayout.Toggle
(
new GUIContent
(
text: "Ctrl",
tooltip: "If ticked, it will require clicking Ctrl and the other keys you have set up."
),
value: m_resetFpsMonitorCtrl.boolValue
);

m_resetFpsMonitorAlt.boolValue = EditorGUILayout.Toggle
(
new GUIContent
(
text: "Alt",
tooltip: "If ticked, it will require clicking Alt and the other keys you have set up."
),
value: m_resetFpsMonitorAlt.boolValue
);

EditorGUILayout.EndHorizontal();
}

GUILayout.Space( 15 );
Expand Down
10 changes: 10 additions & 0 deletions Runtime/Fps/G_FpsMonitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,16 @@ public void UpdateParameters()
m_zero1PercentSamples = (short) (m_fpsSamplesCapacity / 1000);
}

public void Reset()
{
for( int i = 0; i < m_fpsSamplesCapacity; i++ )
{
m_fpsSamples[ i ] = 0;
}
m_fpsSamplesCount = 0;
m_indexSample = 0;
}

#endregion

#region Methods -> Private
Expand Down
244 changes: 99 additions & 145 deletions Runtime/GraphyManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,14 @@ public enum ModulePreset
[SerializeField] private bool m_toggleActiveCtrl = true;
[SerializeField] private bool m_toggleActiveAlt = false;

#if GRAPHY_NEW_INPUT
[SerializeField] private Key m_resetFpsMonitorKeyCode = Key.F5;
#else
[SerializeField] private KeyCode m_resetFpsMonitorKeyCode = KeyCode.F5;
#endif
[SerializeField] private bool m_resetFpsMonitorCtrl = false;
[SerializeField] private bool m_resetFpsMonitorAlt = false;

[SerializeField] private ModulePosition m_graphModulePosition = ModulePosition.TOP_RIGHT;
[SerializeField] private Vector2 m_graphModuleOffset = new Vector2( 0, 0 );

Expand Down Expand Up @@ -834,161 +842,23 @@ public void OnValidate()

private void CheckForHotkeyPresses()
{
#if GRAPHY_NEW_INPUT
// Toggle Mode ---------------------------------------
if (m_toggleModeKeyCode != Key.None)
if( CheckForHotkey( m_toggleModeKeyCode, m_toggleModeCtrl, m_toggleModeAlt ) )
{
if( m_toggleModeCtrl && m_toggleModeAlt )
{
if( CheckFor3KeyPress( m_toggleModeKeyCode, Key.LeftCtrl, Key.LeftAlt )
|| CheckFor3KeyPress( m_toggleModeKeyCode, Key.RightCtrl, Key.LeftAlt )
|| CheckFor3KeyPress( m_toggleModeKeyCode, Key.RightCtrl, Key.RightAlt )
|| CheckFor3KeyPress( m_toggleModeKeyCode, Key.LeftCtrl, Key.RightAlt ) )
{
ToggleModes();
}
}
else if( m_toggleModeCtrl )
{
if( CheckFor2KeyPress( m_toggleModeKeyCode, Key.LeftCtrl )
|| CheckFor2KeyPress( m_toggleModeKeyCode, Key.RightCtrl ) )
{
ToggleModes();
}
}
else if( m_toggleModeAlt )
{
if( CheckFor2KeyPress( m_toggleModeKeyCode, Key.LeftAlt )
|| CheckFor2KeyPress( m_toggleModeKeyCode, Key.RightAlt ) )
{
ToggleModes();
}
}
else
{
if( CheckFor1KeyPress( m_toggleModeKeyCode ) )
{
ToggleModes();
}
}
ToggleModes();
}

// Toggle Active -------------------------------------
if (m_toggleActiveKeyCode != Key.None)
if( CheckForHotkey( m_toggleActiveKeyCode, m_toggleActiveCtrl, m_toggleActiveAlt ) )
{
if( m_toggleActiveCtrl && m_toggleActiveAlt )
{
if( CheckFor3KeyPress( m_toggleActiveKeyCode, Key.LeftCtrl, Key.LeftAlt )
|| CheckFor3KeyPress( m_toggleActiveKeyCode, Key.RightCtrl, Key.LeftAlt )
|| CheckFor3KeyPress( m_toggleActiveKeyCode, Key.RightCtrl, Key.RightAlt )
|| CheckFor3KeyPress( m_toggleActiveKeyCode, Key.LeftCtrl, Key.RightAlt ) )
{
ToggleActive();
}
}

else if( m_toggleActiveCtrl )
{
if( CheckFor2KeyPress( m_toggleActiveKeyCode, Key.LeftCtrl )
|| CheckFor2KeyPress( m_toggleActiveKeyCode, Key.RightCtrl ) )
{
ToggleActive();
}
}
else if( m_toggleActiveAlt )
{
if( CheckFor2KeyPress( m_toggleActiveKeyCode, Key.LeftAlt )
|| CheckFor2KeyPress( m_toggleActiveKeyCode, Key.RightAlt ) )
{
ToggleActive();
}
}
else
{
if( CheckFor1KeyPress( m_toggleActiveKeyCode ) )
{
ToggleActive();
}
}
}
#else
// Toggle Mode ---------------------------------------
if (m_toggleModeKeyCode != KeyCode.None)
{
if (m_toggleModeCtrl && m_toggleModeAlt)
{
if ( CheckFor3KeyPress(m_toggleModeKeyCode, KeyCode.LeftControl, KeyCode.LeftAlt)
|| CheckFor3KeyPress(m_toggleModeKeyCode, KeyCode.RightControl, KeyCode.LeftAlt)
|| CheckFor3KeyPress(m_toggleModeKeyCode, KeyCode.RightControl, KeyCode.RightAlt)
|| CheckFor3KeyPress(m_toggleModeKeyCode, KeyCode.LeftControl, KeyCode.RightAlt))
{
ToggleModes();
}
}
else if (m_toggleModeCtrl)
{
if ( CheckFor2KeyPress(m_toggleModeKeyCode, KeyCode.LeftControl)
|| CheckFor2KeyPress(m_toggleModeKeyCode, KeyCode.RightControl))
{
ToggleModes();
}
}
else if (m_toggleModeAlt)
{
if ( CheckFor2KeyPress(m_toggleModeKeyCode, KeyCode.LeftAlt)
|| CheckFor2KeyPress(m_toggleModeKeyCode, KeyCode.RightAlt))
{
ToggleModes();
}
}
else
{
if (CheckFor1KeyPress(m_toggleModeKeyCode))
{
ToggleModes();
}
}
ToggleActive();
}

// Toggle Active -------------------------------------
if (m_toggleActiveKeyCode != KeyCode.None)
// Reset Fps Monitor ---------------------------------
if( CheckForHotkey( m_resetFpsMonitorKeyCode, m_resetFpsMonitorCtrl, m_resetFpsMonitorAlt ) )
{
if (m_toggleActiveCtrl && m_toggleActiveAlt)
{
if ( CheckFor3KeyPress(m_toggleActiveKeyCode, KeyCode.LeftControl, KeyCode.LeftAlt)
|| CheckFor3KeyPress(m_toggleActiveKeyCode, KeyCode.RightControl, KeyCode.LeftAlt)
|| CheckFor3KeyPress(m_toggleActiveKeyCode, KeyCode.RightControl, KeyCode.RightAlt)
|| CheckFor3KeyPress(m_toggleActiveKeyCode, KeyCode.LeftControl, KeyCode.RightAlt))
{
ToggleActive();
}
}

else if (m_toggleActiveCtrl)
{
if ( CheckFor2KeyPress(m_toggleActiveKeyCode, KeyCode.LeftControl)
|| CheckFor2KeyPress(m_toggleActiveKeyCode, KeyCode.RightControl))
{
ToggleActive();
}
}
else if (m_toggleActiveAlt)
{
if ( CheckFor2KeyPress(m_toggleActiveKeyCode, KeyCode.LeftAlt)
|| CheckFor2KeyPress(m_toggleActiveKeyCode, KeyCode.RightAlt))
{
ToggleActive();
}
}
else
{
if (CheckFor1KeyPress(m_toggleActiveKeyCode))
{
ToggleActive();
}
}
m_fpsMonitor.Reset();
}
#endif
}

#if GRAPHY_NEW_INPUT
Expand Down Expand Up @@ -1033,6 +903,48 @@ Keyboard.current[ key3 ].isPressed

return false;
}

private bool CheckForHotkey( Key keyCode, bool ctrl, bool alt )
{
bool pressed = false;
if( keyCode != Key.None )
{
if( ctrl && alt )
{
if( CheckFor3KeyPress( keyCode, Key.LeftCtrl, Key.LeftAlt )
|| CheckFor3KeyPress( keyCode, Key.RightCtrl, Key.LeftAlt )
|| CheckFor3KeyPress( keyCode, Key.RightCtrl, Key.RightAlt )
|| CheckFor3KeyPress( keyCode, Key.LeftCtrl, Key.RightAlt ) )
{
pressed = true;
}
}
else if( ctrl )
{
if( CheckFor2KeyPress( keyCode, Key.LeftCtrl )
|| CheckFor2KeyPress( keyCode, Key.RightCtrl ) )
{
pressed = true;
}
}
else if( alt )
{
if( CheckFor2KeyPress( keyCode, Key.LeftAlt )
|| CheckFor2KeyPress( keyCode, Key.RightAlt ) )
{
pressed = true;
}
}
else
{
if( CheckFor1KeyPress( keyCode ) )
{
pressed = true;
}
}
}
return pressed;
}
#else
private bool CheckFor1KeyPress(KeyCode key)
{
Expand All @@ -1051,6 +963,48 @@ private bool CheckFor3KeyPress(KeyCode key1, KeyCode key2, KeyCode key3)
|| Input.GetKeyDown(key2) && Input.GetKey(key1) && Input.GetKey(key3)
|| Input.GetKeyDown(key3) && Input.GetKey(key1) && Input.GetKey(key2);
}

private bool CheckForHotkey( KeyCode keyCode, bool ctrl, bool alt )
{
bool pressed = false;
if( keyCode != KeyCode.None )
{
if( ctrl && alt )
{
if( CheckFor3KeyPress( keyCode, KeyCode.LeftControl, KeyCode.LeftAlt )
|| CheckFor3KeyPress( keyCode, KeyCode.RightControl, KeyCode.LeftAlt )
|| CheckFor3KeyPress( keyCode, KeyCode.RightControl, KeyCode.RightAlt )
|| CheckFor3KeyPress( keyCode, KeyCode.LeftControl, KeyCode.RightAlt ) )
{
pressed = true;
}
}
else if( ctrl )
{
if( CheckFor2KeyPress( keyCode, KeyCode.LeftControl )
|| CheckFor2KeyPress( keyCode, KeyCode.RightControl ) )
{
pressed = true;
}
}
else if( alt )
{
if( CheckFor2KeyPress( keyCode, KeyCode.LeftAlt )
|| CheckFor2KeyPress( keyCode, KeyCode.RightAlt ) )
{
pressed = true;
}
}
else
{
if( CheckFor1KeyPress( keyCode ) )
{
pressed = true;
}
}
}
return pressed;
}
#endif
private void UpdateAllParameters()
{
Expand Down