Skip to content

Commit

Permalink
New Shader Compiler
Browse files Browse the repository at this point in the history
  • Loading branch information
@AzadKshitij
AzadKshitij committed Jul 9, 2021
1 parent ea36db4 commit aa01815
Show file tree
Hide file tree
Showing 38 changed files with 1,416 additions and 491 deletions.
4 changes: 4 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ bin-int/
**/bin/
**/bin-int/

# Directories
Triger/vendor/VulkanSDK
Tridor/assets/cache
scripts/__pycache__

# Files
*.user
Expand Down
21 changes: 21 additions & 0 deletions .vscode/c_cpp_properties.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"configurations": [
{
"name": "Win32",
"includePath": [
"${workspaceFolder}/**"
],
"defines": [
"_DEBUG",
"UNICODE",
"_UNICODE"
],
"windowsSdkVersion": "10.0.16299.0",
"compilerPath": "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.29.30037/bin/Hostx64/x64/cl.exe",
"cStandard": "c17",
"cppStandard": "c++17",
"intelliSenseMode": "windows-msvc-x64"
}
],
"version": 4
}
83 changes: 83 additions & 0 deletions .vscode/settings.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
{
"files.associations": {
"algorithm": "cpp",
"array": "cpp",
"atomic": "cpp",
"bit": "cpp",
"cctype": "cpp",
"charconv": "cpp",
"chrono": "cpp",
"clocale": "cpp",
"cmath": "cpp",
"compare": "cpp",
"concepts": "cpp",
"condition_variable": "cpp",
"cstdarg": "cpp",
"cstddef": "cpp",
"cstdint": "cpp",
"cstdio": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cwchar": "cpp",
"deque": "cpp",
"exception": "cpp",
"format": "cpp",
"forward_list": "cpp",
"fstream": "cpp",
"functional": "cpp",
"initializer_list": "cpp",
"iomanip": "cpp",
"ios": "cpp",
"iosfwd": "cpp",
"iostream": "cpp",
"istream": "cpp",
"iterator": "cpp",
"limits": "cpp",
"list": "cpp",
"locale": "cpp",
"map": "cpp",
"memory": "cpp",
"mutex": "cpp",
"new": "cpp",
"optional": "cpp",
"ostream": "cpp",
"queue": "cpp",
"random": "cpp",
"ratio": "cpp",
"regex": "cpp",
"set": "cpp",
"sstream": "cpp",
"stack": "cpp",
"stdexcept": "cpp",
"stop_token": "cpp",
"streambuf": "cpp",
"string": "cpp",
"system_error": "cpp",
"thread": "cpp",
"tuple": "cpp",
"type_traits": "cpp",
"typeinfo": "cpp",
"unordered_map": "cpp",
"unordered_set": "cpp",
"utility": "cpp",
"variant": "cpp",
"vector": "cpp",
"xfacet": "cpp",
"xhash": "cpp",
"xiosbase": "cpp",
"xlocale": "cpp",
"xlocbuf": "cpp",
"xlocinfo": "cpp",
"xlocmes": "cpp",
"xlocmon": "cpp",
"xlocnum": "cpp",
"xloctime": "cpp",
"xmemory": "cpp",
"xstddef": "cpp",
"xstring": "cpp",
"xtr1common": "cpp",
"xtree": "cpp",
"xutility": "cpp"
}
}
35 changes: 35 additions & 0 deletions Dependencies.lua
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@

-- Triger Dependencies

VULKAN_SDK = os.getenv("VULKAN_SDK")

IncludeDir = {}
IncludeDir["stb_image"] = "%{wks.location}/Triger/vendor/stb_image"
IncludeDir["yaml_cpp"] = "%{wks.location}/Triger/vendor/yaml-cpp/include"
IncludeDir["GLFW"] = "%{wks.location}/Triger/vendor/GLFW/include"
IncludeDir["Glad"] = "%{wks.location}/Triger/vendor/Glad/include"
IncludeDir["ImGui"] = "%{wks.location}/Triger/vendor/ImGui"
IncludeDir["ImGuizmo"] = "%{wks.location}/Triger/vendor/ImGuizmo"
IncludeDir["glm"] = "%{wks.location}/Triger/vendor/glm"
IncludeDir["entt"] = "%{wks.location}/Triger/vendor/entt/include"
IncludeDir["shaderc"] = "%{wks.location}/Triger/vendor/shaderc/include"
IncludeDir["SPIRV_Cross"] = "%{wks.location}/Triger/vendor/SPIRV-Cross"
IncludeDir["VulkanSDK"] = "%{VULKAN_SDK}/Include"

