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

anim system wIP

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

1
src/animation/animation_system.cpp
View file

@ -550,6 +550,7 @@ struct AnimationSceneImpl LUMIX_FINAL : public AnimationScene
void initControllerRuntime(Controller& controller)
{
if (!controller.resource->isReady()) return;
controller.root = controller.resource->createInstance(m_anim_system.m_allocator);
controller.input.resize(controller.resource->getInputDecl().getSize());
setMemory(&controller.input[0], 0, controller.input.size());

15
src/animation/editor/animation_editor.cpp
View file

@ -178,25 +178,22 @@ void AnimationEditor::inputsGUI()
{
ImGui::PushID(i);
auto& input = input_decl.inputs[i];
StaticString<20> tmp("###", i);
ImGui::PushItemWidth(100);
ImGui::InputText(tmp, input.name, lengthOf(input.name));
ImGui::InputText("##name", input.name, lengthOf(input.name));
ImGui::SameLine();
tmp << "*";
if (ImGui::Combo(tmp, (int*)&input.type, "float\0int\0bool\0"))
if (ImGui::Combo("##type", (int*)&input.type, "float\0int\0bool\0"))
{
input_decl.recalculateOffsets();
}
if (input_data)
{
ImGui::SameLine();
tmp << "*";
switch (input.type)
{
case Anim::InputDecl::FLOAT: ImGui::DragFloat(tmp, (float*)(input_data + input.offset)); break;
case Anim::InputDecl::BOOL: ImGui::Checkbox(tmp, (bool*)(input_data + input.offset)); break;
case Anim::InputDecl::INT: ImGui::InputInt(tmp, (int*)(input_data + input.offset)); break;
default: ASSERT(false); break;
case Anim::InputDecl::FLOAT: ImGui::DragFloat("##value", (float*)(input_data + input.offset)); break;
case Anim::InputDecl::BOOL: ImGui::Checkbox("##value", (bool*)(input_data + input.offset)); break;
case Anim::InputDecl::INT: ImGui::InputInt("##value", (int*)(input_data + input.offset)); break;
default: ASSERT(false); break;
}
}
ImGui::PopItemWidth();

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

@ -62,7 +62,12 @@ static ImVec2 getEdgeStartPoint(Node* a, Node* b, bool is_dir)
Component::~Component()
{
if (getParent()) getParent()->m_editor_cmps.eraseItem(this);
if (getParent())
{
auto* engine_container = ((Anim::Container*)getParent()->engine_cmp);
engine_container->children.eraseItem(engine_cmp);
getParent()->m_editor_cmps.eraseItem(this);
}
LUMIX_DELETE(m_controller.getEngineResource()->getAllocator(), engine_cmp);
}
@ -99,7 +104,6 @@ bool Node::hitTest(const ImVec2& on_canvas_pos) const
void Node::onGUI()
{
ImGui::InputText("Name", m_name, lengthOf(m_name));
if (getParent()->engine_cmp->type == Anim::Component::STATE_MACHINE)
{
auto* engine_sm = (Anim::StateMachine*)getParent()->engine_cmp;
@ -109,6 +113,7 @@ void Node::onGUI()
engine_sm->m_default_state = (Anim::Node*)engine_cmp;
}
}
ImGui::InputText("Name", m_name, lengthOf(m_name));
}
@ -373,9 +378,10 @@ void Container::serialize(OutputBlob& blob)
}
void StateMachine::createState(Anim::Component::Type type)
void StateMachine::createState(Anim::Component::Type type, const ImVec2& pos)
{
auto* cmp = (Node*)createComponent(Anim::createComponent(type, m_allocator), this, m_controller);
cmp->pos = pos;
cmp->size.x = 100;
cmp->size.y = 30;
cmp->engine_cmp->uid = m_controller.createUID();
@ -419,35 +425,40 @@ void StateMachine::drawInside(ImDrawList* draw, const ImVec2& canvas_screen_pos)
if (ImGui::IsMouseClicked(0)) m_mouse_status = DOWN_LEFT;
if (ImGui::IsMouseClicked(1)) m_mouse_status = DOWN_RIGHT;
if (ImGui::IsMouseReleased(1))
{
if (m_mouse_status == NEW_EDGE)
{
Component* target = childrenHitTest(ImGui::GetMousePos() - canvas_screen_pos);
if (target && target != m_drag_source && target->isNode())
{
auto* engine_parent = ((Anim::Container*)engine_cmp);
auto* engine_edge = LUMIX_NEW(m_allocator, Anim::Edge)(m_allocator);
engine_edge->uid = m_controller.createUID();
engine_edge->from = (Anim::Node*)m_drag_source->engine_cmp;
engine_edge->to = (Anim::Node*)target->engine_cmp;
engine_parent->children.push(engine_edge);
}
}
auto* edge = LUMIX_NEW(m_allocator, Edge)(engine_edge, this, m_controller);
m_editor_cmps.push(edge);
m_selected_component = edge;
}
}
else
if (ImGui::IsMouseReleased(1))
{
Component* hit_cmp = childrenHitTest(ImGui::GetMousePos() - canvas_screen_pos);
if (hit_cmp)
{
if (m_mouse_status == NEW_EDGE)
{
if (hit_cmp != m_drag_source && hit_cmp->isNode())
{
m_context_cmp = cmp;
ImGui::OpenPopup("context_menu");
auto* engine_parent = ((Anim::Container*)engine_cmp);
auto* engine_edge = LUMIX_NEW(m_allocator, Anim::Edge)(m_allocator);
engine_edge->uid = m_controller.createUID();
engine_edge->from = (Anim::Node*)m_drag_source->engine_cmp;
engine_edge->to = (Anim::Node*)hit_cmp->engine_cmp;
engine_parent->children.push(engine_edge);
auto* edge = LUMIX_NEW(m_allocator, Edge)(engine_edge, this, m_controller);
m_editor_cmps.push(edge);
m_selected_component = edge;
}
}
else
{
m_context_cmp = hit_cmp;
m_selected_component = hit_cmp;
ImGui::OpenPopup("context_menu");
}
}
}
if (m_mouse_status == DRAG_NODE)
{
m_drag_source->pos = m_drag_source->pos + ImGui::GetIO().MouseDelta;
@ -462,10 +473,11 @@ void StateMachine::drawInside(ImDrawList* draw, const ImVec2& canvas_screen_pos)
if (ImGui::BeginPopup("context_menu"))
{
ImVec2 pos_on_canvas = ImGui::GetMousePos() - canvas_screen_pos;
if (ImGui::BeginMenu("Create"))
{
if (ImGui::MenuItem("Simple")) createState(Anim::Component::SIMPLE_ANIMATION);
if (ImGui::MenuItem("State machine")) createState(Anim::Component::STATE_MACHINE);
if (ImGui::MenuItem("Simple")) createState(Anim::Component::SIMPLE_ANIMATION, pos_on_canvas);
if (ImGui::MenuItem("State machine")) createState(Anim::Component::STATE_MACHINE, pos_on_canvas);
ImGui::EndMenu();
}
if (m_context_cmp)

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

@ -144,7 +144,7 @@ public:
void onGUI() override;
private:
void createState(Lumix::Anim::Component::Type type);
void createState(Lumix::Anim::Component::Type type, const ImVec2& pos);
private:
enum MouseStatus