Skip to content

Commit 63d77ce

Browse files
author
Unity Technologies
committed
Unity 2017.4.14f1 C# reference source code
1 parent 50d915f commit 63d77ce

File tree

4 files changed

+59
-48
lines changed

4 files changed

+59
-48
lines changed

‎Editor/Mono/GameView/GameViewSizes.cs

Lines changed: 48 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -184,19 +184,41 @@ private void InitBuiltinGroups()
184184
GameViewSize k16_9 = new GameViewSize(GameViewSizeType.AspectRatio, 16, 9, "");
185185
GameViewSize kStandalone = new GameViewSize(GameViewSizeType.FixedResolution, 0, 0, "Standalone");
186186

187+
// all mobiles
188+
GameViewSize k_4_3_Portrait = new GameViewSize(GameViewSizeType.AspectRatio, 3, 4, "4:3 Portrait");
189+
GameViewSize k_4_3_Landscape = new GameViewSize(GameViewSizeType.AspectRatio, 4, 3, "4:3 Landscape");
190+
GameViewSize k_16_10_Portrait = new GameViewSize(GameViewSizeType.AspectRatio, 10, 16, "16:10 Portrait");
191+
GameViewSize k_16_10_Landscape = new GameViewSize(GameViewSizeType.AspectRatio, 16, 10, "16:10 Landscape");
192+
GameViewSize k_16_9_Portrait = new GameViewSize(GameViewSizeType.AspectRatio, 9, 16, "16:9 Portrait");
193+
GameViewSize k_16_9_Landscape = new GameViewSize(GameViewSizeType.AspectRatio, 16, 9, "16:9 Landscape");
194+
195+
187196
// iOS
188-
GameViewSize k_iPhoneTall = new GameViewSize(GameViewSizeType.FixedResolution, 320, 480, "iPhone Tall");
189-
GameViewSize k_iPhoneWide = new GameViewSize(GameViewSizeType.FixedResolution, 480, 320, "iPhone Wide");
190-
GameViewSize k_iPhone4GTall = new GameViewSize(GameViewSizeType.FixedResolution, 640, 960, "iPhone 4 Tall");
191-
GameViewSize k_iPhone4GWide = new GameViewSize(GameViewSizeType.FixedResolution, 960, 640, "iPhone 4 Wide");
192-
GameViewSize k_iPadTall = new GameViewSize(GameViewSizeType.FixedResolution, 768, 1024, "iPad Tall");
193-
GameViewSize k_iPadWide = new GameViewSize(GameViewSizeType.FixedResolution, 1024, 768, "iPad Wide");
194-
GameViewSize k_iPhone5Tall = new GameViewSize(GameViewSizeType.AspectRatio, 9, 16, "iPhone 5 Tall");
195-
GameViewSize k_iPhone5Wide = new GameViewSize(GameViewSizeType.AspectRatio, 16, 9, "iPhone 5 Wide");
196-
GameViewSize k_iPhoneTall2_3 = new GameViewSize(GameViewSizeType.AspectRatio, 2, 3, "iPhone Tall");
197-
GameViewSize k_iPhoneWide3_2 = new GameViewSize(GameViewSizeType.AspectRatio, 3, 2, "iPhone Wide");
198-
GameViewSize k_iPadTall3_4 = new GameViewSize(GameViewSizeType.AspectRatio, 3, 4, "iPad Tall");
199-
GameViewSize k_iPadWide4_3 = new GameViewSize(GameViewSizeType.AspectRatio, 4, 3, "iPad Wide");
197+
GameViewSize k_iPhone_750p_Portrait = new GameViewSize(GameViewSizeType.FixedResolution, 750, 1334, "iPhone 1334x750 Portrait");
198+
GameViewSize k_iPhone_750p_Landscape = new GameViewSize(GameViewSizeType.FixedResolution, 1334, 750, "iPhone 1334x750 Landscape");
199+
GameViewSize k_iPhone_1080p_Portrait = new GameViewSize(GameViewSizeType.FixedResolution, 1080, 1920, "iPhone 1920x1080 Portrait");
200+
GameViewSize k_iPhone_1080p_Landscape = new GameViewSize(GameViewSizeType.FixedResolution, 1920, 1080, "iPhone 1920x1080 Landscape");
201+
GameViewSize k_iPhone_X_Portrait = new GameViewSize(GameViewSizeType.FixedResolution, 1125, 2436, "iPhone X/XS 2436x1125 Portrait");
202+
GameViewSize k_iPhone_X_Landscape = new GameViewSize(GameViewSizeType.FixedResolution, 2436, 1125, "iPhone X/XS 2436x1125 Landscape");
203+
GameViewSize k_iPhone_828p_Portrait = new GameViewSize(GameViewSizeType.FixedResolution, 828, 1792, "iPhone XR 1792x828 Portrait");
204+
GameViewSize k_iPhone_828p_Landscape = new GameViewSize(GameViewSizeType.FixedResolution, 1792, 828, "iPhone XR 1792x828 Landscape");
205+
GameViewSize k_iPhone_1242p_Portrait = new GameViewSize(GameViewSizeType.FixedResolution, 1242, 2688, "iPhone XS Max 2688x1242 Portrait");
206+
GameViewSize k_iPhone_1242p_Landscape = new GameViewSize(GameViewSizeType.FixedResolution, 2688, 1242, "iPhone XS Max 2688x1242 Landscape");
207+
GameViewSize k_iPad_1536p_Landscape = new GameViewSize(GameViewSizeType.FixedResolution, 2048, 1536, "iPad 2048x1536 Landscape");
208+
GameViewSize k_iPad_1536p_Portrait = new GameViewSize(GameViewSizeType.FixedResolution, 1536, 2048, "iPad 2048x1536 Portrait");
209+
210+
GameViewSize k_iPad_2048p_Landscape = new GameViewSize(GameViewSizeType.FixedResolution, 2732, 2048, "iPadPro 2732x2048 Landscape");
211+
GameViewSize k_iPad_2048p_Portrait = new GameViewSize(GameViewSizeType.FixedResolution, 2048, 2732, "iPadPro 2732x2048 Portrait");
212+
GameViewSize k_iPad_1668p_Landscape = new GameViewSize(GameViewSizeType.FixedResolution, 2224, 1668, "iPadPro 2224x1668 Landscape");
213+
GameViewSize k_iPad_1668p_Portrait = new GameViewSize(GameViewSizeType.FixedResolution, 1668, 2224, "iPadPro 2224x1668 Portrait");
214+
215+
216+
GameViewSize k_iPhone4_Portrait = new GameViewSize(GameViewSizeType.FixedResolution, 640, 960, "iPhone 4/4S Portrait");
217+
GameViewSize k_iPhone4_Landscape = new GameViewSize(GameViewSizeType.FixedResolution, 960, 640, "iPhone 4/4S Landscape");
218+
GameViewSize k_iPhone5_Portrait = new GameViewSize(GameViewSizeType.FixedResolution, 640, 1136, "iPhone 5/5S/5C/SE Portrait");
219+
GameViewSize k_iPhone5_Landscape = new GameViewSize(GameViewSizeType.FixedResolution, 1136, 640, "iPhone 5/5S/5C/SE Landscape");
220+
GameViewSize k_iPad_768p_Landscape = new GameViewSize(GameViewSizeType.FixedResolution, 1024, 768, "iPad 2/Mini Landscape");
221+
GameViewSize k_iPad_768p_Portrait = new GameViewSize(GameViewSizeType.FixedResolution, 768, 1024, "iPad 2/Mini Portrait");
200222

