LoweBowe/LumixEngine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

anim system conditions - boolean constants

Browse source
This commit is contained in:
Mikulas Florek 2016-11-17 15:14:37 +01:00
parent 8e61e3a2d0
commit e0ccc1b7cb
2 changed files with 33 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/animation/condition.cpp
View file

@ -164,15 +164,15 @@ private:
}
static bool getConstValue(const char* src, const ExpressionCompiler::Token& token, float& value)
static bool getFloatConstValue(const char* src, const ExpressionCompiler::Token& token, float& value)
{
static const struct { const char* name; float value; } CONSTS[] =
{
{"PI", 3.14159265358979323846f}
{ "PI", 3.14159265358979323846f }
};
for(const auto& i : CONSTS)
for (const auto& i : CONSTS)
{
if(strncmp(i.name, src + token.offset, token.size) == 0)
if (stringLength(i.name) == token.size && equalStrings(i.name, src + token.offset) == 0)
{
value = i.value;
return true;
@ -182,6 +182,22 @@ private:
}
static bool getBoolConstValue(const char* src, const ExpressionCompiler::Token& token, bool& value)
{
if (token.size == 5 && strncmp("false", src + token.offset, token.size) == 0)
{
value = false;
return true;
}
if (token.size == 4 && strncmp("true", src + token.offset, token.size) == 0)
{
value = true;
return true;
}
return false;
}
private:
ExpressionCompiler::Error m_compile_time_error;
int m_compile_time_offset;
@ -657,14 +673,20 @@ int ExpressionCompiler::compile(const char* src,
type_stack[type_stack_idx] = Types::FLOAT;
++type_stack_idx;
++out;
float const_value;
if (!getConstValue(src, token, const_value))
float float_const_value;
if (!getFloatConstValue(src, token, float_const_value))
{
m_compile_time_error = ExpressionCompiler::Error::UNKNOWN_IDENTIFIER;
m_compile_time_offset = token.offset;
return -1;
bool bool_const_value;
if (!getBoolConstValue(src, token, bool_const_value))
{
m_compile_time_error = ExpressionCompiler::Error::UNKNOWN_IDENTIFIER;
m_compile_time_offset = token.offset;
return -1;
}
*(bool*)out = bool_const_value;
out += sizeof(bool);
}
*(float*)out = const_value;
*(float*)out = float_const_value;
out += sizeof(float);
}
}

2
src/animation/editor/state_machine_editor.cpp
View file

@ -218,7 +218,7 @@ void Edge::onGUI()
{
auto* engine_edge = (Anim::Edge*)engine_cmp;
ImGui::DragFloat("Length", &engine_edge->length);
if (ImGui::InputText("Expression", m_expression, lengthOf(m_expression)))
if (ImGui::InputText("Expression", m_expression, lengthOf(m_expression), ImGuiInputTextFlags_EnterReturnsTrue))
{
engine_edge->condition.compile(m_expression, m_controller.getEngineResource()->getInputDecl());
}