LibraryDir = {}

LibraryDir["VulkanSDK"] = "%{VULKAN_SDK}/Lib"
LibraryDir["VulkanSDK_Debug"] = "%{wks.location}/Triger/vendor/VulkanSDK/Lib"

Library = {}
Library["Vulkan"] = "%{LibraryDir.VulkanSDK}/vulkan-1.lib"
Library["VulkanUtils"] = "%{LibraryDir.VulkanSDK}/VkLayer_utils.lib"

Library["ShaderC_Debug"] = "%{LibraryDir.VulkanSDK_Debug}/shaderc_sharedd.lib"
Library["SPIRV_Cross_Debug"] = "%{LibraryDir.VulkanSDK_Debug}/spirv-cross-cored.lib"
Library["SPIRV_Cross_GLSL_Debug"] = "%{LibraryDir.VulkanSDK_Debug}/spirv-cross-glsld.lib"
Library["SPIRV_Tools_Debug"] = "%{LibraryDir.VulkanSDK_Debug}/SPIRV-Toolsd.lib"

Library["ShaderC_Release"] = "%{LibraryDir.VulkanSDK}/shaderc_shared.lib"
Library["SPIRV_Cross_Release"] = "%{LibraryDir.VulkanSDK}/spirv-cross-core.lib"
Library["SPIRV_Cross_GLSL_Release"] = "%{LibraryDir.VulkanSDK}/spirv-cross-glsl.lib"
117 changes: 65 additions & 52 deletions Tridor/assets/Shaders/Texture.glsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//--------------------------------------------------------------------------*/// Basic Texture Shader

#type vertex
#version 450
#version 450 core

layout(location = 0) in vec3 a_Position;
layout(location = 1) in vec4 a_Color;
Expand All @@ -18,75 +18,88 @@ layout(location = 3) in float a_TexIndex;
layout(location = 4) in float a_TilingFactor;
layout(location = 5) in int a_EntityID;

uniform mat4 u_ViewProjection;
layout(std140, binding = 0) uniform Camera
{
mat4 u_ViewProjection;
};

struct VertexOutput
{
vec4 Color;
vec2 TexCoord;
float TexIndex;
float TilingFactor;
};

out vec4 v_Color;
out vec2 v_TexCoord;
out flat float v_TexIndex;
out float v_TilingFactor;
out flat int v_EntityID;
layout (location = 0) out VertexOutput Output;
layout (location = 4) out flat int v_EntityID;

void main()
{
v_Color = a_Color;
v_TexCoord = a_TexCoord;
v_TexIndex = a_TexIndex;
v_TilingFactor = a_TilingFactor;
Output.Color = a_Color;
Output.TexCoord = a_TexCoord;
Output.TexIndex = a_TexIndex;
Output.TilingFactor = a_TilingFactor;
v_EntityID = a_EntityID;
gl_Position = u_ViewProjection * vec4(a_Position, 1.0);
}

#type fragment
#version 450
#version 450 core

layout(location = 0) out vec4 color;
layout(location = 1) out int color2;

in vec4 v_Color;
in vec2 v_TexCoord;
in flat float v_TexIndex;
in float v_TilingFactor;
in flat int v_EntityID;
struct VertexOutput
{
vec4 Color;
vec2 TexCoord;
float TexIndex;
float TilingFactor;
};

layout (location = 0) in VertexOutput Input;
layout (location = 4) in flat int v_EntityID;

uniform sampler2D u_Textures[32];
layout (binding = 0) uniform sampler2D u_Textures[32];

