From 2ce2582318363e6e1dfb298aa0f54d6624e4469f Mon Sep 17 00:00:00 2001 From: Kearwood Gilbert Date: Thu, 13 Nov 2025 22:31:00 -0800 Subject: [PATCH] Refactor KRResourceBinding setName method to set --- kraken/nodes/KRAudioSource.cpp | 4 ++-- kraken/nodes/KRCamera.cpp | 4 ++-- kraken/nodes/KRCollider.cpp | 4 ++-- kraken/nodes/KRLight.cpp | 4 ++-- kraken/nodes/KRModel.cpp | 6 +++--- kraken/nodes/KRSprite.cpp | 4 ++-- kraken/resources/KRResourceBinding.cpp | 2 +- kraken/resources/KRResourceBinding.h | 2 +- kraken/resources/material/KRMaterial.cpp | 12 ++++++------ 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/kraken/nodes/KRAudioSource.cpp b/kraken/nodes/KRAudioSource.cpp index c0b18de..82560fd 100755 --- a/kraken/nodes/KRAudioSource.cpp +++ b/kraken/nodes/KRAudioSource.cpp @@ -109,7 +109,7 @@ void KRAudioSource::loadXML(tinyxml2::XMLElement* e) if (szAudioSampleName == nullptr) { m_sample.clear(); } else { - m_sample.setName(szAudioSampleName); + m_sample.set(szAudioSampleName); } float gain = 1.0f; @@ -364,7 +364,7 @@ bool KRAudioSource::isPlaying() void KRAudioSource::setSample(const std::string& sound_name) { - m_sample.setName(sound_name); + m_sample.set(sound_name); } std::string KRAudioSource::getSample() diff --git a/kraken/nodes/KRCamera.cpp b/kraken/nodes/KRCamera.cpp index 0dfb83b..6ab0678 100755 --- a/kraken/nodes/KRCamera.cpp +++ b/kraken/nodes/KRCamera.cpp @@ -121,7 +121,7 @@ void KRCamera::loadXML(tinyxml2::XMLElement* e) KRNode::loadXML(e); const char* szSkyBoxName = e->Attribute("skybox"); if (szSkyBoxName) { - m_skyBox.setName(szSkyBoxName); + m_skyBox.set(szSkyBoxName); } else { m_skyBox.clear(); } @@ -135,7 +135,7 @@ void KRCamera::loadXML(tinyxml2::XMLElement* e) void KRCamera::setSkyBox(const std::string& skyBox) { - m_skyBox.setName(skyBox); + m_skyBox.set(skyBox); } const std::string KRCamera::getSkyBox() const diff --git a/kraken/nodes/KRCollider.cpp b/kraken/nodes/KRCollider.cpp index cb8ce55..e4df7cb 100755 --- a/kraken/nodes/KRCollider.cpp +++ b/kraken/nodes/KRCollider.cpp @@ -59,7 +59,7 @@ KRCollider::KRCollider(KRScene& scene, std::string collider_name, std::string mo , m_layer_mask(layer_mask) , m_audio_occlusion(audio_occlusion) { - m_model.setName(model_name); + m_model.set(model_name); } KRCollider::~KRCollider() @@ -84,7 +84,7 @@ tinyxml2::XMLElement* KRCollider::saveXML(tinyxml2::XMLNode* parent) void KRCollider::loadXML(tinyxml2::XMLElement* e) { KRNode::loadXML(e); - m_model.setName(e->Attribute("mesh")); + m_model.set(e->Attribute("mesh")); m_layer_mask = 65535; if (e->QueryUnsignedAttribute("layer_mask", &m_layer_mask) != tinyxml2::XML_SUCCESS) { diff --git a/kraken/nodes/KRLight.cpp b/kraken/nodes/KRLight.cpp index 325d550..88472d4 100755 --- a/kraken/nodes/KRLight.cpp +++ b/kraken/nodes/KRLight.cpp @@ -171,7 +171,7 @@ void KRLight::loadXML(tinyxml2::XMLElement* e) const char* szFlareTexture = e->Attribute("flare_texture"); if (szFlareTexture) { - m_flareTexture.setName(szFlareTexture); + m_flareTexture.set(szFlareTexture); } else { m_flareTexture.clear(); } @@ -179,7 +179,7 @@ void KRLight::loadXML(tinyxml2::XMLElement* e) void KRLight::setFlareTexture(std::string flare_texture) { - m_flareTexture.setName(flare_texture); + m_flareTexture.set(flare_texture); } void KRLight::setFlareSize(float flare_size) diff --git a/kraken/nodes/KRModel.cpp b/kraken/nodes/KRModel.cpp index 58249d4..ac14cb7 100755 --- a/kraken/nodes/KRModel.cpp +++ b/kraken/nodes/KRModel.cpp @@ -83,9 +83,9 @@ KRModel::KRModel(KRScene& scene, std::string name) KRModel::KRModel(KRScene& scene, std::string instance_name, std::string model_name[kMeshLODCount], std::string light_map, float lod_min_coverage, bool receives_shadow, bool faces_camera, Vector3 rim_color, float rim_power) : KRNode(scene, instance_name) { - m_lightMap.setName(light_map); + m_lightMap.set(light_map); for (int lod = 0; lod < kMeshLODCount; lod++) { - m_meshes[lod].setName(model_name[lod]); + m_meshes[lod].set(model_name[lod]); } m_min_lod_coverage = lod_min_coverage; m_receivesShadow = receives_shadow; @@ -196,7 +196,7 @@ float KRModel::getRimPower() void KRModel::setLightMap(const std::string& name) { - m_lightMap.setName(name); + m_lightMap.set(name); } std::string KRModel::getLightMap() diff --git a/kraken/nodes/KRSprite.cpp b/kraken/nodes/KRSprite.cpp index 7b799b3..9e521d5 100755 --- a/kraken/nodes/KRSprite.cpp +++ b/kraken/nodes/KRSprite.cpp @@ -85,7 +85,7 @@ void KRSprite::loadXML(tinyxml2::XMLElement* e) const char* szSpriteTexture = e->Attribute("sprite_texture"); if (szSpriteTexture) { - m_spriteTexture.setName(szSpriteTexture); + m_spriteTexture.set(szSpriteTexture); } else { m_spriteTexture.clear(); } @@ -93,7 +93,7 @@ void KRSprite::loadXML(tinyxml2::XMLElement* e) void KRSprite::setSpriteTexture(std::string sprite_texture) { - m_spriteTexture.setName(sprite_texture); + m_spriteTexture.set(sprite_texture); } void KRSprite::setSpriteAlpha(float alpha) diff --git a/kraken/resources/KRResourceBinding.cpp b/kraken/resources/KRResourceBinding.cpp index 9aee856..db7d731 100644 --- a/kraken/resources/KRResourceBinding.cpp +++ b/kraken/resources/KRResourceBinding.cpp @@ -78,7 +78,7 @@ const std::string& KRResourceBinding::getName() const return m_name; } -void KRResourceBinding::setName(const std::string& name) +void KRResourceBinding::set(const std::string& name) { if (m_name == name) { return; diff --git a/kraken/resources/KRResourceBinding.h b/kraken/resources/KRResourceBinding.h index 031c5af..9cb2fdd 100644 --- a/kraken/resources/KRResourceBinding.h +++ b/kraken/resources/KRResourceBinding.h @@ -46,11 +46,11 @@ public: KRResource* get(); void set(KRResource* resource); + void set(const std::string& name); bool isSet() const; void clear(); const std::string& getName() const; - void setName(const std::string& name); virtual bool bind(KRContext* context) = 0; bool isBound() const; diff --git a/kraken/resources/material/KRMaterial.cpp b/kraken/resources/material/KRMaterial.cpp index b29d8bd..32a46bf 100755 --- a/kraken/resources/material/KRMaterial.cpp +++ b/kraken/resources/material/KRMaterial.cpp @@ -142,42 +142,42 @@ bool KRMaterial::save(Block& data) void KRMaterial::setAmbientMap(std::string texture_name, Vector2 texture_scale, Vector2 texture_offset) { - m_ambientMap.setName(texture_name); + m_ambientMap.set(texture_name); m_ambientMapScale = texture_scale; m_ambientMapOffset = texture_offset; } void KRMaterial::setDiffuseMap(std::string texture_name, Vector2 texture_scale, Vector2 texture_offset) { - m_diffuseMap.setName(texture_name); + m_diffuseMap.set(texture_name); m_diffuseMapScale = texture_scale; m_diffuseMapOffset = texture_offset; } void KRMaterial::setSpecularMap(std::string texture_name, Vector2 texture_scale, Vector2 texture_offset) { - m_specularMap.setName(texture_name); + m_specularMap.set(texture_name); m_specularMapScale = texture_scale; m_specularMapOffset = texture_offset; } void KRMaterial::setNormalMap(std::string texture_name, Vector2 texture_scale, Vector2 texture_offset) { - m_normalMap.setName(texture_name); + m_normalMap.set(texture_name); m_normalMapScale = texture_scale; m_normalMapOffset = texture_offset; } void KRMaterial::setReflectionMap(std::string texture_name, Vector2 texture_scale, Vector2 texture_offset) { - m_reflectionMap.setName(texture_name); + m_reflectionMap.set(texture_name); m_reflectionMapScale = texture_scale; m_reflectionMapOffset = texture_offset; } void KRMaterial::setReflectionCube(std::string texture_name) { - m_reflectionCube.setName(texture_name); + m_reflectionCube.set(texture_name); } void KRMaterial::setAlphaMode(KRMaterial::alpha_mode_type alpha_mode)