RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 06:04:57 +00:00
Code Issues Activity Actions

3DFileViewer: Use ByteString for file paths

Browse source
This commit is contained in:
Sam Atkins 2024-01-23 16:31:36 +00:00 • committed by Sam Atkins
parent 90240c0e02
commit 1750af83b0
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Applications/3DFileViewer/MeshLoader.h
View file

@ -17,5 +17,5 @@ public:
MeshLoader() = default;
virtual ~MeshLoader() = default;
virtual ErrorOr<NonnullRefPtr<Mesh>> load(String const& filename, NonnullOwnPtr<Core::File> file) = 0;
virtual ErrorOr<NonnullRefPtr<Mesh>> load(ByteString const& filename, NonnullOwnPtr<Core::File> file) = 0;
};

2
Userland/Applications/3DFileViewer/WavefrontOBJLoader.cpp
View file

@ -25,7 +25,7 @@ static ErrorOr<GLfloat> parse_float(StringView string)
return maybe_float.release_value();
}
ErrorOr<NonnullRefPtr<Mesh>> WavefrontOBJLoader::load(String const& filename, NonnullOwnPtr<Core::File> file)
ErrorOr<NonnullRefPtr<Mesh>> WavefrontOBJLoader::load(ByteString const& filename, NonnullOwnPtr<Core::File> file)
{
auto buffered_file = TRY(Core::InputBufferedFile::create(move(file)));

2
Userland/Applications/3DFileViewer/WavefrontOBJLoader.h
View file

@ -18,5 +18,5 @@ public:
WavefrontOBJLoader() = default;
~WavefrontOBJLoader() override = default;
ErrorOr<NonnullRefPtr<Mesh>> load(String const& filename, NonnullOwnPtr<Core::File> file) override;
ErrorOr<NonnullRefPtr<Mesh>> load(ByteString const& filename, NonnullOwnPtr<Core::File> file) override;
};

14
Userland/Applications/3DFileViewer/main.cpp
View file

@ -34,7 +34,7 @@ class GLContextWidget final : public GUI::Frame {
C_OBJECT(GLContextWidget);
public:
bool load_file(String const& filename, NonnullOwnPtr<Core::File> file);
bool load_file(ByteString const& filename, NonnullOwnPtr<Core::File> file);
void toggle_rotate_x() { m_rotate_x = !m_rotate_x; }
void toggle_rotate_y() { m_rotate_y = !m_rotate_y; }
void toggle_rotate_z() { m_rotate_z = !m_rotate_z; }
@ -153,7 +153,7 @@ void GLContextWidget::drop_event(GUI::DropEvent& event)
auto response = FileSystemAccessClient::Client::the().request_file_read_only_approved(window(), url.serialize_path());
if (response.is_error())
return;
load_file(MUST(String::from_byte_string(response.value().filename())), response.value().release_stream());
load_file(response.value().filename(), response.value().release_stream());
}
}
@ -289,9 +289,9 @@ void GLContextWidget::timer_event(Core::TimerEvent&)
m_cycles++;
}
bool GLContextWidget::load_file(String const& filename, NonnullOwnPtr<Core::File> file)
bool GLContextWidget::load_file(ByteString const& filename, NonnullOwnPtr<Core::File> file)
{
if (!filename.bytes_as_string_view().ends_with(".obj"sv)) {
if (!filename.ends_with(".obj"sv)) {
GUI::MessageBox::show(window(), ByteString::formatted("Opening \"{}\" failed: invalid file type", filename), "Error"sv, GUI::MessageBox::Type::Error);
return false;
}
@ -304,7 +304,7 @@ bool GLContextWidget::load_file(String const& filename, NonnullOwnPtr<Core::File
// Determine whether or not a texture for this model resides within the same directory
StringBuilder builder;
builder.append(filename.bytes_as_string_view().split_view('.').at(0));
builder.append(filename.split_view('.').at(0));
builder.append(".bmp"sv);
// Attempt to open the texture file from disk
@ -389,7 +389,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
return;
auto file = response.release_value();
widget->load_file(MUST(String::from_byte_string(file.filename())), file.release_stream());
widget->load_file(file.filename(), file.release_stream());
}));
file_menu->add_separator();
file_menu->add_action(GUI::CommonActions::make_quit_action([&](auto&) {
@ -583,7 +583,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
GUI::MessageBox::show(window, ByteString::formatted("Opening \"{}\" failed: {}", filename, strerror(errno)), "Error"sv, GUI::MessageBox::Type::Error);
return 1;
}
widget->load_file(TRY(String::from_byte_string(file.value().filename())), file.value().release_stream());
widget->load_file(file.value().filename(), file.value().release_stream());
return app->exec();
}