Move all core types into namespaces (#1886)

* Reorganize namespaces

- Most types are now moved into the `melonDS` namespace
- Only good chance to do this for a while, since a big refactor is next

* Fix the build
This commit is contained in:
Jesse Talavera-Greenberg
2023-11-25 12:32:09 -05:00
committed by GitHub
parent 651b0f680c
commit 346dd4006e
178 changed files with 529 additions and 268 deletions

View File

@ -23,7 +23,7 @@
#include <array>
#include <memory>
namespace Melon
namespace melonDS
{
class GPU;
struct RenderSettings;
@ -31,7 +31,7 @@ struct RenderSettings;
class GLCompositor
{
public:
static std::unique_ptr<GLCompositor> New(Melon::GPU& gpu) noexcept;
static std::unique_ptr<GLCompositor> New(melonDS::GPU& gpu) noexcept;
GLCompositor(const GLCompositor&) = delete;
GLCompositor& operator=(const GLCompositor&) = delete;
~GLCompositor();
@ -44,8 +44,8 @@ public:
void RenderFrame();
void BindOutputTexture(int buf);
private:
GLCompositor(std::array<GLuint, 3> CompShader, Melon::GPU& gpu) noexcept;
Melon::GPU& GPU;
GLCompositor(std::array<GLuint, 3> CompShader, melonDS::GPU& gpu) noexcept;
melonDS::GPU& GPU;
int Scale;
int ScreenH, ScreenW;