Skip to content

Commit

Permalink
world-controller: added hack to fix cesium bug with needing camera na…
Browse files Browse the repository at this point in the history
…med DynamicCamera
  • Loading branch information
ericjohnson97 committed Mar 30, 2024
1 parent 092d5d6 commit 1153e3e
Show file tree
Hide file tree
Showing 2 changed files with 351 additions and 3 deletions.
339 changes: 336 additions & 3 deletions Assets/Scenes/ImageGenerator.unity
Original file line number Diff line number Diff line change
Expand Up @@ -10973,7 +10973,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
georeference: {fileID: 1628688806}
droneController: {fileID: 200453357}
droneController: {fileID: 0}
droneTemplate: {fileID: 200453354}
mavlinkMessageProcessor: {fileID: 110319845}
currentOriginECEF:
Expand Down Expand Up @@ -11121,7 +11121,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &200453355
Transform:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -12287,6 +12287,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4653d28923550ce4190a25901f9d66c4, type: 3}
m_Name:
m_EditorClassIdentifier:
player: {fileID: 0}
heightAbovePlayer: 1000
--- !u!1 &1001390869
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -12897,6 +12899,336 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1148046114}
m_CullTransparentMesh: 1
--- !u!1 &1524864480
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1524864481}
- component: {fileID: 1524864487}
- component: {fileID: 1524864486}
- component: {fileID: 1524864485}
- component: {fileID: 1524864484}
- component: {fileID: 1524864483}
- component: {fileID: 1524864482}
m_Layer: 0
m_Name: DynamicCamera
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1524864481
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1524864480}
serializedVersion: 2
m_LocalRotation: {x: -1.3877783e-17, y: -3.469447e-18, z: -6.9388927e-18, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1.0000004, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1628688807}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1524864482
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1524864480}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 275ecd2d59d942d41bf31252981978e0, type: 3}
m_Name:
m_EditorClassIdentifier:
_flyToAltitudeProfileCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 4.76524
outSlope: 4.76524
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0.061909087
- serializedVersion: 3
time: 0.5
value: 1
inSlope: 0
outSlope: 0
tangentMode: 34
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: -4.821313
outSlope: -4.821313
tangentMode: 0
weightedMode: 0
inWeight: 0.0535717
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
_flyToProgressCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
_flyToMaximumAltitudeCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0.16666667
outSlope: 0.16666667
tangentMode: 34
weightedMode: 0
inWeight: 0
outWeight: 0.33333334
- serializedVersion: 3
time: 12000000
value: 2000000
inSlope: 0.16666667
outSlope: 0.16666667
tangentMode: 34
weightedMode: 0
inWeight: 0.33333334
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
_flyToDuration: 5
--- !u!114 &1524864483
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1524864480}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3bef32f31a547984f88be1ab98b65f04, type: 3}
m_Name:
m_EditorClassIdentifier:
_distance: 0
--- !u!114 &1524864484
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1524864480}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 74f14e1eb550b9a4fb6c0a2f0456845b, type: 3}
m_Name:
m_EditorClassIdentifier:
_adjustOrientationForGlobeWhenMoving: 1
_detectTransformChanges: 1
_localToGlobeFixedMatrix:
c0:
x: 0.9918705852660543
y: -0.12725070563252222
z: 0
w: 0
c1:
x: -0.1070058283319761
y: -0.834069509060469
z: 0.5411825219040995
w: 0
c2:
x: 0.06886583315994345
y: 0.5367828327682781
z: 0.840905278535252
w: 0
c3:
x: -683181.8996028434
y: -5325141.634649307
z: 3432065.5429988545
w: 1
_localToGlobeFixedMatrixIsValid: 1
--- !u!114 &1524864485
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1524864480}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6b621ff6a9d4b8c4d85ac07de7f8b4b9, type: 3}
m_Name:
m_EditorClassIdentifier:
_enableMovement: 1
_enableRotation: 1
_defaultMaximumSpeed: 100
_enableDynamicSpeed: 1
_dynamicSpeedMinHeight: 20
_enableDynamicClippingPlanes: 1
_dynamicClippingPlanesMinHeight: 10000
_lookAction:
m_UseReference: 0
m_Action:
m_Name:
m_Type: 0
m_ExpectedControlType:
m_Id: a4e8637b-172e-4058-949c-de33e2a4c1c1
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 0}
_moveAction:
m_UseReference: 0
m_Action:
m_Name:
m_Type: 0
m_ExpectedControlType:
m_Id: bafe3a72-4cce-44bf-b30a-48bf2012f31f
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 0}
_moveUpAction:
m_UseReference: 0
m_Action:
m_Name:
m_Type: 0
m_ExpectedControlType:
m_Id: a37f9b19-1638-486d-8149-270152f200b0
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 0}
_speedChangeAction:
m_UseReference: 0
m_Action:
m_Name:
m_Type: 0
m_ExpectedControlType:
m_Id: bc64bab6-1f16-48ae-b1b9-b763dabd8a82
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 0}
_speedResetAction:
m_UseReference: 0
m_Action:
m_Name:
m_Type: 0
m_ExpectedControlType:
m_Id: f7e230a4-8873-4df0-8989-59360bcf0867
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 0}
_toggleDynamicSpeedAction:
m_UseReference: 0
m_Action:
m_Name:
m_Type: 0
m_ExpectedControlType:
m_Id: 3487f642-a136-4abc-afeb-6a5c8c20d723
m_Processors:
m_Interactions:
m_SingletonActionBindings: []
m_Flags: 0
m_Reference: {fileID: 0}
--- !u!81 &1524864486
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1524864480}
m_Enabled: 1
--- !u!20 &1524864487
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1524864480}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_Iso: 200
m_ShutterSpeed: 0.005
m_Aperture: 16
m_FocusDistance: 10
m_FocalLength: 50
m_BladeCount: 5
m_Curvature: {x: 2, y: 11}
m_BarrelClipping: 0.25
m_Anamorphism: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.5
far clip plane: 1000000
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!1 &1628688805
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -12949,6 +13281,7 @@ Transform:
m_Children:
- {fileID: 1814485188}
- {fileID: 200453355}
- {fileID: 1524864481}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1762790762
Expand Down Expand Up @@ -13196,7 +13529,7 @@ MonoBehaviour:
_maximumCachedBytes: 15368709120
_loadingDescendantLimit: 20
_enableFrustumCulling: 0
_enableFogCulling: 1
_enableFogCulling: 0
_enforceCulledScreenSpaceError: 1
_culledScreenSpaceError: 8
_opaqueMaterial: {fileID: 0}
Expand Down
Loading

0 comments on commit 1153e3e

Please sign in to comment.