From 66f0cf9a7c0cae65d6eea7786180208aba23229e Mon Sep 17 00:00:00 2001 From: Lendemor Date: Mon, 30 Jan 2017 02:47:04 +0100 Subject: [PATCH] updated version and added version command in shell --- CMakeLists.txt | 4 +-- src/defaultkeysmap.h | 2 +- src/engine.cpp | 11 ++------- src/engine.h | 2 -- src/scene/cameranode.h | 2 +- src/scene/gui/backgroundnode.cpp | 4 +-- src/scene/gui/buttonnode.cpp | 26 +++++++++----------- src/scene/gui/buttonnode.h | 2 -- src/scene/lightnode.cpp | 2 +- src/scene/lightnode.h | 2 +- src/scene/meshnode.cpp | 2 +- src/scene/meshnode.h | 2 +- src/scene/physicsdebugnode.cpp | 4 +-- src/scene/playercharacternode.cpp | 2 +- src/scene/playercharacternode.h | 2 +- src/scene/scenetree.cpp | 6 ++--- src/scene/scenetree.h | 2 +- src/scene/textnode.cpp | 3 --- src/scene/trackballcameranode.cpp | 2 +- src/scene/trackballcameranode.h | 4 +-- src/sparrowshell/scriptnode.cpp | 38 ++++++++++++++++++++--------- src/sparrowshell/scriptnode.h | 3 ++- src/sparrowshell/shellscrollbar.cpp | 6 ++--- src/sparrowshell/sparrowshell.cpp | 23 +++++++++-------- src/sparrowshell/sparrowshell.h | 9 +++---- src/test/main.cpp | 24 +++++++++--------- src/test/potator.cpp | 6 ++--- src/test/potator.h | 2 +- src/tools/font.cpp | 4 +-- src/tools/loader.cpp | 8 +++--- 30 files changed, 104 insertions(+), 105 deletions(-) delete mode 100644 src/scene/textnode.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 048cb4c..2d5d08d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,8 @@ project(SparrowEngine) cmake_minimum_required(VERSION 2.8) -SET(VERSION_MAJOR 0) -SET(VERSION_MINOR 1) +SET(VERSION_MAJOR 1) +SET(VERSION_MINOR 0) set(EXTRA_INCLUDES ${PROJECT_SOURCE_DIR}/src) diff --git a/src/defaultkeysmap.h b/src/defaultkeysmap.h index d212b51..53df63f 100644 --- a/src/defaultkeysmap.h +++ b/src/defaultkeysmap.h @@ -1,7 +1,7 @@ #ifndef DEFAULTKEYSMAP_H #define DEFAULTKEYSMAP_H -#include "keybindings.h" +#include "SparrowInput/keybindings.h" class DefaultKeysMap : public IKeysMap { diff --git a/src/engine.cpp b/src/engine.cpp index 245cbf3..05bd0cd 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -2,8 +2,8 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -192,13 +192,6 @@ void Engine::setShowMouseAction(int action) m_showMouseAction = action; } -void Engine::outputShell(std::string str) const -{ - std::wstring ws; - ws.assign(str.begin(),str.end()); - m_sparrowshell->out(ws); -} - void Engine::checkSpecialInputs() { for(int action : m_input->getActions()) diff --git a/src/engine.h b/src/engine.h index 0afaed2..9c58e2a 100644 --- a/src/engine.h +++ b/src/engine.h @@ -50,8 +50,6 @@ public: SparrowShell* getShell() const {return m_sparrowshell;} SceneTree* getScene() const {return m_scene;} - void outputShell(std::string str) const; - unsigned int getTime() const; unsigned int getDeltaTime() const; diff --git a/src/scene/cameranode.h b/src/scene/cameranode.h index b38c722..a4b15b9 100644 --- a/src/scene/cameranode.h +++ b/src/scene/cameranode.h @@ -2,7 +2,7 @@ #define CAMERANODE_H #include "scenenode.h" -#include "camera.h" +#include "SparrowRenderer/camera.h" /** * @brief The CameraNode class is a scene node that can be used by the renderer diff --git a/src/scene/gui/backgroundnode.cpp b/src/scene/gui/backgroundnode.cpp index 3cd3bd9..c0ecc20 100644 --- a/src/scene/gui/backgroundnode.cpp +++ b/src/scene/gui/backgroundnode.cpp @@ -3,8 +3,8 @@ #include "glm/vec2.hpp" #include "glm/vec3.hpp" -#include "mesh.h" -#include "phongmaterial.h" +#include "SparrowRenderer/mesh.h" +#include "SparrowRenderer/phongmaterial.h" BackGroundNode::BackGroundNode(glm::vec2 position,glm::vec2 dimension, glm::vec3 color, float opacity,float depth,bool visible): MeshNode(nullptr,visible) diff --git a/src/scene/gui/buttonnode.cpp b/src/scene/gui/buttonnode.cpp index a161386..4984d9f 100644 --- a/src/scene/gui/buttonnode.cpp +++ b/src/scene/gui/buttonnode.cpp @@ -5,16 +5,19 @@ #include #include "scene/scenetree.h" -#include "input.h" + +#include "SparrowInput/input.h" + +#include "SparrowRenderer/sparrowrenderer.h" +#include "SparrowRenderer/mesh.h" +#include "SparrowRenderer/phongmaterial.h" + #include "sparrowshell/sparrowshell.h" -#include "mesh.h" -#include "phongmaterial.h" #include "tools/font.h" #include "resourcemanager.h" -#include "sparrowrenderer.h" ButtonNode::ButtonNode(glm::vec2 position,ButtonShape* shape): - m_position(position),m_shape(shape),i(0) + m_position(position),m_shape(shape) { addChild(m_shape->getBackGround()); } @@ -26,9 +29,10 @@ MeshNode* ButtonNode::getBackGround() void ButtonNode::update() { + GraphicalContainerNode::update(); Input* input = getEngine().getInput(); - sf::Vector2i v = input->getPosition(); - glm::vec2 pos = glm::vec2(v.x,v.y); + + glm::vec2 pos = input->getPosition();; if(m_label_updated){ if(m_label_node) @@ -42,14 +46,6 @@ void ButtonNode::update() m_label_updated = false; } - if(i == 120){ - glm::vec4 posa = m_transform[3]; - glm::vec4 posb = getBackGround()->getParentTransform()[3]; - glm::vec4 posc = m_label_node->getParentTransform()[3]; - std::cout << posa.x << " " << posa.y <<"\n"<< posb.x << " " << posb.y << "\n" << posc.x << " " << posc.y << "\n"<< std::endl; - i=0; - } - i++; for (auto action : input->getActions()) { if (action == m_action){ diff --git a/src/scene/gui/buttonnode.h b/src/scene/gui/buttonnode.h index 7010f74..c69eb31 100644 --- a/src/scene/gui/buttonnode.h +++ b/src/scene/gui/buttonnode.h @@ -21,8 +21,6 @@ class ButtonNode : public GraphicalContainerNode TextNode* m_label_node; glm::vec3 m_label_color; - int i; - public: ButtonNode(glm::vec2 m_position, ButtonShape* shape); MeshNode* getBackGround(); diff --git a/src/scene/lightnode.cpp b/src/scene/lightnode.cpp index 18081c9..d8748f7 100644 --- a/src/scene/lightnode.cpp +++ b/src/scene/lightnode.cpp @@ -1,6 +1,6 @@ #include "lightnode.h" #include "scenetree.h" -#include +#include #include void LightNode::update() diff --git a/src/scene/lightnode.h b/src/scene/lightnode.h index fd95741..8cb11a1 100644 --- a/src/scene/lightnode.h +++ b/src/scene/lightnode.h @@ -3,7 +3,7 @@ #include "graphicalnode.h" #include "glm/mat4x4.hpp" -#include "scene.h" +#include "SparrowRenderer/scene.h" class LightNode : public GraphicalNode { diff --git a/src/scene/meshnode.cpp b/src/scene/meshnode.cpp index 8fc156b..72b8c92 100644 --- a/src/scene/meshnode.cpp +++ b/src/scene/meshnode.cpp @@ -1,5 +1,5 @@ #include "meshnode.h" -#include "mesh.h" +#include "SparrowRenderer/mesh.h" #include "scenetree.h" #include diff --git a/src/scene/meshnode.h b/src/scene/meshnode.h index a5393c9..a214855 100644 --- a/src/scene/meshnode.h +++ b/src/scene/meshnode.h @@ -3,7 +3,7 @@ #include "graphicalnode.h" #include "glm/mat4x4.hpp" -#include "scene.h" +#include "SparrowRenderer/scene.h" class btRigidBody; class btIndexedMesh; diff --git a/src/scene/physicsdebugnode.cpp b/src/scene/physicsdebugnode.cpp index f3eb720..e4492e8 100644 --- a/src/scene/physicsdebugnode.cpp +++ b/src/scene/physicsdebugnode.cpp @@ -1,6 +1,6 @@ #include "physicsdebugnode.h" -#include "mesh.h" -#include "phongmaterial.h" +#include "SparrowRenderer/mesh.h" +#include "SparrowRenderer/phongmaterial.h" PhysicsDebugNode::PhysicsDebugNode() : MeshNode(new Mesh()) diff --git a/src/scene/playercharacternode.cpp b/src/scene/playercharacternode.cpp index d5eab08..a36e94f 100644 --- a/src/scene/playercharacternode.cpp +++ b/src/scene/playercharacternode.cpp @@ -135,7 +135,7 @@ void PlayerCharacterNode::update() } // update camera rotation - sf::Vector2i diff = input->getDeltaPosition(); + glm::vec2 diff = input->getDeltaPosition(); m_fpsCamera.rotate(diff.x, diff.y); // update camera position diff --git a/src/scene/playercharacternode.h b/src/scene/playercharacternode.h index 24e4c37..865e2f9 100644 --- a/src/scene/playercharacternode.h +++ b/src/scene/playercharacternode.h @@ -2,7 +2,7 @@ #define PLAYERCHARACTERNODE_H #include "cameranode.h" -#include "input.h" +#include "SparrowInput/input.h" #include class btRigidBody; diff --git a/src/scene/scenetree.cpp b/src/scene/scenetree.cpp index b8e3c85..e3df85c 100644 --- a/src/scene/scenetree.cpp +++ b/src/scene/scenetree.cpp @@ -1,11 +1,11 @@ #include "scene/scenetree.h" #include "resourcemanager.h" -#include -#include +#include +#include #include #include // Scene -#include +#include #include #include "scene/scenenode.h" #include "scene/cameranode.h" diff --git a/src/scene/scenetree.h b/src/scene/scenetree.h index 3f67ebb..1c5a62b 100644 --- a/src/scene/scenetree.h +++ b/src/scene/scenetree.h @@ -3,7 +3,7 @@ #include #include -#include "scene.h" +#include "SparrowRenderer/scene.h" #include "containernode.h" #include "engine.h" diff --git a/src/scene/textnode.cpp b/src/scene/textnode.cpp deleted file mode 100644 index 189495e..0000000 --- a/src/scene/textnode.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#include "textnode.h" - - diff --git a/src/scene/trackballcameranode.cpp b/src/scene/trackballcameranode.cpp index 9a3c8bb..11500a9 100644 --- a/src/scene/trackballcameranode.cpp +++ b/src/scene/trackballcameranode.cpp @@ -8,7 +8,7 @@ TrackBallCameraNode::TrackBallCameraNode(Input *input) : void TrackBallCameraNode::update() { - sf::Vector2i diff = m_input->getDeltaPosition(); + glm::vec2 diff = m_input->getDeltaPosition(); for(int action : m_input->getActions()) { if(action == m_action_move) diff --git a/src/scene/trackballcameranode.h b/src/scene/trackballcameranode.h index d876898..fd7fffa 100644 --- a/src/scene/trackballcameranode.h +++ b/src/scene/trackballcameranode.h @@ -2,8 +2,8 @@ #define TRACKBALLCAMERANODE_H #include "cameranode.h" -#include "trackballcamera.h" -#include "input.h" +#include "SparrowRenderer/trackballcamera.h" +#include "SparrowInput/input.h" /** * @brief The CameraNode class is a scene node that can be used by the renderer diff --git a/src/sparrowshell/scriptnode.cpp b/src/sparrowshell/scriptnode.cpp index 55fe30c..f6b88e8 100644 --- a/src/sparrowshell/scriptnode.cpp +++ b/src/sparrowshell/scriptnode.cpp @@ -2,11 +2,18 @@ #include "engine.h" #include "sparrowshell/sparrowshell.h" #include +#include +#include "Version.h" +#include "SparrowInput/Version.h" +#include "SparrowRenderer/Version.h" +#include "SparrowSerializer/Version.h" + #define LUASETFUN(var) m_script.set_function(#var,&ScriptNode::var,this) ScriptNode::ScriptNode() { LUASETFUN(print); + LUASETFUN(version); } void ScriptNode::update(){ @@ -16,21 +23,28 @@ void ScriptNode::update(){ } void ScriptNode::print(std::string to_print){ - std::wstring ws; - to_print.append("\n"); - ws.assign(to_print.begin(),to_print.end()); - this->getEngine().getShell()->out(ws); + this->getEngine().getShell()->out(to_print.append("\n")); } -void ScriptNode::execute(std::wstring to_execute){ +void ScriptNode::version(){ + std::ostringstream oss; + oss << " SparrowEngine version: "<< SparrowEngine_VERSION_MAJOR << "." << SparrowEngine_VERSION_MINOR; + this->getEngine().getShell()->out(oss.str()); + oss.str(""); + oss << " SparrowInput version: "<< SparrowInput_VERSION_MAJOR << "." << SparrowInput_VERSION_MINOR; + this->getEngine().getShell()->out(oss.str()); + oss.str(""); + oss << " SparrowRenderer version: "<< SparrowRenderer_VERSION_MAJOR << "." << SparrowRenderer_VERSION_MINOR; + this->getEngine().getShell()->out(oss.str()); + oss.str(""); + oss << " SparrowSerializer version: "<< SparrowSerializer_VERSION_MAJOR << "." << SparrowSerializer_VERSION_MINOR; + this->getEngine().getShell()->out(oss.str()); +} + +void ScriptNode::execute(std::string to_execute){ try{ - std::string str; - str.assign(to_execute.begin(),to_execute.end()); - m_script.script(str); + m_script.script(to_execute); }catch(sol::error error_lua){ - std::string s = error_lua.what(); - std::wstring ws; - ws.assign(s.begin(),s.end()); - this->getEngine().getShell()->out(ws,glm::vec3(1,0,0)); + this->getEngine().getShell()->out(error_lua.what(),glm::vec3(1,0,0)); } } diff --git a/src/sparrowshell/scriptnode.h b/src/sparrowshell/scriptnode.h index 412db13..41bbd66 100644 --- a/src/sparrowshell/scriptnode.h +++ b/src/sparrowshell/scriptnode.h @@ -13,7 +13,8 @@ public: ScriptNode(); void update(); void print(std::string); - void execute(std::wstring); + void version(); + void execute(std::string); }; #endif // SCRIPTNODE_H diff --git a/src/sparrowshell/shellscrollbar.cpp b/src/sparrowshell/shellscrollbar.cpp index 031666c..5b5fb47 100644 --- a/src/sparrowshell/shellscrollbar.cpp +++ b/src/sparrowshell/shellscrollbar.cpp @@ -1,7 +1,7 @@ #include "shellscrollbar.h" #include "sparrowshell.h" -#include "mesh.h" -#include "phongmaterial.h" +#include "SparrowRenderer/mesh.h" +#include "SparrowRenderer/phongmaterial.h" #include "scene/meshnode.h" #include "tools/utils.h" #include @@ -41,7 +41,7 @@ void ShellScrollBar::update(){ if (m_shell->indexMoved()) { m_position.y = cran * indexCursor; - std::cout << m_position.x << " " << m_position.y << std::endl; +// std::cout << m_position.x << " " << m_position.y << std::endl; moveTo2D(m_position); } } diff --git a/src/sparrowshell/sparrowshell.cpp b/src/sparrowshell/sparrowshell.cpp index 5dff1e1..1a561a8 100644 --- a/src/sparrowshell/sparrowshell.cpp +++ b/src/sparrowshell/sparrowshell.cpp @@ -1,16 +1,14 @@ #include "sparrowshell.h" -#include "input.h" +#include "SparrowInput/input.h" #include "scene/scenetree.h" #include "scene/meshnode.h" #include "scene/textnode.h" #include "scene/gui/backgroundnode.h" #include "scriptnode.h" -#include "mesh.h" -#include "phongmaterial.h" - -//#include "tools/utils.h" +#include "SparrowRenderer/mesh.h" +#include "SparrowRenderer/phongmaterial.h" #include "tools/font.h" #include "resourcemanager.h" @@ -53,15 +51,17 @@ SparrowShell::SparrowShell(sf::Window* window): } // write wstring str in shell -void SparrowShell::out(std::wstring str) +void SparrowShell::out(std::string str) { out(str,m_text_color); } -void SparrowShell::out(std::wstring str,glm::vec3 color) +void SparrowShell::out(std::string str,glm::vec3 color) { + std::wstring ws; + ws.assign(str.begin(),str.end()); Font *shellfont = RESOURCE_GET(Font,"shellfont"); - TextNode* tnode = shellfont->getTextNode(str,color,m_buffer->getFontSize(),false); + TextNode* tnode = shellfont->getTextNode(ws,color,m_buffer->getFontSize(),false); tnode->setDepth(SHELL_DEPTH+1); m_buffer->push(tnode); scrollDown(); @@ -125,6 +125,7 @@ void SparrowShell::update() else if(scroll > 0) scrollUp(); } + getEngine().getScene()->updateShaders(); GraphicalContainerNode::update(); } @@ -156,7 +157,7 @@ void SparrowShell::updateTextInput() input_string_updated = true; break; default: - m_input_string.insert(m_input_cursor_pos++,std::wstring(1,c)); + m_input_string.insert(m_input_cursor_pos++,std::string(1,c)); input_string_updated = true; } } @@ -165,7 +166,9 @@ void SparrowShell::updateTextInput() { if(m_input_mesh) this->removeChild(m_input_mesh); - m_input_mesh = shellfont->getTextNode(m_input_string,m_text_color,m_buffer->getFontSize(),false); + std::wstring ws; + ws.assign(m_input_string.begin(),m_input_string.end()); + m_input_mesh = shellfont->getTextNode(ws,m_text_color,m_buffer->getFontSize(),false); m_input_mesh->moveTo2D(glm::vec2(0,m_buffer->getFontSize()*BUFFER_DISPLAYED_LINES)); this->addChild(m_input_mesh); m_input_mesh->setVisible(true); diff --git a/src/sparrowshell/sparrowshell.h b/src/sparrowshell/sparrowshell.h index 3971919..ba4edd5 100644 --- a/src/sparrowshell/sparrowshell.h +++ b/src/sparrowshell/sparrowshell.h @@ -8,7 +8,7 @@ #include "sparrowshell/shellbuffer.h" #include "sparrowshell/shellscrollbar.h" #include "scene/graphicalcontainernode.h" -#include "keybindings.h" +#include "SparrowInput/keybindings.h" class Input; class MeshNode; @@ -36,7 +36,7 @@ private: ScriptNode * m_script; glm::vec3 m_text_color; - std::wstring m_input_string; + std::string m_input_string; unsigned int m_input_cursor_pos; TextNode* m_input_mesh; @@ -61,8 +61,8 @@ public: void scrollDown(); void toggleShell(); - void out(std::wstring str); - void out(std::wstring str, glm::vec3 color); + void out(std::string str); + void out(std::string str, glm::vec3 color); glm::ivec2 getPosition(){return m_position;} glm::ivec2 getDimension(){return m_dimension;} @@ -72,7 +72,6 @@ public: void setMoveCursorLeftAction(int action){m_move_cursor_left = action;} void setMoveCursorRightAction(int action){m_move_cursor_right = action;} -// void setPlopTest(int action){m_plop_test = action;} void setClearConsoleAction(int action){m_clear_console_action = action;} void moveCursorLeft(){m_input_cursor_pos--;} diff --git a/src/test/main.cpp b/src/test/main.cpp index 12538b9..d53b747 100644 --- a/src/test/main.cpp +++ b/src/test/main.cpp @@ -1,13 +1,13 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include "defaultkeysmap.h" #include @@ -34,8 +34,8 @@ #include "scene/gui/backgroundnode.h" #include "potator.h" -#include "serializationmanager.h" -#include "serializable.h" +#include "SparrowSerializer/serializationmanager.h" +#include "SparrowSerializer/serializable.h" #include #include "scene/gui/callback.h" @@ -372,8 +372,8 @@ int main(){ }*/ // shell output tests - engine.outputShell("Hello World!"); - engine.outputShell("Starting test :"); + engine.getShell()->out("Hello World!"); + engine.getShell()->out("Starting test :"); // preparing shaders and launching the engine engine.getScene()->updateShaders(); diff --git a/src/test/potator.cpp b/src/test/potator.cpp index db6a146..6c52d28 100644 --- a/src/test/potator.cpp +++ b/src/test/potator.cpp @@ -3,11 +3,11 @@ #include #include #include "scene/scenetree.h" -#include "parametricmesh.h" -#include "phongmaterial.h" +#include "SparrowRenderer/parametricmesh.h" +#include "SparrowRenderer/phongmaterial.h" #include "scene/meshnode.h" #include "tools/loader.h" -#include "texture.h" +#include "SparrowRenderer/texture.h" #include "scene/graphicalcontainernode.h" #define PHYSICS_OFFSET 0.01f diff --git a/src/test/potator.h b/src/test/potator.h index c9368a6..bb08213 100644 --- a/src/test/potator.h +++ b/src/test/potator.h @@ -2,7 +2,7 @@ #define POTATOR_H #include "scene/gibgeneratornode.h" -#include "input.h" +#include "SparrowInput/input.h" class PlayerCharacterNode; class Mesh; diff --git a/src/tools/font.cpp b/src/tools/font.cpp index d657a43..a330cb1 100644 --- a/src/tools/font.cpp +++ b/src/tools/font.cpp @@ -1,6 +1,6 @@ #include "font.h" -#include -#include "mesh.h" +#include +#include "SparrowRenderer/mesh.h" #include "scene/textnode.h" Font::Font() diff --git a/src/tools/loader.cpp b/src/tools/loader.cpp index 7345161..db9c72e 100644 --- a/src/tools/loader.cpp +++ b/src/tools/loader.cpp @@ -2,12 +2,12 @@ #include #include #include -#include +#include #include "../resourcemanager.h" #include -#include -#include -#include "texture.h" +#include +#include +#include "SparrowRenderer/texture.h" #include "utils.h" #include "font.h"