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

fixed it, letterbox scale no longer exists but thats good

Browse source
This commit is contained in:
Firerise9402 2023-08-21 13:17:56 -04:00
parent 3310b77e18
commit 95c989d3b7
10 changed files with 70 additions and 26 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/GameTex.renderTexture
View file

@ -14,8 +14,8 @@ RenderTexture:
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 5
m_Width: 1728
m_Height: 972
m_Width: 1521
m_Height: 793
m_AntiAliasing: 2
m_MipCount: -1
m_DepthStencilFormat: 92
@ -23,7 +23,7 @@ RenderTexture:
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 1
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_TextureSettings:

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

31
Assets/Scenes/Editor.unity
View file

@ -1673,6 +1673,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
@ -13310,7 +13315,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 704039020}
m_Direction: 0
m_Value: 0
m_Size: 0.10518809
m_Size: 0.10518808
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@ -13790,6 +13795,10 @@ PrefabInstance:
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
@ -13826,10 +13835,18 @@ PrefabInstance:
propertyPath: letterboxMask
value:
objectReference: {fileID: 2105509201}
- 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: 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
@ -13902,6 +13919,14 @@ PrefabInstance:
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
@ -20125,7 +20150,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1589389272}
m_HandleRect: {fileID: 1589389271}
m_Direction: 2
m_Value: 1
m_Value: 0
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
@ -24823,7 +24848,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: 103.92639}
m_AnchoredPosition: {x: 0, y: 117.31038}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &1154875944

4
Assets/Scripts/AppInfo.cs
View file

@ -1,8 +1,8 @@
using System;
public static class AppInfo {
public const string Version = "0.0.982";
public static readonly DateTime Date = new DateTime(2023, 08, 19, 19, 24, 59, 372, DateTimeKind.Utc);
public const string Version = "0.0.983";
public static readonly DateTime Date = new DateTime(2023, 08, 21, 17, 14, 36, 304, DateTimeKind.Utc);
}

22
Assets/Scripts/StaticCamera.cs
View file

@ -16,8 +16,8 @@ namespace HeavenStudio
{
[SerializeField] RectTransform canvas;
[SerializeField] GameObject overlayView;
[SerializeField] RectTransform overlayCanvas;
[SerializeField] RectTransform parentView;
[SerializeField] UnityEngine.UI.CanvasScaler parent;
[SerializeField] Image ambientBg;
[SerializeField] GameObject ambientBgGO;
@ -134,16 +134,20 @@ namespace HeavenStudio
UpdateTilePan();
UpdateScreenTile();
if(fitToScreen) parent.screenMatchMode = CanvasScaler.ScreenMatchMode.MatchWidthOrHeight;
else if (!fitToScreen) parent.screenMatchMode = CanvasScaler.ScreenMatchMode.Expand;
canvas.localPosition = pan;
canvas.eulerAngles = new Vector3(0, 0, rotation);
letterboxMask.localScale = letterbox;
scaleInv = scale;
scaleInv.x /= letterbox.x;
scaleInv.y /= letterbox.y;
scaleInv.z /= letterbox.z;
canvas.localScale = scaleInv;
//letterboxMask.localScale = letterbox;
if(fitToScreen)
{
letterboxMask.localScale = new Vector3(parentView.sizeDelta.x/16, parentView.sizeDelta.y/9, 1);
overlayCanvas.localScale = new Vector3(parentView.sizeDelta.x/16, parentView.sizeDelta.y/9, 1);
}
else
{
letterboxMask.localScale = new Vector3(1, 1, 1);
overlayCanvas.localScale = new Vector3(1, 1, 1);
}
canvas.localScale = scale;
viewportTexture.uvRect = new Rect(tilePan.x, tilePan.y, screenTile.x, screenTile.y);
}

6
ProjectSettings/ProjectSettings.asset
View file

@ -134,7 +134,7 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
bundleVersion: 0.0.982
bundleVersion: 0.0.983
preloadedAssets:
- {fileID: 102900000, guid: 5348c08b82446e0478cee8bda6c02cfc, type: 3}
metroInputSource: 0
@ -158,11 +158,11 @@ PlayerSettings:
applicationIdentifier:
Standalone: com.RHeavenStudio.Heaven-Studio
buildNumber:
Standalone: 982
Standalone: 983
iPhone: 0
tvOS: 0
overrideDefaultApplicationIdentifier: 0
AndroidBundleVersionCode: 982
AndroidBundleVersionCode: 983
AndroidMinSdkVersion: 22
AndroidTargetSdkVersion: 0
AndroidPreferredInstallLocation: 1