201223
// Android
202224
GameViewSize k_HVGA_Portrait = new GameViewSize(GameViewSizeType.FixedResolution, 320, 480, "HVGA Portrait");
@@ -211,8 +233,6 @@ private void InitBuiltinGroups()
211233
GameViewSize k_WXGA_Landscape = new GameViewSize(GameViewSizeType.FixedResolution, 1280, 800, "WXGA Landscape");
212234
GameViewSize k_3_2_Portrait = new GameViewSize(GameViewSizeType.AspectRatio, 2, 3, "3:2 Portrait");
213235
GameViewSize k_3_2_Landscape = new GameViewSize(GameViewSizeType.AspectRatio, 3, 2, "3:2 Landscape");
214-
GameViewSize k_16_10_Portrait = new GameViewSize(GameViewSizeType.AspectRatio, 10, 16, "16:10 Portrait");
215-
GameViewSize k_16_10_Landscape = new GameViewSize(GameViewSizeType.AspectRatio, 16, 10, "16:10 Landscape");
216236

217237
// Wii U
218238
GameViewSize kWiiU_1080p_169 = new GameViewSize(GameViewSizeType.FixedResolution, 1920, 1080, "1080p (16:9)");
@@ -231,12 +251,20 @@ private void InitBuiltinGroups()
231251

232252
m_WiiU.AddBuiltinSizes(kFree, k4_3, k16_9, kWiiU_1080p_169, kWiiU_720p_169, kWiiU_GamePad_854_480);
233253
m_iOS.AddBuiltinSizes(kFree,
234-
k_iPhoneTall, k_iPhoneWide,
235-
k_iPhone4GTall, k_iPhone4GWide,
236-
k_iPadTall, k_iPadWide,
237-
k_iPhone5Tall, k_iPhone5Wide,
238-
k_iPhoneTall2_3, k_iPhoneWide3_2,
239-
k_iPadTall3_4, k_iPadWide4_3);
254+
k_iPhone_750p_Portrait, k_iPhone_750p_Landscape,
255+
k_iPhone_1080p_Portrait, k_iPhone_1080p_Landscape,
256+
k_iPhone_X_Portrait, k_iPhone_X_Landscape,
257+
k_iPhone_828p_Portrait, k_iPhone_828p_Landscape,
258+
k_iPhone_1242p_Portrait, k_iPhone_1242p_Landscape,
259+
k_iPad_1536p_Landscape, k_iPad_1536p_Portrait,
260+
k_iPad_2048p_Landscape, k_iPad_2048p_Portrait,
261+
k_iPad_1668p_Landscape, k_iPad_1668p_Portrait,
262+
k_16_9_Landscape, k_16_9_Portrait,
263+
k_4_3_Landscape, k_4_3_Portrait,
264+
k_iPhone4_Portrait, k_iPhone4_Landscape,
265+
k_iPhone5_Portrait, k_iPhone5_Landscape,
266+
k_iPad_768p_Landscape, k_iPad_768p_Portrait);
267+
240268
m_Android.AddBuiltinSizes(kFree, m_Remote,
241269
k_HVGA_Portrait, k_HVGA_Landscape,
242270
k_WVGA_Portrait, k_WVGA_Landscape,

‎Editor/Src/VR/Mono/PlayerSettingsEditorVR.cs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -514,19 +514,7 @@ internal void TangoGUI(BuildTargetGroup targetGroup)
514514
return;
515515

516516
// Google Tango settings
517-
EditorGUILayout.PropertyField(m_AndroidEnableTango, EditorGUIUtility.TextContent("ARCore Supported"));
518-
519-
if (PlayerSettings.Android.ARCoreEnabled)
520-
{
521-
EditorGUI.indentLevel++;
522-
523-
if ((int)PlayerSettings.Android.minSdkVersion < 24)
524-
{
525-
GUIContent tangoAndroidWarning = EditorGUIUtility.TextContent("ARCore requires 'Minimum API Level' to be at least Android 7.0");
526-
EditorGUILayout.HelpBox(tangoAndroidWarning.text, MessageType.Warning);
527-
}
528-
EditorGUI.indentLevel--;
529-
}
517+
EditorGUILayout.PropertyField(m_AndroidEnableTango, EditorGUIUtility.TrTextContent("ARCore Supported"));
530518
}
531519

532520
internal void VuforiaGUI(BuildTargetGroup targetGroup)

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Unity 2017.4.13f1 C# reference source code
1+
## Unity 2017.4.14f1 C# reference source code
22

33
The C# part of the Unity engine and editor source code.
44
May be used for reference purposes only.

‎Runtime/AR/Tango/ScriptBindings/Tango.bindings.cs

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,22 +50,17 @@ internal struct CoordinateFramePair
5050

5151
[UsedByNativeCode]
5252
[NativeHeader("ARScriptingClasses.h")]
53-
[StructLayout(LayoutKind.Explicit, Size = 92)]
53+
[StructLayout(LayoutKind.Explicit, Size = 60)]
5454
internal struct PoseData
5555
{
56-
[FieldOffset(0)] public uint version;
57-
[FieldOffset(8)] public double timestamp;
58-
[FieldOffset(16)] public double orientation_x;
59-
[FieldOffset(24)] public double orientation_y;
60-
[FieldOffset(32)] public double orientation_z;
61-
[FieldOffset(40)] public double orientation_w;
62-
[FieldOffset(48)] public double translation_x;
63-
[FieldOffset(56)] public double translation_y;
64-
[FieldOffset(64)] public double translation_z;
65-
[FieldOffset(72)] public PoseStatus statusCode;
66-
[FieldOffset(76)] public CoordinateFramePair frame;
67-
[FieldOffset(84)] public uint confidence;
68-
[FieldOffset(88)] public float accuracy;
56+
[FieldOffset(0)] public double orientation_x;
57+
[FieldOffset(8)] public double orientation_y;
58+
[FieldOffset(16)] public double orientation_z;
59+
[FieldOffset(24)] public double orientation_w;
60+
[FieldOffset(32)] public double translation_x;
61+
[FieldOffset(40)] public double translation_y;
62+
[FieldOffset(48)] public double translation_z;
63+
[FieldOffset(56)] public PoseStatus statusCode;
6964

7065
public Quaternion rotation
7166
{

0 commit comments

Comments
 (0)