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

Implemented bool support for KRNodeProperty. Applied KRNodeProperty to bool and float properties of KRLight

Browse Source
This commit is contained in:
Kearwood Gilbert
2025-11-17 22:56:29 -08:00
parent ead7aade63
commit 92843b93d2
3 changed files with 38 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
kraken/nodes/KRLight.cpp
View File

@@ -67,16 +67,7 @@ KRLight::KRLight(KRScene& scene, std::string name)
: KRNode(scene, name) : KRNode(scene, name)
, m_flareTexture(KRTextureBinding(KRTexture::TEXTURE_USAGE_LIGHT_FLARE)) , m_flareTexture(KRTextureBinding(KRTexture::TEXTURE_USAGE_LIGHT_FLARE))
{ {
m_intensity = 1.0f;
m_dust_particle_intensity = 1.0f;
m_color = Vector3::One(); m_color = Vector3::One();
m_flareSize = 0.0f;
m_flareOcclusionSize = 0.05f;
m_casts_shadow = true;
m_light_shafts = true;
m_dust_particle_density = 0.1f;
m_dust_particle_size = 1.0f;
m_dust_particle_intensity = 1.0f;
m_occlusionQuery = 0; m_occlusionQuery = 0;
m_decayStart = 0; m_decayStart = 0;
@@ -101,19 +92,19 @@ KRLight::~KRLight()
tinyxml2::XMLElement* KRLight::saveXML(tinyxml2::XMLNode* parent) tinyxml2::XMLElement* KRLight::saveXML(tinyxml2::XMLNode* parent)
{ {
tinyxml2::XMLElement* e = KRNode::saveXML(parent); tinyxml2::XMLElement* e = KRNode::saveXML(parent);
e->SetAttribute("intensity", m_intensity); m_intensity.save(e);
e->SetAttribute("color_r", m_color.x); e->SetAttribute("color_r", m_color.x);
e->SetAttribute("color_g", m_color.y); e->SetAttribute("color_g", m_color.y);
e->SetAttribute("color_b", m_color.z); e->SetAttribute("color_b", m_color.z);
e->SetAttribute("decay_start", m_decayStart); m_decayStart.save(e);
e->SetAttribute("flare_size", m_flareSize); m_flareSize.save(e);
e->SetAttribute("flare_occlusion_size", m_flareOcclusionSize); m_flareOcclusionSize.save(e);
m_casts_shadow.save(e);
m_light_shafts.save(e);
m_dust_particle_density.save(e);
m_dust_particle_size.save(e);
m_dust_particle_intensity.save(e);
e->SetAttribute("flare_texture", m_flareTexture.getName().c_str()); e->SetAttribute("flare_texture", m_flareTexture.getName().c_str());
e->SetAttribute("casts_shadow", m_casts_shadow ? "true" : "false");
e->SetAttribute("light_shafts", m_light_shafts ? "true" : "false");
e->SetAttribute("dust_particle_density", m_dust_particle_density);
e->SetAttribute("dust_particle_size", m_dust_particle_size);
e->SetAttribute("dust_particle_intensity", m_dust_particle_intensity);
return e; return e;
} }
@@ -132,44 +123,15 @@ void KRLight::loadXML(tinyxml2::XMLElement* e)
} }
m_color = Vector3::Create(x, y, z); m_color = Vector3::Create(x, y, z);
if (e->QueryFloatAttribute("intensity", &m_intensity) != tinyxml2::XML_SUCCESS) { m_intensity.load(e);
m_intensity = 100.0; m_decayStart.load(e);
} m_flareSize.load(e);
m_flareOcclusionSize.load(e);
if (e->QueryFloatAttribute("decay_start", &m_decayStart) != tinyxml2::XML_SUCCESS) { m_casts_shadow.load(e);
m_decayStart = 0.0; m_light_shafts.load(e);
} m_dust_particle_density.load(e);
m_dust_particle_size.load(e);
if (e->QueryFloatAttribute("flare_size", &m_flareSize) != tinyxml2::XML_SUCCESS) { m_dust_particle_intensity.load(e);
m_flareSize = 0.0;
}
if (e->QueryFloatAttribute("flare_occlusion_size", &m_flareOcclusionSize) != tinyxml2::XML_SUCCESS) {
m_flareOcclusionSize = 0.05f;
}
if (e->QueryBoolAttribute("casts_shadow", &m_casts_shadow) != tinyxml2::XML_SUCCESS) {
m_casts_shadow = true;
}
if (e->QueryBoolAttribute("light_shafts", &m_light_shafts) != tinyxml2::XML_SUCCESS) {
m_light_shafts = true;
}
m_dust_particle_density = 0.1f;
if (e->QueryFloatAttribute("dust_particle_density", &m_dust_particle_density) != tinyxml2::XML_SUCCESS) {
m_dust_particle_density = 0.1f;
}
m_dust_particle_size = 1.0f;
if (e->QueryFloatAttribute("dust_particle_size", &m_dust_particle_size) != tinyxml2::XML_SUCCESS) {
m_dust_particle_size = 1.0f;
}
m_dust_particle_intensity = 1.0f;
if (e->QueryFloatAttribute("dust_particle_intensity", &m_dust_particle_intensity) != tinyxml2::XML_SUCCESS) {
m_dust_particle_intensity = 1.0f;
}
const char* szFlareTexture = e->Attribute("flare_texture"); const char* szFlareTexture = e->Attribute("flare_texture");
if (szFlareTexture) { if (szFlareTexture) {
@@ -338,7 +300,7 @@ void KRLight::render(RenderInfo& ri)
float slice_spacing = (slice_far - slice_near) / slice_count; float slice_spacing = (slice_far - slice_near) / slice_count;
pFogShader->setPushConstant(ShaderValue::slice_depth_scale, Vector2::Create(slice_near, slice_spacing)); pFogShader->setPushConstant(ShaderValue::slice_depth_scale, Vector2::Create(slice_near, slice_spacing));
pFogShader->setPushConstant(ShaderValue::light_color, (m_color * ri.camera->settings.volumetric_environment_intensity * m_intensity * -slice_spacing / 1000.0f)); pFogShader->setPushConstant(ShaderValue::light_color, (m_color * ri.camera->settings.volumetric_environment_intensity * m_intensity * -slice_spacing / 10.0f));
pFogShader->bind(ri, Matrix4()); // TODO: Pass indexes of lights to shader pFogShader->bind(ri, Matrix4()); // TODO: Pass indexes of lights to shader
m_pContext->getMeshManager()->bindVBO(ri.commandBuffer, &m_pContext->getMeshManager()->KRENGINE_VBO_DATA_VOLUMETRIC_LIGHTING, 1.0f); m_pContext->getMeshManager()->bindVBO(ri.commandBuffer, &m_pContext->getMeshManager()->KRENGINE_VBO_DATA_VOLUMETRIC_LIGHTING, 1.0f);
@@ -572,7 +534,7 @@ bool KRLight::getShaderValue(ShaderValue value, float* output) const
{ {
switch (value) { switch (value) {
case ShaderValue::light_intensity: case ShaderValue::light_intensity:
*output = m_intensity * 0.01f; *output = m_intensity;
return true; return true;
case ShaderValue::light_decay_start: case ShaderValue::light_decay_start:
*output = getDecayStart(); *output = getDecayStart();

19
kraken/nodes/KRLight.h
View File

@@ -79,19 +79,18 @@ protected:
bool getShaderValue(ShaderValue value, float* output) const override; bool getShaderValue(ShaderValue value, float* output) const override;
bool getShaderValue(ShaderValue value, hydra::Vector3* output) const override; bool getShaderValue(ShaderValue value, hydra::Vector3* output) const override;
float m_intensity; KRNODE_PROPERTY(float, m_decayStart, 0.f, "decay_start");
float m_decayStart;
hydra::Vector3 m_color; hydra::Vector3 m_color;
KRTextureBinding m_flareTexture; KRTextureBinding m_flareTexture;
float m_flareSize; KRNODE_PROPERTY(float, m_intensity, 1.f, "intensity");
float m_flareOcclusionSize; KRNODE_PROPERTY(float, m_flareSize, 0.f, "flare_size");
KRNODE_PROPERTY(float, m_flareOcclusionSize, 0.05f, "flare_occlusion_size");
bool m_casts_shadow; KRNODE_PROPERTY(bool, m_casts_shadow, true, "casts_shadow");
bool m_light_shafts; KRNODE_PROPERTY(bool, m_light_shafts, true, "light_shafts");
float m_dust_particle_density; KRNODE_PROPERTY(float, m_dust_particle_density, 0.1f, "dust_particle_density");
float m_dust_particle_size; KRNODE_PROPERTY(float, m_dust_particle_size, 1.f, "dust_particle_size");
float m_dust_particle_intensity; KRNODE_PROPERTY(float, m_dust_particle_intensity, 1.f, "dust_particle_intensity");
int m_occlusionQuery; // Occlusion query for attenuating occluded flares int m_occlusionQuery; // Occlusion query for attenuating occluded flares

10
kraken/nodes/KRNode.h
View File

@@ -95,7 +95,11 @@ public:
void save(tinyxml2::XMLElement* element) const void save(tinyxml2::XMLElement* element) const
{ {
element->SetAttribute(config::name, val); if constexpr (std::is_same<T, bool>::value) {
element->SetAttribute(config::name, val ? "true" : "false");
} else {
element->SetAttribute(config::name, val);
}
} }
void load(tinyxml2::XMLElement* element) void load(tinyxml2::XMLElement* element)
@@ -104,6 +108,10 @@ public:
if (element->QueryFloatAttribute(config::name, &val) != tinyxml2::XML_SUCCESS) { if (element->QueryFloatAttribute(config::name, &val) != tinyxml2::XML_SUCCESS) {
val = config::defaultVal; val = config::defaultVal;
} }
} else if constexpr (std::is_same<T, bool>::value) {
if (element->QueryBoolAttribute(config::name, &val) != tinyxml2::XML_SUCCESS) {
val = config::defaultVal;
}
} else { } else {
static_assert(false, "Typename not implemented."); static_assert(false, "Typename not implemented.");
} }