36张图片打包

2025-10-29 21:38:03 +08:00
parent 13357ab256
commit dfbef7caf1
54 changed files with 228 additions and 46 deletions
@@ -19,7 +19,7 @@ struct Motion {
    string png_name;
    int png_num;
    string getMotionId() {
-        return type + technique + step + show_type;
+        return type + technique + step + show_type + png_name;
    }
    NLOHMANN_DEFINE_TYPE_INTRUSIVE(Motion, type, technique, step, show_type, png_name, png_num)
 };
@@ -104,7 +104,7 @@ private:
    VkPipelineLayout m_pipelineLayout = VK_NULL_HANDLE;
    VkDescriptorSetLayout m_descriptorSetLayout = VK_NULL_HANDLE;
    vector<VkDescriptorSet> m_descriptor_sets;
-    const int kMaxTexture = 20;
+    const int kMaxTexture = 2;
    vector<Texture> m_texs;
    vector<Texture> m_texs_ex;

@@ -137,8 +137,10 @@ private:
    VkDescriptorSetLayout m_descriptorSetLayout_bg = VK_NULL_HANDLE;
    VkDescriptorSet       m_descriptor_set_bg = VK_NULL_HANDLE;

-    void changeMotion(Motion& motion);
+    
 public:
+    void changeMotion(const char* json);
+    void changeMotion(Motion& motion);
    InitArg _initArg;
    Motion _curMotion;
    int _curTexIndex = 0;