2024

.devcontainer/devcontainer.json

@@ -0,0 +1,28 @@
+{
+    "image": "tek5030/devcontainer:latest",
+    "runArgs": [
+        "--rm",
+        "--device-cgroup-rule=c 81:* rmw",
+        "--device-cgroup-rule=c 189:* rmw"
+    ],
+    "containerEnv": {
+        "DISPLAY": "${localEnv:DISPLAY}",
+        "XDG_RUNTIME_DIR": "${localEnv:XDG_RUNTIME_DIR}"
+    },
+    "mounts": [
+        "type=bind,source=/dev,target=/dev",
+        "type=bind,source=/tmp/.X11-unix,target=/tmp/.X11-unix",
+        "type=bind,source=${localEnv:XAUTHORITY},target=${localEnv:XAUTHORITY}",
+        "type=bind,source=${localEnv:XDG_RUNTIME_DIR},target=${localEnv:XDG_RUNTIME_DIR}"
+    ],
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "ms-vscode.cpptools",
+                "ms-vscode.cmake-tools",
+                "ms-vscode.cpptools-extension-pack",
+                "azuretools.vscode-docker"
+            ]
+        }
+    }
+}

README.md

@@ -2,24 +2,24 @@
 
 This is our proposed solution for the lab ["Pose and camera geometry"][repo] in the computer vision course [TEK5030] at the University of Oslo.
 
-Please see the [lab guide][guide] for more information.
+Please see the [lab guide] for more information.
 
 ## Prerequisites
+- OpenCV must be installed on your system. If you are on a lab computer, you are all set.
 
-For this lab, we can unfortunately not rely on conan to install all required OpenCV modules (namely the `viz` module for 3D visualization). You have a few other options:
+  If you are on Ubuntu, but not on a lab computer, the following should be sufficient _for this lab_.
 
-- Solve the [python lab](https://github.com/tek5030/lab-camera-pose-py)
-- Use the lab computers
-- Install OpenCV using [homebrew](https://brew.sh/) (option for mac and linux). (See also [Getting started on MacOS](https://tek5030.github.io/tutorial/macos.html).)
-- Rely on virtualbox and our prepared linux image with dependencies preinstalled (see [Canvas: Setting up your computer for the labs](https://uio.instructure.com/courses/44675/discussion_topics/295673))
+   ```bash
+   sudo apt update
+   sudo apt install libopencv-dev libopencv-viz-dev
+   ```
 
-[TEK5030]: https://www.uio.no/studier/emner/matnat/its/TEK5030/
-[conan]: https://tek5030.github.io/tutorial/conan.html
-[lab_intro]: https://github.com/tek5030/lab-intro/blob/master/cpp/lab-guide/1-open-project-in-clion.md#6-configure-project
+- We refer to [setup_scripts](https://github.com/tek5030/setup_scripts) and [the intro lab] as a general getting started-guide for the C++ labs on Ubuntu 22.04.
+
+---
 
 [repo]:  https://github.com/tek5030/lab-camera-pose
-[guide]: https://github.com/tek5030/lab-camera-pose/blob/master/README.md
+[lab guide]: https://github.com/tek5030/lab-camera-pose/blob/master/README.md
 
-[lab_intro]: https://github.com/tek5030/lab-intro/blob/master/cpp/lab-guide/1-open-project-in-clion.md#6-configure-project
+[the intro lab]: https://github.com/tek5030/lab-intro/blob/master/cpp/lab-guide/1-open-project-in-clion.md#6-configure-project
 [TEK5030]: https://www.uio.no/studier/emner/matnat/its/TEK5030/
-[conan]: https://tek5030.github.io/tutorial/conan.html