Skip to content

Commit b6ce2d9

Browse files
AiMiDiAiMiDi
committed
version 0.3.9.1
1 parent 6e3e2ea commit b6ce2d9

12 files changed

+718
-625
lines changed

‎README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,12 @@ If there is a problem with selecting multiple-parts when the model is imported,
112112

113113
​ 7. Fixed some actions importing problems.
114114

115+
**version 0.3.9.1**
116+
117+
​ 1. Fixed the problem of stuck animation after import.
118+
119+
​ 2. Fix some possible memory leaks.
120+
115121
## usage
116122

117123
1.Select the corresponding version of the plugin and place it in the plugins folder under the Cinema 4D installation directory.

‎README_zh.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,12 @@ Cinema 4D的mmdtool。
112112

113113
​ 7.修复部分动作导入问题。
114114

115+
**version 0.3.9.1**
116+
117+
​ 1.修复导入动画后卡死问题。
118+
119+
​ 2.修复一些可能的内存泄漏问题。
120+
115121
## 使用方法
116122

117123
1.选择相应的插件版本，并将其放置在Cinema 4D安装目录下的plugins文件夹中。

‎source/BulletTest.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ namespace mmd
236236
}
237237

238238
m_group = bc->GetInt32(RIGID_GROUP_ID);
239-
PMX_Rigid_body_non_collision_group groupMask{
239+
PMX_Rigid_body_non_collision_group groupMask(
240240
bc->GetBool(RIGID_NON_COLLISION_GROUP_0),
241241
bc->GetBool(RIGID_NON_COLLISION_GROUP_1),
242242
bc->GetBool(RIGID_NON_COLLISION_GROUP_2),
@@ -252,7 +252,7 @@ namespace mmd
252252
bc->GetBool(RIGID_NON_COLLISION_GROUP_12),
253253
bc->GetBool(RIGID_NON_COLLISION_GROUP_13),
254254
bc->GetBool(RIGID_NON_COLLISION_GROUP_14),
255-
bc->GetBool(RIGID_NON_COLLISION_GROUP_15)};
255+
bc->GetBool(RIGID_NON_COLLISION_GROUP_15));
256256
m_groupMask = *reinterpret_cast<uint16_t*>(&groupMask);
257257
m_node = node;
258258
m_name = bc->GetString(RIGID_NAME_LOCAL);

