KJ16609/FGL-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup file scanner code

Browse Source
This commit is contained in:
kj16609
2025-02-17 03:00:09 -05:00
parent 91ad1c21c3
commit 8670fe3530
4 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/editor/src/gui/FileBrowser.cpp
View File

@@ -125,7 +125,7 @@ namespace fgl::engine::filesystem
void FileBrowser::drawTexture( const FileInfo& info )
{
if ( auto itter = m_file_textures.find( info.path ); itter != m_file_textures.end() )
if ( auto itter = m_file_textures.find( info.m_path ); itter != m_file_textures.end() )
{
auto& [ path, texture ] = *itter;
@@ -135,17 +135,17 @@ namespace fgl::engine::filesystem
{
m_file_texture->drawImGuiButton( { DESIRED_SIZE, DESIRED_SIZE } );
auto tex { getTextureStore().load( info.path ) };
auto tex { getTextureStore().load( info.m_path ) };
// Add the texture
m_file_textures.insert( std::make_pair( info.path, std::move( tex ) ) );
m_file_textures.insert( std::make_pair( info.m_path, std::move( tex ) ) );
}
if ( ImGui::BeginDragDropSource() )
{
ImGui::SetDragDropPayload(
DRAG_TYPE_FILE_TEXTURE_INFO, &info, sizeof( info ), ImGuiCond_Once /* Only copy the info once */ );
ImGui::SetTooltip( info.filename.c_str() );
ImGui::SetTooltip( info.m_filename.c_str() );
ImGui::EndDragDropSource();
}
@@ -168,7 +168,7 @@ namespace fgl::engine::filesystem
{
ImGui::SetDragDropPayload(
DRAG_TYPE_FILE_MODEL_INFO, &info, sizeof( info ), ImGuiCond_Once /* Only copy the info once */ );
ImGui::SetTooltip( info.filename.c_str() );
ImGui::SetTooltip( info.m_filename.c_str() );
ImGui::EndDragDropSource();
}
@@ -176,9 +176,9 @@ namespace fgl::engine::filesystem
void FileBrowser::drawFile( const FileInfo& data )
{
ImGui::PushID( data.path.c_str() );
ImGui::PushID( data.m_path.c_str() );
switch ( data.engine_type )
switch ( data.m_engine_type )
{
case TEXTURE:
drawTexture( data );
@@ -197,9 +197,9 @@ namespace fgl::engine::filesystem
break;
}
ImGui::Text( data.filename.c_str() );
ImGui::Text( data.m_filename.c_str() );
const std::string str { toHumanByteSize( data.size ) };
const std::string str { toHumanByteSize( data.m_size ) };
ImGui::Text( str.c_str() );
ImGui::NextColumn();
ImGui::PopID();

6
src/editor/src/gui/preview.cpp
View File

@@ -30,7 +30,7 @@ namespace fgl::engine::gui
const filesystem::FileInfo* data { static_cast< filesystem::FileInfo* >( payload->Data ) };
//Determine what the file is
switch ( data->engine_type )
switch ( data->m_engine_type )
{
default:
[[fallthrough]];
@@ -48,7 +48,7 @@ namespace fgl::engine::gui
GameObject obj { GameObject::createGameObject() };
std::shared_ptr< Model > model {
Model::createModel( data->path, info.model_vertex_buffer, info.model_index_buffer )
Model::createModel( data->m_path, info.model_vertex_buffer, info.model_index_buffer )
};
obj.addFlag( IsEntity | IsVisible );
@@ -65,7 +65,7 @@ namespace fgl::engine::gui
{
SceneBuilder builder { info.model_vertex_buffer, info.model_index_buffer };
builder.loadScene( data->path );
builder.loadScene( data->m_path );
std::vector< GameObject > objs { builder.getGameObjects() };