void main()
{
vec4 texColor = v_Color;
switch(int(v_TexIndex))
vec4 texColor = Input.Color;
switch(int(Input.TexIndex))
{
case 0: texColor *= texture(u_Textures[ 0], v_TexCoord * v_TilingFactor); break;
case 1: texColor *= texture(u_Textures[ 1], v_TexCoord * v_TilingFactor); break;
case 2: texColor *= texture(u_Textures[ 2], v_TexCoord * v_TilingFactor); break;
case 3: texColor *= texture(u_Textures[ 3], v_TexCoord * v_TilingFactor); break;
case 4: texColor *= texture(u_Textures[ 4], v_TexCoord * v_TilingFactor); break;
case 5: texColor *= texture(u_Textures[ 5], v_TexCoord * v_TilingFactor); break;
case 6: texColor *= texture(u_Textures[ 6], v_TexCoord * v_TilingFactor); break;
case 7: texColor *= texture(u_Textures[ 7], v_TexCoord * v_TilingFactor); break;
case 8: texColor *= texture(u_Textures[ 8], v_TexCoord * v_TilingFactor); break;
case 9: texColor *= texture(u_Textures[ 9], v_TexCoord * v_TilingFactor); break;
case 10: texColor *= texture(u_Textures[10], v_TexCoord * v_TilingFactor); break;
case 11: texColor *= texture(u_Textures[11], v_TexCoord * v_TilingFactor); break;
case 12: texColor *= texture(u_Textures[12], v_TexCoord * v_TilingFactor); break;
case 13: texColor *= texture(u_Textures[13], v_TexCoord * v_TilingFactor); break;
case 14: texColor *= texture(u_Textures[14], v_TexCoord * v_TilingFactor); break;
case 15: texColor *= texture(u_Textures[15], v_TexCoord * v_TilingFactor); break;
case 16: texColor *= texture(u_Textures[16], v_TexCoord * v_TilingFactor); break;
case 17: texColor *= texture(u_Textures[17], v_TexCoord * v_TilingFactor); break;
case 18: texColor *= texture(u_Textures[18], v_TexCoord * v_TilingFactor); break;
case 19: texColor *= texture(u_Textures[19], v_TexCoord * v_TilingFactor); break;
case 20: texColor *= texture(u_Textures[20], v_TexCoord * v_TilingFactor); break;
case 21: texColor *= texture(u_Textures[21], v_TexCoord * v_TilingFactor); break;
case 22: texColor *= texture(u_Textures[22], v_TexCoord * v_TilingFactor); break;
case 23: texColor *= texture(u_Textures[23], v_TexCoord * v_TilingFactor); break;
case 24: texColor *= texture(u_Textures[24], v_TexCoord * v_TilingFactor); break;
case 25: texColor *= texture(u_Textures[25], v_TexCoord * v_TilingFactor); break;
case 26: texColor *= texture(u_Textures[26], v_TexCoord * v_TilingFactor); break;
case 27: texColor *= texture(u_Textures[27], v_TexCoord * v_TilingFactor); break;
case 28: texColor *= texture(u_Textures[28], v_TexCoord * v_TilingFactor); break;
case 29: texColor *= texture(u_Textures[29], v_TexCoord * v_TilingFactor); break;
case 30: texColor *= texture(u_Textures[30], v_TexCoord * v_TilingFactor); break;
case 31: texColor *= texture(u_Textures[31], v_TexCoord * v_TilingFactor); break;
case 0: texColor *= texture(u_Textures[ 0], Input.TexCoord * Input.TilingFactor); break;
case 1: texColor *= texture(u_Textures[ 1], Input.TexCoord * Input.TilingFactor); break;
case 2: texColor *= texture(u_Textures[ 2], Input.TexCoord * Input.TilingFactor); break;
case 3: texColor *= texture(u_Textures[ 3], Input.TexCoord * Input.TilingFactor); break;
case 4: texColor *= texture(u_Textures[ 4], Input.TexCoord * Input.TilingFactor); break;
case 5: texColor *= texture(u_Textures[ 5], Input.TexCoord * Input.TilingFactor); break;
case 6: texColor *= texture(u_Textures[ 6], Input.TexCoord * Input.TilingFactor); break;
case 7: texColor *= texture(u_Textures[ 7], Input.TexCoord * Input.TilingFactor); break;
case 8: texColor *= texture(u_Textures[ 8], Input.TexCoord * Input.TilingFactor); break;
case 9: texColor *= texture(u_Textures[ 9], Input.TexCoord * Input.TilingFactor); break;
case 10: texColor *= texture(u_Textures[10], Input.TexCoord * Input.TilingFactor); break;
case 11: texColor *= texture(u_Textures[11], Input.TexCoord * Input.TilingFactor); break;
case 12: texColor *= texture(u_Textures[12], Input.TexCoord * Input.TilingFactor); break;
case 13: texColor *= texture(u_Textures[13], Input.TexCoord * Input.TilingFactor); break;
case 14: texColor *= texture(u_Textures[14], Input.TexCoord * Input.TilingFactor); break;
case 15: texColor *= texture(u_Textures[15], Input.TexCoord * Input.TilingFactor); break;
case 16: texColor *= texture(u_Textures[16], Input.TexCoord * Input.TilingFactor); break;
case 17: texColor *= texture(u_Textures[17], Input.TexCoord * Input.TilingFactor); break;
case 18: texColor *= texture(u_Textures[18], Input.TexCoord * Input.TilingFactor); break;
case 19: texColor *= texture(u_Textures[19], Input.TexCoord * Input.TilingFactor); break;
case 20: texColor *= texture(u_Textures[20], Input.TexCoord * Input.TilingFactor); break;
case 21: texColor *= texture(u_Textures[21], Input.TexCoord * Input.TilingFactor); break;
case 22: texColor *= texture(u_Textures[22], Input.TexCoord * Input.TilingFactor); break;
case 23: texColor *= texture(u_Textures[23], Input.TexCoord * Input.TilingFactor); break;
case 24: texColor *= texture(u_Textures[24], Input.TexCoord * Input.TilingFactor); break;
case 25: texColor *= texture(u_Textures[25], Input.TexCoord * Input.TilingFactor); break;
case 26: texColor *= texture(u_Textures[26], Input.TexCoord * Input.TilingFactor); break;
case 27: texColor *= texture(u_Textures[27], Input.TexCoord * Input.TilingFactor); break;
case 28: texColor *= texture(u_Textures[28], Input.TexCoord * Input.TilingFactor); break;
case 29: texColor *= texture(u_Textures[29], Input.TexCoord * Input.TilingFactor); break;
case 30: texColor *= texture(u_Textures[30], Input.TexCoord * Input.TilingFactor); break;
case 31: texColor *= texture(u_Textures[31], Input.TexCoord * Input.TilingFactor); break;
}
color = texColor;

Expand Down
2 changes: 1 addition & 1 deletion Tridor/imgui.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Collapsed=0
DockId=0x0000000A,0

[Docking][Data]
DockSpace ID=0x3BC79352 Window=0x4647B76E Pos=380,186 Size=1280,695 Split=X Selected=0x1C33C293
DockSpace ID=0x3BC79352 Window=0x4647B76E Pos=137,191 Size=1280,695 Split=X Selected=0x1C33C293
DockNode ID=0x00000005 Parent=0x3BC79352 SizeRef=771,994 Split=X
DockNode ID=0x00000001 Parent=0x00000005 SizeRef=298,701 Selected=0x1C33C293
DockNode ID=0x00000003 Parent=0x00000005 SizeRef=980,701 Split=X Selected=0x995B0CF8
Expand Down
2 changes: 1 addition & 1 deletion Tridor/premake5.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ project "Tridor"
kind "ConsoleApp"
language "C++"
cppdialect "C++17"
staticruntime "on"
staticruntime "off"

targetdir ("%{wks.location}/bin/" .. outputdir .. "/%{prj.name}")
objdir ("%{wks.location}/bin-int/" .. outputdir .. "/%{prj.name}")
Expand Down
22 changes: 15 additions & 7 deletions Tridor/src/EditorLayer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,14 @@ namespace Triger

m_ActiveScene = CreateRef<Scene>();

auto commandLineArgs = Application::Get().GetCommandLineArgs();
if (commandLineArgs.Count > 1)
{
auto sceneFilePath = commandLineArgs[1];
SceneSerializer serializer(m_ActiveScene);
serializer.Deserialize(sceneFilePath);
}

m_EditorCamera = EditorCamera(30.0f, 1.778f, 0.01f, 1000.0f);

#if 0
Expand Down Expand Up @@ -526,16 +534,16 @@ namespace Triger

void EditorLayer::OpenScene()
{
std::optional<std::string> filepath = FileDialogs::OpenFile("Triger Scene (*.hazel)\0*.triger\0");
if (filepath)
std::string filepath = FileDialogs::OpenFile("Triger Scene (*.triger)\0*.triger\0");
if (!filepath.empty())
{
m_ActiveScene = CreateRef<Scene>();
m_ActiveScene->OnViewportResize((uint32_t)m_ViewportSize.x, (uint32_t)m_ViewportSize.y);
m_SceneHierarchyPanel.SetContext(m_ActiveScene);

SceneSerializer serializer(m_ActiveScene);
m_openedFilepath = *filepath;
serializer.Deserialize(*filepath);
m_openedFilepath = filepath;
serializer.Deserialize(filepath);
}
}

Expand All @@ -548,11 +556,11 @@ namespace Triger
}
else
{
std::optional<std::string> filepath = FileDialogs::SaveFile("Triger Scene (*.triger)\0*.triger\0");
if (filepath)
std::string filepath = FileDialogs::SaveFile("Triger Scene (*.triger)\0*.triger\0");
if (!filepath.empty())
{
SceneSerializer serializer(m_ActiveScene);
serializer.Serialize(*filepath);
serializer.Serialize(filepath);
}
}
}
Expand Down
Loading

0 comments on commit aa01815

Please sign in to comment.