From 16ee9366608df237faa51c02cd27c8480c0b7d99 Mon Sep 17 00:00:00 2001 From: AlvaroHG Date: Wed, 20 Nov 2024 20:25:47 -0800 Subject: [PATCH] Prefab update --- .../Assets/Resources/ThirdPartyCameraTemplate.prefab | 7 ++++--- unity/Assets/Scripts/AgentManager.cs | 2 +- unity/Assets/Scripts/RenderingManager.cs.meta | 11 +++++++++++ .../FirstPersonCharacter/Prefabs/FPSController.prefab | 7 ++++--- 4 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 unity/Assets/Scripts/RenderingManager.cs.meta diff --git a/unity/Assets/Resources/ThirdPartyCameraTemplate.prefab b/unity/Assets/Resources/ThirdPartyCameraTemplate.prefab index eaa63241b9..db14b7ae90 100644 --- a/unity/Assets/Resources/ThirdPartyCameraTemplate.prefab +++ b/unity/Assets/Resources/ThirdPartyCameraTemplate.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 5990649868303501632} - component: {fileID: 3402215512074657615} - component: {fileID: 5576228602605313083} - - component: {fileID: 5929461731447045472} + - component: {fileID: 2621852717849587523} m_Layer: 0 m_Name: ThirdPartyCameraTemplate m_TagString: Untagged @@ -149,7 +149,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: dd09293d18a1af44d95b8ed5c5418f95, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &5929461731447045472 +--- !u!114 &2621852717849587523 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -158,6 +158,7 @@ MonoBehaviour: m_GameObject: {fileID: 7692911009727723218} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 68871f0bc5fb742138947ad4c5e73f7d, type: 3} + m_Script: {fileID: 11500000, guid: ef2c6204ab3bb40a6afb21bd364dbadc, type: 3} m_Name: m_EditorClassIdentifier: + distortionMat: {fileID: 0} diff --git a/unity/Assets/Scripts/AgentManager.cs b/unity/Assets/Scripts/AgentManager.cs index b2ed3bceee..0465f06bae 100644 --- a/unity/Assets/Scripts/AgentManager.cs +++ b/unity/Assets/Scripts/AgentManager.cs @@ -190,7 +190,7 @@ void Start() { //Why is Rendering manager not in cloudrendering? - gameObject.AddComponent(typeof(RenderingManager)); + // gameObject.AddComponent(typeof(RenderingManager)); // Camera camera = this.primaryAgent.gameObject.GetComponentInChildren(); // camera.targetTexture = createRenderTexture(Screen.width, Screen.height); diff --git a/unity/Assets/Scripts/RenderingManager.cs.meta b/unity/Assets/Scripts/RenderingManager.cs.meta new file mode 100644 index 0000000000..c18107413f --- /dev/null +++ b/unity/Assets/Scripts/RenderingManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ef2c6204ab3bb40a6afb21bd364dbadc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity/Assets/Standard Assets/Characters/FirstPersonCharacter/Prefabs/FPSController.prefab b/unity/Assets/Standard Assets/Characters/FirstPersonCharacter/Prefabs/FPSController.prefab index 83f0d93dd0..907cb6de55 100644 --- a/unity/Assets/Standard Assets/Characters/FirstPersonCharacter/Prefabs/FPSController.prefab +++ b/unity/Assets/Standard Assets/Characters/FirstPersonCharacter/Prefabs/FPSController.prefab @@ -258,7 +258,7 @@ GameObject: - component: {fileID: 114176532703538896} - component: {fileID: 992261166} - component: {fileID: 2007864990} - - component: {fileID: 8452980845336696311} + - component: {fileID: 6005229055677503837} m_Layer: 10 m_Name: FirstPersonCharacter m_TagString: MainCamera @@ -465,7 +465,7 @@ MonoBehaviour: m_BeforeTransparentBundles: [] m_BeforeStackBundles: [] m_AfterStackBundles: [] ---- !u!114 &8452980845336696311 +--- !u!114 &6005229055677503837 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -474,9 +474,10 @@ MonoBehaviour: m_GameObject: {fileID: 100002} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 68871f0bc5fb742138947ad4c5e73f7d, type: 3} + m_Script: {fileID: 11500000, guid: ef2c6204ab3bb40a6afb21bd364dbadc, type: 3} m_Name: m_EditorClassIdentifier: + distortionMat: {fileID: 0} --- !u!1 &1340499340313870 GameObject: m_ObjectHideFlags: 0