动画编码完成
This commit is contained in:
+4
-8
@@ -13,15 +13,11 @@ using json = nlohmann::json;
|
||||
|
||||
struct Motion {
|
||||
string type;
|
||||
string technique;
|
||||
string step;
|
||||
string show_type;
|
||||
string png_name;
|
||||
int png_num;
|
||||
vector<string> png_names;
|
||||
string getMotionId() {
|
||||
return type + technique + step + show_type + png_name;
|
||||
return type;
|
||||
}
|
||||
NLOHMANN_DEFINE_TYPE_INTRUSIVE(Motion, type, technique, step, show_type, png_name, png_num)
|
||||
NLOHMANN_DEFINE_TYPE_INTRUSIVE(Motion, type, png_names)
|
||||
};
|
||||
|
||||
struct InitArg
|
||||
@@ -104,7 +100,7 @@ private:
|
||||
VkPipelineLayout m_pipelineLayout = VK_NULL_HANDLE;
|
||||
VkDescriptorSetLayout m_descriptorSetLayout = VK_NULL_HANDLE;
|
||||
vector<VkDescriptorSet> m_descriptor_sets;
|
||||
const int kMaxTexture = 2;
|
||||
const int kMaxTexture = 30;
|
||||
vector<Texture> m_texs;
|
||||
vector<Texture> m_texs_ex;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user