Sync editor rendering and UI workspace updates
This commit is contained in:
@@ -34,6 +34,7 @@ constexpr const char* kBuiltinShadowCasterShaderPath = "builtin://shaders/shadow
|
||||
constexpr const char* kBuiltinObjectIdShaderPath = "builtin://shaders/object-id";
|
||||
constexpr const char* kBuiltinObjectIdOutlineShaderPath = "builtin://shaders/object-id-outline";
|
||||
constexpr const char* kBuiltinSkyboxShaderPath = "builtin://shaders/skybox";
|
||||
constexpr const char* kBuiltinVolumetricShaderPath = "builtin://shaders/volumetric";
|
||||
constexpr const char* kBuiltinColorScalePostProcessShaderPath =
|
||||
"builtin://shaders/color-scale-post-process";
|
||||
constexpr const char* kBuiltinFinalColorShaderPath = "builtin://shaders/final-color";
|
||||
@@ -61,6 +62,8 @@ constexpr const char* kBuiltinObjectIdOutlineShaderAssetRelativePath =
|
||||
"engine/assets/builtin/shaders/object-id-outline.shader";
|
||||
constexpr const char* kBuiltinSkyboxShaderAssetRelativePath =
|
||||
"engine/assets/builtin/shaders/skybox.shader";
|
||||
constexpr const char* kBuiltinVolumetricShaderAssetRelativePath =
|
||||
"engine/assets/builtin/shaders/volumetric.shader";
|
||||
constexpr const char* kBuiltinColorScalePostProcessShaderAssetRelativePath =
|
||||
"engine/assets/builtin/shaders/color-scale-post-process.shader";
|
||||
constexpr const char* kBuiltinFinalColorShaderAssetRelativePath =
|
||||
@@ -149,6 +152,9 @@ const char* GetBuiltinShaderAssetRelativePath(const Containers::String& builtinS
|
||||
if (builtinShaderPath == Containers::String(kBuiltinSkyboxShaderPath)) {
|
||||
return kBuiltinSkyboxShaderAssetRelativePath;
|
||||
}
|
||||
if (builtinShaderPath == Containers::String(kBuiltinVolumetricShaderPath)) {
|
||||
return kBuiltinVolumetricShaderAssetRelativePath;
|
||||
}
|
||||
if (builtinShaderPath == Containers::String(kBuiltinColorScalePostProcessShaderPath)) {
|
||||
return kBuiltinColorScalePostProcessShaderAssetRelativePath;
|
||||
}
|
||||
@@ -708,6 +714,10 @@ Shader* BuildBuiltinSkyboxShader(const Containers::String& path) {
|
||||
return TryLoadBuiltinShaderFromAsset(path);
|
||||
}
|
||||
|
||||
Shader* BuildBuiltinVolumetricShader(const Containers::String& path) {
|
||||
return TryLoadBuiltinShaderFromAsset(path);
|
||||
}
|
||||
|
||||
Shader* BuildBuiltinColorScalePostProcessShader(const Containers::String& path) {
|
||||
return TryLoadBuiltinShaderFromAsset(path);
|
||||
}
|
||||
@@ -817,6 +827,10 @@ bool TryGetBuiltinShaderPathByShaderName(
|
||||
outPath = GetBuiltinSkyboxShaderPath();
|
||||
return true;
|
||||
}
|
||||
if (shaderName == "Builtin Volumetric") {
|
||||
outPath = GetBuiltinVolumetricShaderPath();
|
||||
return true;
|
||||
}
|
||||
if (shaderName == "Builtin Color Scale Post Process") {
|
||||
outPath = GetBuiltinColorScalePostProcessShaderPath();
|
||||
return true;
|
||||
@@ -892,6 +906,10 @@ Containers::String GetBuiltinSkyboxShaderPath() {
|
||||
return Containers::String(kBuiltinSkyboxShaderPath);
|
||||
}
|
||||
|
||||
Containers::String GetBuiltinVolumetricShaderPath() {
|
||||
return Containers::String(kBuiltinVolumetricShaderPath);
|
||||
}
|
||||
|
||||
Containers::String GetBuiltinColorScalePostProcessShaderPath() {
|
||||
return Containers::String(kBuiltinColorScalePostProcessShaderPath);
|
||||
}
|
||||
@@ -1002,6 +1020,8 @@ LoadResult CreateBuiltinShaderResource(const Containers::String& path) {
|
||||
shader = BuildBuiltinObjectIdOutlineShader(path);
|
||||
} else if (path == GetBuiltinSkyboxShaderPath()) {
|
||||
shader = BuildBuiltinSkyboxShader(path);
|
||||
} else if (path == GetBuiltinVolumetricShaderPath()) {
|
||||
shader = BuildBuiltinVolumetricShader(path);
|
||||
} else if (path == GetBuiltinColorScalePostProcessShaderPath()) {
|
||||
shader = BuildBuiltinColorScalePostProcessShader(path);
|
||||
} else if (path == GetBuiltinFinalColorShaderPath()) {
|
||||
|
||||
Reference in New Issue
Block a user