Skip to content

Partial fix for #428. #431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 9, 2021
Merged

Partial fix for #428. #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions source/backend/control/scene.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,28 +143,26 @@ void Scene::StartParser(POVMS_Object& parseOptions)
parseOptions.Get(kPOVAttrib_Declare, ds);
for(int i = 1; i <= ds.GetListSize(); i++)
{
std::ostringstream sstr;
POVMS_Attribute a;
POVMS_Object d;

ds.GetNth(i, d);
std::string ident = d.GetString(kPOVAttrib_Identifier);
d.Get(kPOVAttrib_Value, a);
switch (a.Type())
{
case kPOVMSType_CString:
sstr << "\"" + d.TryGetString(kPOVAttrib_Value, "") + "\"";
sceneData->declaredStrings.insert(make_pair(ident, d.TryGetString(kPOVAttrib_Value, "")));
break;

case kPOVMSType_Float:
sstr << d.TryGetFloat(kPOVAttrib_Value, 0.0);
sceneData->declaredNumbers.insert(make_pair(ident, d.TryGetFloat(kPOVAttrib_Value, 0.0)));
break;

default:
// shouldn't happen unless we make a coding error
throw POV_EXCEPTION(kParamErr, "Invalid type passed in declare list");
}

sceneData->declaredVariables.insert(make_pair(d.GetString(kPOVAttrib_Identifier), sstr.str()));
}
}

Expand Down
6 changes: 4 additions & 2 deletions source/core/scene/scenedata.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ class SceneData
{
public:

typedef std::map<string, string> DeclaredVariablesMap;
typedef std::map<string, string> DeclaredStringsMap;
typedef std::map<string, double> DeclaredNumbersMap;

/// Destructor.
~SceneData();
Expand Down Expand Up @@ -203,7 +204,8 @@ class SceneData
int defaultFileType;

FrameSettings frameSettings; // TODO - move ???
DeclaredVariablesMap declaredVariables; // TODO - move to parser
DeclaredStringsMap declaredStrings; // TODO - move to parser
DeclaredNumbersMap declaredNumbers; // TODO - move to parser
Camera parsedCamera; // TODO - handle differently or move to parser
bool clocklessAnimation; // TODO - this is support for an experimental feature and may be changed or removed
vector<Camera> cameras; // TODO - this is support for an experimental feature and may be changed or removed
Expand Down
30 changes: 13 additions & 17 deletions source/parser/parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,25 +212,21 @@ void Parser::Run()

Frame_Init ();

for(SceneData::DeclaredVariablesMap::const_iterator i(sceneData->declaredVariables.begin()); i != sceneData->declaredVariables.end(); i++)
for(SceneData::DeclaredStringsMap::const_iterator i(sceneData->declaredStrings.begin()); i != sceneData->declaredStrings.end(); i++)
{
if(i->second.length() > 0)
{
SYM_ENTRY *Temp_Entry = nullptr;
SYM_ENTRY *Temp_Entry = nullptr;

if(i->second[0] == '\"')
{
string tmp(i->second, 1, i->second.length() - 2);
Temp_Entry = Add_Symbol(SYM_TABLE_GLOBAL, const_cast<char *>(i->first.c_str()), STRING_ID_TOKEN);
Temp_Entry->Data = String_Literal_To_UCS2(const_cast<char *>(tmp.c_str()), false);
}
else
{
Temp_Entry = Add_Symbol(SYM_TABLE_GLOBAL, const_cast<char *>(i->first.c_str()), FLOAT_ID_TOKEN);
Temp_Entry->Data = Create_Float();
*(reinterpret_cast<DBL *>(Temp_Entry->Data)) = std::atof(i->second.c_str());
}
}
Temp_Entry = Add_Symbol(SYM_TABLE_GLOBAL, const_cast<char *>(i->first.c_str()), STRING_ID_TOKEN);
Temp_Entry->Data = String_Literal_To_UCS2(const_cast<char *>(i->second.c_str()), false);
}

for (SceneData::DeclaredNumbersMap::const_iterator i(sceneData->declaredNumbers.begin()); i != sceneData->declaredNumbers.end(); i++)
{
SYM_ENTRY *Temp_Entry = nullptr;

Temp_Entry = Add_Symbol(SYM_TABLE_GLOBAL, const_cast<char *>(i->first.c_str()), FLOAT_ID_TOKEN);
Temp_Entry->Data = Create_Float();
*(reinterpret_cast<DBL *>(Temp_Entry->Data)) = i->second;
}

IncludeHeader(sceneData->headerFile);
Expand Down