Skip to content
This repository was archived by the owner on Oct 20, 2021. It is now read-only.

Commit cbf82e0

Browse files
authored
Sane camera clipping (#156)
* Remove logic from TileEnabler * Move environment rendering to separate skybox camera * Environment cloud and terrain now a combined prefab for all worker scenes * Set player camera far clipping plane to checkout distance + bias * Player camera is now a separate prefab for easier tweaking * Fix spawning on mobile * Disable MSAA on Camera level, fixes mobile
1 parent efb4444 commit cbf82e0

27 files changed

+2298
-3619
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
### Internal
1111

1212
- Fixed package dependencies.
13+
- Fixed camera clipping.
14+
- Removed unused camera.
1315

1416
## `0.2.0` - 2019-03-19
1517

workers/unity/Assets/Fps/Prefabs/Cameras.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: 161 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &7287687211098107042
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: 7292942736476539930}
12+
- component: {fileID: 7308505979847638194}
13+
- component: {fileID: 7256163362374654352}
14+
- component: {fileID: 7207908353475919646}
15+
- component: {fileID: 8315485854471764127}
16+
m_Layer: 11
17+
m_Name: FirstPersonCamera_mobile
18+
m_TagString: MainCamera
19+
m_Icon: {fileID: 0}
20+
m_NavMeshLayer: 0
21+
m_StaticEditorFlags: 0
22+
m_IsActive: 1
23+
--- !u!4 &7292942736476539930
24+
Transform:
25+
m_ObjectHideFlags: 0
26+
m_CorrespondingSourceObject: {fileID: 0}
27+
m_PrefabInstance: {fileID: 0}
28+
m_PrefabAsset: {fileID: 0}
29+
m_GameObject: {fileID: 7287687211098107042}
30+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
31+
m_LocalPosition: {x: 0, y: 0, z: 0}
32+
m_LocalScale: {x: 1, y: 1, z: 1}
33+
m_Children: []
34+
m_Father: {fileID: 0}
35+
m_RootOrder: 0
36+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
37+
--- !u!20 &7308505979847638194
38+
Camera:
39+
m_ObjectHideFlags: 0
40+
m_CorrespondingSourceObject: {fileID: 0}
41+
m_PrefabInstance: {fileID: 0}
42+
m_PrefabAsset: {fileID: 0}
43+
m_GameObject: {fileID: 7287687211098107042}
44+
m_Enabled: 1
45+
serializedVersion: 2
46+
m_ClearFlags: 3
47+
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
48+
m_projectionMatrixMode: 1
49+
m_SensorSize: {x: 36, y: 24}
50+
m_LensShift: {x: 0, y: 0}
51+
m_GateFitMode: 2
52+
m_FocalLength: 50
53+
m_NormalizedViewPortRect:
54+
serializedVersion: 2
55+
x: 0
56+
y: 0
57+
width: 1
58+
height: 1
59+
near clip plane: 0.12
60+
far clip plane: 1000
61+
field of view: 50
62+
orthographic: 0
63+
orthographic size: 5
64+
m_Depth: -1
65+
m_CullingMask:
66+
serializedVersion: 2
67+
m_Bits: 3895
68+
m_RenderingPath: 1
69+
m_TargetTexture: {fileID: 0}
70+
m_TargetDisplay: 0
71+
m_TargetEye: 3
72+
m_HDR: 1
73+
m_AllowMSAA: 0
74+
m_AllowDynamicResolution: 0
75+
m_ForceIntoRT: 1
76+
m_OcclusionCulling: 1
77+
m_StereoConvergence: 10
78+
m_StereoSeparation: 0.022
79+
--- !u!114 &7256163362374654352
80+
MonoBehaviour:
81+
m_ObjectHideFlags: 0
82+
m_CorrespondingSourceObject: {fileID: 0}
83+
m_PrefabInstance: {fileID: 0}
84+
m_PrefabAsset: {fileID: 0}
85+
m_GameObject: {fileID: 7287687211098107042}
86+
m_Enabled: 1
87+
m_EditorHideFlags: 0
88+
m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3}
89+
m_Name:
90+
m_EditorClassIdentifier:
91+
volumeTrigger: {fileID: 7292942736476539930}
92+
volumeLayer:
93+
serializedVersion: 2
94+
m_Bits: 256
95+
stopNaNPropagation: 1
96+
finalBlitToCameraTarget: 1
97+
antialiasingMode: 1
98+
temporalAntialiasing:
99+
jitterSpread: 0.75
100+
sharpness: 0.25
101+
stationaryBlending: 0.95
102+
motionBlending: 0.85
103+
subpixelMorphologicalAntialiasing:
104+
quality: 2
105+
fastApproximateAntialiasing:
106+
fastMode: 1
107+
keepAlpha: 0
108+
fog:
109+
enabled: 1
110+
excludeSkybox: 1
111+
debugLayer:
112+
lightMeter:
113+
width: 512
114+
height: 256
115+
showCurves: 1
116+
histogram:
117+
width: 512
118+
height: 256
119+
channel: 3
120+
waveform:
121+
exposure: 0.12
122+
height: 256
123+
vectorscope:
124+
size: 256
125+
exposure: 0.12
126+
overlaySettings:
127+
linearDepth: 0
128+
motionColorIntensity: 4
129+
motionGridSize: 64
130+
colorBlindnessType: 0
131+
colorBlindnessStrength: 1
132+
m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2}
133+
m_ShowToolkit: 0
134+
m_ShowCustomSorter: 0
135+
breakBeforeColorGrading: 0
136+
m_BeforeTransparentBundles: []
137+
m_BeforeStackBundles: []
138+
m_AfterStackBundles:
139+
- assemblyQualifiedName: Fps.LowHealthVignette, Improbable.Fps, Version=0.0.0.0,
140+
Culture=neutral, PublicKeyToken=null
141+
--- !u!81 &7207908353475919646
142+
AudioListener:
143+
m_ObjectHideFlags: 0
144+
m_CorrespondingSourceObject: {fileID: 0}
145+
m_PrefabInstance: {fileID: 0}
146+
m_PrefabAsset: {fileID: 0}
147+
m_GameObject: {fileID: 7287687211098107042}
148+
m_Enabled: 1
149+
--- !u!114 &8315485854471764127
150+
MonoBehaviour:
151+
m_ObjectHideFlags: 0
152+
m_CorrespondingSourceObject: {fileID: 0}
153+
m_PrefabInstance: {fileID: 0}
154+
m_PrefabAsset: {fileID: 0}
155+
m_GameObject: {fileID: 7287687211098107042}
156+
m_Enabled: 1
157+
m_EditorHideFlags: 0
158+
m_Script: {fileID: 11500000, guid: 0457310fd8ed7374082efac84284c527, type: 3}
159+
m_Name:
160+
m_EditorClassIdentifier:
161+
checkoutBias: 10

