kraken_engine/kraken
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added default __white material to standard assets bundle.

Browse Source 
Assigned default __white material to all standard asset meshes.
Enabled models to be loaded prior to their referenced materials.
Refactored ObjectShader glsl for Vulkan use.
This commit is contained in:
Kearwood Gilbert
2024-09-22 19:20:45 -07:00
parent 0a66f11ff0
commit 3928e247eb
11 changed files with 840 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kraken/resources/material/KRMaterial.cpp
View File

@@ -344,7 +344,7 @@ void KRMaterial::bind(KRNode::RenderInfo& ri, ModelFormat modelFormat, __uint32_
bool bAlphaBlend = (m_alpha_mode == KRMATERIAL_ALPHA_MODE_BLENDONESIDE) || (m_alpha_mode == KRMATERIAL_ALPHA_MODE_BLENDTWOSIDE);
PipelineInfo info{};
std::string shader_name("ObjectShader");
std::string shader_name("object");
info.shader_name = &shader_name;
info.pCamera = ri.camera;
info.point_lights = &ri.point_lights;

41
kraken/resources/mesh/KRMesh.cpp
View File

@@ -181,28 +181,31 @@ void KRMesh::loadPack(Block* data)
void KRMesh::getMaterials()
{
if (m_materials.size() == 0) {
if (m_materials.size() != 0) {
return;
}
for (std::vector<KRMesh::Submesh>::iterator itr = m_submeshes.begin(); itr != m_submeshes.end(); itr++) {
const char* szMaterialName = (*itr).szMaterialName;
KRMaterial* pMaterial = nullptr;
if (*szMaterialName != '\0') {
pMaterial = getContext().getMaterialManager()->getMaterial(szMaterialName);
}
m_materials.push_back(pMaterial);
if (pMaterial) {
m_uniqueMaterials.insert(pMaterial);
} else if (*szMaterialName != '\0') {
KRContext::Log(KRContext::LOG_LEVEL_WARNING, "Missing material: %s", szMaterialName);
}
for (std::vector<KRMesh::Submesh>::iterator itr = m_submeshes.begin(); itr != m_submeshes.end(); itr++) {
const char* szMaterialName = (*itr).szMaterialName;
KRMaterial* pMaterial = nullptr;
if (*szMaterialName != '\0') {
pMaterial = getContext().getMaterialManager()->getMaterial(szMaterialName);
}
m_materials.push_back(pMaterial);
if (pMaterial) {
m_uniqueMaterials.insert(pMaterial);
} else if (*szMaterialName != '\0') {
KRContext::Log(KRContext::LOG_LEVEL_WARNING, "Missing material: %s", szMaterialName);
m_materials.clear();
return;
}
}
m_hasTransparency = false;
for (std::set<KRMaterial*>::iterator mat_itr = m_uniqueMaterials.begin(); mat_itr != m_uniqueMaterials.end(); mat_itr++) {
if ((*mat_itr)->isTransparent()) {
m_hasTransparency = true;
break;
}
m_hasTransparency = false;
for (std::set<KRMaterial*>::iterator mat_itr = m_uniqueMaterials.begin(); mat_itr != m_uniqueMaterials.end(); mat_itr++) {
if ((*mat_itr)->isTransparent()) {
m_hasTransparency = true;
break;
}
}
}

2
kraken/resources/mesh/KRMeshCube.cpp
View File

@@ -57,7 +57,7 @@ KRMeshCube::KRMeshCube(KRContext& context) : KRMesh(context, "__cube")
mi.submesh_starts.push_back(0);
mi.submesh_lengths.push_back((int)mi.vertices.size());
mi.material_names.push_back("");
mi.material_names.push_back("__white");
mi.format = ModelFormat::KRENGINE_MODEL_FORMAT_STRIP;

2
kraken/resources/mesh/KRMeshQuad.cpp
View File

@@ -52,7 +52,7 @@ KRMeshQuad::KRMeshQuad(KRContext& context) : KRMesh(context, "__quad")
mi.submesh_starts.push_back(0);
mi.submesh_lengths.push_back((int)mi.vertices.size());
mi.material_names.push_back("");
mi.material_names.push_back("__white");
mi.format = ModelFormat::KRENGINE_MODEL_FORMAT_STRIP;
LoadData(mi, true, true);

2
kraken/resources/mesh/KRMeshSphere.cpp
View File

@@ -110,7 +110,7 @@ KRMeshSphere::KRMeshSphere(KRContext& context) : KRMesh(context, "__sphere")
mi.submesh_starts.push_back(0);
mi.submesh_lengths.push_back((int)mi.vertices.size());
mi.material_names.push_back("");
mi.material_names.push_back("__white");
mi.format = ModelFormat::KRENGINE_MODEL_FORMAT_TRIANGLES;