summaryrefslogtreecommitdiffhomepage
path: root/pose-widget/pose-widget.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'pose-widget/pose-widget.hpp')
-rw-r--r--pose-widget/pose-widget.hpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/pose-widget/pose-widget.hpp b/pose-widget/pose-widget.hpp
index fa956b47..aa51957e 100644
--- a/pose-widget/pose-widget.hpp
+++ b/pose-widget/pose-widget.hpp
@@ -47,8 +47,8 @@ public:
struct pose_transform final : QThread
{
- pose_transform(QWidget* dst);
- ~pose_transform();
+ pose_transform(QWidget* dst, double device_pixel_ratio);
+ ~pose_transform() override;
void rotate_async(double xAngle, double yAngle, double zAngle, double x, double y, double z);
void rotate_sync(double xAngle, double yAngle, double zAngle, double x, double y, double z);
@@ -63,8 +63,7 @@ struct pose_transform final : QThread
void project_quad_texture();
std::pair<vec2i, vec2i> get_bounds(const vec2& size);
- template<typename F>
- inline void with_image_lock(F&& fun);
+ template<typename F> inline void with_image_lock(F&& fun);
rmat rotation, rotation_;
vec3 translation, translation_;
@@ -73,27 +72,28 @@ struct pose_transform final : QThread
QWidget* dst;
- QImage front, back;
- QImage image, image2;
+ QImage front{QImage{":/images/side1.png"}.convertToFormat(QImage::Format_ARGB32)};
+ QImage back{QImage{":/images/side6.png"}.convertToFormat(QImage::Format_ARGB32)};
+ QImage image{w, h, QImage::Format_ARGB32};
+ QImage image2{w, h, QImage::Format_ARGB32};
- struct uv_
+ struct uv_ // NOLINT(cppcoreguidelines-pro-type-member-init)
{
vec2 coords;
int i;
};
std::vector<uv_> uv_vec;
+ std::atomic<bool> fresh{false};
- std::atomic<bool> fresh;
-
- static constexpr inline int w = 320, h = 240;
+ static constexpr int w = 320, h = 240;
};
class OTR_POSE_WIDGET_EXPORT pose_widget final : public QWidget
{
public:
pose_widget(QWidget *parent = nullptr);
- ~pose_widget();
+ ~pose_widget() override;
void rotate_async(double xAngle, double yAngle, double zAngle, double x, double y, double z);
void rotate_sync(double xAngle, double yAngle, double zAngle, double x, double y, double z);
@@ -104,4 +104,4 @@ private:
}
-using pose_widget_impl::pose_widget;
+using pose_widget = pose_widget_impl::pose_widget;