coffee/HDSDK
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. 删除无用宏

Browse Source 
2. 增加文本的背景颜色默认参数
This commit is contained in:
coffee 2024-12-08 18:10:10 +08:00
parent a1085f62cb
commit bc672478fa
2 changed files with 1 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SDK/Data/HProgramInfo.h
View File

@ -75,7 +75,7 @@ struct TextInfo : public IProgramNode
EffectInfo effect; ///< 特效 EffectInfo effect; ///< 特效
cat::HCatBuffer text; ///< 文本 cat::HCatBuffer text; ///< 文本
TextInfo() : guid("textGuid"), singleLine(false) {} TextInfo() : guid("textGuid"), background("#000000"), singleLine(false) {}
virtual void ToXml(HXml &xml) override { xml.NewChild(GetType()).ToXml(*this); } virtual void ToXml(HXml &xml) override { xml.NewChild(GetType()).ToXml(*this); }
virtual bool FromXml(const HXml &xml) override { return xml.get_to(*this); } virtual bool FromXml(const HXml &xml) override { return xml.get_to(*this); }

95
SDK/HXml.h
View File

@ -357,99 +357,4 @@ private:
}; };
#define CREATE_TAG_P(_doc, _parent, _node, _tagName) \
_node = (_doc)->NewElement(_tagName); \
if (_node == nullptr) { \
code = cat::HErrorCode::kMemoryFailed; \
break; \
} else { \
(_parent)->InsertEndChild(_node); \
}
#define CREATE_TAG_ATTR(_doc, _node, _tagName, _attrName, _attrValue) \
_node = (_doc)->NewElement(_tagName); \
if (_node == nullptr) { \
code = cat::HErrorCode::kMemoryFailed; \
break; \
} else { \
_node->SetAttribute(_attrName, _attrValue); \
}
#define CREATE_TAG_ATTR_P(_doc, _parent, _node, _tagName, _attrName, _attrValue)\
_node = (_doc)->NewElement(_tagName); \
if (_node == nullptr) { \
code = cat::HErrorCode::kMemoryFailed; \
break; \
} else { \
_node->SetAttribute(_attrName, _attrValue); \
(_parent)->InsertEndChild(_node); \
}
#define PARSE_TAG_ATTR_P(_parent, _node, _tagName, _attrName, _attrValue) \
_node = (_parent)->FirstChildElement(_tagName); \
if (_node == nullptr) { \
code = cat::HErrorCode::kParseXmlFailed; \
break; \
} else if (_node->FindAttribute(_attrName) == nullptr) { \
code = cat::HErrorCode::kParseXmlFailed; \
break; \
} else { \
_attrValue = _node->Attribute(_attrName); \
}
#define PARSE_TAG_ATTR_P_TYPE(_parent, _node, _tagName, _attrName, _attrValue, _type) \
_node = (_parent)->FirstChildElement(_tagName); \
if (_node == nullptr) { \
code = cat::HErrorCode::kParseXmlFailed; \
break; \
} else if (_node->FindAttribute(_attrName) == nullptr) { \
code = cat::HErrorCode::kParseXmlFailed; \
break; \
} else { \
_attrValue = DataToType<_type>(_node->Attribute(_attrName)); \
}
#define PARSE_TAG_ATTR_P_NULL(_parent, _node, _tagName, _attrName, _attrValue) \
_node = (_parent)->FirstChildElement(_tagName); \
if (_node == nullptr) { \
_attrValue = _type(); \
} else if (_node->FindAttribute(_attrName) == nullptr) { \
code = cat::HErrorCode::kParseXmlFailed; \
break; \
} else { \
_attrValue = _node->Attribute(_attrName); \
}
#define PARSE_TAG_ATTR_P_NULL_TYPE(_parent, _node, _tagName, _attrName, _attrValue, _type) \
_node = (_parent)->FirstChildElement(_tagName); \
if (_node == nullptr) { \
_attrValue = _type(); \
} else if (_node->FindAttribute(_attrName) == nullptr) { \
code = cat::HErrorCode::kParseXmlFailed; \
break; \
} else { \
_attrValue = DataToType<_type>(_node->Attribute(_attrName)); \
}
#define PARSE_TAG_ATTR(_node, _tagName, _attrName, _attrValue) \
if (_node->FindAttribute(_attrName) == nullptr) { \
code = cat::HErrorCode::kParseXmlFailed; \
break; \
} else { \
_attrValue = _node->Attribute(_attrName); \
}
#define PARSE_TAG_ATTR_TYPE(_node, _tagName, _attrName, _attrValue, _type) \
if (_node->FindAttribute(_attrName) == nullptr) { \
code = cat::HErrorCode::kParseXmlFailed; \
break; \
} else { \
_attrValue = DataToType<_type>(_node->Attribute(_attrName)); \
}
#endif // HXML_H #endif // HXML_H