From a93b9f8c80a23dc019d440c4f78132b7e899ea94 Mon Sep 17 00:00:00 2001 From: Steve M Date: Sun, 16 Mar 2025 05:32:17 -0700 Subject: [PATCH] [OpenGEX] disable partial implementation of light import (causes model load failure) (#6044) * Disable OpenGEX lights and cameras which are suspected of causing model load failure * Revert changes to camera import --------- Co-authored-by: tellypresence Co-authored-by: Kim Kulling --- code/AssetLib/OpenGEX/OpenGEXImporter.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/code/AssetLib/OpenGEX/OpenGEXImporter.cpp b/code/AssetLib/OpenGEX/OpenGEXImporter.cpp index 9170f1bd3..14ec58e9e 100644 --- a/code/AssetLib/OpenGEX/OpenGEXImporter.cpp +++ b/code/AssetLib/OpenGEX/OpenGEXImporter.cpp @@ -310,7 +310,8 @@ void OpenGEXImporter::InternReadFile(const std::string &filename, aiScene *pScen copyMeshes(pScene); copyCameras(pScene); - copyLights(pScene); + // TODO: lights only partially implemented and breaking model import +// copyLights(pScene); copyMaterials(pScene); resolveReferences(); createNodeTree(pScene); @@ -366,7 +367,8 @@ void OpenGEXImporter::handleNodes(DDLNode *node, aiScene *pScene) { break; case Grammar::LightNodeToken: - handleLightNode(*it, pScene); + // TODO: lights only partially implemented and breaking model import +// handleLightNode(*it, pScene); break; case Grammar::GeometryObjectToken: @@ -378,7 +380,8 @@ void OpenGEXImporter::handleNodes(DDLNode *node, aiScene *pScene) { break; case Grammar::LightObjectToken: - handleLightObject(*it, pScene); + // TODO: lights only partially implemented and breaking model import +// handleLightObject(*it, pScene); break; case Grammar::TransformToken: @@ -468,7 +471,10 @@ void OpenGEXImporter::handleNameNode(DDLNode *node, aiScene * /*pScene*/) { } const std::string name(val->getString()); - if (m_tokenType == Grammar::GeometryNodeToken || m_tokenType == Grammar::LightNodeToken || m_tokenType == Grammar::CameraNodeToken) { + if (m_tokenType == Grammar::GeometryNodeToken || + // TODO: lights only partially implemented and breaking model import +// m_tokenType == Grammar::LightNodeToken || + m_tokenType == Grammar::CameraNodeToken) { m_currentNode->mName.Set(name.c_str()); } else if (m_tokenType == Grammar::MaterialToken) { aiString aiName;