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

letterbox both in editor and in fullscreen

Browse source
This commit is contained in:
minenice55 2022-06-13 22:13:36 -04:00
parent ec2ab4932a
commit f5c2562a02
4 changed files with 230 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
Assets/Resources/Fonts/rodin/FOT-Rodin Pro B SDF Dynamic.asset
View file

File diff suppressed because one or more lines are too long

188
Assets/Scenes/Editor.unity
View file

@ -1104,6 +1104,57 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 58431083}
m_CullTransparentMesh: 1
--- !u!1 &89978021
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 89978023}
- component: {fileID: 89978022}
m_Layer: 0
m_Name: LetterboxFullscreen
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!114 &89978022
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 89978021}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e188ee899633d0b49870a5ae38b7359d, type: 3}
m_Name:
m_EditorClassIdentifier:
ratio: {x: 16, y: 9}
forceRatioOnAwake: 1
listenForWindowChanges: 1
createCameraForLetterBoxRendering: 0
findCamerasAutomatically: 1
letterBoxCameraColor: {r: 0, g: 0, b: 0, a: 1}
cameras: []
letterBoxCamera: {fileID: 1186982022}
--- !u!4 &89978023
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 89978021}
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: 0}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &93132552
GameObject:
m_ObjectHideFlags: 0
@ -9615,9 +9666,9 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 5, y: -5}
m_AnchoredPosition: {x: 26, y: -26.000122}
m_SizeDelta: {x: 42, y: 42}
m_Pivot: {x: 0, y: 1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &781200687
MonoBehaviour:
m_ObjectHideFlags: 0
@ -9670,8 +9721,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
GameTitlePreview: {fileID: 0}
GridGameSelector: {fileID: 1154875947}
MainTex: {fileID: 0}
MaskTex: {fileID: 0}
BgTex: {fileID: 0}
--- !u!114 &781200690
MonoBehaviour:
m_ObjectHideFlags: 0
@ -13410,6 +13461,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
SelectedMinigame:
SelectedGameIcon: {fileID: 0}
GameEventSelector: {fileID: 1056099131}
EventRef: {fileID: 1149103344}
CurrentSelected: {fileID: 841081095}
@ -13593,6 +13645,80 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1182082593}
m_CullTransparentMesh: 1
--- !u!1 &1186982020
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1186982023}
- component: {fileID: 1186982022}
m_Layer: 0
m_Name: LetterboxBgCam
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!20 &1186982022
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1186982020}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 5
m_Depth: -100
m_CullingMask:
serializedVersion: 2
m_Bits: 0
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!4 &1186982023
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1186982020}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1196204502
GameObject:
m_ObjectHideFlags: 0
@ -15418,6 +15544,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
MainCanvas: {fileID: 1791483802}
EditorCamera: {fileID: 2047408675}
EditorLetterbox: {fileID: 1733325622}
GameLetterbox: {fileID: 89978021}
ScreenRenderTexture: {fileID: 8400000, guid: d3f3d6ca32122da4d9e3a8e7aa2ede16, type: 2}
Screen: {fileID: 558010761}
GridGameSelector: {fileID: 1154875943}
@ -18634,6 +18762,60 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1709317942}
m_CullTransparentMesh: 1
--- !u!1 &1733325622
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1733325624}
- component: {fileID: 1733325623}
m_Layer: 0
m_Name: LetterboxEditor
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1733325623
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1733325622}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e188ee899633d0b49870a5ae38b7359d, type: 3}
m_Name:
m_EditorClassIdentifier:
ratio: {x: 16, y: 9}
forceRatioOnAwake: 1
listenForWindowChanges: 1
createCameraForLetterBoxRendering: 0
findCamerasAutomatically: 0
letterBoxCameraColor: {r: 0, g: 0, b: 0, a: 1}
cameras:
- camera: {fileID: 2047408675}
anchor: 0
vectorAnchor: {x: 0.5, y: 0.5}
letterBoxCamera: {fileID: 1186982022}
--- !u!4 &1733325624
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1733325622}
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: 0}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1747099761
GameObject:
m_ObjectHideFlags: 0

9
Assets/Scripts/LevelEditor/Editor.cs
View file

@ -28,6 +28,9 @@ namespace HeavenStudio.Editor
[SerializeField] private Canvas MainCanvas;
[SerializeField] public Camera EditorCamera;
[SerializeField] public GameObject EditorLetterbox;
[SerializeField] public GameObject GameLetterbox;
[Header("Rect")]
[SerializeField] private RenderTexture ScreenRenderTexture;
[SerializeField] private RawImage Screen;
@ -438,6 +441,9 @@ namespace HeavenStudio.Editor
{
if (fullscreen == false)
{
EditorLetterbox.SetActive(false);
GameLetterbox.SetActive(true);
MainCanvas.enabled = false;
EditorCamera.enabled = false;
GameCamera.instance.camera.targetTexture = null;
@ -453,6 +459,9 @@ namespace HeavenStudio.Editor
GameManager.instance.CursorCam.enabled = true;
GameManager.instance.OverlayCamera.targetTexture = ScreenRenderTexture;
fullscreen = false;
EditorLetterbox.SetActive(true);
GameLetterbox.SetActive(false);
}
}

3
Assets/Scripts/LevelEditor/EventSelector/GridGameSelectorGame.cs
View file

@ -37,9 +37,9 @@ namespace HeavenStudio.Editor
GridGameSelector.SelectGame(this.gameObject.name, this.transform.GetSiblingIndex());
}
//TODO: animate between shapes
public void ClickIcon()
{
// GetComponent<Canvas>().sortingOrder = 1501;
transform.DOScale(new Vector3(1.15f, 1.15f, 1f), 0.1f);
BgTex = Resources.Load<Texture>($"Sprites/GeneralPurpose/Circle");
SetupTextures();
@ -47,7 +47,6 @@ namespace HeavenStudio.Editor
public void UnClickIcon()
{
// GetComponent<Canvas>().sortingOrder = 1500;
transform.DOScale(new Vector3(1f, 1f, 1f), 0.1f);
BgTex = Resources.Load<Texture>($"Sprites/GeneralPurpose/Square");
SetupTextures();