Skip to content

System for changing camera angles #365

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
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

System for changing camera angles #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1282999
added a test scene and prefab for camera swapping
vjs22334 Feb 13, 2021
1f1a64a
Merge branch 'main' of https://github.com/UnityTechnologies/open-proj…
vjs22334 Feb 13, 2021
f119cf5
improved priority change for camera swap
vjs22334 Feb 14, 2021
0aacbc2
added a way to use collider volume to swap camera
vjs22334 Feb 14, 2021
801b208
fixed some bugs
vjs22334 Feb 14, 2021
1a27df0
added support for composite collider
vjs22334 Feb 15, 2021
5fb3ca0
moved vcam player target setup from CameraManager to VCamRequiresPlay…
vjs22334 Feb 17, 2021
e14fea1
Merge branch 'main' of https://github.com/UnityTechnologies/open-proj…
vjs22334 Feb 17, 2021
f26e75a
added GameSceneSO for CameraSwapTest scene
vjs22334 Feb 17, 2021
bf10f05
added camera swapping based on which child trigger is entered
vjs22334 Mar 22, 2021
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
8 changes: 7 additions & 1 deletion UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@ MonoBehaviour:
m_Data:
m_SerializedData: []
m_GUID: a7bae5f88e2e24365bdf768f42df85c5
m_SerializeEntries: []
m_SerializeEntries:
- m_GUID: e941c7f6da81eee43b36d39adcd34538
m_Address: Assets/Scenes/Examples/CameraSwapTest.unity
m_ReadOnly: 0
m_SerializedLabels: []
m_MainAsset: {fileID: 0}
m_TargetAsset: {fileID: 0}
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2}
m_SchemaSet:
Expand Down
105 changes: 105 additions & 0 deletions UOP1_Project/Assets/Prefabs/CameraSwapTrigger.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2027150783
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2027150784}
- component: {fileID: 2027150785}
- component: {fileID: 4546130587037777008}
m_Layer: 0
m_Name: ChildTrigger
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2027150784
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2027150783}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8105939767358850019}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &2027150785
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2027150783}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &4546130587037777008
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2027150783}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5b3adff19c8734b45b01d4fd9dddad05, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &8105939767358849821
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8105939767358850019}
- component: {fileID: 8105939767358850018}
m_Layer: 0
m_Name: CameraSwapTrigger
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8105939767358850019
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8105939767358849821}
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: -11.7, y: 1.03, z: -8.09}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2027150784}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!114 &8105939767358850018
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8105939767358849821}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3631e2db38d3fc547977e1c0a59a7738, type: 3}
m_Name:
m_EditorClassIdentifier:
cameraToSwap: {fileID: 0}
VcamEventChannel: {fileID: 11400000, guid: 8163123e968b0324998867587ac6058a, type: 2}
7 changes: 7 additions & 0 deletions UOP1_Project/Assets/Prefabs/CameraSwapTrigger.prefab.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 17 additions & 1 deletion UOP1_Project/Assets/Prefabs/Gameplay/CameraSystem.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5457523176376150323}
m_LocalRotation: {x: 0.22975291, y: -2.274687e-15, z: 4.0599975e-16, w: 0.973249}
m_LocalRotation: {x: 0.22975291, y: -0, z: -0, w: 0.973249}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
Expand Down Expand Up @@ -787,6 +787,7 @@ MonoBehaviour:
type: 2}
_frameObjectChannel: {fileID: 11400000, guid: 2723b3f59f7ede3498fe7e385d2bb6ee,
type: 2}
_VcamEventChannel: {fileID: 0}
--- !u!1 &8745341641394998848
GameObject:
m_ObjectHideFlags: 0
Expand All @@ -798,6 +799,7 @@ GameObject:
- component: {fileID: 8745341641394998850}
- component: {fileID: 8745341641394998849}
- component: {fileID: 643664704}
- component: {fileID: 6204018112097571263}
m_Layer: 0
m_Name: FreeLook_VCam
m_TagString: Untagged
Expand Down Expand Up @@ -953,6 +955,20 @@ MonoBehaviour:
m_Damping: 2
m_DampingWhenOccluded: 0
m_OptimalTargetDistance: 0
--- !u!114 &6204018112097571263
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8745341641394998848}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b320bb9e71a27c3439f31fa5cecc0f7f, type: 3}
m_Name:
m_EditorClassIdentifier:
followsPlayer: 1
looksAtPlayer: 1
--- !u!1 &8745341642014614487
GameObject:
m_ObjectHideFlags: 0
Expand Down
Loading