light7734/light
light7734/light
1
1
Fork 0
Code Issues 21 Pull requests 3 Projects 1 Releases Packages Wiki Activity

fix: more hardcoded paths

Browse source
This commit is contained in:
light7734 2025-07-06 14:09:58 +03:30
parent ee4c658919
commit 77d1619b1c
Signed by: light7734
GPG key ID: 8C30176798F1A6BA
7 changed files with 231 additions and 234 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

400
Test.Mirror
View file

File diff suppressed because it is too large Load diff

2
modules/engine/src/graphics/renderer_programs/texture.cpp
View file

@ -22,7 +22,7 @@ TextureRendererProgram::TextureRendererProgram(
// #todo: don't use relative path // #todo: don't use relative path
ResourceManager::load_shader( ResourceManager::load_shader(
"LT_ENGINE_RESOURCES_TEXTURE_SHADER", "LT_ENGINE_RESOURCES_TEXTURE_SHADER",
"data/assets/shaders/texture/ps.glsl", "data/assets/shaders/texture/vs.glsl",
"data/assets/shaders/texture/ps.glsl" "data/assets/shaders/texture/ps.glsl"
); );

2
modules/engine/src/graphics/renderer_programs/tinted_texture.cpp
View file

@ -22,7 +22,7 @@ TintedTextureRendererProgram::TintedTextureRendererProgram(
// #todo: don't use relative path // #todo: don't use relative path
ResourceManager::load_shader( ResourceManager::load_shader(
"LT_ENGINE_RESOURCES_TINTED_TEXTURE_SHADER", "LT_ENGINE_RESOURCES_TINTED_TEXTURE_SHADER",
"data/assets/shaders/tinted_texture/ps.glsl", "data/assets/shaders/tinted_texture/vs.glsl",
"data/assets/shaders/tinted_texture/ps.glsl" "data/assets/shaders/tinted_texture/ps.glsl"
); );

13
modules/engine/src/platform/graphics/opengl/graphics_context.cpp
View file

@ -42,6 +42,7 @@ void glGraphicsContext::log_debug_data()
void glGraphicsContext::set_debug_message_callback() void glGraphicsContext::set_debug_message_callback()
{ {
// determine log level // determine log level
// #todo: set filters from config.h
#if defined(LIGHT_DEBUG) #if defined(LIGHT_DEBUG)
glEnable(GL_DEBUG_OUTPUT); glEnable(GL_DEBUG_OUTPUT);
glDebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, nullptr, GL_TRUE); glDebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, nullptr, GL_TRUE);
@ -88,26 +89,22 @@ void glGraphicsContext::set_debug_message_callback()
case GL_DEBUG_SEVERITY_MEDIUM: case GL_DEBUG_SEVERITY_MEDIUM:
case GL_DEBUG_SEVERITY_LOW: case GL_DEBUG_SEVERITY_LOW:
lt_log( lt_log(warn,
warn,
"glMessageCallback: Severity: {} :: Source: {} :: Type: {} :: ID: {}", "glMessageCallback: Severity: {} :: Source: {} :: Type: {} :: ID: {}",
Stringifier::glDebugMsgSeverity(severity), Stringifier::glDebugMsgSeverity(severity),
Stringifier::glDebugMsgSource(source), Stringifier::glDebugMsgSource(source),
Stringifier::glDebugMsgType(type), Stringifier::glDebugMsgType(type),
id id);
);
lt_log(warn, " {}", message); lt_log(warn, " {}", message);
return; return;
case GL_DEBUG_SEVERITY_NOTIFICATION: case GL_DEBUG_SEVERITY_NOTIFICATION:
lt_log( lt_log(trace,
trace,
"Severity: {} :: Source: {} :: Type: {} :: ID: {}", "Severity: {} :: Source: {} :: Type: {} :: ID: {}",
Stringifier::glDebugMsgSeverity(severity), Stringifier::glDebugMsgSeverity(severity),
Stringifier::glDebugMsgSource(source), Stringifier::glDebugMsgSource(source),
Stringifier::glDebugMsgType(type), Stringifier::glDebugMsgType(type),
id id);
);
lt_log(trace, " {}", message); lt_log(trace, " {}", message);
return; return;
} }

12
modules/mirror/include/mirror/panel/asset_browser.hpp
View file

