AxioDL/amuse
2
0
Fork 0
mirror of https://github.com/AxioDL/amuse.git synced 2025-12-09 05:27:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

More work on Amuse Editor

Browse Source
This commit is contained in:
Jack Andersen
2018-07-17 21:39:26 -10:00
parent 3f265cdb46
commit f50ee6e8f1
38 changed files with 1193 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/AudioGroupPool.cpp
View File

@@ -134,7 +134,7 @@ AudioGroupPool AudioGroupPool::CreateAudioGroupPool(SystemStringView groupPath)
if (!fi.hasError())
{
athena::io::YAMLDocReader r;
if (r.parse(&fi) && r.ValidateClassType("amuse::Pool"))
if (r.parse(&fi) && !r.readString("DNAType").compare("amuse::Pool"))
{
if (auto __r = r.enterSubRecord("soundMacros"))
{
@@ -518,6 +518,8 @@ std::unique_ptr<SoundMacro::ICmd> SoundMacro::MakeCmd(R& r)
cmd = _MakeCmd<CmdDivVars>(r); break;
case CmdOp::AddIVars:
cmd = _MakeCmd<CmdAddIVars>(r); break;
case CmdOp::SetVar:
cmd = _MakeCmd<CmdSetVar>(r); break;
case CmdOp::IfEqual:
cmd = _MakeCmd<CmdIfEqual>(r); break;
case CmdOp::IfLess:
@@ -684,6 +686,8 @@ std::string_view SoundMacro::CmdOpToStr(CmdOp op)
return "DivVars"sv;
case CmdOp::AddIVars:
return "AddIVars"sv;
case CmdOp::SetVar:
return "SetVar"sv;
case CmdOp::IfEqual:
return "IfEqual"sv;
case CmdOp::IfLess:
@@ -845,6 +849,8 @@ SoundMacro::CmdOp SoundMacro::CmdStrToOp(std::string_view op)
return CmdOp::DivVars;
else if (!CompareCaseInsensitive(op.data(), "AddIVars"))
return CmdOp::AddIVars;
else if (!CompareCaseInsensitive(op.data(), "SetVar"))
return CmdOp::SetVar;
else if (!CompareCaseInsensitive(op.data(), "IfEqual"))
return CmdOp::IfEqual;
else if (!CompareCaseInsensitive(op.data(), "IfLess"))