Implemented get command

ChangeLog.md

@@ -2,6 +2,9 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20141031 ]
+    * Added get command
+
     [ 20141018 ]
     * Added target to auto-indent code using astyle and used it.
 

include/Camera.h

@@ -41,13 +41,13 @@ class Camera {
      * \brief Get angle/yaw of camera
      * \returns theta angle/yaw of camera
      */
-    float getRadianYaw();
+    float getRadianYaw() { return mTheta; }
 
     /*!
      * \brief Get angle/pitch of camera
      * \returns phi angle/pitch of camera
      */
-    float getRadianPitch();
+    float getRadianPitch() { return mTheta2; }
 
     /*!
      * \brief Set current position
@@ -55,9 +55,13 @@ class Camera {
      */
     void setPosition(float pos[3]);
 
-    void setSensitivityX(float sens);
+    void setSensitivityX(float sens) { mRotationDeltaX = sens; }
 
-    void setSensitivityY(float sens);
+    float getSensitivityX() { return mRotationDeltaX; }
+
+    void setSensitivityY(float sens) { mRotationDeltaY = sens; }
+
+    float getSensitivityY() { return mRotationDeltaY; }
 
     /*!
      * \brief Updates view target

include/Font.h

@@ -19,6 +19,8 @@ class Font {
 
     static int initialize(std::string font = "");
 
+    static std::string getFontName() { return fontName; }
+
     static unsigned int widthText(float scale, std::string s);
 
     static unsigned int heightText(float scale, unsigned int maxWidth, std::string s);

include/Log.h

@@ -17,7 +17,7 @@ class Log {
 
     const static char endl = '\n';
 
-    ~Log();
+    Log();
 
     unsigned long size();
     std::string get(unsigned long i);

include/Sound.h

@@ -33,12 +33,16 @@ class Sound {
 
     virtual void setEnabled(bool on) = 0;
 
+    virtual bool getEnabled() = 0;
+
     /*!
      * \brief Set the volume
      * \param vol new source gain
      */
     virtual void setVolume(float vol) = 0;
 
+    virtual float getVolume() = 0;
+
     /*!
      * \brief Get number of registered sources
      * \returns number of registered sources

include/SoundAL.h

@@ -37,12 +37,16 @@ class SoundAL : public Sound {
 
     virtual void setEnabled(bool on);
 
+    virtual bool getEnabled() { return mEnabled; }
+
     /*!
      * \brief Set the volume
      * \param vol new source gain
      */
     virtual void setVolume(float vol);
 
+    virtual float getVolume() { return mVolume; }
+
     /*!
      * \brief Get number of registered sources
      * \returns number of registered sources

include/SoundNull.h

@@ -34,12 +34,16 @@ class SoundNull : public Sound {
 
     virtual void setEnabled(bool on);
 
+    virtual bool getEnabled() { return false; }
+
     /*!
      * \brief Set the volume
      * \param vol new source gain
      */
     virtual void setVolume(float vol);
 
+    virtual float getVolume() { return 0.0f; }
+
     /*!
      * \brief Get number of registered sources
      * \returns number of registered sources

include/Window.h

@@ -20,6 +20,8 @@ class Window {
 
     virtual void setFullscreen(bool fullscreen) = 0;
 
+    virtual bool getFullscreen() { return mFullscreen; }
+
     virtual void setMousegrab(bool grab) = 0;
 
     virtual bool getMousegrab() { return mMousegrab; }

include/commands/CommandSet.h

@@ -18,5 +18,13 @@ class CommandSet : public Command {
     virtual int execute(std::istream& args);
 };
 
+class CommandGet : public Command {
+  public:
+    virtual std::string name();
+    virtual std::string brief();
+    virtual void printHelp();
+    virtual int execute(std::istream& args);
+};
+
 #endif
 

src/Camera.cpp

@@ -35,28 +35,12 @@ void Camera::getTarget(float target[3]) {
     target[2] = mTarget[2];
 }
 
-float Camera::getRadianYaw() {
-    return mTheta;
-}
-
-float Camera::getRadianPitch() {
-    return mTheta2;
-}
-
 void Camera::setPosition(float pos[3]) {
     mPos[0] = pos[0];
     mPos[1] = pos[1];
     mPos[2] = pos[2];
 }
 
-void Camera::setSensitivityX(float sens) {
-    mRotationDeltaX = sens;
-}
-
-void Camera::setSensitivityY(float sens) {
-    mRotationDeltaY = sens;
-}
-
 void Camera::update() {
     mTarget[0] = (mViewDistance * std::sin(mTheta)) + mPos[0];
     mTarget[1] = (mViewDistance * std::sin(mTheta2)) + mPos[1]; // + height_offset;

src/Log.cpp

@@ -8,7 +8,8 @@
 #include "global.h"
 #include "Log.h"
 
-Log::~Log() {
+Log::Log() {
+    printBuffer << std::boolalpha;
 }
 
 unsigned long Log::size() {

src/commands/Command.cpp

@@ -35,6 +35,7 @@ void Command::fillCommandList() {
     commands.push_back(std::shared_ptr<Command>(new CommandLoad()));
     commands.push_back(std::shared_ptr<Command>(new CommandBind()));
     commands.push_back(std::shared_ptr<Command>(new CommandSet()));
+    commands.push_back(std::shared_ptr<Command>(new CommandGet()));
     commands.push_back(std::shared_ptr<Command>(new CommandScreenshot()));
     commands.push_back(std::shared_ptr<Command>(new CommandAnimate()));
     commands.push_back(std::shared_ptr<Command>(new CommandMove()));

src/commands/CommandSet.cpp

@@ -148,3 +148,65 @@ int CommandSet::execute(std::istream& args) {
     return 0;
 }
 
+std::string CommandGet::name() {
+    return "get";
+}
+
+std::string CommandGet::brief() {
+    return "get a parameter";
+}
+
+void CommandGet::printHelp() {
+    getLog() << "get-Command Usage:" << Log::endl;
+    getLog() << "  get VAR" << Log::endl;
+    getLog() << "Available Variables:" << Log::endl;
+    getLog() << "  basedir" << Log::endl;
+    getLog() << "  pakdir" << Log::endl;
+    getLog() << "  audiodir" << Log::endl;
+    getLog() << "  datadir" << Log::endl;
+    getLog() << "  font" << Log::endl;
+    getLog() << "  size" << Log::endl;
+    getLog() << "  fullscreen" << Log::endl;
+    getLog() << "  audio" << Log::endl;
+    getLog() << "  volume" << Log::endl;
+    getLog() << "  mouse_x" << Log::endl;
+    getLog() << "  mouse_y" << Log::endl;
+    getLog() << "  fps" << Log::endl;
+}
+
+int CommandGet::execute(std::istream& args) {
+    std::string var;
+    args >> var;
+
+    if (var.compare("size") == 0) {
+        getLog() << getWindow().getWidth() << " " << getWindow().getHeight() << Log::endl;
+    } else if (var.compare("fullscreen") == 0) {
+        getLog() << getWindow().getFullscreen() << Log::endl;
+    } else if (var.compare("audio") == 0) {
+        getLog() << getSound().getEnabled() << Log::endl;
+    } else if (var.compare("volume") == 0) {
+        getLog() << getSound().getVolume() << Log::endl;
+    } else if (var.compare("mouse_x") == 0) {
+        getLog() << OR_RAD_TO_DEG(getCamera().getSensitivityX()) << Log::endl;
+    } else if (var.compare("mouse_y") == 0) {
+        getLog() << OR_RAD_TO_DEG(getCamera().getSensitivityY()) << Log::endl;
+    } else if (var.compare("fps") == 0) {
+        getLog() << getRunTime().getFPS() << Log::endl;
+    } else if (var.compare("basedir") == 0) {
+        getLog() << getRunTime().getBaseDir() << Log::endl;
+    } else if (var.compare("pakdir") == 0) {
+        getLog() << getRunTime().getPakDir() << Log::endl;
+    } else if (var.compare("audiodir") == 0) {
+        getLog() << getRunTime().getAudioDir() << Log::endl;
+    } else if (var.compare("datadir") == 0) {
+        getLog() << getRunTime().getDataDir() << Log::endl;
+    } else if (var.compare("font") == 0) {
+        getLog() << Font::getFontName() << Log::endl;
+    } else {
+        getLog() << "get-Error: Unknown variable (" << var << ")" << Log::endl;
+        return -1;
+    }
+
+    return 0;
+}
+