diff --git a/Assets/Materials/UI/Instruction_01.shmat b/Assets/Materials/UI/Instruction_01.shmat index bbcb6352..4dc449f7 100644 --- a/Assets/Materials/UI/Instruction_01.shmat +++ b/Assets/Materials/UI/Instruction_01.shmat @@ -3,6 +3,6 @@ SubPass: UI Properties: data.color: {x: 1, y: 1, z: 1, w: 1} - data.textureIndex: 62200943 + data.textureIndex: 52834559 data.alpha: 1 data.beta: {x: 1, y: 1, z: 1} \ No newline at end of file diff --git a/Assets/Materials/UI/Instruction_02.shmat b/Assets/Materials/UI/Instruction_02.shmat index 3084049a..d5947130 100644 --- a/Assets/Materials/UI/Instruction_02.shmat +++ b/Assets/Materials/UI/Instruction_02.shmat @@ -3,6 +3,6 @@ SubPass: UI Properties: data.color: {x: 1, y: 1, z: 1, w: 1} - data.textureIndex: 53303669 + data.textureIndex: 60762613 data.alpha: 1 data.beta: {x: 1, y: 1, z: 1} \ No newline at end of file diff --git a/Assets/Materials/UI/Instruction_03.shmat b/Assets/Materials/UI/Instruction_03.shmat index b548319f..9dd722c0 100644 --- a/Assets/Materials/UI/Instruction_03.shmat +++ b/Assets/Materials/UI/Instruction_03.shmat @@ -3,6 +3,6 @@ SubPass: UI Properties: data.color: {x: 1, y: 1, z: 1, w: 1} - data.textureIndex: 61780097 + data.textureIndex: 53309226 data.alpha: 1 data.beta: {x: 1, y: 1, z: 1} \ No newline at end of file diff --git a/Assets/Materials/UI/Instruction_04.shmat b/Assets/Materials/UI/Instruction_04.shmat index dba0a45d..430ee860 100644 --- a/Assets/Materials/UI/Instruction_04.shmat +++ b/Assets/Materials/UI/Instruction_04.shmat @@ -3,6 +3,6 @@ SubPass: UI Properties: data.color: {x: 1, y: 1, z: 1, w: 1} - data.textureIndex: 59178524 + data.textureIndex: 63002526 data.alpha: 1 data.beta: {x: 1, y: 1, z: 1} \ No newline at end of file diff --git a/Assets/Materials/UIMat_Credits.shmat b/Assets/Materials/UIMat_Credits.shmat new file mode 100644 index 00000000..4c5f5a74 --- /dev/null +++ b/Assets/Materials/UIMat_Credits.shmat @@ -0,0 +1,8 @@ +- VertexShader: 46580970 + FragmentShader: 35983630 + SubPass: UI + Properties: + data.color: {x: 1, y: 1, z: 1, w: 1} + data.textureIndex: 59379300 + data.alpha: 1 + data.beta: {x: 1, y: 1, z: 1} \ No newline at end of file diff --git a/Assets/Materials/UIMat_Credits.shmat.shmeta b/Assets/Materials/UIMat_Credits.shmat.shmeta new file mode 100644 index 00000000..9ee55eef --- /dev/null +++ b/Assets/Materials/UIMat_Credits.shmat.shmeta @@ -0,0 +1,3 @@ +Name: UIMat_Credits +ID: 120332672 +Type: 7 diff --git a/Assets/Scenes/MainMenu.shade b/Assets/Scenes/MainMenu.shade index 3eee8d33..e3642472 100644 --- a/Assets/Scenes/MainMenu.shade +++ b/Assets/Scenes/MainMenu.shade @@ -405,16 +405,16 @@ Transform Component: Translate: {x: 800, y: 0, z: 0} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 100, y: 100, z: 1} + Scale: {x: 100, y: 382, z: 1} IsActive: true Renderable Component: Mesh: 141771688 Material: 129340704 IsActive: true Button Component: - Default Texture: 0 - Hovered Texture: 0 - Clicked Texture: 0 + Default Texture: 55358401 + Hovered Texture: 59400474 + Clicked Texture: 52333376 IsActive: true UI Component: Canvas ID: 13 @@ -426,6 +426,14 @@ Enabled: true isNext: true multiImageList: 15 + - Type: SHADE_Scripting.UI.ButtonFX + Enabled: true + onHoverEnterSound: event:/Music/player_undetected + onHoverExitSound: event:/Music/player_undetected + onClickSound: event:/Music/player_undetected + onReleaseSound: event:/Music/player_undetected + hoverScale: 1.10000002 + clickScale: 0.899999976 - EID: 17 Name: PrevButton IsActive: true @@ -433,17 +441,17 @@ Components: Transform Component: Translate: {x: -800, y: 0, z: 0} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 100, y: 100, z: 1} + Rotate: {x: 0, y: 0, z: 3.14159274} + Scale: {x: 100, y: 382, z: 1} IsActive: true Renderable Component: Mesh: 141771688 Material: 129340704 IsActive: true Button Component: - Default Texture: 0 - Hovered Texture: 0 - Clicked Texture: 0 + Default Texture: 55358401 + Hovered Texture: 59400474 + Clicked Texture: 52333376 IsActive: true UI Component: Canvas ID: 13 @@ -455,6 +463,14 @@ Enabled: true isNext: false multiImageList: 15 + - Type: SHADE_Scripting.UI.ButtonFX + Enabled: true + onHoverEnterSound: event:/Music/player_undetected + onHoverExitSound: event:/Music/player_undetected + onClickSound: event:/Music/player_undetected + onReleaseSound: event:/Music/player_undetected + hoverScale: 1.10000002 + clickScale: 0.899999976 - EID: 18 Name: BackButton IsActive: true @@ -462,7 +478,7 @@ Components: Transform Component: Translate: {x: -800, y: 450, z: 0} - Rotate: {x: 0, y: 0, z: 0} + Rotate: {x: 0, y: 0, z: 3.14159274} Scale: {x: 100, y: 100, z: 1} IsActive: true Renderable Component: @@ -470,9 +486,9 @@ Material: 129340704 IsActive: true Button Component: - Default Texture: 0 - Hovered Texture: 0 - Clicked Texture: 0 + Default Texture: 55358401 + Hovered Texture: 59400474 + Clicked Texture: 52333376 IsActive: true UI Component: Canvas ID: 13 @@ -483,6 +499,22 @@ - Type: SHADE_Scripting.UI.ChangeCanvasButton Enabled: true canvasToActivate: 0 + - Type: SHADE_Scripting.UI.ButtonFX + Enabled: true + onHoverEnterSound: event:/Music/player_undetected + onHoverExitSound: event:/Music/player_undetected + onClickSound: event:/Music/player_undetected + onReleaseSound: event:/Music/player_undetected + hoverScale: 1.10000002 + clickScale: 0.899999976 + - Type: SHADE_Scripting.UI.ButtonFX + Enabled: true + onHoverEnterSound: event:/Music/player_undetected + onHoverExitSound: event:/Music/player_undetected + onClickSound: event:/Music/player_undetected + onReleaseSound: event:/Music/player_undetected + hoverScale: 1.10000002 + clickScale: 0.899999976 - EID: 19 Name: Options Canvas IsActive: false @@ -521,7 +553,7 @@ Components: Transform Component: Translate: {x: -800, y: 450, z: 0} - Rotate: {x: 0, y: 0, z: 0} + Rotate: {x: 0, y: 0, z: 3.14159274} Scale: {x: 100, y: 100, z: 1} IsActive: true Renderable Component: @@ -529,9 +561,9 @@ Material: 129340704 IsActive: true Button Component: - Default Texture: 0 - Hovered Texture: 0 - Clicked Texture: 0 + Default Texture: 55358401 + Hovered Texture: 59400474 + Clicked Texture: 52333376 IsActive: true UI Component: Canvas ID: 19 @@ -1051,23 +1083,23 @@ Scripts: ~ - EID: 47 Name: BackGround - IsActive: false + IsActive: true NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 0, y: 0, z: 1} + Translate: {x: 0, y: -3800, z: 0.100000001} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1920, y: 1080, z: 1} - IsActive: false + Scale: {x: 1920, y: 8026, z: 1} + IsActive: true Renderable Component: Mesh: 141771688 - Material: 121834459 - IsActive: false + Material: 120332672 + IsActive: true UI Component: Canvas ID: 46 Hovered: false Clicked: false - IsActive: false + IsActive: true Scripts: ~ - EID: 48 Name: BackButton @@ -1076,7 +1108,7 @@ Components: Transform Component: Translate: {x: -800, y: 450, z: 0} - Rotate: {x: 0, y: 0, z: 0} + Rotate: {x: 0, y: 0, z: 3.14159274} Scale: {x: 100, y: 100, z: 1} IsActive: true Renderable Component: @@ -1084,9 +1116,9 @@ Material: 129340704 IsActive: true Button Component: - Default Texture: 0 - Hovered Texture: 0 - Clicked Texture: 0 + Default Texture: 55358401 + Hovered Texture: 59400474 + Clicked Texture: 52333376 IsActive: true UI Component: Canvas ID: 46 @@ -1155,7 +1187,7 @@ Components: Transform Component: Translate: {x: -800, y: 450, z: 0} - Rotate: {x: 0, y: 0, z: 0} + Rotate: {x: 0, y: 0, z: 3.14159274} Scale: {x: 100, y: 100, z: 1} IsActive: true Renderable Component: @@ -1163,9 +1195,9 @@ Material: 129340704 IsActive: true Button Component: - Default Texture: 0 - Hovered Texture: 0 - Clicked Texture: 0 + Default Texture: 55358401 + Hovered Texture: 59400474 + Clicked Texture: 52333376 IsActive: true UI Component: Canvas ID: 50 diff --git a/Assets/Texture/UI/Credits/Credits_Placeholder.dds b/Assets/Texture/UI/Credits/Credits_Placeholder.dds new file mode 100644 index 00000000..65b7c0b6 Binary files /dev/null and b/Assets/Texture/UI/Credits/Credits_Placeholder.dds differ diff --git a/Assets/Texture/UI/Credits/Credits_Placeholder.shtex b/Assets/Texture/UI/Credits/Credits_Placeholder.shtex new file mode 100644 index 00000000..39fbc4ee Binary files /dev/null and b/Assets/Texture/UI/Credits/Credits_Placeholder.shtex differ diff --git a/Assets/Texture/UI/Credits/Credits_Placeholder.shtex.shmeta b/Assets/Texture/UI/Credits/Credits_Placeholder.shtex.shmeta new file mode 100644 index 00000000..80b9d641 --- /dev/null +++ b/Assets/Texture/UI/Credits/Credits_Placeholder.shtex.shmeta @@ -0,0 +1,3 @@ +Name: Credits_Placeholder +ID: 59379300 +Type: 3 diff --git a/Assets/Texture/UI/Gameplay/GameplayUI_Multiplier.dds b/Assets/Texture/UI/Gameplay/GameplayUI_Multiplier.dds new file mode 100644 index 00000000..661ad4ef Binary files /dev/null and b/Assets/Texture/UI/Gameplay/GameplayUI_Multiplier.dds differ diff --git a/Assets/Texture/UI/Gameplay/GameplayUI_Timer.dds b/Assets/Texture/UI/Gameplay/GameplayUI_Timer.dds new file mode 100644 index 00000000..d0fe1168 Binary files /dev/null and b/Assets/Texture/UI/Gameplay/GameplayUI_Timer.dds differ diff --git a/Assets/Texture/UI/Gameplay/GameplayUU_Timer.dds b/Assets/Texture/UI/Gameplay/GameplayUU_Timer.dds new file mode 100644 index 00000000..77c9dd8a Binary files /dev/null and b/Assets/Texture/UI/Gameplay/GameplayUU_Timer.dds differ diff --git a/Assets/Texture/UI/How To Play/HowToPlay_Button_Default.dds b/Assets/Texture/UI/How To Play/HowToPlay_Button_Default.dds new file mode 100644 index 00000000..32d7f52a Binary files /dev/null and b/Assets/Texture/UI/How To Play/HowToPlay_Button_Default.dds differ diff --git a/Assets/Texture/UI/How To Play/HowToPlay_Button_Default.shtex b/Assets/Texture/UI/How To Play/HowToPlay_Button_Default.shtex new file mode 100644 index 00000000..0739128b Binary files /dev/null and b/Assets/Texture/UI/How To Play/HowToPlay_Button_Default.shtex differ diff --git a/Assets/Texture/UI/How To Play/HowToPlay_Button_Default.shtex.shmeta b/Assets/Texture/UI/How To Play/HowToPlay_Button_Default.shtex.shmeta new file mode 100644 index 00000000..03c44b88 --- /dev/null +++ b/Assets/Texture/UI/How To Play/HowToPlay_Button_Default.shtex.shmeta @@ -0,0 +1,3 @@ +Name: HowToPlay_Button_Default +ID: 55358401 +Type: 3 diff --git a/Assets/Texture/UI/How To Play/HowToPlay_Button_Hover.dds b/Assets/Texture/UI/How To Play/HowToPlay_Button_Hover.dds new file mode 100644 index 00000000..506960e6 Binary files /dev/null and b/Assets/Texture/UI/How To Play/HowToPlay_Button_Hover.dds differ diff --git a/Assets/Texture/UI/How To Play/HowToPlay_Button_Hover.shtex b/Assets/Texture/UI/How To Play/HowToPlay_Button_Hover.shtex new file mode 100644 index 00000000..39458cef Binary files /dev/null and b/Assets/Texture/UI/How To Play/HowToPlay_Button_Hover.shtex differ diff --git a/Assets/Texture/UI/How To Play/HowToPlay_Button_Hover.shtex.shmeta b/Assets/Texture/UI/How To Play/HowToPlay_Button_Hover.shtex.shmeta new file mode 100644 index 00000000..d460ea30 --- /dev/null +++ b/Assets/Texture/UI/How To Play/HowToPlay_Button_Hover.shtex.shmeta @@ -0,0 +1,3 @@ +Name: HowToPlay_Button_Hover +ID: 59400474 +Type: 3 diff --git a/Assets/Texture/UI/How To Play/HowToPlay_Button_Pressed.dds b/Assets/Texture/UI/How To Play/HowToPlay_Button_Pressed.dds new file mode 100644 index 00000000..5dc6ae51 Binary files /dev/null and b/Assets/Texture/UI/How To Play/HowToPlay_Button_Pressed.dds differ diff --git a/Assets/Texture/UI/How To Play/HowToPlay_Button_Pressed.shtex b/Assets/Texture/UI/How To Play/HowToPlay_Button_Pressed.shtex new file mode 100644 index 00000000..f9aca00a Binary files /dev/null and b/Assets/Texture/UI/How To Play/HowToPlay_Button_Pressed.shtex differ diff --git a/Assets/Texture/UI/How To Play/HowToPlay_Button_Pressed.shtex.shmeta b/Assets/Texture/UI/How To Play/HowToPlay_Button_Pressed.shtex.shmeta new file mode 100644 index 00000000..85a3b84e --- /dev/null +++ b/Assets/Texture/UI/How To Play/HowToPlay_Button_Pressed.shtex.shmeta @@ -0,0 +1,3 @@ +Name: HowToPlay_Button_Pressed +ID: 52333376 +Type: 3 diff --git a/Assets/Texture/UI/How To Play/HowToPlay_Screen_1.dds b/Assets/Texture/UI/How To Play/HowToPlay_Screen_1.dds new file mode 100644 index 00000000..2b6108ee Binary files /dev/null and b/Assets/Texture/UI/How To Play/HowToPlay_Screen_1.dds differ diff --git a/Assets/Texture/UI/How To Play/HowToPlay_Screen_1.shtex b/Assets/Texture/UI/How To Play/HowToPlay_Screen_1.shtex new file mode 100644 index 00000000..80d1b498 Binary files /dev/null and b/Assets/Texture/UI/How To Play/HowToPlay_Screen_1.shtex differ diff --git a/Assets/Texture/UI/How To Play/HowToPlay_Screen_1.shtex.shmeta b/Assets/Texture/UI/How To Play/HowToPlay_Screen_1.shtex.shmeta new file mode 100644 index 00000000..2c8ad4fa --- /dev/null +++ b/Assets/Texture/UI/How To Play/HowToPlay_Screen_1.shtex.shmeta @@ -0,0 +1,3 @@ +Name: HowToPlay_Screen_1 +ID: 52834559 +Type: 3 diff --git a/Assets/Texture/UI/How To Play/HowToPlay_Screen_2.dds b/Assets/Texture/UI/How To Play/HowToPlay_Screen_2.dds new file mode 100644 index 00000000..6b4af404 Binary files /dev/null and b/Assets/Texture/UI/How To Play/HowToPlay_Screen_2.dds differ diff --git a/Assets/Texture/UI/How To Play/HowToPlay_Screen_2.shtex b/Assets/Texture/UI/How To Play/HowToPlay_Screen_2.shtex new file mode 100644 index 00000000..a1354654 Binary files /dev/null and b/Assets/Texture/UI/How To Play/HowToPlay_Screen_2.shtex differ diff --git a/Assets/Texture/UI/How To Play/HowToPlay_Screen_2.shtex.shmeta b/Assets/Texture/UI/How To Play/HowToPlay_Screen_2.shtex.shmeta new file mode 100644 index 00000000..8bacb413 --- /dev/null +++ b/Assets/Texture/UI/How To Play/HowToPlay_Screen_2.shtex.shmeta @@ -0,0 +1,3 @@ +Name: HowToPlay_Screen_2 +ID: 60762613 +Type: 3 diff --git a/Assets/Texture/UI/How To Play/HowToPlay_Screen_3.dds b/Assets/Texture/UI/How To Play/HowToPlay_Screen_3.dds new file mode 100644 index 00000000..d7b333bd Binary files /dev/null and b/Assets/Texture/UI/How To Play/HowToPlay_Screen_3.dds differ diff --git a/Assets/Texture/UI/How To Play/HowToPlay_Screen_3.shtex b/Assets/Texture/UI/How To Play/HowToPlay_Screen_3.shtex new file mode 100644 index 00000000..943f41e5 Binary files /dev/null and b/Assets/Texture/UI/How To Play/HowToPlay_Screen_3.shtex differ diff --git a/Assets/Texture/UI/How To Play/HowToPlay_Screen_3.shtex.shmeta b/Assets/Texture/UI/How To Play/HowToPlay_Screen_3.shtex.shmeta new file mode 100644 index 00000000..320cbba1 --- /dev/null +++ b/Assets/Texture/UI/How To Play/HowToPlay_Screen_3.shtex.shmeta @@ -0,0 +1,3 @@ +Name: HowToPlay_Screen_3 +ID: 53309226 +Type: 3 diff --git a/Assets/Texture/UI/How To Play/HowToPlay_Screen_4.dds b/Assets/Texture/UI/How To Play/HowToPlay_Screen_4.dds new file mode 100644 index 00000000..b2c3f5d7 Binary files /dev/null and b/Assets/Texture/UI/How To Play/HowToPlay_Screen_4.dds differ diff --git a/Assets/Texture/UI/How To Play/HowToPlay_Screen_4.shtex b/Assets/Texture/UI/How To Play/HowToPlay_Screen_4.shtex new file mode 100644 index 00000000..0e334b25 Binary files /dev/null and b/Assets/Texture/UI/How To Play/HowToPlay_Screen_4.shtex differ diff --git a/Assets/Texture/UI/How To Play/HowToPlay_Screen_4.shtex.shmeta b/Assets/Texture/UI/How To Play/HowToPlay_Screen_4.shtex.shmeta new file mode 100644 index 00000000..cde9bacb --- /dev/null +++ b/Assets/Texture/UI/How To Play/HowToPlay_Screen_4.shtex.shmeta @@ -0,0 +1,3 @@ +Name: HowToPlay_Screen_4 +ID: 63002526 +Type: 3 diff --git a/Assets/Texture/UI/TX_WK10_HowToPlay_01.dds b/Assets/Texture/UI/TX_WK10_HowToPlay_01.dds deleted file mode 100644 index cc1d68b6..00000000 Binary files a/Assets/Texture/UI/TX_WK10_HowToPlay_01.dds and /dev/null differ diff --git a/Assets/Texture/UI/TX_WK10_HowToPlay_01.shtex b/Assets/Texture/UI/TX_WK10_HowToPlay_01.shtex deleted file mode 100644 index 061d84c8..00000000 Binary files a/Assets/Texture/UI/TX_WK10_HowToPlay_01.shtex and /dev/null differ diff --git a/Assets/Texture/UI/TX_WK10_HowToPlay_01.shtex.shmeta b/Assets/Texture/UI/TX_WK10_HowToPlay_01.shtex.shmeta deleted file mode 100644 index fcd72302..00000000 --- a/Assets/Texture/UI/TX_WK10_HowToPlay_01.shtex.shmeta +++ /dev/null @@ -1,3 +0,0 @@ -Name: TX_WK10_HowToPlay_01 -ID: 62200943 -Type: 3 diff --git a/Assets/Texture/UI/TX_WK10_HowToPlay_02.dds b/Assets/Texture/UI/TX_WK10_HowToPlay_02.dds deleted file mode 100644 index 38ea5b30..00000000 Binary files a/Assets/Texture/UI/TX_WK10_HowToPlay_02.dds and /dev/null differ diff --git a/Assets/Texture/UI/TX_WK10_HowToPlay_02.shtex b/Assets/Texture/UI/TX_WK10_HowToPlay_02.shtex deleted file mode 100644 index 3fa62e86..00000000 Binary files a/Assets/Texture/UI/TX_WK10_HowToPlay_02.shtex and /dev/null differ diff --git a/Assets/Texture/UI/TX_WK10_HowToPlay_02.shtex.shmeta b/Assets/Texture/UI/TX_WK10_HowToPlay_02.shtex.shmeta deleted file mode 100644 index 56e9b58a..00000000 --- a/Assets/Texture/UI/TX_WK10_HowToPlay_02.shtex.shmeta +++ /dev/null @@ -1,3 +0,0 @@ -Name: TX_WK10_HowToPlay_02 -ID: 53303669 -Type: 3 diff --git a/Assets/Texture/UI/TX_WK10_HowToPlay_03.dds b/Assets/Texture/UI/TX_WK10_HowToPlay_03.dds deleted file mode 100644 index ac8adee9..00000000 Binary files a/Assets/Texture/UI/TX_WK10_HowToPlay_03.dds and /dev/null differ diff --git a/Assets/Texture/UI/TX_WK10_HowToPlay_03.shtex b/Assets/Texture/UI/TX_WK10_HowToPlay_03.shtex deleted file mode 100644 index 826d87b2..00000000 Binary files a/Assets/Texture/UI/TX_WK10_HowToPlay_03.shtex and /dev/null differ diff --git a/Assets/Texture/UI/TX_WK10_HowToPlay_03.shtex.shmeta b/Assets/Texture/UI/TX_WK10_HowToPlay_03.shtex.shmeta deleted file mode 100644 index c190e6d8..00000000 --- a/Assets/Texture/UI/TX_WK10_HowToPlay_03.shtex.shmeta +++ /dev/null @@ -1,3 +0,0 @@ -Name: TX_WK10_HowToPlay_03 -ID: 61780097 -Type: 3 diff --git a/Assets/Texture/UI/TX_WK10_HowToPlay_04.dds b/Assets/Texture/UI/TX_WK10_HowToPlay_04.dds deleted file mode 100644 index 66298f3a..00000000 Binary files a/Assets/Texture/UI/TX_WK10_HowToPlay_04.dds and /dev/null differ diff --git a/Assets/Texture/UI/TX_WK10_HowToPlay_04.shtex b/Assets/Texture/UI/TX_WK10_HowToPlay_04.shtex deleted file mode 100644 index 3d6504b1..00000000 Binary files a/Assets/Texture/UI/TX_WK10_HowToPlay_04.shtex and /dev/null differ diff --git a/Assets/Texture/UI/TX_WK10_HowToPlay_04.shtex.shmeta b/Assets/Texture/UI/TX_WK10_HowToPlay_04.shtex.shmeta deleted file mode 100644 index df21f174..00000000 --- a/Assets/Texture/UI/TX_WK10_HowToPlay_04.shtex.shmeta +++ /dev/null @@ -1,3 +0,0 @@ -Name: TX_WK10_HowToPlay_04 -ID: 59178524 -Type: 3 diff --git a/SHADE_Engine/src/UI/SHUISystem.cpp b/SHADE_Engine/src/UI/SHUISystem.cpp index 87a6552d..16cf88aa 100644 --- a/SHADE_Engine/src/UI/SHUISystem.cpp +++ b/SHADE_Engine/src/UI/SHUISystem.cpp @@ -190,6 +190,15 @@ namespace SHADE SHVec2 camSize{ cameraSystem->GetCameraWidthHeight(0) }; //SHLOG_INFO("TopExtent: {}, {}", topExtent.x, topExtent.y) + if (topExtent.y < btmExtent.y) + { + SHVec2 temp = topExtent; + topExtent = btmExtent; + btmExtent = temp; + + } + + topExtent = CanvasToScreenPoint(topExtent, true); btmExtent = CanvasToScreenPoint(btmExtent, true); //SHLOG_INFO("TopExtent: {}, {} Btm Extent: {}, {}", topExtent.x, topExtent.y, btmExtent.x, btmExtent.y)