‎source/MMD_PMX_Control.cpp

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,6 +1253,9 @@ Bool mmd::TMMDBone::SetDParameter(GeListNode* node, const DescID& id, const GeDa
12531253
return SUPER::SetDParameter(node, id, t_data, flags);
12541254
}
12551255
Bool mmd::TMMDBone::Message(GeListNode* node, Int32 type, void* data) {
1256+
iferr_scope_handler{
1257+
return true;
1258+
};
12561259
switch (type)
12571260
{
12581261
case MSG_DESCRIPTION_CHECKUPDATE:
@@ -1436,7 +1439,7 @@ Bool mmd::TMMDBone::Message(GeListNode* node, Int32 type, void* data) {
14361439
xCurvr->by = by;
14371440
}
14381441
else {
1439-
iferr(XCurve.Insert(frame, new mmd::VMD_Curve(ax, ay, bx, by)))return false;
1442+
XCurve.Insert(frame, NewObj(mmd::VMD_Curve,ax, ay, bx, by).GetValue())iferr_return;
14401443
}
14411444
break;
14421445
}
@@ -1450,7 +1453,7 @@ Bool mmd::TMMDBone::Message(GeListNode* node, Int32 type, void* data) {
14501453
yCurvr->by = by;
14511454
}
14521455
else {
1453-
iferr(YCurve.Insert(frame, new mmd::VMD_Curve(ax, ay, bx, by)))return false;
1456+
YCurve.Insert(frame, NewObj(mmd::VMD_Curve,ax, ay, bx, by).GetValue())iferr_return;
14541457
}
14551458
break;
14561459
}
@@ -1464,7 +1467,7 @@ Bool mmd::TMMDBone::Message(GeListNode* node, Int32 type, void* data) {
14641467
zCurvr->by = by;
14651468
}
14661469
else {
1467-
iferr(ZCurve.Insert(frame, new mmd::VMD_Curve(ax, ay, bx, by)))return false;
1470+
ZCurve.Insert(frame, NewObj(mmd::VMD_Curve,ax, ay, bx, by).GetValue())iferr_return;
14681471
}
14691472
break;
14701473
}
@@ -1478,7 +1481,7 @@ Bool mmd::TMMDBone::Message(GeListNode* node, Int32 type, void* data) {
14781481
rCurvr->by = by;
14791482
}
14801483
else {
1481-
iferr(RCurve.Insert(frame, new mmd::VMD_Curve(ax, ay, bx, by)))return false;
1484+
RCurve.Insert(frame, NewObj(mmd::VMD_Curve,ax, ay, bx, by).GetValue())iferr_return;
14821485
}
14831486
break;
14841487
}
@@ -1492,7 +1495,7 @@ Bool mmd::TMMDBone::Message(GeListNode* node, Int32 type, void* data) {
14921495
xCurvr->by = by;
14931496
}
14941497
else {
1495-
iferr(XCurve.Insert(frame, new mmd::VMD_Curve(ax, ay, bx, by)))return false;
1498+
XCurve.Insert(frame, NewObj(mmd::VMD_Curve,ax, ay, bx, by).GetValue())iferr_return;
14961499
}
14971500
auto yCurvr_ptr = YCurve.Find(frame);
14981501
if (yCurvr_ptr != nullptr) {
@@ -1503,7 +1506,7 @@ Bool mmd::TMMDBone::Message(GeListNode* node, Int32 type, void* data) {
15031506
yCurvr->by = by;
15041507
}
15051508
else {
1506-
iferr(YCurve.Insert(frame, new mmd::VMD_Curve(ax, ay, bx, by)))return false;
1509+
YCurve.Insert(frame, NewObj(mmd::VMD_Curve,ax, ay, bx, by).GetValue())iferr_return;
15071510
}
15081511
auto zCurvr_ptr = ZCurve.Find(frame);
15091512
if (zCurvr_ptr != nullptr) {
@@ -1514,7 +1517,7 @@ Bool mmd::TMMDBone::Message(GeListNode* node, Int32 type, void* data) {
15141517
zCurvr->by = by;
15151518
}
15161519
else {
1517-
iferr(ZCurve.Insert(frame, new mmd::VMD_Curve(ax, ay, bx, by)))return false;
1520+
ZCurve.Insert(frame, NewObj(mmd::VMD_Curve,ax, ay, bx, by).GetValue())iferr_return;
15181521
}
15191522
auto rCurvr_ptr = RCurve.Find(frame);
15201523
if (rCurvr_ptr != nullptr) {
@@ -1525,7 +1528,7 @@ Bool mmd::TMMDBone::Message(GeListNode* node, Int32 type, void* data) {
15251528
rCurvr->by = by;
15261529
}
15271530
else {
1528-
iferr(RCurve.Insert(frame, new mmd::VMD_Curve(ax, ay, bx, by)))return false;
1531+
RCurve.Insert(frame, NewObj(mmd::VMD_Curve,ax, ay, bx, by).GetValue())iferr_return;
15291532
}
15301533
auto aCurvr_ptr = ACurve.Find(frame);
15311534
if (aCurvr_ptr != nullptr) {
@@ -1536,7 +1539,7 @@ Bool mmd::TMMDBone::Message(GeListNode* node, Int32 type, void* data) {
15361539
aCurvr->by = by;
15371540
}
15381541
else {
1539-
iferr(ACurve.Insert(frame, new mmd::VMD_Curve(ax, ay, bx, by)))return false;
1542+
ACurve.Insert(frame, NewObj(mmd::VMD_Curve,ax, ay, bx, by).GetValue())iferr_return;
15401543
}
15411544
UpdateCurve(frame);
15421545
break;
@@ -1746,6 +1749,9 @@ Bool mmd::TMMDBone::Message(GeListNode* node, Int32 type, void* data) {
17461749
return true;
17471750
}
17481751
Bool mmd::TMMDBone::Read(GeListNode* node, HyperFile* hf, Int32 level) {
1752+
iferr_scope_handler{
1753+
return false;
1754+
};
17491755
if (!hf->ReadInt32(&this->bone_morph_name_index))
17501756
return false;
17511757
if (!hf->ReadInt32(&this->prev_frame))
@@ -1767,8 +1773,7 @@ Bool mmd::TMMDBone::Read(GeListNode* node, HyperFile* hf, Int32 level) {
17671773
return false;
17681774
if (!hf->ReadMemory(&data, &size))
17691775
return false;
1770-
iferr(this->XCurve.Insert(TempIndex, new mmd::VMD_Curve(*static_cast<mmd::VMD_Curve*>(data))))
1771-
return false;
1776+
this->XCurve.Insert(TempIndex, NewObj(mmd::VMD_Curve, *static_cast<mmd::VMD_Curve*>(data)).GetValue())iferr_return;
17721777
}
17731778
if (!hf->ReadInt32(&CountTemp))
17741779
return false;
@@ -1778,8 +1783,7 @@ Bool mmd::TMMDBone::Read(GeListNode* node, HyperFile* hf, Int32 level) {
17781783
return false;
17791784
if (!hf->ReadMemory(&data, &size))
17801785
return false;
1781-
iferr(this->YCurve.Insert(TempIndex, new mmd::VMD_Curve(*static_cast<mmd::VMD_Curve*>(data))))
1782-
return false;
1786+
this->YCurve.Insert(TempIndex, NewObj(mmd::VMD_Curve, *static_cast<mmd::VMD_Curve*>(data)).GetValue())iferr_return;
17831787
}
17841788
if (!hf->ReadInt32(&CountTemp))
17851789
return false;
@@ -1789,8 +1793,7 @@ Bool mmd::TMMDBone::Read(GeListNode* node, HyperFile* hf, Int32 level) {
17891793
return false;
17901794
if (!hf->ReadMemory(&data, &size))
17911795
return false;
1792-
iferr(this->ZCurve.Insert(TempIndex, new mmd::VMD_Curve(*static_cast<mmd::VMD_Curve*>(data))))
1793-
return false;
1796+
this->ZCurve.Insert(TempIndex, NewObj(mmd::VMD_Curve, *static_cast<mmd::VMD_Curve*>(data)).GetValue())iferr_return;
17941797
}
17951798
if (!hf->ReadInt32(&CountTemp))
17961799
return false;
@@ -1800,8 +1803,7 @@ Bool mmd::TMMDBone::Read(GeListNode* node, HyperFile* hf, Int32 level) {
18001803
return false;
18011804
if (!hf->ReadMemory(&data, &size))
18021805
return false;
1803-
iferr(this->RCurve.Insert(TempIndex, new mmd::VMD_Curve(*static_cast<mmd::VMD_Curve*>(data))))
1804-
return false;
1806+
this->RCurve.Insert(TempIndex, NewObj(mmd::VMD_Curve, *static_cast<mmd::VMD_Curve*>(data)).GetValue())iferr_return;
18051807
}
18061808
if (!hf->ReadInt32(&CountTemp))
18071809
return false;
@@ -1811,8 +1813,7 @@ Bool mmd::TMMDBone::Read(GeListNode* node, HyperFile* hf, Int32 level) {
18111813
return false;
18121814
if (!hf->ReadMemory(&data, &size))
18131815
return false;
1814-
iferr(this->ACurve.Insert(TempIndex, new mmd::VMD_Curve(*static_cast<mmd::VMD_Curve*>(data))))
1815-
return false;
1816+
this->ACurve.Insert(TempIndex, NewObj(mmd::VMD_Curve, *static_cast<mmd::VMD_Curve*>(data)).GetValue())iferr_return;
18161817
}
18171818
if (!hf->ReadInt32(&CountTemp))
18181819
return false;
@@ -1823,8 +1824,7 @@ Bool mmd::TMMDBone::Read(GeListNode* node, HyperFile* hf, Int32 level) {
18231824
Int32 TempIndex = 0;
18241825
if (!hf->ReadInt32(&TempIndex))
18251826
return false;
1826-
iferr(this->button_id_map.Insert(TempID, TempIndex))
1827-
return false;
1827+
this->button_id_map.Insert(TempID, TempIndex)iferr_return;
18281828
}
18291829
hf->ReadInt32(&CountTemp);
18301830
for (Int32 i = 0; i < CountTemp; i++) {
@@ -1845,8 +1845,7 @@ Bool mmd::TMMDBone::Read(GeListNode* node, HyperFile* hf, Int32 level) {
18451845
return false;
18461846
if (!hf->ReadString(&TempData.name))
18471847
return false;
1848-
iferr(this->bone_morph_data_arr.Append(TempData))
1849-
return false;
1848+
this->bone_morph_data_arr.Append(TempData)iferr_return;
18501849
}
18511850
return SUPER::Read(node, hf, level);
18521851
}
@@ -1939,21 +1938,22 @@ Bool mmd::TMMDBone::Write(GeListNode* node, HyperFile* hf) {
19391938
return SUPER::Write(node, hf);
19401939
}
19411940
void mmd::TMMDBone::Free(GeListNode* node) {
1942-
for (auto i : this->XCurve.GetValues()) {
1943-
if (i != nullptr)delete i;
1941+
for (auto i : XCurve.GetValues()) {
1942+
if (i != nullptr)DeleteObj(i);
19441943
}
1945-
for (auto i : this->YCurve.GetValues()) {
1946-
if (i != nullptr)delete i;
1944+
for (auto i : YCurve.GetValues()) {
1945+
if (i != nullptr)DeleteObj(i);
19471946
}
1948-
for (auto i : this->ZCurve.GetValues()) {
1949-
if (i != nullptr)delete i;
1947+
for (auto i : ZCurve.GetValues()) {
1948+
if (i != nullptr)DeleteObj(i);
19501949
}
1951-
for (auto i : this->RCurve.GetValues()) {
1952-
if (i != nullptr)delete i;
1950+
for (auto i : RCurve.GetValues()) {
1951+
if (i != nullptr)DeleteObj(i);
19531952
}
19541953
for (auto i : this->ACurve.GetValues()) {
1955-
if (i != nullptr)delete i;
1954+
if (i != nullptr)DeleteObj(i);
19561955
}
1956+
19571957
}
19581958

19591959
//*******************
@@ -3078,49 +3078,49 @@ Bool mmd::OMMDBoneRoot::SetDParameter(GeListNode* node, const DescID& id, const
30783078
{
30793079
op->SetEditorMode(MODE_UNDEF);
30803080
op->SetRenderMode(MODE_UNDEF);
3081-
node->MultiMessage(MULTIMSG_ROUTE::BROADCAST, ID_O_MMD_BONE_ROOT, new OMMDBoneRoot_MSG(0, BONE_DISPLAY_TYPE_ON));
3081+
node->MultiMessage(MULTIMSG_ROUTE::BROADCAST, ID_O_MMD_BONE_ROOT, NewObj(OMMDBoneRoot_MSG,0, BONE_DISPLAY_TYPE_ON).GetValue());
30823082
break;
30833083
}
30843084
case BONE_DISPLAY_TYPE_OFF:
30853085
{
30863086
op->SetEditorMode(MODE_OFF);
30873087
op->SetRenderMode(MODE_OFF);
3088-
node->MultiMessage(MULTIMSG_ROUTE::BROADCAST, ID_O_MMD_BONE_ROOT, new OMMDBoneRoot_MSG(0, BONE_DISPLAY_TYPE_OFF));
3088+
node->MultiMessage(MULTIMSG_ROUTE::BROADCAST, ID_O_MMD_BONE_ROOT, NewObj(OMMDBoneRoot_MSG,0, BONE_DISPLAY_TYPE_OFF).GetValue());
30893089
break;
30903090
}
30913091
case BONE_DISPLAY_TYPE_MOVABLE:
30923092
{
30933093
op->SetEditorMode(MODE_UNDEF);
30943094
op->SetRenderMode(MODE_UNDEF);
3095-
node->MultiMessage(MULTIMSG_ROUTE::BROADCAST, ID_O_MMD_BONE_ROOT, new OMMDBoneRoot_MSG(0, BONE_DISPLAY_TYPE_MOVABLE));
3095+
node->MultiMessage(MULTIMSG_ROUTE::BROADCAST, ID_O_MMD_BONE_ROOT, NewObj(OMMDBoneRoot_MSG,0, BONE_DISPLAY_TYPE_MOVABLE).GetValue());
30963096
break;
30973097
}
30983098
case BONE_DISPLAY_TYPE_VISIBLE:
30993099
{
31003100
op->SetEditorMode(MODE_UNDEF);
31013101
op->SetRenderMode(MODE_UNDEF);
3102-
node->MultiMessage(MULTIMSG_ROUTE::BROADCAST, ID_O_MMD_BONE_ROOT, new OMMDBoneRoot_MSG(0, BONE_DISPLAY_TYPE_VISIBLE));
3102+
node->MultiMessage(MULTIMSG_ROUTE::BROADCAST, ID_O_MMD_BONE_ROOT, NewObj(OMMDBoneRoot_MSG,0, BONE_DISPLAY_TYPE_VISIBLE).GetValue());
31033103
break;
31043104
}
31053105
case BONE_DISPLAY_TYPE_ROTATABLE:
31063106
{
31073107
op->SetEditorMode(MODE_UNDEF);
31083108
op->SetRenderMode(MODE_UNDEF);
3109-
node->MultiMessage(MULTIMSG_ROUTE::BROADCAST, ID_O_MMD_BONE_ROOT, new OMMDBoneRoot_MSG(0, BONE_DISPLAY_TYPE_ROTATABLE));
3109+
node->MultiMessage(MULTIMSG_ROUTE::BROADCAST, ID_O_MMD_BONE_ROOT, NewObj(OMMDBoneRoot_MSG,0, BONE_DISPLAY_TYPE_ROTATABLE).GetValue());
31103110
break;
31113111
}
31123112
case BONE_DISPLAY_TYPE_ENABLED:
31133113
{
31143114
op->SetEditorMode(MODE_UNDEF);
31153115
op->SetRenderMode(MODE_UNDEF);
3116-
node->MultiMessage(MULTIMSG_ROUTE::BROADCAST, ID_O_MMD_BONE_ROOT, new OMMDBoneRoot_MSG(0, BONE_DISPLAY_TYPE_ENABLED));
3116+
node->MultiMessage(MULTIMSG_ROUTE::BROADCAST, ID_O_MMD_BONE_ROOT, NewObj(OMMDBoneRoot_MSG,0, BONE_DISPLAY_TYPE_ENABLED).GetValue());
31173117
break;
31183118
}
31193119
case BONE_DISPLAY_TYPE_IK:
31203120
{
31213121
op->SetEditorMode(MODE_UNDEF);
31223122
op->SetRenderMode(MODE_UNDEF);
3123-
node->MultiMessage(MULTIMSG_ROUTE::BROADCAST, ID_O_MMD_BONE_ROOT, new OMMDBoneRoot_MSG(0, BONE_DISPLAY_TYPE_IK));
3123+
node->MultiMessage(MULTIMSG_ROUTE::BROADCAST, ID_O_MMD_BONE_ROOT, NewObj(OMMDBoneRoot_MSG,0, BONE_DISPLAY_TYPE_IK).GetValue());
31243124
break;
31253125
}
31263126
default:
@@ -3178,19 +3178,19 @@ Bool mmd::OMMDRigidRoot::SetDParameter(GeListNode* node, const DescID& id, const
31783178
{
31793179
case RIGID_DISPLAY_TYPE_OFF:
31803180
{
3181-
node->MultiMessage(MULTIMSG_ROUTE::DOWN, ID_O_MMD_RIGID_ROOT, new OMMDRigidRoot_MSG(0,RIGID_DISPLAY_TYPE_OFF));
3181+
node->MultiMessage(MULTIMSG_ROUTE::DOWN, ID_O_MMD_RIGID_ROOT, NewObj(OMMDRigidRoot_MSG,0,RIGID_DISPLAY_TYPE_OFF).GetValue());
31823182
break;
31833183
}
31843184
case RIGID_DISPLAY_TYPE_ON:
31853185
{
3186-
node->MultiMessage(MULTIMSG_ROUTE::DOWN, ID_O_MMD_RIGID_ROOT, new OMMDRigidRoot_MSG(0,RIGID_DISPLAY_TYPE_ON));
3186+
node->MultiMessage(MULTIMSG_ROUTE::DOWN, ID_O_MMD_RIGID_ROOT, NewObj(OMMDRigidRoot_MSG,0,RIGID_DISPLAY_TYPE_ON).GetValue());
31873187
if(op->GetTag(Tdisplay)!=nullptr)
31883188
op->GetTag(Tdisplay)->SetParameter(DISPLAYTAG_SDISPLAYMODE, DISPLAYTAG_SDISPLAY_GOURAUD, DESCFLAGS_SET::NONE);
31893189
break;
31903190
}
31913191
case RIGID_DISPLAY_TYPE_WIRE:
31923192
{
3193-
node->MultiMessage(MULTIMSG_ROUTE::DOWN, ID_O_MMD_RIGID_ROOT, new OMMDRigidRoot_MSG(0,RIGID_DISPLAY_TYPE_WIRE));
3193+
node->MultiMessage(MULTIMSG_ROUTE::DOWN, ID_O_MMD_RIGID_ROOT, NewObj(OMMDRigidRoot_MSG,0,RIGID_DISPLAY_TYPE_WIRE).GetValue());
31943194
if (op->GetTag(Tdisplay) != nullptr)
31953195
op->GetTag(Tdisplay)->SetParameter(DISPLAYTAG_SDISPLAYMODE, DISPLAYTAG_SDISPLAY_NOSHADING, DESCFLAGS_SET::NONE);
31963196
break;
@@ -3261,17 +3261,17 @@ Bool mmd::OMMDJointRoot::SetDParameter(GeListNode* node, const DescID& id, const
32613261
{
32623262
case JOINT_DISPLAY_TYPE_OFF:
32633263
{
3264-
node->MultiMessage(MULTIMSG_ROUTE::DOWN, ID_O_MMD_JOINT_ROOT, new OMMDJointRoot_MSG(0, JOINT_DISPLAY_TYPE_OFF));
3264+
node->MultiMessage(MULTIMSG_ROUTE::DOWN, ID_O_MMD_JOINT_ROOT, NewObj(OMMDJointRoot_MSG,0, JOINT_DISPLAY_TYPE_OFF).GetValue());
32653265
break;
32663266
}
32673267
case JOINT_DISPLAY_TYPE_ON:
32683268
{
3269-
node->MultiMessage(MULTIMSG_ROUTE::DOWN, ID_O_MMD_JOINT_ROOT, new OMMDJointRoot_MSG(0, JOINT_DISPLAY_TYPE_ON));
3269+
node->MultiMessage(MULTIMSG_ROUTE::DOWN, ID_O_MMD_JOINT_ROOT, NewObj(OMMDJointRoot_MSG,0, JOINT_DISPLAY_TYPE_ON).GetValue());
32703270
break;
32713271
}
32723272
case JOINT_DISPLAY_TYPE_WIRE:
32733273
{
3274-
node->MultiMessage(MULTIMSG_ROUTE::DOWN, ID_O_MMD_JOINT_ROOT, new OMMDJointRoot_MSG(0, JOINT_DISPLAY_TYPE_WIRE));
3274+
node->MultiMessage(MULTIMSG_ROUTE::DOWN, ID_O_MMD_JOINT_ROOT, NewObj(OMMDJointRoot_MSG,0, JOINT_DISPLAY_TYPE_WIRE).GetValue());
32753275
break;
32763276
}
32773277
default:

‎source/MMD_PMX_Control.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,12 @@ namespace mmd {
129129
//储存上一种曲线类型，以确定更新状态
130130
Int32 prev_curve_type = -1;
131131
//对应的主对象
132-
BaseObject* obj = nullptr;
132+
BaseObject* obj = nullptr;
133133
Vector prev_position;
134134
Vector prev_rotation;
135135
INSTANCEOF(TMMDBone, TagData)
136-
public:
137-
maxon::BaseArray<bone_morph_data> bone_morph_data_arr;
136+
public:
137+
maxon::BaseArray<bone_morph_data> bone_morph_data_arr;
138138
//是否是物理骨骼
139139
Bool Is_physical = false;
140140
Bool SetBondMorphTranslation(Int32 id, Vector& translation) {
@@ -167,7 +167,7 @@ namespace mmd {
167167
virtual Bool Init(GeListNode* node);
168168
//设置参数时调用，用于调用SplineData的回调函数
169169
virtual Bool SetDParameter(GeListNode* node, const DescID& id, const GeData& t_data, DESCFLAGS_SET& flags);
170-
virtual Bool GetDEnabling(GeListNode *node, const DescID &id, const GeData &t_data, DESCFLAGS_ENABLE flags, const BaseContainer *itemdesc);
170+
virtual Bool GetDEnabling(GeListNode* node, const DescID& id, const GeData& t_data, DESCFLAGS_ENABLE flags, const BaseContainer* itemdesc);
171171
virtual EXECUTIONRESULT Execute(BaseTag* tag, BaseDocument* doc, BaseObject* op, BaseThread* bt, Int32 priority, EXECUTIONFLAGS flags);
172172
virtual Bool Read(GeListNode* node, HyperFile* hf, Int32 level);
173173
virtual Bool Write(GeListNode* node, HyperFile* hf);
@@ -177,9 +177,9 @@ namespace mmd {
177177

178178
class OMMDRigid : public ObjectData
179179
{
180-
private:
180+
private:
181181
Vector position_frozne = Vector();
182-
Vector rotation_frozne = Vector();
182+
Vector rotation_frozne = Vector();
183183
//析构函数
184184
~OMMDRigid() {}
185185
Int32 DisplayType = RIGID_DISPLAY_TYPE_OFF;
@@ -237,7 +237,7 @@ namespace mmd {
237237
//生成函数
238238
static NodeData* Alloc() { return NewObjClear(OMMDJoint); }
239239
};
240-
/*
240+
/*
241241
class PMX_Material_Tag : public TagData
242242
{
243243
public:

0 commit comments

Comments
 (0)