opencv test

src/modules/Archimedes-Modules/Rubiks/Rubiks.cpp

@@ -12,7 +12,7 @@
 #include <cstdlib>
 #include <ctime>
 
-#include <opencv2/opencv.hpp>
+#include <opencv4/opencv2/opencv.hpp>
 
 Rubiks::Rubiks(Archimedes::App* a, void* h) : Archimedes::Module(a, h) {
 

src/modules/Archimedes-Modules/Rubiks/RubiksCube.h

@@ -67,19 +67,10 @@ class RubiksCube {
         void orbit(Archimedes::Body& body, glm::vec3 center, glm::vec3 direction, float radians) {
             glm::vec3 o = body.getPosition() - center;
 
-            //direction = glm::normalize(glm::cross(glm::cross(o, direction), o));
-
             glm::vec4 d = glm::vec4(direction, 0) * body.getTransform();
 
             direction = glm::vec3(d.x, d.y, d.z);
 
-            glm::vec3 a = glm::cross(o, direction);
-
-            glm::vec3 v = glm::cos(radians) * glm::normalize(a) + glm::sin(radians) * glm::normalize(o);
-
-
-            glm::vec3 r = glm::length(o) * glm::normalize(v);
-
             if(o != glm::vec3(0.0f)) {
                 body.moveTo(center);
             }

src/modules/Archimedes-Modules/Rubiks/default.nix

@@ -12,6 +12,7 @@
 
             nativeBuildInputs = with pkgs; [
                 clang
+                pkg-config
             ];
 
             buildInputs = with pkgs; [
@@ -25,7 +26,6 @@
                 stb
 
                 opencv
-                pkg-config
             ];
 
             buildPhase = ''
@@ -45,7 +45,7 @@
                 -lEGL -lglfw -lGLEW \
                 $(curl-config --cflags) \
                 $(curl-config --libs) \
-                ''$(pkg-config --cflags --libs ${pkgs.opencv}/lib/pkgconfig/opencv4.pc) \
+                `pkg-config --cflags --libs ${pkgs.opencv}/lib/pkgconfig/opencv4.pc` \
                 -Wall \
                 -o $name -DIMGUI_IMPL_GLFW_DISABLE_X11 
             '';