RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-18 08:05:07 +00:00
Code Issues Activity Actions

LibDraw: Put all classes in the Gfx namespace

Browse source 
I started adding things to a Draw namespace, but it somehow felt really
wrong seeing Draw::Rect and Draw::Bitmap, etc. So instead, let's rename
the library to LibGfx. :^)
This commit is contained in:
Andreas Kling 2020-02-06 11:56:38 +01:00
parent 939a605334
commit 11580babbf
269 changed files with 1513 additions and 1315 deletions
Download patch file Download diff file Expand all files Collapse all files

50
Libraries/LibDraw/GraphicsBitmap.cpp
View file

@ -33,17 +33,19 @@
#include <sys/mman.h>
#include <unistd.h>
NonnullRefPtr<GraphicsBitmap> GraphicsBitmap::create(Format format, const Size& size)
namespace Gfx {
NonnullRefPtr<Bitmap> Bitmap::create(Format format, const Size& size)
{
return adopt(*new GraphicsBitmap(format, size, Purgeable::No));
return adopt(*new Bitmap(format, size, Purgeable::No));
}
NonnullRefPtr<GraphicsBitmap> GraphicsBitmap::create_purgeable(Format format, const Size& size)
NonnullRefPtr<Bitmap> Bitmap::create_purgeable(Format format, const Size& size)
{
return adopt(*new GraphicsBitmap(format, size, Purgeable::Yes));
return adopt(*new Bitmap(format, size, Purgeable::Yes));
}
GraphicsBitmap::GraphicsBitmap(Format format, const Size& size, Purgeable purgeable)
Bitmap::Bitmap(Format format, const Size& size, Purgeable purgeable)
: m_size(size)
, m_pitch(round_up_to_power_of_two(size.width() * sizeof(RGBA32), 16))
, m_format(format)
@ -57,25 +59,25 @@ GraphicsBitmap::GraphicsBitmap(Format format, const Size& size, Purgeable purgea
m_needs_munmap = true;
}
NonnullRefPtr<GraphicsBitmap> GraphicsBitmap::create_wrapper(Format format, const Size& size, size_t pitch, RGBA32* data)
NonnullRefPtr<Bitmap> Bitmap::create_wrapper(Format format, const Size& size, size_t pitch, RGBA32* data)
{
return adopt(*new GraphicsBitmap(format, size, pitch, data));
return adopt(*new Bitmap(format, size, pitch, data));
}
RefPtr<GraphicsBitmap> GraphicsBitmap::load_from_file(const StringView& path)
RefPtr<Bitmap> Bitmap::load_from_file(const StringView& path)
{
return load_png(path);
}
RefPtr<GraphicsBitmap> GraphicsBitmap::load_from_file(Format format, const StringView& path, const Size& size)
RefPtr<Bitmap> Bitmap::load_from_file(Format format, const StringView& path, const Size& size)
{
MappedFile mapped_file(path);
if (!mapped_file.is_valid())
return nullptr;
return adopt(*new GraphicsBitmap(format, size, move(mapped_file)));
return adopt(*new Bitmap(format, size, move(mapped_file)));
}
GraphicsBitmap::GraphicsBitmap(Format format, const Size& size, size_t pitch, RGBA32* data)
Bitmap::Bitmap(Format format, const Size& size, size_t pitch, RGBA32* data)
: m_size(size)
, m_data(data)
, m_pitch(pitch)
@ -85,7 +87,7 @@ GraphicsBitmap::GraphicsBitmap(Format format, const Size& size, size_t pitch, RG
m_palette = new RGBA32[256];
}
GraphicsBitmap::GraphicsBitmap(Format format, const Size& size, MappedFile&& mapped_file)
Bitmap::Bitmap(Format format, const Size& size, MappedFile&& mapped_file)
: m_size(size)
, m_data((RGBA32*)mapped_file.data())
, m_pitch(round_up_to_power_of_two(size.width() * sizeof(RGBA32), 16))
@ -95,12 +97,12 @@ GraphicsBitmap::GraphicsBitmap(Format format, const Size& size, MappedFile&& map
ASSERT(format != Format::Indexed8);
}
NonnullRefPtr<GraphicsBitmap> GraphicsBitmap::create_with_shared_buffer(Format format, NonnullRefPtr<SharedBuffer>&& shared_buffer, const Size& size)
NonnullRefPtr<Bitmap> Bitmap::create_with_shared_buffer(Format format, NonnullRefPtr<SharedBuffer>&& shared_buffer, const Size& size)
{
return adopt(*new GraphicsBitmap(format, move(shared_buffer), size));
return adopt(*new Bitmap(format, move(shared_buffer), size));
}
GraphicsBitmap::GraphicsBitmap(Format format, NonnullRefPtr<SharedBuffer>&& shared_buffer, const Size& size)
Bitmap::Bitmap(Format format, NonnullRefPtr<SharedBuffer>&& shared_buffer, const Size& size)
: m_size(size)
, m_data((RGBA32*)shared_buffer->data())
, m_pitch(round_up_to_power_of_two(size.width() * sizeof(RGBA32), 16))
@ -110,17 +112,17 @@ GraphicsBitmap::GraphicsBitmap(Format format, NonnullRefPtr<SharedBuffer>&& shar
ASSERT(format != Format::Indexed8);
}
NonnullRefPtr<GraphicsBitmap> GraphicsBitmap::to_shareable_bitmap() const
NonnullRefPtr<Bitmap> Bitmap::to_shareable_bitmap() const
{
if (m_shared_buffer)
return *this;
auto buffer = SharedBuffer::create_with_size(size_in_bytes());
auto bitmap = GraphicsBitmap::create_with_shared_buffer(m_format, *buffer, m_size);
auto bitmap = Bitmap::create_with_shared_buffer(m_format, *buffer, m_size);
memcpy(buffer->data(), scanline(0), size_in_bytes());
return bitmap;
}
GraphicsBitmap::~GraphicsBitmap()
Bitmap::~Bitmap()
{
if (m_needs_munmap) {
int rc = munmap(m_data, size_in_bytes());
@ -130,22 +132,22 @@ GraphicsBitmap::~GraphicsBitmap()
delete[] m_palette;
}
void GraphicsBitmap::set_mmap_name(const StringView& name)
void Bitmap::set_mmap_name(const StringView& name)
{
ASSERT(m_needs_munmap);
::set_mmap_name(m_data, size_in_bytes(), String(name).characters());
}
void GraphicsBitmap::fill(Color color)
void Bitmap::fill(Color color)
{
ASSERT(m_format == GraphicsBitmap::Format::RGB32 || m_format == GraphicsBitmap::Format::RGBA32);
ASSERT(m_format == Bitmap::Format::RGB32 || m_format == Bitmap::Format::RGBA32);
for (int y = 0; y < height(); ++y) {
auto* scanline = this->scanline(y);
fast_u32_fill(scanline, color.value(), width());
}
}
void GraphicsBitmap::set_volatile()
void Bitmap::set_volatile()
{
ASSERT(m_purgeable);
if (m_volatile)
@ -158,7 +160,7 @@ void GraphicsBitmap::set_volatile()
m_volatile = true;
}
[[nodiscard]] bool GraphicsBitmap::set_nonvolatile()
[[nodiscard]] bool Bitmap::set_nonvolatile()
{
ASSERT(m_purgeable);
if (!m_volatile)
@ -171,3 +173,5 @@ void GraphicsBitmap::set_volatile()
m_volatile = false;
return rc == 0;
}
}