Skip to content

Bugfix/Unity 2017.3+ support #306

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

Open
southrop wants to merge 7 commits into
base: develop
Choose a base branch
from
Open

Bugfix/Unity 2017.3+ support #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8ae0e1d
mouseDown was depecated
southrop Jul 10, 2018
0f7aceb
Samsung TV and WiiU are deprecated
southrop Jul 10, 2018
dc15a8a
EnumMaskField was deprecated in 2017.3
southrop Jul 10, 2018
cb5195a
Remove newline at EOF
southrop Jul 10, 2018
4b389d8
Consistency fix
southrop Jul 10, 2018
044c579
Tizen deprecated in 2018.2
southrop Jul 11, 2018
c4dbbc0
PS Vita (PSP2) deprecated as of 2018.3
southrop Dec 14, 2018
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
4 changes: 4 additions & 0 deletions Source/Assets/TouchScript/Editor/TouchManagerEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,11 @@ private void drawSendMessage()
var label = EditorGUI.BeginProperty(r, TEXT_SEND_MESSAGE_EVENTS, sendMessageEvents);
EditorGUI.BeginChangeCheck();
r = EditorGUI.PrefixLabel(r, label);
#if UNITY_2017_3_OR_NEWER
var sMask = (TouchManager.MessageType) EditorGUI.EnumFlagsField(r, instance.SendMessageEvents);
#else
var sMask = (TouchManager.MessageType) EditorGUI.EnumMaskField(r, instance.SendMessageEvents);
#endif
if (EditorGUI.EndChangeCheck())
{
instance.SendMessageEvents = sMask;
Expand Down
2 changes: 1 addition & 1 deletion Source/Assets/TouchScript/Editor/TouchScriptSettingsWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ private void drawListElement(string header, string content, string url)
{
var rect = GUILayoutUtility.GetLastRect();
EditorGUIUtility.AddCursorRect(rect, MouseCursor.Link);
if (Event.current.type == EventType.mouseDown && rect.Contains(Event.current.mousePosition))
if (Event.current.type == EventType.MouseDown && rect.Contains(Event.current.mousePosition))
Application.OpenURL(url);
}
}
Expand Down
16 changes: 16 additions & 0 deletions Source/Assets/TouchScript/Scripts/Devices/Display/GenericDisplayDevice.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ private void updateNativeResulotion()
// Mobiles / fullscreen
case RuntimePlatform.Android:
case RuntimePlatform.IPhonePlayer:
#if !UNITY_2018_2_OR_NEWER
case RuntimePlatform.TizenPlayer:
#endif
case RuntimePlatform.WSAPlayerARM:
case RuntimePlatform.WSAPlayerX64:
case RuntimePlatform.WSAPlayerX86:
Expand All @@ -102,21 +104,27 @@ private void updateNativeResulotion()
nativeResolution = new Vector2(res.width, res.height);
break;
// Probably TVs
#if !UNITY_2017_3_OR_NEWER
case RuntimePlatform.SamsungTVPlayer:
#endif
#if UNITY_5_6_OR_NEWER
case RuntimePlatform.Switch:
#endif
#if !UNITY_2018_1_OR_NEWER
case RuntimePlatform.WiiU:
#endif
case RuntimePlatform.XboxOne:
case RuntimePlatform.tvOS:
// This has not been tested and is probably wrong.
if (getHighestResolution(out nativeResolution)) break;
res = Screen.currentResolution;
nativeResolution = new Vector2(res.width, res.height);
break;
#if !UNITY_2018_3_OR_NEWER
case RuntimePlatform.PSP2:
nativeResolution = new Vector2(960, 544);
break;
#endif
default:
// This has not been tested and is probably wrong.
if (getHighestResolution(out nativeResolution)) break;
Expand Down Expand Up @@ -192,18 +200,24 @@ private void updateNativeDPI()
// Mobiles / fullscreen
case RuntimePlatform.Android:
case RuntimePlatform.IPhonePlayer:
#if !UNITY_2018_2_OR_NEWER
case RuntimePlatform.TizenPlayer:
#endif
case RuntimePlatform.WSAPlayerARM:
case RuntimePlatform.WSAPlayerX64:
case RuntimePlatform.WSAPlayerX86:
// We just hope that mobiles report their DPI correctly
break;
// Probably TVs
#if !UNITY_2017_3_OR_NEWER
case RuntimePlatform.SamsungTVPlayer:
#endif
#if UNITY_5_6_OR_NEWER
case RuntimePlatform.Switch:
#endif
#if !UNITY_2018_1_OR_NEWER
case RuntimePlatform.WiiU:
#endif
case RuntimePlatform.XboxOne:
case RuntimePlatform.tvOS:
// This has not been tested and is probably wrong.
Expand All @@ -220,9 +234,11 @@ private void updateNativeDPI()
nativeDPI = 40;
}
break;
#if !UNITY_2018_3_OR_NEWER
case RuntimePlatform.PSP2:
nativeDPI = 220.68f;
break;
#endif
default:
// This has not been tested and is probably wrong.
nativeDPI = 160;
Expand Down