redstrate/novus
1
Fork 0
mirror of https://github.com/redstrate/Novus.git synced 2025-04-26 21:57:45 +00:00
Code Activity

Use material's own shader keys if available

Browse source 
Instead of using the shader package default values
This commit is contained in:
Joshua Goins 2024-04-27 12:29:19 -04:00
parent 2325fdbad0
commit 88e64b859d
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
parts/mdl/mdlpart.cpp
View file

@ -219,6 +219,7 @@ void MDLPart::reloadBoneData()
RenderMaterial MDLPart::createMaterial(const physis_Material &material) RenderMaterial MDLPart::createMaterial(const physis_Material &material)
{ {
RenderMaterial newMaterial; RenderMaterial newMaterial;
newMaterial.mat = material;
if (material.shpk_name != nullptr) { if (material.shpk_name != nullptr) {
std::string shpkPath = "shader/sm5/shpk/" + std::string(material.shpk_name); std::string shpkPath = "shader/sm5/shpk/" + std::string(material.shpk_name);

1
renderer/include/drawobject.h
View file

@ -21,6 +21,7 @@ struct RenderTexture {
enum class MaterialType { Object, Skin }; enum class MaterialType { Object, Skin };
struct RenderMaterial { struct RenderMaterial {
physis_Material mat;
MaterialType type = MaterialType::Object; MaterialType type = MaterialType::Object;
physis_SHPK shaderPackage; physis_SHPK shaderPackage;

17
renderer/src/gamerenderer.cpp
View file

@ -224,8 +224,21 @@ void GameRenderer::render(VkCommandBuffer commandBuffer, uint32_t imageIndex, Ca
}; };
std::vector<uint32_t> materialKeys; std::vector<uint32_t> materialKeys;
for (int j = 0; j < renderMaterial.shaderPackage.num_material_keys; j++) { for (int j = 0; j < renderMaterial.shaderPackage.num_material_keys; j++) {
auto value = renderMaterial.shaderPackage.material_keys[j].default_value; auto id = renderMaterial.shaderPackage.material_keys[j].id;
materialKeys.push_back(renderMaterial.shaderPackage.material_keys[j].default_value);
bool found = false;
for (int z = 0; z < renderMaterial.mat.num_shader_keys; z++) {
if (renderMaterial.mat.shader_keys[z].category == id) {
materialKeys.push_back(renderMaterial.mat.shader_keys[z].value);
found = true;
}
}
// Fall back to default if needed
if (!found) {
auto value = renderMaterial.shaderPackage.material_keys[j].default_value;
materialKeys.push_back(renderMaterial.shaderPackage.material_keys[j].default_value);
}
} }
std::vector<uint32_t> subviewKeys = {physis_shpk_crc("Default"), physis_shpk_crc("SUB_VIEW_MAIN")}; std::vector<uint32_t> subviewKeys = {physis_shpk_crc("Default"), physis_shpk_crc("SUB_VIEW_MAIN")};