Merge branch 'fix-camera-stretching' into develop

gl/glstuff.cpp

@@ -9,7 +9,7 @@
 #include "Program.hpp"
 
 namespace gl {
-    GLFWwindow * createDefaultWindow(const std::string &windowName) {
+    GLFWwindow * createDefaultWindow(const std::string &windowName, uint64_t width, uint64_t height) {
         GLFWmonitor *pmonitor = glfwGetPrimaryMonitor();
         const GLFWvidmode *vmode = glfwGetVideoMode(pmonitor);
 
@@ -18,8 +18,9 @@ namespace gl {
         glfwWindowHint(GLFW_OPENGL_CORE_PROFILE, GLFW_TRUE);
         glfwWindowHint(GLFW_DECORATED, GLFW_TRUE);
         glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE);
-        GLFWwindow *wnd = glfwCreateWindow(vmode->width - 100, vmode->height - 100, windowName.c_str(), nullptr, nullptr);
-        glfwSetWindowPos(wnd, 50, 50);
+        const uint64_t actualWidth = width > vmode->width ? vmode->width : width;
+        const uint64_t actualHeight = height > vmode->height ? vmode->height : height;
+        GLFWwindow *wnd = glfwCreateWindow(actualWidth, actualHeight, windowName.c_str(), nullptr, nullptr);
 
         return wnd;
     }

gl/glstuff.hpp

@@ -11,7 +11,7 @@
 
 namespace gl {
     class Texture;
-    GLFWwindow * createDefaultWindow(const std::string &windowName);
+    GLFWwindow * createDefaultWindow(const std::string &windowName, uint64_t width, uint64_t height);
     void loadCVmat2GLTexture(const Texture &texture, const cv::Mat &image, bool shouldFlip = false);
     Program loadDefaultShaders();
     GLuint retrieveTypeSize(GLenum type);

main.cpp

@@ -96,7 +96,9 @@ int main(int argc, char **argv) {
         try {
             if (!glfwInit()) throw std::runtime_error("Could not initialize GLFW.");
 
-            GLFWwindow *wnd = gl::createDefaultWindow("Viewport");
+                GLFWwindow *wnd = gl::createDefaultWindow("Viewport",
+                        2 * cam.frameData().width,
+                        2 * cam.frameData().height);
             glfwMakeContextCurrent(wnd);
             glfwSwapInterval(1);
 

vidIO/CMakeLists.txt

@@ -3,8 +3,9 @@ cmake_minimum_required(VERSION 3.15)
 project(vidIO LANGUAGES CXX)
 
 add_library(vidIO STATIC
-    Camera.cpp
-    CVCameraAdapter.cpp
+    "Camera.cpp"
+    "CameraAdapter.cpp"
+    "CVCameraAdapter.cpp"
 )
 
 target_include_directories(vidIO PRIVATE ${opencv_INCLUDE_DIRS})

vidIO/CVCameraAdapter.cpp

@@ -1,15 +1,20 @@
 #include "CVCameraAdapter.hpp"
 
 namespace vidIO {
-    CVCameraAdapter::CVCameraAdapter() { this->open(); }
+    CVCameraAdapter::CVCameraAdapter() {
+        this->open();
+        this->fdat.width = cap_.get(cv::CAP_PROP_FRAME_WIDTH);
+        this->fdat.height = cap_.get(cv::CAP_PROP_FRAME_HEIGHT);
+    }
+
     bool CVCameraAdapter::open() {
-        return cap.open(0);
+        return cap_.open(0);
     }
 
-    void CVCameraAdapter::close() { if (cap.isOpened()) cap.release(); }
+    void CVCameraAdapter::close() { if (cap_.isOpened()) cap_.release(); }
     Frame CVCameraAdapter::nextFrame() {
         cv::Mat frame;
-        if (!cap.read(frame))
+        if (!cap_.read(frame))
             throw std::runtime_error("Device could not read frame.");
 
         return frame;

vidIO/CVCameraAdapter.hpp

@@ -15,6 +15,6 @@ namespace vidIO {
         Frame nextFrame() override;
 
     private:
-        cv::VideoCapture cap;
+        cv::VideoCapture cap_;
     };
 }

vidIO/Camera.cpp

@@ -9,4 +9,7 @@ namespace vidIO {
     bool Camera::open() { return adapter->open(); }
     void Camera::close() { adapter->close(); }
     Camera::~Camera() { adapter->close(); }
+    auto Camera::frameData() const -> const FrameData & {
+        return adapter->frameData();
+    }
 }

vidIO/Camera.hpp

@@ -12,6 +12,7 @@ namespace vidIO {
         bool open();
         void close();
         Frame nextFrame();
+        auto frameData() const -> const FrameData &;
     private:
         std::unique_ptr<CameraAdapter> adapter = nullptr;
     };

vidIO/CameraAdapter.cpp

@@ -0,0 +1,5 @@
+#include "CameraAdapter.hpp"
+
+auto vidIO::CameraAdapter::frameData() const -> const FrameData & {
+    return fdat;
+}

vidIO/CameraAdapter.hpp

@@ -4,10 +4,18 @@
 
 namespace vidIO {
     using Frame = cv::Mat;
+    struct FrameData {
+        uint64_t width;
+        uint64_t height;
+    };
+
     class CameraAdapter {
     public:
         virtual bool open() = 0;
         virtual void close() = 0;
         virtual Frame nextFrame() = 0;
+        auto frameData() const -> const FrameData &;
+    protected:
+        FrameData fdat;
     };
 }