workers/unity/Assets/Fps/Prefabs/Cameras/FirstPersonCamera_mobile.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.
Lines changed: 161 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &896626365763983101
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: 893921381858113093}
12+
- component: {fileID: 882533396211205869}
13+
- component: {fileID: 1000210505865880527}
14+
- component: {fileID: 960892282380535105}
15+
- component: {fileID: 693404368483823210}
16+
m_Layer: 11
17+
m_Name: FirstPersonCamera_pc
18+
m_TagString: MainCamera
19+
m_Icon: {fileID: 0}
20+
m_NavMeshLayer: 0
21+
m_StaticEditorFlags: 0
22+
m_IsActive: 1
23+
--- !u!4 &893921381858113093
24+
Transform:
25+
m_ObjectHideFlags: 0
26+
m_CorrespondingSourceObject: {fileID: 0}
27+
m_PrefabInstance: {fileID: 0}
28+
m_PrefabAsset: {fileID: 0}
29+
m_GameObject: {fileID: 896626365763983101}
30+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
31+
m_LocalPosition: {x: 0, y: 0, z: 0}
32+
m_LocalScale: {x: 1, y: 1, z: 1}
33+
m_Children: []
34+
m_Father: {fileID: 0}
35+
m_RootOrder: 0
36+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
37+
--- !u!20 &882533396211205869
38+
Camera:
39+
m_ObjectHideFlags: 0
40+
m_CorrespondingSourceObject: {fileID: 0}
41+
m_PrefabInstance: {fileID: 0}
42+
m_PrefabAsset: {fileID: 0}
43+
m_GameObject: {fileID: 896626365763983101}
44+
m_Enabled: 1
45+
serializedVersion: 2
46+
m_ClearFlags: 3
47+
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
48+
m_projectionMatrixMode: 1
49+
m_SensorSize: {x: 36, y: 24}
50+
m_LensShift: {x: 0, y: 0}
51+
m_GateFitMode: 2
52+
m_FocalLength: 50
53+
m_NormalizedViewPortRect:
54+
serializedVersion: 2
55+
x: 0
56+
y: 0
57+
width: 1
58+
height: 1
59+
near clip plane: 0.12
60+
far clip plane: 300
61+
field of view: 55
62+
orthographic: 0
63+
orthographic size: 5
64+
m_Depth: -1
65+
m_CullingMask:
66+
serializedVersion: 2
67+
m_Bits: 3895
68+
m_RenderingPath: -1
69+
m_TargetTexture: {fileID: 0}
70+
m_TargetDisplay: 0
71+
m_TargetEye: 3
72+
m_HDR: 1
73+
m_AllowMSAA: 0
74+
m_AllowDynamicResolution: 0
75+
m_ForceIntoRT: 1
76+
m_OcclusionCulling: 1
77+
m_StereoConvergence: 10
78+
m_StereoSeparation: 0.022
79+
--- !u!114 &1000210505865880527
80+
MonoBehaviour:
81+
m_ObjectHideFlags: 0
82+
m_CorrespondingSourceObject: {fileID: 0}
83+
m_PrefabInstance: {fileID: 0}
84+
m_PrefabAsset: {fileID: 0}
85+
m_GameObject: {fileID: 896626365763983101}
86+
m_Enabled: 1
87+
m_EditorHideFlags: 0
88+
m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3}
89+
m_Name:
90+
m_EditorClassIdentifier:
91+
volumeTrigger: {fileID: 893921381858113093}
92+
volumeLayer:
93+
serializedVersion: 2
94+
m_Bits: 256
95+
stopNaNPropagation: 1
96+
finalBlitToCameraTarget: 1
97+
antialiasingMode: 3
98+
temporalAntialiasing:
99+
jitterSpread: 0.75
100+
sharpness: 0.4
101+
stationaryBlending: 0.95
102+
motionBlending: 0.5
103+
subpixelMorphologicalAntialiasing:
104+
quality: 2
105+
fastApproximateAntialiasing:
106+
fastMode: 0
107+
keepAlpha: 0
108+
fog:
109+
enabled: 1
110+
excludeSkybox: 1
111+
debugLayer:
112+
lightMeter:
113+
width: 512
114+
height: 256
115+
showCurves: 1
116+
histogram:
117+
width: 512
118+
height: 256
119+
channel: 3
120+
waveform:
121+
exposure: 0.12
122+
height: 256
123+
vectorscope:
124+
size: 256
125+
exposure: 0.12
126+
overlaySettings:
127+
linearDepth: 0
128+
motionColorIntensity: 4
129+
motionGridSize: 64
130+
colorBlindnessType: 0
131+
colorBlindnessStrength: 1
132+
m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2}
133+
m_ShowToolkit: 0
134+
m_ShowCustomSorter: 0
135+
breakBeforeColorGrading: 0
136+
m_BeforeTransparentBundles: []
137+
m_BeforeStackBundles: []
138+
m_AfterStackBundles:
139+
- assemblyQualifiedName: Fps.LowHealthVignette, Improbable.Fps, Version=0.0.0.0,
140+
Culture=neutral, PublicKeyToken=null
141+
--- !u!81 &960892282380535105
142+
AudioListener:
143+
m_ObjectHideFlags: 0
144+
m_CorrespondingSourceObject: {fileID: 0}
145+
m_PrefabInstance: {fileID: 0}
146+
m_PrefabAsset: {fileID: 0}
147+
m_GameObject: {fileID: 896626365763983101}
148+
m_Enabled: 1
149+
--- !u!114 &693404368483823210
150+
MonoBehaviour:
151+
m_ObjectHideFlags: 0
152+
m_CorrespondingSourceObject: {fileID: 0}
153+
m_PrefabInstance: {fileID: 0}
154+
m_PrefabAsset: {fileID: 0}
155+
m_GameObject: {fileID: 896626365763983101}
156+
m_Enabled: 1
157+
m_EditorHideFlags: 0
158+
m_Script: {fileID: 11500000, guid: 0457310fd8ed7374082efac84284c527, type: 3}
159+
m_Name:
160+
m_EditorClassIdentifier:
161+
checkoutBias: 10

workers/unity/Assets/Fps/Prefabs/Cameras/FirstPersonCamera_pc.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.

workers/unity/Assets/Fps/Prefabs/Environment.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.

0 commit comments

Comments
 (0)