add unpushed changes

CMakeLists.txt

@@ -439,7 +439,8 @@ source/modules/font/GenericShaper.cpp
 source/modules/font/wrap_Font.cpp
 source/modules/font/wrap_Rasterizer.cpp
 source/modules/font/wrap_GlyphData.cpp
-source/modules/graphics/Buffer.cpp
+# source/modules/graphics/Buffer.cpp
+source/modules/graphics/DrawCommand.cpp
 source/modules/graphics/Graphics.cpp
 source/modules/graphics/FontBase.cpp
 source/modules/graphics/Mesh.cpp

include/common/Exception.hpp

@@ -30,20 +30,14 @@ namespace love
 
 #if __DEBUG__
     #include <cstdio>
+    #define __FILENAME__ (__FILE__ + (sizeof(__FILE__) - 1) - sizeof(basename(__FILE__)))
 
     // Macro to log to both stdout and a debug.log file
-    #define LOG(format, ...)                                                                  \
-        do                                                                                    \
-        {                                                                                     \
-            std::FILE* outFile      = std::fopen("debug.log", "a");                           \
-            static const char* data = "%s %s:%d: " format "\n";                               \
-                                                                                              \
-            if (outFile)                                                                      \
-            {                                                                                 \
-                std::fprintf(outFile, data, __FILE__, __FUNCTION__, __LINE__, ##__VA_ARGS__); \
-                std::fclose(outFile);                                                         \
-            }                                                                                 \
-            std::printf(data, __FILE__, __FUNCTION__, __LINE__, ##__VA_ARGS__);               \
+    #define LOG(format, ...)                                                        \
+        do                                                                          \
+        {                                                                           \
+            static const char* data = "[C++] %s %s:%d: " format "\n";               \
+            std::printf(data, __FILENAME__, __FUNCTION__, __LINE__, ##__VA_ARGS__); \
         } while (0)
 #endif
 } // namespace love

include/common/error.hpp

@@ -83,4 +83,8 @@ namespace love
 // Thread
 #define E_CHANNEL_VARIANT_UNKNOWN "boolean, number, string, love type, or table expected."
 #define E_THREAD_VARIANT_UNKNOWN  "boolean, number, string, love type, or flat table expected."
+
+// Window
+#define E_WINDOW_CLOSING_RENDERTARGET_ACTIVE \
+    "love.window.close cannot be called while a render target is active in love.graphics."
 } // namespace love

include/driver/DigitalSound.tcc

@@ -3,6 +3,8 @@
 #include "common/Map.hpp"
 #include "common/Singleton.tcc"
 
+#include <atomic>
+
 namespace love
 {
     template<class T>
@@ -23,12 +25,17 @@ namespace love
             ENCODING_MAX_ENUM
         };
 
-        virtual void initialize()
+        DigitalSoundBase() : initialized(false)
         {}
 
+        virtual void initialize() = 0;
+
         void update()
         {
             static_cast<T*>(this)->updateImpl();
         }
+
+      protected:
+        std::atomic<bool> initialized;
     };
 } // namespace love

include/driver/graphics/DrawCommand.hpp

@@ -101,13 +101,6 @@ namespace love
     constexpr size_t INIT_VERTEX_BUFFER_SIZE = sizeof(Vertex) * 4096 * 1;
     constexpr size_t INIT_INDEX_BUFFER_SIZE  = sizeof(uint16_t) * LOVE_UINT16_MAX * 1;
 
-    inline StreamBuffer<Vertex>* newVertexBuffer(size_t size)
-    {
-        return new StreamBuffer<Vertex>(BUFFERUSAGE_VERTEX, size);
-    }
-
-    inline StreamBuffer<uint16_t>* newIndexBuffer(size_t size)
-    {
-        return new StreamBuffer<uint16_t>(BUFFERUSAGE_INDEX, size);
-    }
+    StreamBuffer<Vertex>* newVertexBuffer(size_t size);
+    StreamBuffer<uint16_t>* newIndexBuffer(size_t size);
 } // namespace love

include/modules/graphics/TextBatch.hpp

@@ -2,7 +2,7 @@
 
 #include "common/Range.hpp"
 
-#include "modules/graphics/Buffer.tcc"
+// #include "modules/graphics/Buffer.tcc"
 #include "modules/graphics/Drawable.hpp"
 #include "modules/graphics/Font.tcc"
 
@@ -61,8 +61,6 @@ namespace love
         VertexAttributes vertexAttributes;
         BufferBindings vertexBuffers;
 
-        StrongRef<BufferBase> vertexBuffer;
-
         std::vector<Vertex> buffer;
         Range modifiedVertices;
 

include/modules/graphics/wrap_Graphics.hpp

