xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

Added TweenThreadVec3. Updated UI elements to use new textures and fonts. Gameplay UI WIP #380

Merged
maverickdgg merged 6 commits from SP3-20-UI-System into main 2023-03-02 12:46:12 +08:00
Conversation 0 Commits 6 Files Changed 194 +112 -48
47 changed files with 112 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9dd01f5fa1 - Show all commits

2
Assets/Materials/UI/Instruction_01.shmat
View File

@ -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}

2
Assets/Materials/UI/Instruction_02.shmat
View File

@ -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}

2
Assets/Materials/UI/Instruction_03.shmat
View File

@ -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}

2
Assets/Materials/UI/Instruction_04.shmat
View File

@ -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}

8
Assets/Materials/UIMat_Credits.shmat Normal file
View File

@ -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}

3
Assets/Materials/UIMat_Credits.shmat.shmeta Normal file
View File

@ -0,0 +1,3 @@
Name: UIMat_Credits
ID: 120332672
Type: 7

96
Assets/Scenes/MainMenu.shade
View File

@ -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

BIN
Assets/Texture/UI/Credits/Credits_Placeholder.dds Normal file
View File

Binary file not shown.

BIN
Assets/Texture/UI/Credits/Credits_Placeholder.shtex Normal file
View File

Binary file not shown.

3
Assets/Texture/UI/Credits/Credits_Placeholder.shtex.shmeta Normal file
View File

@ -0,0 +1,3 @@
Name: Credits_Placeholder
ID: 59379300
Type: 3

BIN
Assets/Texture/UI/Gameplay/GameplayUI_Multiplier.dds Normal file
View File

Binary file not shown.

BIN
Assets/Texture/UI/Gameplay/GameplayUI_Timer.dds Normal file
View File

Binary file not shown.

BIN
Assets/Texture/UI/Gameplay/GameplayUU_Timer.dds Normal file
View File

Binary file not shown.

BIN
Assets/Texture/UI/How To Play/HowToPlay_Button_Default.dds Normal file
View File

Binary file not shown.

BIN
Assets/Texture/UI/How To Play/HowToPlay_Button_Default.shtex Normal file
View File

Binary file not shown.

3
Assets/Texture/UI/How To Play/HowToPlay_Button_Default.shtex.shmeta Normal file
View File

@ -0,0 +1,3 @@
Name: HowToPlay_Button_Default
ID: 55358401
Type: 3

BIN
Assets/Texture/UI/How To Play/HowToPlay_Button_Hover.dds Normal file
View File

Binary file not shown.

BIN
Assets/Texture/UI/How To Play/HowToPlay_Button_Hover.shtex Normal file
View File

Binary file not shown.

3
Assets/Texture/UI/How To Play/HowToPlay_Button_Hover.shtex.shmeta Normal file
View File

@ -0,0 +1,3 @@
Name: HowToPlay_Button_Hover
ID: 59400474
Type: 3

BIN
Assets/Texture/UI/How To Play/HowToPlay_Button_Pressed.dds Normal file
View File

Binary file not shown.

BIN
Assets/Texture/UI/How To Play/HowToPlay_Button_Pressed.shtex Normal file
View File

Binary file not shown.

3
Assets/Texture/UI/How To Play/HowToPlay_Button_Pressed.shtex.shmeta Normal file
View File

@ -0,0 +1,3 @@
Name: HowToPlay_Button_Pressed
ID: 52333376
Type: 3

BIN
Assets/Texture/UI/How To Play/HowToPlay_Screen_1.dds Normal file
View File

Binary file not shown.

BIN
Assets/Texture/UI/How To Play/HowToPlay_Screen_1.shtex Normal file
View File

Binary file not shown.

3
Assets/Texture/UI/How To Play/HowToPlay_Screen_1.shtex.shmeta Normal file
View File

@ -0,0 +1,3 @@
Name: HowToPlay_Screen_1
ID: 52834559
Type: 3

BIN
Assets/Texture/UI/How To Play/HowToPlay_Screen_2.dds Normal file
View File

Binary file not shown.

BIN
Assets/Texture/UI/How To Play/HowToPlay_Screen_2.shtex Normal file
View File

Binary file not shown.

3
Assets/Texture/UI/How To Play/HowToPlay_Screen_2.shtex.shmeta Normal file
View File

@ -0,0 +1,3 @@
Name: HowToPlay_Screen_2
ID: 60762613
Type: 3

BIN
Assets/Texture/UI/How To Play/HowToPlay_Screen_3.dds Normal file
View File

Binary file not shown.

BIN
Assets/Texture/UI/How To Play/HowToPlay_Screen_3.shtex Normal file
View File

Binary file not shown.

3
Assets/Texture/UI/How To Play/HowToPlay_Screen_3.shtex.shmeta Normal file
View File

@ -0,0 +1,3 @@
Name: HowToPlay_Screen_3
ID: 53309226
Type: 3

BIN
Assets/Texture/UI/How To Play/HowToPlay_Screen_4.dds Normal file
View File

Binary file not shown.

BIN
Assets/Texture/UI/How To Play/HowToPlay_Screen_4.shtex Normal file
View File

Binary file not shown.

3
Assets/Texture/UI/How To Play/HowToPlay_Screen_4.shtex.shmeta Normal file
View File

@ -0,0 +1,3 @@
Name: HowToPlay_Screen_4
ID: 63002526
Type: 3

BIN
Assets/Texture/UI/TX_WK10_HowToPlay_01.dds
View File

Binary file not shown.

BIN
Assets/Texture/UI/TX_WK10_HowToPlay_01.shtex
View File

Binary file not shown.

3
Assets/Texture/UI/TX_WK10_HowToPlay_01.shtex.shmeta
View File

@ -1,3 +0,0 @@
Name: TX_WK10_HowToPlay_01
ID: 62200943
Type: 3

BIN
Assets/Texture/UI/TX_WK10_HowToPlay_02.dds
View File

Binary file not shown.

BIN
Assets/Texture/UI/TX_WK10_HowToPlay_02.shtex
View File

Binary file not shown.

3
Assets/Texture/UI/TX_WK10_HowToPlay_02.shtex.shmeta
View File

@ -1,3 +0,0 @@
Name: TX_WK10_HowToPlay_02
ID: 53303669
Type: 3

BIN
Assets/Texture/UI/TX_WK10_HowToPlay_03.dds
View File

Binary file not shown.

BIN
Assets/Texture/UI/TX_WK10_HowToPlay_03.shtex
View File

Binary file not shown.

3
Assets/Texture/UI/TX_WK10_HowToPlay_03.shtex.shmeta
View File

@ -1,3 +0,0 @@
Name: TX_WK10_HowToPlay_03
ID: 61780097
Type: 3

BIN
Assets/Texture/UI/TX_WK10_HowToPlay_04.dds
View File

Binary file not shown.

BIN
Assets/Texture/UI/TX_WK10_HowToPlay_04.shtex
View File

Binary file not shown.

3
Assets/Texture/UI/TX_WK10_HowToPlay_04.shtex.shmeta
View File

@ -1,3 +0,0 @@
Name: TX_WK10_HowToPlay_04
ID: 59178524
Type: 3

9
SHADE_Engine/src/UI/SHUISystem.cpp
View File

@ -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)