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

Added UI functionality to the Graphics System #232

Merged
Xenosas1337 merged 40 commits from UI_Integration into main 2022-11-20 15:43:34 +08:00
Conversation 0 Commits 40 Files Changed 86 +8 -2
6 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4eb5fa64e0 - Show all commits

BIN
Assets/Editor/Fonts/MaterialIcons-Regular.shfont
View File

Binary file not shown.

BIN
Assets/Editor/Fonts/fa-solid-900.shfont
View File

Binary file not shown.

0
Assets/Editor/Fonts/Segoe UI.shfont → Assets/Fonts/SegoeUI.shfont
View File

2
Assets/Shaders/Text_VS.glsl
View File

@ -55,7 +55,7 @@ vec2 CreateQuad(in uint vertexID)
void main() void main()
{ {
// write EID data to FS // write EID data to FS
Out2.eid = testPushConstats.eid; Out2.eid = testPushConstant.eid;
// local variable for font index // local variable for font index
uint fontIndex = glyphIndex; uint fontIndex = glyphIndex;

BIN
Assets/Shaders/Text_VS.shshaderb
View File

Binary file not shown.

8
SHADE_Engine/src/Assets/SHAssetManager.cpp
View File

@ -349,7 +349,13 @@ namespace SHADE
auto const ext{ path.extension().string() }; auto const ext{ path.extension().string() };
if (ext == GLSL_EXTENSION.data()) if (ext == GLSL_EXTENSION.data())
{ {
newPath = SHShaderSourceCompiler::LoadAndCompileShader(path).value(); auto value { SHShaderSourceCompiler::LoadAndCompileShader(path) };
if (!value.has_value())
{
SHLOG_ERROR("Shader compile failed: {}", path.string());
return;
}
newPath = value.value();
} }
else if (ext == GLTF_EXTENSION.data() || ext == FBX_EXTENSION.data()) else if (ext == GLTF_EXTENSION.data() || ext == FBX_EXTENSION.data())
{ {