@ -9,18 +9,18 @@ namespace Light {
class AssetBrowserPanel: public Panel class AssetBrowserPanel: public Panel
{ {
public: public:
AssetBrowserPanel(Ref<Scene> activeScene); AssetBrowserPanel(Ref<Scene> active_scene);
void on_user_interface_update(); void on_user_interface_update();
private: private:
enum class AssetType enum class AssetType
{ {
None = 0, none = 0,
Scene, scene,
Directory, directory,
Text, text,
Image, image,
}; };
std::filesystem::path m_current_directory; std::filesystem::path m_current_directory;

2
modules/mirror/src/editor_layer.cpp
View file

@ -18,7 +18,7 @@ EditorLayer::EditorLayer(const std::string &name): Layer(name), m_scene_dir("")
m_camera_entity = m_scene->create_entity("Camera"); m_camera_entity = m_scene->create_entity("Camera");
m_camera_entity.add_component<CameraComponent>(SceneCamera(), true); m_camera_entity.add_component<CameraComponent>(SceneCamera(), true);
ResourceManager::load_texture("Awesomeface", "Assets/Textures/awesomeface.png"); ResourceManager::load_texture("Awesomeface", "data/assets/textures/awesomeface.png");
auto entity = Entity { m_scene->create_entity("Awesomeface", {}) }; auto entity = Entity { m_scene->create_entity("Awesomeface", {}) };
entity.add_component<SpriteRendererComponent>( entity.add_component<SpriteRendererComponent>(

32
modules/mirror/src/panel/asset_browser.cpp
View file

@ -5,10 +5,10 @@
namespace Light { namespace Light {
AssetBrowserPanel::AssetBrowserPanel(Ref<Scene> activeScene) AssetBrowserPanel::AssetBrowserPanel(Ref<Scene> active_scene)
: m_current_directory("Assets") : m_current_directory("./data/assets")
, m_assets_path("Assets") , m_assets_path("./data/assets")
, m_active_scene(activeScene) , m_active_scene(std::move(active_scene))
{ {
ResourceManager::load_texture("_Assets_Directory", "data/engine/icons/asset/dir.png"); ResourceManager::load_texture("_Assets_Directory", "data/engine/icons/asset/dir.png");
ResourceManager::load_texture("_Assets_Scene", "data/engine/icons/asset/scene.png"); ResourceManager::load_texture("_Assets_Scene", "data/engine/icons/asset/scene.png");
@ -26,7 +26,7 @@ void AssetBrowserPanel::on_user_interface_update()
ImGui::Begin("Content Browser"); ImGui::Begin("Content Browser");
// Parent directory button // Parent directory button
if (m_current_directory != std::filesystem::path("Assets")) if (m_current_directory != std::filesystem::path("data/assets"))
{ {
if (ImGui::Button(" <-- ")) if (ImGui::Button(" <-- "))
{ {
@ -52,19 +52,19 @@ void AssetBrowserPanel::on_user_interface_update()
// TODO: Tidy up // TODO: Tidy up
auto assetType = AssetType {}; auto assetType = AssetType {};
assetType = extension.empty() ? AssetType::Directory : assetType = extension.empty() ? AssetType::directory :
extension == ".txt" ? AssetType::Text : extension == ".txt" ? AssetType::text :
extension == ".glsl" ? AssetType::Text : extension == ".glsl" ? AssetType::text :
extension == ".png" ? AssetType::Image : extension == ".png" ? AssetType::image :
extension == ".scene" ? AssetType::Scene : extension == ".scene" ? AssetType::scene :
AssetType::None; AssetType::none;
// Extension not supported // Extension not supported
if (assetType == AssetType::None) if (assetType == AssetType::none)
{ {
continue; continue;
} }
@ -75,7 +75,7 @@ void AssetBrowserPanel::on_user_interface_update()
switch (assetType) switch (assetType)
{ {
// Directory // Directory
case AssetType::Directory: case AssetType::directory:
if (ImGui::ImageButton( if (ImGui::ImageButton(
m_directory_texture->get_texture(), m_directory_texture->get_texture(),
ImVec2(m_file_size, m_file_size), ImVec2(m_file_size, m_file_size),
@ -91,7 +91,7 @@ void AssetBrowserPanel::on_user_interface_update()
break; break;
// Scene // Scene
case AssetType::Scene: case AssetType::scene:
if (ImGui::ImageButton( if (ImGui::ImageButton(
m_scene_texture->get_texture(), m_scene_texture->get_texture(),
ImVec2(m_file_size, m_file_size), ImVec2(m_file_size, m_file_size),
@ -109,7 +109,7 @@ void AssetBrowserPanel::on_user_interface_update()
break; break;
// Image // Image
case AssetType::Image: case AssetType::image:
if (ImGui::ImageButton( if (ImGui::ImageButton(
m_image_texture->get_texture(), m_image_texture->get_texture(),
ImVec2(m_file_size, m_file_size), ImVec2(m_file_size, m_file_size),
@ -124,7 +124,7 @@ void AssetBrowserPanel::on_user_interface_update()
break; break;
// Text // Text
case AssetType::Text: case AssetType::text:
if (ImGui::ImageButton( if (ImGui::ImageButton(
m_text_texture->get_texture(), m_text_texture->get_texture(),
ImVec2(m_file_size, m_file_size), ImVec2(m_file_size, m_file_size),