Skip to content

Commit 87bc8fe

Browse files
Common Camera Prefab (#130)
Unify cameras in samples.
1 parent 6c14f12 commit 87bc8fe

13 files changed

Lines changed: 8272 additions & 8960 deletions

File tree

com.microsoft.mrtk.graphicstools.unity/Runtime/Prefabs.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 182 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,182 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &2605718042319707032
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
10+
m_Component:
11+
- component: {fileID: 2605718042319707029}
12+
- component: {fileID: 2605718042319707034}
13+
- component: {fileID: 2605718042319707035}
14+
- component: {fileID: 1351213706856392110}
15+
- component: {fileID: 2605718042319707028}
16+
- component: {fileID: 2605718042319707031}
17+
m_Layer: 0
18+
m_Name: FlyCamera
19+
m_TagString: MainCamera
20+
m_Icon: {fileID: 0}
21+
m_NavMeshLayer: 0
22+
m_StaticEditorFlags: 0
23+
m_IsActive: 1
24+
--- !u!4 &2605718042319707029
25+
Transform:
26+
m_ObjectHideFlags: 0
27+
m_CorrespondingSourceObject: {fileID: 0}
28+
m_PrefabInstance: {fileID: 0}
29+
m_PrefabAsset: {fileID: 0}
30+
m_GameObject: {fileID: 2605718042319707032}
31+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
32+
m_LocalPosition: {x: 0, y: 0, z: 0}
33+
m_LocalScale: {x: 1, y: 1, z: 1}
34+
m_Children: []
35+
m_Father: {fileID: 0}
36+
m_RootOrder: 0
37+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
38+
--- !u!20 &2605718042319707034
39+
Camera:
40+
m_ObjectHideFlags: 0
41+
m_CorrespondingSourceObject: {fileID: 0}
42+
m_PrefabInstance: {fileID: 0}
43+
m_PrefabAsset: {fileID: 0}
44+
m_GameObject: {fileID: 2605718042319707032}
45+
m_Enabled: 1
46+
serializedVersion: 2
47+
m_ClearFlags: 2
48+
m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
49+
m_projectionMatrixMode: 1
50+
m_GateFitMode: 2
51+
m_FOVAxisMode: 0
52+
m_SensorSize: {x: 36, y: 24}
53+
m_LensShift: {x: 0, y: 0}
54+
m_FocalLength: 50
55+
m_NormalizedViewPortRect:
56+
serializedVersion: 2
57+
x: 0
58+
y: 0
59+
width: 1
60+
height: 1
61+
near clip plane: 0.01
62+
far clip plane: 100
63+
field of view: 55
64+
orthographic: 0
65+
orthographic size: 5
66+
m_Depth: -1
67+
m_CullingMask:
68+
serializedVersion: 2
69+
m_Bits: 4294967295
70+
m_RenderingPath: -1
71+
m_TargetTexture: {fileID: 0}
72+
m_TargetDisplay: 0
73+
m_TargetEye: 3
74+
m_HDR: 1
75+
m_AllowMSAA: 1
76+
m_AllowDynamicResolution: 0
77+
m_ForceIntoRT: 0
78+
m_OcclusionCulling: 1
79+
m_StereoConvergence: 10
80+
m_StereoSeparation: 0.022
81+
--- !u!81 &2605718042319707035
82+
AudioListener:
83+
m_ObjectHideFlags: 0
84+
m_CorrespondingSourceObject: {fileID: 0}
85+
m_PrefabInstance: {fileID: 0}
86+
m_PrefabAsset: {fileID: 0}
87+
m_GameObject: {fileID: 2605718042319707032}
88+
m_Enabled: 1
89+
--- !u!114 &1351213706856392110
90+
MonoBehaviour:
91+
m_ObjectHideFlags: 0
92+
m_CorrespondingSourceObject: {fileID: 0}
93+
m_PrefabInstance: {fileID: 0}
94+
m_PrefabAsset: {fileID: 0}
95+
m_GameObject: {fileID: 2605718042319707032}
96+
m_Enabled: 1
97+
m_EditorHideFlags: 0
98+
m_Script: {fileID: 11500000, guid: 5a2a9c34df4095f47b9ca8f975175f5b, type: 3}
99+
m_Name:
100+
m_EditorClassIdentifier:
101+
m_Device: 0
102+
m_PoseSource: 2
103+
m_PoseProviderComponent: {fileID: 0}
104+
m_TrackingType: 0
105+
m_UpdateType: 0
106+
m_UseRelativeTransform: 0
107+
--- !u!114 &2605718042319707028
108+
MonoBehaviour:
109+
m_ObjectHideFlags: 0
110+
m_CorrespondingSourceObject: {fileID: 0}
111+
m_PrefabInstance: {fileID: 0}
112+
m_PrefabAsset: {fileID: 0}
113+
m_GameObject: {fileID: 2605718042319707032}
114+
m_Enabled: 1
115+
m_EditorHideFlags: 0
116+
m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
117+
m_Name:
118+
m_EditorClassIdentifier:
119+
m_RenderShadows: 0
120+
m_RequiresDepthTextureOption: 2
121+
m_RequiresOpaqueTextureOption: 2
122+
m_CameraType: 0
123+
m_Cameras: []
124+
m_RendererIndex: -1
125+
m_VolumeLayerMask:
126+
serializedVersion: 2
127+
m_Bits: 1
128+
m_VolumeTrigger: {fileID: 0}
129+
m_VolumeFrameworkUpdateModeOption: 2
130+
m_RenderPostProcessing: 0
131+
m_Antialiasing: 0
132+
m_AntialiasingQuality: 2
133+
m_StopNaN: 0
134+
m_Dithering: 0
135+
m_ClearDepth: 1
136+
m_AllowXRRendering: 1
137+
m_RequiresDepthTexture: 0
138+
m_RequiresColorTexture: 0
139+
m_Version: 2
140+
--- !u!114 &2605718042319707031
141+
MonoBehaviour:
142+
m_ObjectHideFlags: 0
143+
m_CorrespondingSourceObject: {fileID: 0}
144+
m_PrefabInstance: {fileID: 0}
145+
m_PrefabAsset: {fileID: 0}
146+
m_GameObject: {fileID: 2605718042319707032}
147+
m_Enabled: 1
148+
m_EditorHideFlags: 0
149+
m_Script: {fileID: 11500000, guid: a7fa20e0121f06f4ca28c947342626e2, type: 3}
150+
m_Name:
151+
m_EditorClassIdentifier:
152+
Boost: 1
153+
MinBoost: 0.5
154+
MaxBoost: 4
155+
PositionLerpTime: 0.2
156+
MouseSensitivityCurve:
157+
serializedVersion: 2
158+
m_Curve:
159+
- serializedVersion: 3
160+
time: 0
161+
value: 0.5
162+
inSlope: 0
163+
outSlope: 5
164+
tangentMode: 0
165+
weightedMode: 0
166+
inWeight: 0
167+
outWeight: 0
168+
- serializedVersion: 3
169+
time: 1
170+
value: 2.5
171+
inSlope: 0
172+
outSlope: 0
173+
tangentMode: 0
174+
weightedMode: 0
175+
inWeight: 0
176+
outWeight: 0
177+
m_PreInfinity: 2
178+
m_PostInfinity: 2
179+
m_RotationOrder: 4
180+
RotationLerpTime: 0.1
181+
InvertY: 0
182+
showControlsText: 1

com.microsoft.mrtk.graphicstools.unity/Runtime/Prefabs/FlyCamera.prefab.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

com.microsoft.mrtk.graphicstools.unity/Runtime/Utilities/FlyCameraController.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ private class CameraState
2424
public void SetFromTransform(Transform t)
2525
{
2626
Position = t.position;
27-
Rotation = t.eulerAngles;
27+
Vector3 euler = t.eulerAngles;
28+
Rotation = new Vector3(euler.y, euler.x, euler.z);
2829
}
2930

3031
public void Translate(Vector3 translation)
@@ -70,7 +71,7 @@ public void UpdateTransform(Transform t)
7071
public bool InvertY = false;
7172

7273
[Header("Other Settings")]
73-
public bool showControlsText = true;
74+
public bool showControlsText = false;
7475

7576
private CameraState targetCameraState = new CameraState();
7677
private CameraState interpolatingCameraState = new CameraState();

0 commit comments

Comments
 (0)