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

KRCamera now using KRTextureBinding

Browse Source
This commit is contained in:
Kearwood Gilbert
2025-11-11 14:29:26 -08:00
parent d8eb663731
commit 64b89426bc
2 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
kraken/nodes/KRCamera.cpp
View File

@@ -63,12 +63,7 @@ KrResult KRCamera::update(const KrNodeInfo* nodeInfo)
return res; return res;
} }
} }
m_pSkyBoxTexture = skybox_texture; m_skyBox.set(skybox_texture);
if (m_pSkyBoxTexture) {
m_skyBox = m_pSkyBoxTexture->getName();
} else {
m_skyBox = "";
}
return KR_SUCCESS; return KR_SUCCESS;
} }
@@ -82,7 +77,6 @@ KRCamera::KRCamera(KRScene& scene, std::string name)
m_particlesAbsoluteTime = 0.0f; m_particlesAbsoluteTime = 0.0f;
volumetricBufferWidth = 0; volumetricBufferWidth = 0;
volumetricBufferHeight = 0; volumetricBufferHeight = 0;
m_pSkyBoxTexture = NULL;
compositeDepthTexture = 0; compositeDepthTexture = 0;
compositeColorTexture = 0; compositeColorTexture = 0;
@@ -116,7 +110,7 @@ std::string KRCamera::getElementName()
tinyxml2::XMLElement* KRCamera::saveXML(tinyxml2::XMLNode* parent) tinyxml2::XMLElement* KRCamera::saveXML(tinyxml2::XMLNode* parent)
{ {
tinyxml2::XMLElement* e = KRNode::saveXML(parent); tinyxml2::XMLElement* e = KRNode::saveXML(parent);
e->SetAttribute("skybox", m_skyBox.c_str()); e->SetAttribute("skybox", m_skyBox.getName().c_str());
return e; return e;
} }
@@ -126,7 +120,11 @@ void KRCamera::loadXML(tinyxml2::XMLElement* e)
{ {
KRNode::loadXML(e); KRNode::loadXML(e);
const char* szSkyBoxName = e->Attribute("skybox"); const char* szSkyBoxName = e->Attribute("skybox");
m_skyBox = szSkyBoxName ? szSkyBoxName : ""; if (szSkyBoxName) {
m_skyBox.setName(szSkyBoxName);
} else {
m_skyBox.clear();
}
unsigned int surfaceHandle = 1; unsigned int surfaceHandle = 1;
if (e->QueryUnsignedAttribute("surface", &surfaceHandle) != tinyxml2::XML_SUCCESS) { if (e->QueryUnsignedAttribute("surface", &surfaceHandle) != tinyxml2::XML_SUCCESS) {
@@ -137,13 +135,12 @@ void KRCamera::loadXML(tinyxml2::XMLElement* e)
void KRCamera::setSkyBox(const std::string& skyBox) void KRCamera::setSkyBox(const std::string& skyBox)
{ {
m_pSkyBoxTexture = NULL; m_skyBox.setName(skyBox);
m_skyBox = skyBox;
} }
const std::string KRCamera::getSkyBox() const const std::string KRCamera::getSkyBox() const
{ {
return m_skyBox; return m_skyBox.getName();
} }
void KRCamera::render(KRNode::RenderInfo& ri) void KRCamera::render(KRNode::RenderInfo& ri)
@@ -157,12 +154,10 @@ void KRCamera::render(KRNode::RenderInfo& ri)
GL_PUSH_GROUP_MARKER("Sky Box"); GL_PUSH_GROUP_MARKER("Sky Box");
if (!m_pSkyBoxTexture && m_skyBox.length()) { m_skyBox.load(&getContext());
m_pSkyBoxTexture = getContext().getTextureManager()->getTextureCube(m_skyBox.c_str());
}
if (m_pSkyBoxTexture) { if (m_skyBox.isLoaded()) {
m_pSkyBoxTexture->resetPoolExpiry(0.0f, KRTexture::TEXTURE_USAGE_SKY_CUBE); m_skyBox.get()->resetPoolExpiry(0.0f, KRTexture::TEXTURE_USAGE_SKY_CUBE);
std::string shader_name("sky_box"); std::string shader_name("sky_box");
PipelineInfo info{}; PipelineInfo info{};
@@ -173,7 +168,7 @@ void KRCamera::render(KRNode::RenderInfo& ri)
info.cullMode = CullMode::kCullNone; info.cullMode = CullMode::kCullNone;
KRPipeline* pPipeline = getContext().getPipelineManager()->getPipeline(*ri.surface, info); KRPipeline* pPipeline = getContext().getPipelineManager()->getPipeline(*ri.surface, info);
pPipeline->setImageBinding("diffuseTexture", m_pSkyBoxTexture, getContext().getSamplerManager()->DEFAULT_CLAMPED_SAMPLER); pPipeline->setImageBinding("diffuseTexture", m_skyBox.get(), getContext().getSamplerManager()->DEFAULT_CLAMPED_SAMPLER);
pPipeline->bind(ri, Matrix4()); pPipeline->bind(ri, Matrix4());
// Render a full screen quad // Render a full screen quad

5
kraken/nodes/KRCamera.h
View File

@@ -36,6 +36,7 @@
#include "KRPipeline.h" #include "KRPipeline.h"
#include "KRContextObject.h" #include "KRContextObject.h"
#include "resources/texture/KRTexture.h" #include "resources/texture/KRTexture.h"
#include "resources/texture/KRTextureBinding.h"
#include "KRContext.h" #include "KRContext.h"
#include "KRViewport.h" #include "KRViewport.h"
#include "KRRenderSettings.h" #include "KRRenderSettings.h"
@@ -101,8 +102,8 @@ private:
void destroyBuffers(); void destroyBuffers();
KrSurfaceHandle m_surfaceHandle; KrSurfaceHandle m_surfaceHandle;
KRTexture* m_pSkyBoxTexture;
std::string m_skyBox; KRTextureBinding m_skyBox;
KRViewport m_viewport; KRViewport m_viewport;
float m_particlesAbsoluteTime; float m_particlesAbsoluteTime;