From 2b452ab4d82195d203239ac140841d3855f7ad46 Mon Sep 17 00:00:00 2001 From: Jenny Crowe Date: Sat, 12 Feb 2022 09:57:45 -0700 Subject: [PATCH] Rhythm Rally: Utilizing rendertextures to preserve main camera qualities between games --- Assets/Materials.meta | 8 + Assets/Materials/3DGameRenderTex.mat | 125 +++++++++++ Assets/Materials/3DGameRenderTex.mat.meta | 8 + .../Materials/3DGameRenderTex.renderTexture | 38 ++++ .../3DGameRenderTex.renderTexture.meta | 8 + Assets/Resources/Games/rhythmRally.prefab | 197 +++++++++++++++--- Assets/Resources/Prefabs/Cameras.prefab | 2 +- .../Scripts/Games/RhythmRally/RhythmRally.cs | 10 +- ProjectSettings/TagManager.asset | 2 +- 9 files changed, 358 insertions(+), 40 deletions(-) create mode 100644 Assets/Materials.meta create mode 100644 Assets/Materials/3DGameRenderTex.mat create mode 100644 Assets/Materials/3DGameRenderTex.mat.meta create mode 100644 Assets/Materials/3DGameRenderTex.renderTexture create mode 100644 Assets/Materials/3DGameRenderTex.renderTexture.meta diff --git a/Assets/Materials.meta b/Assets/Materials.meta new file mode 100644 index 00000000..d222ae4e --- /dev/null +++ b/Assets/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 165d4b56fe9ccaf46a0b0d10cb425b1f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/3DGameRenderTex.mat b/Assets/Materials/3DGameRenderTex.mat new file mode 100644 index 00000000..61ddd6eb --- /dev/null +++ b/Assets/Materials/3DGameRenderTex.mat @@ -0,0 +1,125 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 3DGameRenderTex + m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 8400000, guid: 34ad849a7863186428ae52d94f70e5b8, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 8400000, guid: 34ad849a7863186428ae52d94f70e5b8, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SampleGI: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &7115608494913881147 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 4 diff --git a/Assets/Materials/3DGameRenderTex.mat.meta b/Assets/Materials/3DGameRenderTex.mat.meta new file mode 100644 index 00000000..dda8ad52 --- /dev/null +++ b/Assets/Materials/3DGameRenderTex.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eca7c3841d223b040bb1d6cb52dd8564 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/3DGameRenderTex.renderTexture b/Assets/Materials/3DGameRenderTex.renderTexture new file mode 100644 index 00000000..5bcfd691 --- /dev/null +++ b/Assets/Materials/3DGameRenderTex.renderTexture @@ -0,0 +1,38 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 3DGameRenderTex + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_IsAlphaChannelOptional: 0 + serializedVersion: 3 + m_Width: 1920 + m_Height: 1080 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthFormat: 2 + m_ColorFormat: 8 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 diff --git a/Assets/Materials/3DGameRenderTex.renderTexture.meta b/Assets/Materials/3DGameRenderTex.renderTexture.meta new file mode 100644 index 00000000..e406a31d --- /dev/null +++ b/Assets/Materials/3DGameRenderTex.renderTexture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 34ad849a7863186428ae52d94f70e5b8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Games/rhythmRally.prefab b/Assets/Resources/Games/rhythmRally.prefab index 91ed99c0..cfd7fbe5 100644 --- a/Assets/Resources/Games/rhythmRally.prefab +++ b/Assets/Resources/Games/rhythmRally.prefab @@ -1,5 +1,42 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &469210912253486127 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4631944531018638297} + m_Layer: 0 + m_Name: Game + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4631944531018638297 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 469210912253486127} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -10, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6509993024069972873} + - {fileID: 3078425781313688086} + - {fileID: 4228713593463920381} + - {fileID: 4959957736091286558} + - {fileID: 1845910055258765698} + - {fileID: 3001474442492713424} + - {fileID: 2651138408829433753} + m_Father: {fileID: 3337760827311893485} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &513601240051193262 GameObject: m_ObjectHideFlags: 0 @@ -24,14 +61,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 513601240051193262} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: - {fileID: 8175507810436109978} - {fileID: 8145851341164007221} - {fileID: 5184658146293876446} - m_Father: {fileID: 3337760827311893485} + m_Father: {fileID: 4631944531018638297} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &6371738825610660614 @@ -81,12 +118,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1668061868608559892} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0, y: 0.834, z: 1.933} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.834, z: 1.933} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_Children: - {fileID: 7059330671292263157} - m_Father: {fileID: 3337760827311893485} + m_Father: {fileID: 4631944531018638297} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1621474196642630351 @@ -175,11 +212,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1844272066746215056} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.66, y: 0.66, z: 1} m_Children: [] - m_Father: {fileID: 3337760827311893485} + m_Father: {fileID: 4631944531018638297} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1429261158168197235 @@ -230,7 +267,7 @@ SpriteRenderer: m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!1 &1871413452992259420 @@ -315,6 +352,102 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &2034480636994138272 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 743597382397742394} + - component: {fileID: 7685415152932937369} + - component: {fileID: 5323844124406337437} + - component: {fileID: 1795449076279258878} + m_Layer: 9 + m_Name: RenderQuad + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &743597382397742394 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2034480636994138272} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 19.2, y: 10.8, z: 1} + m_Children: [] + m_Father: {fileID: 3337760827311893485} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &7685415152932937369 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2034480636994138272} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &5323844124406337437 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2034480636994138272} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: eca7c3841d223b040bb1d6cb52dd8564, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &1795449076279258878 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2034480636994138272} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &2081744100163324485 GameObject: m_ObjectHideFlags: 0 @@ -434,13 +567,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3112497704503559489} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: - {fileID: 7291063904195614871} - {fileID: 397144130134918796} - m_Father: {fileID: 3337760827311893485} + m_Father: {fileID: 4631944531018638297} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3340141389927785323 @@ -599,7 +732,7 @@ GameObject: - component: {fileID: 6268063764140376526} - component: {fileID: 4166003395478435209} m_Layer: 0 - m_Name: CameraPos + m_Name: RallyCam m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -616,7 +749,7 @@ Transform: m_LocalPosition: {x: -1.86, y: 2.2, z: -3.9} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3337760827311893485} + m_Father: {fileID: 4631944531018638297} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 20.97, y: 27.3, z: 0} --- !u!20 &6268063764140376526 @@ -626,7 +759,7 @@ Camera: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4052947733920485538} - m_Enabled: 0 + m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} @@ -650,9 +783,9 @@ Camera: m_Depth: 0 m_CullingMask: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 23 m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} + m_TargetTexture: {fileID: 8400000, guid: 34ad849a7863186428ae52d94f70e5b8, type: 2} m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 1 @@ -981,13 +1114,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 6509993024069972873} - - {fileID: 3078425781313688086} - - {fileID: 4228713593463920381} - - {fileID: 4959957736091286558} - - {fileID: 1845910055258765698} - - {fileID: 3001474442492713424} - - {fileID: 2651138408829433753} + - {fileID: 743597382397742394} + - {fileID: 4631944531018638297} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1005,6 +1133,7 @@ MonoBehaviour: m_EditorClassIdentifier: EligibleHits: [] firstEnable: 0 + renderQuadTrans: {fileID: 743597382397742394} cameraPos: {fileID: 6509993024069972873} ball: {fileID: 1668061868608559892} curve3D: {fileID: 6371738825610660614} @@ -1087,16 +1216,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cebeb8610d89fb34688750080a285ddb, type: 3} ---- !u!1 &1065418898597387318 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: cebeb8610d89fb34688750080a285ddb, type: 3} - m_PrefabInstance: {fileID: 146447278275535207} - m_PrefabAsset: {fileID: 0} --- !u!4 &397144130134918796 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: cebeb8610d89fb34688750080a285ddb, type: 3} m_PrefabInstance: {fileID: 146447278275535207} m_PrefabAsset: {fileID: 0} +--- !u!1 &1065418898597387318 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: cebeb8610d89fb34688750080a285ddb, type: 3} + m_PrefabInstance: {fileID: 146447278275535207} + m_PrefabAsset: {fileID: 0} --- !u!95 &4559734961269837672 Animator: serializedVersion: 3 @@ -1121,7 +1250,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 3337760827311893485} + m_TransformParent: {fileID: 4631944531018638297} m_Modifications: - target: {fileID: -8679921383154817045, guid: 8103cc38c4670444aa1d4d4cc3a0be68, type: 3} propertyPath: m_RootOrder @@ -1157,7 +1286,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 8103cc38c4670444aa1d4d4cc3a0be68, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 8103cc38c4670444aa1d4d4cc3a0be68, type: 3} propertyPath: m_LocalRotation.y @@ -1165,7 +1294,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 8103cc38c4670444aa1d4d4cc3a0be68, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 8103cc38c4670444aa1d4d4cc3a0be68, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1199,7 +1328,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 3337760827311893485} + m_TransformParent: {fileID: 4631944531018638297} m_Modifications: - target: {fileID: -8679921383154817045, guid: 11e67fcf8c072044eb96c34e94477a0f, type: 3} propertyPath: m_RootOrder @@ -1223,15 +1352,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 11e67fcf8c072044eb96c34e94477a0f, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 11e67fcf8c072044eb96c34e94477a0f, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 11e67fcf8c072044eb96c34e94477a0f, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 11e67fcf8c072044eb96c34e94477a0f, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/Resources/Prefabs/Cameras.prefab b/Assets/Resources/Prefabs/Cameras.prefab index ac87d839..a88cd868 100644 --- a/Assets/Resources/Prefabs/Cameras.prefab +++ b/Assets/Resources/Prefabs/Cameras.prefab @@ -174,7 +174,7 @@ Camera: m_Depth: -1 m_CullingMask: serializedVersion: 2 - m_Bits: 23 + m_Bits: 535 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 diff --git a/Assets/Scripts/Games/RhythmRally/RhythmRally.cs b/Assets/Scripts/Games/RhythmRally/RhythmRally.cs index eaa00d4e..221dddbf 100644 --- a/Assets/Scripts/Games/RhythmRally/RhythmRally.cs +++ b/Assets/Scripts/Games/RhythmRally/RhythmRally.cs @@ -7,6 +7,8 @@ namespace RhythmHeavenMania.Games.RhythmRally { public class RhythmRally : Minigame { + public Transform renderQuadTrans; + public Transform cameraPos; public GameObject ball; @@ -27,10 +29,10 @@ namespace RhythmHeavenMania.Games.RhythmRally // Start is called before the first frame update void Start() { - GameCamera.instance.camera.transform.position = cameraPos.position; - GameCamera.instance.camera.transform.rotation = cameraPos.rotation; - GameCamera.instance.camera.fieldOfView = 41f; - GameCamera.instance.camera.backgroundColor = Color.white; + var cam = GameCamera.instance.camera; + var camHeight = 2f * cam.orthographicSize; + var camWidth = camHeight * cam.aspect; + renderQuadTrans.localScale = new Vector3(camWidth, camHeight, 1f); playerAnim.Play("Idle", 0, 0); opponentAnim.Play("Idle", 0, 0); diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 45a1eae3..97e3188f 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -14,7 +14,7 @@ TagManager: - Debug - EventBlocks - EventProperties - - + - RenderTextures - - -