From 5757f10cf29ee503210d4307befffdd5b2ca5331 Mon Sep 17 00:00:00 2001 From: Atdunbg Date: Tue, 2 Dec 2025 13:35:16 +0800 Subject: [PATCH] change editor code: m1911Materials.fbx to M1911Materials.fbx, delete the extra keyword PUBLIC from CMakeLists.txt --- Editor/Editor/EditorLayer.cpp | 2 +- Prism/CMakeLists.txt | 1 - Prism/src/Prism/Platform/OpenGL/OpenGLRendererAPI.cpp | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Editor/Editor/EditorLayer.cpp b/Editor/Editor/EditorLayer.cpp index 60f4504..bdb6b8c 100644 --- a/Editor/Editor/EditorLayer.cpp +++ b/Editor/Editor/EditorLayer.cpp @@ -149,7 +149,7 @@ namespace Prism auto secondEntity = m_Scene->CreateEntity("Gun Entity"); secondEntity->Transform() = glm::translate(glm::mat4(1.0f), { 5, 5, 5 }) * glm::scale(glm::mat4(1.0f), {10, 10, 10}); - mesh = CreateRef("assets/models/m1911/m1911Materials.fbx"); + mesh = CreateRef("assets/models/m1911/M1911Materials.fbx"); secondEntity->SetMesh(mesh); } diff --git a/Prism/CMakeLists.txt b/Prism/CMakeLists.txt index 9bde539..b0f525e 100644 --- a/Prism/CMakeLists.txt +++ b/Prism/CMakeLists.txt @@ -83,7 +83,6 @@ set(STATIC_LIBRARY ${PROJECT_NAME}-static) add_library(${STATIC_LIBRARY} STATIC ${SRC_SOURCE}) target_compile_definitions(${STATIC_LIBRARY} PRIVATE - PUBLIC ${DEBUG_DEFINITIONS} INTERFACE PRISM_STATIC diff --git a/Prism/src/Prism/Platform/OpenGL/OpenGLRendererAPI.cpp b/Prism/src/Prism/Platform/OpenGL/OpenGLRendererAPI.cpp index 4b0b5b4..d7effd5 100644 --- a/Prism/src/Prism/Platform/OpenGL/OpenGLRendererAPI.cpp +++ b/Prism/src/Prism/Platform/OpenGL/OpenGLRendererAPI.cpp @@ -71,7 +71,6 @@ namespace Prism { case GL_DEBUG_SEVERITY_HIGH: PM_CORE_ERROR("[OpenGL HIGH] Source: {0}, Type: {1}, ID: {2}\nMessage: {3}", sourceStr, typeStr, id, message); - PM_CORE_ASSERT(false); break; case GL_DEBUG_SEVERITY_MEDIUM: