Merge branch 'Test-for-letterbox'
This commit is contained in:
commit
9c4e9e8545
|
|
@ -20174,7 +20174,7 @@ MonoBehaviour:
|
||||||
m_TargetGraphic: {fileID: 1589389272}
|
m_TargetGraphic: {fileID: 1589389272}
|
||||||
m_HandleRect: {fileID: 1589389271}
|
m_HandleRect: {fileID: 1589389271}
|
||||||
m_Direction: 2
|
m_Direction: 2
|
||||||
m_Value: 0
|
m_Value: 1
|
||||||
m_Size: 1
|
m_Size: 1
|
||||||
m_NumberOfSteps: 0
|
m_NumberOfSteps: 0
|
||||||
m_OnValueChanged:
|
m_OnValueChanged:
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,6 @@ namespace HeavenStudio
|
||||||
[SerializeField] GameObject letterboxBgGO;
|
[SerializeField] GameObject letterboxBgGO;
|
||||||
[SerializeField] RectTransform letterboxMask;
|
[SerializeField] RectTransform letterboxMask;
|
||||||
[SerializeField] RawImage viewportTexture;
|
[SerializeField] RawImage viewportTexture;
|
||||||
//[SerializeField] RawImage overlayTexture;
|
|
||||||
|
|
||||||
public static StaticCamera instance { get; private set; }
|
public static StaticCamera instance { get; private set; }
|
||||||
public new Camera camera;
|
public new Camera camera;
|
||||||
|
|
@ -137,7 +136,6 @@ namespace HeavenStudio
|
||||||
|
|
||||||
canvas.localPosition = pan;
|
canvas.localPosition = pan;
|
||||||
canvas.eulerAngles = new Vector3(0, 0, rotation);
|
canvas.eulerAngles = new Vector3(0, 0, rotation);
|
||||||
//letterboxMask.localScale = letterbox;
|
|
||||||
if(fitToScreen)
|
if(fitToScreen)
|
||||||
{
|
{
|
||||||
letterboxMask.localScale = new Vector3(parentView.sizeDelta.x/16, parentView.sizeDelta.y/9, 1);
|
letterboxMask.localScale = new Vector3(parentView.sizeDelta.x/16, parentView.sizeDelta.y/9, 1);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue