Feature/cleanup (#837)

* Style guide fixes
* Various cleanups
* Update SGCT
This commit is contained in:
Alexander Bock
2019-05-03 13:27:43 +02:00
committed by GitHub
parent 6a6db9aa78
commit 595cbc4bcf
39 changed files with 78 additions and 74 deletions

View File

@@ -69,7 +69,7 @@ public:
static scripting::LuaLibrary luaLibrary();
void keyboardCallback(Key key, KeyModifier modifier, KeyAction action);
std::string generateJson() const override;
const std::multimap<KeyWithModifier, KeyInformation>& keyBindings() const;

View File

@@ -114,7 +114,7 @@ private:
// Anchor: Node to follow and orbit.
properties::StringProperty _anchor;
// Aim: Node to look at (when camera direction is reset),
// Aim: Node to look at (when camera direction is reset),
// Empty string means same as anchor.
// If these are the same node we call it the `focus` node.
properties::StringProperty _aim;

View File

@@ -95,7 +95,7 @@ public:
ScriptCallback cb = ScriptCallback());
std::vector<std::string> allLuaFunctions() const;
std::string generateJson() const override;
private:

View File

@@ -110,7 +110,7 @@ public:
*/
template <class T>
ghoul::TemplateFactory<T>* factory() const;
std::string generateJson() const override;
private: