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

Refactor KRResourceBinding load and isLoaded methods to reflect binding rather than loading

Browse Source
This commit is contained in:
Kearwood Gilbert
2025-11-13 22:25:34 -08:00
parent dbf31ceebe
commit 13efe5caec
15 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kraken/resources/KRResourceBinding.cpp
View File

@@ -92,7 +92,7 @@ void KRResourceBinding::clear()
set(nullptr);
}
bool KRResourceBinding::isLoaded() const
bool KRResourceBinding::isBound() const
{
return m_resource != nullptr;
}

4
kraken/resources/KRResourceBinding.h
View File

@@ -52,8 +52,8 @@ public:
const std::string& getName() const;
void setName(const std::string& name);
virtual bool load(KRContext* context) = 0;
bool isLoaded() const;
virtual bool bind(KRContext* context) = 0;
bool isBound() const;
protected:
KRResource* m_resource;

2
kraken/resources/audio/KRAudioSampleBinding.cpp
View File

@@ -42,7 +42,7 @@ KRAudioSample* KRAudioSampleBinding::get()
return static_cast<KRAudioSample*>(m_resource);
}
bool KRAudioSampleBinding::load(KRContext* context)
bool KRAudioSampleBinding::bind(KRContext* context)
{
if (m_name.size() == 0) {
return true;

2
kraken/resources/audio/KRAudioSampleBinding.h
View File

@@ -41,6 +41,6 @@ class KRAudioSampleBinding : public KRResourceBinding
public:
KRAudioSample* get();
bool load(KRContext* context) override final;
bool bind(KRContext* context) override final;
private:
};

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

@@ -232,27 +232,27 @@ void KRMaterial::preStream(float lodCoverage)
{
getTextures();
if (m_ambientMap.isLoaded()) {
if (m_ambientMap.isBound()) {
m_ambientMap.get()->resetPoolExpiry(lodCoverage, KRTexture::TEXTURE_USAGE_AMBIENT_MAP);
}
if (m_diffuseMap.isLoaded()) {
if (m_diffuseMap.isBound()) {
m_diffuseMap.get()->resetPoolExpiry(lodCoverage, KRTexture::TEXTURE_USAGE_DIFFUSE_MAP);
}
if (m_normalMap.isLoaded()) {
if (m_normalMap.isBound()) {
m_normalMap.get()->resetPoolExpiry(lodCoverage, KRTexture::TEXTURE_USAGE_NORMAL_MAP);
}
if (m_specularMap.isLoaded()) {
if (m_specularMap.isBound()) {
m_specularMap.get()->resetPoolExpiry(lodCoverage, KRTexture::TEXTURE_USAGE_SPECULAR_MAP);
}
if (m_reflectionMap.isLoaded()) {
if (m_reflectionMap.isBound()) {
m_reflectionMap.get()->resetPoolExpiry(lodCoverage, KRTexture::TEXTURE_USAGE_REFLECTION_MAP);
}
if (m_reflectionCube.isLoaded()) {
if (m_reflectionCube.isBound()) {
m_reflectionCube.get()->resetPoolExpiry(lodCoverage, KRTexture::TEXTURE_USAGE_REFECTION_CUBE);
}
}
@@ -264,27 +264,27 @@ kraken_stream_level KRMaterial::getStreamLevel()
getTextures();
if (m_ambientMap.isLoaded()) {
if (m_ambientMap.isBound()) {
stream_level = KRMIN(stream_level, m_ambientMap.get()->getStreamLevel(KRTexture::TEXTURE_USAGE_AMBIENT_MAP));
}
if (m_diffuseMap.isLoaded()) {
if (m_diffuseMap.isBound()) {
stream_level = KRMIN(stream_level, m_diffuseMap.get()->getStreamLevel(KRTexture::TEXTURE_USAGE_DIFFUSE_MAP));
}
if (m_normalMap.isLoaded()) {
if (m_normalMap.isBound()) {
stream_level = KRMIN(stream_level, m_normalMap.get()->getStreamLevel(KRTexture::TEXTURE_USAGE_NORMAL_MAP));
}
if (m_specularMap.isLoaded()) {
if (m_specularMap.isBound()) {
stream_level = KRMIN(stream_level, m_specularMap.get()->getStreamLevel(KRTexture::TEXTURE_USAGE_SPECULAR_MAP));
}
if (m_reflectionMap.isLoaded()) {
if (m_reflectionMap.isBound()) {
stream_level = KRMIN(stream_level, m_reflectionMap.get()->getStreamLevel(KRTexture::TEXTURE_USAGE_REFLECTION_MAP));
}
if (m_reflectionCube.isLoaded()) {
if (m_reflectionCube.isBound()) {
stream_level = KRMIN(stream_level, m_reflectionCube.get()->getStreamLevel(KRTexture::TEXTURE_USAGE_REFECTION_CUBE));
}
@@ -293,12 +293,12 @@ kraken_stream_level KRMaterial::getStreamLevel()
void KRMaterial::getTextures()
{
m_ambientMap.load(&getContext());
m_diffuseMap.load(&getContext());
m_normalMap.load(&getContext());
m_specularMap.load(&getContext());
m_reflectionMap.load(&getContext());
m_reflectionCube.load(&getContext());
m_ambientMap.bind(&getContext());
m_diffuseMap.bind(&getContext());
m_normalMap.bind(&getContext());
m_specularMap.bind(&getContext());
m_reflectionMap.bind(&getContext());
m_reflectionCube.bind(&getContext());
}
void KRMaterial::bind(KRNode::RenderInfo& ri, ModelFormat modelFormat, __uint32_t vertexAttributes, CullMode cullMode, const std::vector<KRBone*>& bones, const std::vector<Matrix4>& bind_poses, const Matrix4& matModel, KRTexture* pLightMap, float lod_coverage)
@@ -311,11 +311,11 @@ void KRMaterial::bind(KRNode::RenderInfo& ri, ModelFormat modelFormat, __uint32_
Vector2 default_offset = Vector2::Zero();
bool bHasReflection = m_reflectionColor != Vector3::Zero();
bool bDiffuseMap = m_diffuseMap.isLoaded() && ri.camera->settings.bEnableDiffuseMap;
bool bNormalMap = m_normalMap.isLoaded() && ri.camera->settings.bEnableNormalMap;
bool bSpecMap = m_specularMap.isLoaded() && ri.camera->settings.bEnableSpecMap;
bool bReflectionMap = m_reflectionMap.isLoaded() && ri.camera->settings.bEnableReflectionMap && ri.camera->settings.bEnableReflection && bHasReflection;
bool bReflectionCubeMap = m_reflectionCube.isLoaded() && ri.camera->settings.bEnableReflection && bHasReflection;
bool bDiffuseMap = m_diffuseMap.isBound() && ri.camera->settings.bEnableDiffuseMap;
bool bNormalMap = m_normalMap.isBound() && ri.camera->settings.bEnableNormalMap;
bool bSpecMap = m_specularMap.isBound() && ri.camera->settings.bEnableSpecMap;
bool bReflectionMap = m_reflectionMap.isBound() && ri.camera->settings.bEnableReflectionMap && ri.camera->settings.bEnableReflection && bHasReflection;
bool bReflectionCubeMap = m_reflectionCube.isBound() && ri.camera->settings.bEnableReflection && bHasReflection;
bool bAlphaTest = (m_alpha_mode == KRMATERIAL_ALPHA_MODE_TEST) && bDiffuseMap;
bool bAlphaBlend = (m_alpha_mode == KRMATERIAL_ALPHA_MODE_BLENDONESIDE) || (m_alpha_mode == KRMATERIAL_ALPHA_MODE_BLENDTWOSIDE);

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

@@ -39,7 +39,7 @@ KRMesh* KRMeshBinding::get()
return static_cast<KRMesh*>(m_resource);
}
bool KRMeshBinding::load(KRContext* context)
bool KRMeshBinding::bind(KRContext* context)
{
if (m_name.size() == 0) {
return true;

2
kraken/resources/mesh/KRMeshBinding.h
View File

@@ -41,6 +41,6 @@ class KRMeshBinding : public KRResourceBinding
public:
KRMesh* get();
bool load(KRContext* context) override final;
bool bind(KRContext* context) override final;
private:
};

2
kraken/resources/texture/KRTextureBinding.cpp
View File

@@ -39,7 +39,7 @@ KRTexture* KRTextureBinding::get()
return static_cast<KRTexture*>(m_resource);
}
bool KRTextureBinding::load(KRContext* context)
bool KRTextureBinding::bind(KRContext* context)
{
if (m_name.size() == 0) {
return true;

2
kraken/resources/texture/KRTextureBinding.h
View File

@@ -41,6 +41,6 @@ class KRTextureBinding : public KRResourceBinding
public:
KRTexture* get();
bool load(KRContext* context) override final;
bool bind(KRContext* context) override final;
private:
};