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

Fixes

This commit is contained in:
Sri Sham Haran 2022-11-04 19:16:32 +08:00
parent b86f092f52
commit b30da7e495
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Materials/TestMat.shmat
View File

@ -2,7 +2,7 @@
FragmentShader: 46377769 FragmentShader: 46377769
SubPass: G-Buffer Write SubPass: G-Buffer Write
Properties: Properties:
data.color: {x: 0, y: 0, z: 0, w: 1} data.color: {x: 1, y: 1, z: 1, w: 1}
data.textureIndex: 64651793 data.textureIndex: 64651793
data.alpha: 0 data.alpha: 0
data.beta: {x: 1, y: 1, z: 1} data.beta: {x: 1, y: 1, z: 1}

14
Assets/Scenes/M2Scene.shade
View File

@ -31,8 +31,8 @@
Rotate: {x: -0, y: 0, z: -0} Rotate: {x: -0, y: 0, z: -0}
Scale: {x: 49.4798889, y: 0.5, z: 17.5} Scale: {x: 49.4798889, y: 0.5, z: 17.5}
Renderable Component: Renderable Component:
Mesh: 80365422 Mesh: 149697411
Material: 0 Material: 126974645
RigidBody Component: RigidBody Component:
Type: Static Type: Static
Mass: 1 Mass: 1
@ -66,7 +66,7 @@
Rotate: {x: -0, y: 0, z: -0} Rotate: {x: -0, y: 0, z: -0}
Scale: {x: 2, y: 2, z: 2} Scale: {x: 2, y: 2, z: 2}
Renderable Component: Renderable Component:
Mesh: 80365422 Mesh: 149697411
Material: 126974645 Material: 126974645
RigidBody Component: RigidBody Component:
Type: Dynamic Type: Dynamic
@ -121,8 +121,8 @@
Rotate: {x: 0, y: 0, z: 0} Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 2, y: 2, z: 2} Scale: {x: 2, y: 2, z: 2}
Renderable Component: Renderable Component:
Mesh: 80365422 Mesh: 149697411
Material: 124370424 Material: 126974645
RigidBody Component: RigidBody Component:
Type: Dynamic Type: Dynamic
Mass: 1 Mass: 1
@ -163,7 +163,7 @@
Rotate: {x: 0, y: 0, z: 0} Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 2, y: 2, z: 2} Scale: {x: 2, y: 2, z: 2}
Renderable Component: Renderable Component:
Mesh: 80365422 Mesh: 149697411
Material: 126974645 Material: 126974645
RigidBody Component: RigidBody Component:
Type: Dynamic Type: Dynamic
@ -198,7 +198,7 @@
Rotate: {x: 0, y: 0, z: 0} Rotate: {x: 0, y: 0, z: 0}
Scale: {x: 5, y: 5, z: 5} Scale: {x: 5, y: 5, z: 5}
Renderable Component: Renderable Component:
Mesh: 80365422 Mesh: 149697411
Material: 126974645 Material: 126974645
Scripts: ~ Scripts: ~
- EID: 8 - EID: 8

10
SHADE_Engine/src/Serialization/SHSerializationHelper.hpp
View File

@ -258,21 +258,21 @@ namespace SHADE
{ {
auto fragShader = SHResourceManager::LoadOrGet<SHVkShaderModule>(spec.fragShader); auto fragShader = SHResourceManager::LoadOrGet<SHVkShaderModule>(spec.fragShader);
auto interface = fragShader->GetReflectedData().GetDescriptorBindingInfo().GetShaderBlockInterface(SHGraphicsConstants::DescriptorSetIndex::PER_INSTANCE, SHGraphicsConstants::DescriptorSetBindings::BATCHED_PER_INST_DATA); auto interface = fragShader->GetReflectedData().GetDescriptorBindingInfo().GetShaderBlockInterface(SHGraphicsConstants::DescriptorSetIndex::PER_INSTANCE, SHGraphicsConstants::DescriptorSetBindings::BATCHED_PER_INST_DATA);
/*int const varCount = static_cast<int>(interface->GetVariableCount()); int const varCount = static_cast<int>(interface->GetVariableCount());
for (int i = 0; i < varCount; ++i) for (int i = 0; i < varCount; ++i)
{ {
auto variable = interface->GetVariable(i); auto variable = interface->GetVariable(i);
if(variable->type != SHShaderBlockInterface::Variable::Type::INT) if(variable->type != SHShaderBlockInterface::Variable::Type::INT)
return; continue;
const std::string& VAR_NAME = interface->GetVariableName(i); const std::string& VAR_NAME = interface->GetVariableName(i);
if(VAR_NAME.empty()) if(VAR_NAME.empty())
continue; continue;
assetQueue.insert({matNode.as<AssetID>(), AssetType::TEXTURE}); assetQueue.insert({spec.properties[VAR_NAME.data()].as<AssetID>(), AssetType::TEXTURE});
}*/
} }
} }
assetQueue.insert({matNode.as<AssetID>(), AssetType::MATERIAL}); }
//assetQueue.insert({matNode.as<AssetID>(), AssetType::MATERIAL});
//SHResourceManager::LoadOrGet<SHMaterial>(node[YAML::convert<SHRenderable>::MAT_YAML_TAG.data()].as<AssetID>()); //SHResourceManager::LoadOrGet<SHMaterial>(node[YAML::convert<SHRenderable>::MAT_YAML_TAG.data()].as<AssetID>());
} }
} }