From 689596629dcd6012ddb7c89a6a794dace0fda79a Mon Sep 17 00:00:00 2001 From: kearwood Date: Thu, 18 Oct 2012 21:20:38 +0000 Subject: [PATCH] No longer crashes for scenes that don't have a skybox Removed excessive NSLog messages --HG-- extra : convert_revision : svn%3A7752d6cf-9f14-4ad2-affc-04f1e67b81a5/trunk%40132 --- KREngine/KREngine/Classes/KRCamera.cpp | 2 +- KREngine/KREngine/Classes/KRScene.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/KREngine/KREngine/Classes/KRCamera.cpp b/KREngine/KREngine/Classes/KRCamera.cpp index 3dea041..355a6a9 100644 --- a/KREngine/KREngine/Classes/KRCamera.cpp +++ b/KREngine/KREngine/Classes/KRCamera.cpp @@ -499,7 +499,7 @@ void KRCamera::renderFrame(KRScene &scene, KRMat4 &viewMatrix, KRVector3 &lightD GLDEBUG(glDepthMask(GL_TRUE)); - fprintf(stderr, "VBO Mem: %i Kbyte Texture Mem: %i/%i Kbyte (active/total) Shader Handles: %i Visible Bounds: %i Max Texture LOD: %i\n", (int)m_pContext->getModelManager()->getMemUsed() / 1024, (int)m_pContext->getTextureManager()->getActiveMemUsed() / 1024, (int)m_pContext->getTextureManager()->getMemUsed() / 1024, (int)m_pContext->getShaderManager()->getShaderHandlesUsed(), (int)m_visibleBounds.size(), m_pContext->getTextureManager()->getLODDimCap()); +// fprintf(stderr, "VBO Mem: %i Kbyte Texture Mem: %i/%i Kbyte (active/total) Shader Handles: %i Visible Bounds: %i Max Texture LOD: %i\n", (int)m_pContext->getModelManager()->getMemUsed() / 1024, (int)m_pContext->getTextureManager()->getActiveMemUsed() / 1024, (int)m_pContext->getTextureManager()->getMemUsed() / 1024, (int)m_pContext->getShaderManager()->getShaderHandlesUsed(), (int)m_visibleBounds.size(), m_pContext->getTextureManager()->getLODDimCap()); } diff --git a/KREngine/KREngine/Classes/KRScene.cpp b/KREngine/KREngine/Classes/KRScene.cpp index e99c8cc..76102c6 100644 --- a/KREngine/KREngine/Classes/KRScene.cpp +++ b/KREngine/KREngine/Classes/KRScene.cpp @@ -343,7 +343,8 @@ KRScene *KRScene::Load(KRContext &context, const std::string &name, KRDataBlock KRScene *new_scene = new KRScene(context, name); tinyxml2::XMLElement *scene_element = doc.RootElement(); - new_scene->m_skyBoxName = scene_element->Attribute("skybox"); // This is temporary until the camera is moved into the scene graph + const char *szSkyBoxName = scene_element->Attribute("skybox"); + new_scene->m_skyBoxName = szSkyBoxName ? szSkyBoxName : ""; // This is temporary until the camera is moved into the scene graph KRNode *n = KRNode::LoadXML(*new_scene, scene_element->FirstChildElement()); if(n) {