@@ -199,6 +199,10 @@ namespace Wrap_Graphics
 
     int printf(lua_State* L);
 
+    int getDefaultFilter(lua_State* L);
+
+    int setDefaultFilter(lua_State* L);
+
     int getScreens(lua_State* L);
 
     int getActiveScreen(lua_State* L);

include/modules/math/wrap_Math.lua

@@ -179,6 +179,5 @@ function love_math.linearToGamma(r, g, b, a)
 	end
 	return linearToGamma(r), linearToGamma(g), linearToGamma(b), a
 end
-
 -- DO NOT REMOVE THE NEXT LINE. It is used to load this file as a C++ string.
 --)luastring"--"

include/modules/system/wrap_System.hpp

@@ -31,5 +31,7 @@ namespace Wrap_System
 
     int setPlayCoins(lua_State* L);
 
+    int getTheme(lua_State* L);
+
     int open(lua_State* L);
 } // namespace Wrap_System

include/modules/window/Window.tcc

@@ -135,11 +135,6 @@ namespace love
             return this->open;
         }
 
-        void close()
-        {
-            this->close(true);
-        }
-
         void updateSettings(const WindowSettings& newSettings, bool updateGraphicsViewport)
         {
             this->pixelWidth  = windowWidth;
@@ -297,11 +292,6 @@ namespace love
         // clang-format on
 
       protected:
-        void close(bool)
-        {
-            this->open = false;
-        }
-
         bool createWindowAndContext(int x, int y, int width, int height, uint32_t flags)
         {
             this->open = true;

platform/cafe/include/driver/display/GX2.hpp

@@ -32,7 +32,7 @@ namespace love
 
         void initialize();
 
-        ~GX2();
+        void deInitialize();
 
         int onForegroundAcquired();
 

platform/cafe/include/modules/window/Window.hpp

@@ -15,6 +15,8 @@ namespace love
 
         virtual ~Window();
 
+        void close();
+
         void setGraphics(Graphics* graphics)
         {
             this->graphics.set(graphics);
@@ -33,6 +35,8 @@ namespace love
         using WindowBase::getConstant;
 
       private:
+        void close(bool allowExceptions);
+
         StrongRef<Graphics> graphics;
     };
 } // namespace love

platform/cafe/include/modules/window/wrap_Window.lua

@@ -0,0 +1,9 @@
+R"luastring"--(
+-- DO NOT REMOVE THE ABOVE LINE. It is used to load this file as a C++ string.
+-- There is a matching delimiter at the bottom of the file.
+local title, message, buttons = ...
+local result                  = nil
+
+return true
+-- DO NOT REMOVE THE NEXT LINE. It is used to load this file as a C++ string.
+--)luastring"--"

platform/cafe/source/driver/display/GX2.cpp

@@ -29,7 +29,7 @@ namespace love
         dirtyProjection(false)
     {}
 
-    GX2::~GX2()
+    void GX2::deInitialize()
     {
         if (this->inForeground)
             this->onForegroundReleased();

platform/cafe/source/modules/graphics/Graphics.cpp

@@ -371,6 +371,7 @@ namespace love
             return;
 
         this->flushBatchedDraws();
+        gx2.deInitialize();
     }
 
     bool Graphics::isActive() const

platform/cafe/source/modules/window/Window.cpp

@@ -15,6 +15,24 @@ namespace love
         this->graphics.set(nullptr);
     }
 
+    void Window::close()
+    {
+        this->close(true);
+    }
+
+    void Window::close(bool allowExceptions)
+    {
+        if (this->graphics.get())
+        {
+            if (allowExceptions && this->graphics->isRenderTargetActive())
+                throw love::Exception(E_WINDOW_CLOSING_RENDERTARGET_ACTIVE);
+
+            this->graphics->unsetMode();
+        }
+
+        this->open = false;
+    }
+
     bool Window::setWindow(int width, int height, WindowSettings* settings)
     {
         if (!this->graphics.get())

platform/ctr/include/driver/display/citro3d.hpp

@@ -35,7 +35,7 @@ namespace love
 
         void setupContext();
 
-        ~citro3d();
+        void deInitialize();
 
         void clear(const Color& color);
 

platform/ctr/include/modules/window/Window.hpp

@@ -20,6 +20,8 @@ namespace love
             this->graphics.set(graphics);
         }
 
+        void close();
+
         bool setWindow(int width = 800, int height = 600, WindowSettings* settings = nullptr);
 
         void updateSettingsImpl(const WindowSettings& settings, bool updateGraphicsViewport);
@@ -33,6 +35,8 @@ namespace love
         using WindowBase::getConstant;
 
       private:
+        void close(bool allowExceptions);
+
         StrongRef<Graphics> graphics;
     };
 } // namespace love