mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'Test-for-letterbox'

Browse source
This commit is contained in:
Firerise9402 2023-08-24 11:55:20 -04:00
parent c9c2f23cb8 90d09eebd8
commit c24a9ec418
7 changed files with 76 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Assets/Materials/3DGameRenderTex.mat
View file

@ -2,14 +2,15 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: 3DGameRenderTex
m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
@ -75,6 +76,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AlphaClip: 0
- _Blend: 0

5
Assets/Materials/3DGameRenderTex.renderTexture
View file

@ -13,12 +13,12 @@ RenderTexture:
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 3
serializedVersion: 5
m_Width: 1920
m_Height: 1080
m_AntiAliasing: 1
m_MipCount: -1
m_DepthFormat: 2
m_DepthStencilFormat: 92
m_ColorFormat: 8
m_MipMap: 0
m_GenerateMips: 1
@ -36,3 +36,4 @@ RenderTexture:
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
m_ShadowSamplingMode: 2

5
Assets/Resources/Prefabs/GameView/CamerasEditor.prefab
View file

@ -90,9 +90,14 @@ MonoBehaviour:
m_EditorClassIdentifier:
canvas: {fileID: 1535126665250126034}
overlayView: {fileID: 2482900817612876218}
parentView: {fileID: 0}
parent: {fileID: 0}
ambientBg: {fileID: 5129120947114944961}
ambientBgGO: {fileID: 269805006432045765}
letterboxBgGO: {fileID: 3741076794236313655}
letterboxMask: {fileID: 0}
viewportTexture: {fileID: 0}
gameRenderTexture: {fileID: 0}
camera: {fileID: 378821074852065722}
--- !u!1 &269805006432045765
GameObject:

5
Assets/Resources/Prefabs/GameView/CamerasGame.prefab
View file

@ -227,9 +227,14 @@ MonoBehaviour:
m_EditorClassIdentifier:
canvas: {fileID: 1168123228960484818}
overlayView: {fileID: 2814421364062256314}
parentView: {fileID: 0}
parent: {fileID: 0}
ambientBg: {fileID: 4779885053979786433}
ambientBgGO: {fileID: 487891016983371717}
letterboxBgGO: {fileID: 3931965693507761463}
letterboxMask: {fileID: 0}
viewportTexture: {fileID: 0}
gameRenderTexture: {fileID: 0}
camera: {fileID: 16338400879174842}
--- !u!1 &487891016983371717
GameObject:

6
Assets/Resources/Prefabs/GameView/OverlayTexMaterial.mat
View file

@ -2,14 +2,15 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: OverlayTexMaterial
m_Shader: {fileID: 4800000, guid: 0596a6838d78f624397b642817cf20bc, type: 3}
m_ShaderKeywords:
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
@ -55,6 +56,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _ColorMask: 15

55
Assets/Scenes/Editor.unity
View file

@ -1700,6 +1700,11 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 58525995}
m_CullTransparentMesh: 1
--- !u!224 &66970446 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8512930684284350359, guid: 720073bc7682b1441bece7116681f72c, type: 3}
m_PrefabInstance: {fileID: 631525709}
m_PrefabAsset: {fileID: 0}
--- !u!1 &73172994
GameObject:
m_ObjectHideFlags: 0
@ -13801,6 +13806,30 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 198071653306764931, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 198071653306764931, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: m_PixelPerfect
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1535126665250126034, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: m_SizeDelta.x
value: 16
objectReference: {fileID: 0}
- target: {fileID: 1535126665250126034, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: m_SizeDelta.y
value: 9
objectReference: {fileID: 0}
- target: {fileID: 1535126665250126034, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1535126665250126034, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3558106557710386107, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: m_BlockingMask.m_Bits
value: 0
@ -13825,10 +13854,22 @@ PrefabInstance:
propertyPath: overlayCanvas
value:
objectReference: {fileID: 496671}
- target: {fileID: 4035854539513523048, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: overlayCanvas
value:
objectReference: {fileID: 66970446}
- target: {fileID: 4035854539513523048, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: viewportTexture
value:
objectReference: {fileID: 22565105}
objectReference: {fileID: 1638236456}
- target: {fileID: 4035854539513523048, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: gameRenderTexture
value:
objectReference: {fileID: 8400000, guid: da1c23fc8a9167c438d0d771189a6157, type: 2}
- target: {fileID: 4500092555783399993, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: m_ScreenMatchMode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4820152107260776423, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: m_RaycastTarget
value: 0
@ -13893,6 +13934,18 @@ PrefabInstance:
propertyPath: m_RaycastTarget
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8925473620302868482, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: m_SizeDelta.x
value: 16
objectReference: {fileID: 0}
- target: {fileID: 8925473620302868482, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8925473620302868482, guid: 720073bc7682b1441bece7116681f72c, type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 720073bc7682b1441bece7116681f72c, type: 3}
--- !u!1 &631525710 stripped

1
Assets/Scripts/StaticCamera.cs
View file

@ -24,6 +24,7 @@ namespace HeavenStudio
[SerializeField] GameObject letterboxBgGO;
[SerializeField] RectTransform letterboxMask;
[SerializeField] RawImage viewportTexture;
//[SerializeField] RawImage overlayTexture;
public static StaticCamera instance { get; private set; }
public new Camera camera;