Improve code style

Author: halx99

core/2d/FontAtlas.cpp

@@ -43,23 +43,23 @@
 #include "fmt/format.h"
 #include "base/ZipUtils.h"
 
-#include "base/PaddedString.h"
+#include "base/json.h"
 
 namespace ax
 {
-
 const int FontAtlas::CacheTextureWidth     = 512;
 const int FontAtlas::CacheTextureHeight    = 512;
 const char* FontAtlas::CMD_PURGE_FONTATLAS = "__ax_PURGE_FONTATLAS";
 const char* FontAtlas::CMD_RESET_FONTATLAS = "__ax_RESET_FONTATLAS";
 
 void FontAtlas::loadFontAtlas(std::string_view fontatlasFile, hlookup::string_map<FontAtlas*>& outAtlasMap)
 {
-    using namespace simdjson;
+    using namespace ::simdjson;
 
     try
     {
-        auto strJson = PaddedString::load(fontatlasFile);
+        simdjson::PaddedString strJson;
+        FileUtils::getInstance()->getContents(fontatlasFile, &strJson);
         ondemand::parser parser;
         ondemand::document settings = parser.iterate(strJson);
         std::string_view type       = settings["type"];

core/base/CMakeLists.txt

@@ -78,7 +78,6 @@ set(_AX_BASE_HEADER
     base/Scheduler.h
     base/EventType.h
     base/IMEDispatcher.h
-    base/PaddedString.h
     base/JsonWriter.h
     base/JobSystem.h
     )

core/base/PaddedString.h

@@ -2,3 +2,71 @@
 
 #include "rapidjson/rapidjson.h"
 #include "rapidjson/document.h"
+#include "simdjson/simdjson.h"
+
+namespace simdjson
+{
+
+/**
+ * @addtogroup base
+ * @{
+ */
+/**
+ @brief A dedicated class for easy load padded string for simdjson parser.
+
+ The only legal use case is:
+
+ PaddedString strJson;
+ FileUtils::getInstance()->getContents(filePath, &strJson);
+ ondemand::parser parser;
+ ondemand::document settings = parser.iterate(strJson);
+ */
+class PaddedString final
+{
+public:
+    PaddedString() = default;
+    ~PaddedString() { delete[] data_ptr; }
+
+    PaddedString(PaddedString&& o) noexcept : viable_size(o.viable_size), data_ptr(o.data_ptr)
+    {
+        o.data_ptr = nullptr;  // we take ownership
+    }
+    PaddedString& operator=(PaddedString&& o) noexcept
+    {
+        swap(o);
+        return *this;
+    }
+    void swap(PaddedString& o) noexcept
+    {
+        std::swap(viable_size, o.viable_size);
+        std::swap(data_ptr, o.data_ptr);
+    }
+
+    using value_type = char;
+    size_t size() const { return viable_size; }
+    void resize(size_t size)
+    {
+        assert(!data_ptr || size <= viable_size);  // not allow enlarge
+        if (!data_ptr)
+            data_ptr = internal::allocate_padded_buffer(size);
+        viable_size = size;
+    }
+
+    char* data() { return data_ptr; }
+    const char* data() const { return data_ptr; }
+
+    operator padded_string_view() const noexcept
+    {
+        return padded_string_view(data(), size(), size() + SIMDJSON_PADDING);
+    }
+
+private:
+    PaddedString(const PaddedString&) = delete;
+    size_t viable_size{0};
+    char* data_ptr{nullptr};
+};
+
+// end of base group
+/** @} */
+
+}  // namespace ax::simdjson