diff options
Diffstat (limited to 'tracker-wii')
| -rw-r--r-- | tracker-wii/wii_camera.cpp | 6 | ||||
| -rw-r--r-- | tracker-wii/wii_camera.h | 15 | ||||
| -rw-r--r-- | tracker-wii/wii_frame.hpp | 5 | 
3 files changed, 8 insertions, 18 deletions
| diff --git a/tracker-wii/wii_camera.cpp b/tracker-wii/wii_camera.cpp index 4054523a..684131c6 100644 --- a/tracker-wii/wii_camera.cpp +++ b/tracker-wii/wii_camera.cpp @@ -42,12 +42,12 @@ WIICamera::~WIICamera()  QString WIICamera::get_desired_name() const  { -    return desired_name; +    return {};  }  QString WIICamera::get_active_name() const  { -    return active_name; +    return {};  }  void WIICamera::show_camera_settings() @@ -106,8 +106,6 @@ void WIICamera::stop()  		m_pDev = nullptr;  	} -    desired_name = QString(); -    active_name = QString();      cam_info = pt_camera_info();      cam_desired = pt_camera_info();  } diff --git a/tracker-wii/wii_camera.h b/tracker-wii/wii_camera.h index 3b67b286..11af8846 100644 --- a/tracker-wii/wii_camera.h +++ b/tracker-wii/wii_camera.h @@ -45,30 +45,23 @@ struct WIICamera final : pt_camera      void show_camera_settings() override;  private: -	std::unique_ptr<wiimote> m_pDev;  	static void on_state_change(wiimote &remote,  		state_change_flags changed,  		const wiimote_state &new_state); -	bool onExit = false; -	pt_frame internalframe; -	 - -    double dt_mean = 0; - -    Timer t;      wii_camera_status pair();      wii_camera_status get_frame_(cv::Mat& Frame);      bool get_points(struct wii_info& wii);      void get_status(struct wii_info& wii); +    std::unique_ptr<wiimote> m_pDev; +      pt_camera_info cam_info;      pt_camera_info cam_desired; -    QString desired_name, active_name; +      struct { float p = 0, r = 0; } horizon;      pt_settings s; - -    static constexpr inline double dt_eps = 1./384; +    bool onExit = false;  };  } // ns pt_module diff --git a/tracker-wii/wii_frame.hpp b/tracker-wii/wii_frame.hpp index 2107646b..10c1b122 100644 --- a/tracker-wii/wii_frame.hpp +++ b/tracker-wii/wii_frame.hpp @@ -57,9 +57,8 @@ struct WIIPreview final : pt_preview  private:      static void ensure_size(cv::Mat& frame, int w, int h, int type); -    bool fresh = true; -    cv::Mat frame_copy, frame_color, frame_resize, frame_out; -	wii_camera_status status = wii_cam_wait_for_dongle; +    cv::Mat frame_copy, frame_out; +    wii_camera_status status = wii_cam_wait_for_dongle;  };  } // ns pt_module | 
