started to add a gui window for key mapping
This commit is contained in:
parent
78073bac45
commit
80543e3f82
@ -14,6 +14,7 @@
|
|||||||
#include "imgui/imgui.h"
|
#include "imgui/imgui.h"
|
||||||
#include "tools/loader.h"
|
#include "tools/loader.h"
|
||||||
#include "editor.h"
|
#include "editor.h"
|
||||||
|
#include "keymapper.h"
|
||||||
#include "tools/loadingthread.h"
|
#include "tools/loadingthread.h"
|
||||||
|
|
||||||
Engine::Engine() :
|
Engine::Engine() :
|
||||||
@ -67,6 +68,7 @@ void Engine::createWindow(std::string title,
|
|||||||
m_renderer->initGL(w, h);
|
m_renderer->initGL(w, h);
|
||||||
m_sparrowshell = new SparrowShell(m_window);
|
m_sparrowshell = new SparrowShell(m_window);
|
||||||
m_editor = new Editor();
|
m_editor = new Editor();
|
||||||
|
m_keymapper = new KeyMapper();
|
||||||
m_loadingThread = LoadingThread::init();
|
m_loadingThread = LoadingThread::init();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -180,12 +182,14 @@ void Engine::setScene(std::string scene)
|
|||||||
|
|
||||||
previous_scene->getRootObject()->removeChild(m_sparrowshell);
|
previous_scene->getRootObject()->removeChild(m_sparrowshell);
|
||||||
previous_scene->getRootObject()->removeChild(m_editor);
|
previous_scene->getRootObject()->removeChild(m_editor);
|
||||||
|
previous_scene->getRootObject()->removeChild(m_keymapper);
|
||||||
|
|
||||||
m_renderer->setScene(new_scene);
|
m_renderer->setScene(new_scene);
|
||||||
m_renderer->resizeGL(m_window->getSize().x, m_window->getSize().y);
|
m_renderer->resizeGL(m_window->getSize().x, m_window->getSize().y);
|
||||||
|
|
||||||
new_scene->getRootObject()->addChild(m_sparrowshell);
|
new_scene->getRootObject()->addChild(m_sparrowshell);
|
||||||
new_scene->getRootObject()->addChild(m_editor);
|
new_scene->getRootObject()->addChild(m_editor);
|
||||||
|
new_scene->getRootObject()->addChild(m_keymapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Engine::enablePhysicsDebug()
|
void Engine::enablePhysicsDebug()
|
||||||
|
@ -9,6 +9,7 @@ class SceneTree;
|
|||||||
class SparrowShell;
|
class SparrowShell;
|
||||||
class PhysicsDebugNode;
|
class PhysicsDebugNode;
|
||||||
class Editor;
|
class Editor;
|
||||||
|
class KeyMapper;
|
||||||
class LoadingThread;
|
class LoadingThread;
|
||||||
|
|
||||||
namespace sf
|
namespace sf
|
||||||
@ -54,6 +55,7 @@ public:
|
|||||||
SparrowShell* getShell() const {return m_sparrowshell;}
|
SparrowShell* getShell() const {return m_sparrowshell;}
|
||||||
PhysicsDebugNode* getPhysicsDebug() const {return m_physicsDebugNode;}
|
PhysicsDebugNode* getPhysicsDebug() const {return m_physicsDebugNode;}
|
||||||
Editor* getEditor() const {return m_editor;}
|
Editor* getEditor() const {return m_editor;}
|
||||||
|
KeyMapper* getKeyMapper() const{return m_keymapper;}
|
||||||
LoadingThread* getLoadingThread() const {return m_loadingThread;}
|
LoadingThread* getLoadingThread() const {return m_loadingThread;}
|
||||||
SceneTree* getScene() const;
|
SceneTree* getScene() const;
|
||||||
|
|
||||||
@ -81,6 +83,7 @@ private:
|
|||||||
PhysicsDebugNode *m_physicsDebugNode;
|
PhysicsDebugNode *m_physicsDebugNode;
|
||||||
SparrowRenderer* m_renderer;
|
SparrowRenderer* m_renderer;
|
||||||
Editor* m_editor;
|
Editor* m_editor;
|
||||||
|
KeyMapper* m_keymapper;
|
||||||
LoadingThread* m_loadingThread;
|
LoadingThread* m_loadingThread;
|
||||||
|
|
||||||
void update();
|
void update();
|
||||||
|
46
src/keymapper.cpp
Normal file
46
src/keymapper.cpp
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
#include "keymapper.h"
|
||||||
|
|
||||||
|
#include <imgui/imgui.h>
|
||||||
|
#include "engine.h"
|
||||||
|
#include "SparrowInput/input.h"
|
||||||
|
#include <iostream>
|
||||||
|
|
||||||
|
KeyMapper::KeyMapper() :
|
||||||
|
m_enabled(false)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void KeyMapper::update()
|
||||||
|
{
|
||||||
|
if(m_enabled)
|
||||||
|
gui();
|
||||||
|
}
|
||||||
|
|
||||||
|
void KeyMapper::gui()
|
||||||
|
{
|
||||||
|
std::vector<std::string> contexts = getEngine().getInput()->getContextsList();
|
||||||
|
std::vector<std::string> types_binding = {"pressed","released","hold"};
|
||||||
|
|
||||||
|
ImGui::Begin("KeyMapper");
|
||||||
|
ImGui::Combo("Context",&m_selected_context,contexts);
|
||||||
|
for (Binding b : m_keysmap.data()){
|
||||||
|
ImGui::Text("%d",b.action);
|
||||||
|
ImGui::SameLine(50);
|
||||||
|
ImGui::Text("%d",b.key);
|
||||||
|
ImGui::SameLine(100);
|
||||||
|
ImGui::PushItemWidth(100);
|
||||||
|
ImGui::Combo("",&(b.type),types_binding);
|
||||||
|
ImGui::PopItemWidth();
|
||||||
|
}
|
||||||
|
ImGui::End();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
void KeyMapper::toggle()
|
||||||
|
{
|
||||||
|
m_enabled = !m_enabled;
|
||||||
|
if(m_enabled){
|
||||||
|
m_keysmap = getEngine().getInput()->getKeysMap();
|
||||||
|
}
|
||||||
|
}
|
20
src/keymapper.h
Normal file
20
src/keymapper.h
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
#ifndef KEYMAPPER_H
|
||||||
|
#define KEYMAPPER_H
|
||||||
|
|
||||||
|
#include "scene/containernode.h"
|
||||||
|
#include "SparrowInput/keybindings.h"
|
||||||
|
|
||||||
|
class KeyMapper : public ContainerNode
|
||||||
|
{
|
||||||
|
bool m_enabled;
|
||||||
|
int m_selected_context;
|
||||||
|
IKeysMap m_keysmap;
|
||||||
|
|
||||||
|
void gui();
|
||||||
|
public:
|
||||||
|
KeyMapper();
|
||||||
|
void update();
|
||||||
|
void toggle();
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // KEYMAPPER_H
|
@ -10,6 +10,7 @@
|
|||||||
#include "SparrowSerializer/Version.h"
|
#include "SparrowSerializer/Version.h"
|
||||||
#include "tools/utils.h"
|
#include "tools/utils.h"
|
||||||
#include "editor.h"
|
#include "editor.h"
|
||||||
|
#include "keymapper.h"
|
||||||
|
|
||||||
#define LUA_DEFINE(var) S[#var]=var
|
#define LUA_DEFINE(var) S[#var]=var
|
||||||
#define LUA_SET_FUN(var) m_script.set_function(#var,&ScriptNode::var,this);this->functions_name.push_back(#var);
|
#define LUA_SET_FUN(var) m_script.set_function(#var,&ScriptNode::var,this);this->functions_name.push_back(#var);
|
||||||
@ -29,6 +30,7 @@ ScriptNode::ScriptNode()
|
|||||||
LUA_SET_FUN(rendering);
|
LUA_SET_FUN(rendering);
|
||||||
LUA_SET_FUN(resourcePackEditor);
|
LUA_SET_FUN(resourcePackEditor);
|
||||||
LUA_SET_FUN(editor);
|
LUA_SET_FUN(editor);
|
||||||
|
LUA_SET_FUN(keymapper);
|
||||||
|
|
||||||
m_script.new_usertype<Engine>("Engine",
|
m_script.new_usertype<Engine>("Engine",
|
||||||
"time",&Engine::getTime
|
"time",&Engine::getTime
|
||||||
@ -118,3 +120,7 @@ void ScriptNode::resourcePackEditor(){
|
|||||||
void ScriptNode::editor(){
|
void ScriptNode::editor(){
|
||||||
this->getEngine().getEditor()->toggleEditor();
|
this->getEngine().getEditor()->toggleEditor();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ScriptNode::keymapper(){
|
||||||
|
this->getEngine().getKeyMapper()->toggle();
|
||||||
|
}
|
||||||
|
@ -28,6 +28,7 @@ public:
|
|||||||
void rendering();
|
void rendering();
|
||||||
void resourcePackEditor();
|
void resourcePackEditor();
|
||||||
void editor();
|
void editor();
|
||||||
|
void keymapper();
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // SCRIPTNODE_H
|
#endif // SCRIPTNODE_H
|
||||||
|
Loading…
x
Reference in New Issue
Block a user