marrub
/
Maraiah
1
0
Fork 0
Code Issues Pull Requests Releases Activity

tycho: use Qt's integers instead of cstdint ones because reasons

master
an 2019-07-26 00:15:55 -04:00
parent 186020c8c2
commit 1fcb3fd609
4 changed files with 34 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tycho/cc/interface.h
View File

@ -34,7 +34,7 @@ public slots:
signals: signals:
void dirtyChanged(bool dirty); void dirtyChanged(bool dirty);
void deselected(); void deselected();
void selected(std::uint16_t index); void selected(quint16 index);
}; };
class IProjectView : public QWidget class IProjectView : public QWidget

3
tycho/cc/mapmodel.cc
View File

@ -30,9 +30,8 @@ void MapModel::select(QModelIndex const &index)
QVariant MapModel::data(const QModelIndex &index, int role) const QVariant MapModel::data(const QModelIndex &index, int role) const
{ {
switch(role) { switch(role) {
case Qt::DecorationRole: { case Qt::DecorationRole:
return QVariant::fromValue(::getIcon(propIcon(index.row()))); return QVariant::fromValue(::getIcon(propIcon(index.row())));
}
default: default:
return IMapModel::data(index, role); return IMapModel::data(index, role);
} }

74
tycho/cc/paint.cc
View File

@ -2,58 +2,47 @@
extern "C" { extern "C" {
struct int2 { struct int2 {
std::int16_t x, y; qint16 x, y;
}; };
void paint_arc(QPainter *paint, void paint_arc(QPainter *paint,
std::int16_t x, qint16 x,
std::int16_t y, qint16 y,
std::int16_t w, qint16 w,
std::int16_t h, qint16 h,
std::int16_t t, qint16 t,
std::int16_t p) qint16 p)
{ {
paint->drawArc(x, y, w, h, t, p); paint->drawArc(x, y, w, h, t, p);
} }
void paint_chord(QPainter *paint, void paint_chord(QPainter *paint,
std::int16_t x, qint16 x,
std::int16_t y, qint16 y,
std::int16_t w, qint16 w,
std::int16_t h, qint16 h,
std::int16_t t, qint16 t,
std::int16_t p) qint16 p)
{ {
paint->drawChord(x, y, w, h, t, p); paint->drawChord(x, y, w, h, t, p);
} }
void paint_ellipse(QPainter *paint, void paint_ellipse(QPainter *paint, qint16 x, qint16 y, qint16 w, qint16 h)
std::int16_t x,
std::int16_t y,
std::int16_t w,
std::int16_t h)
{ {
paint->drawEllipse(x, y, w, h); paint->drawEllipse(x, y, w, h);
} }
void paint_image(QPainter *paint, void paint_image(QPainter *paint, qint16 x, qint16 y, char const *fname)
std::int16_t x,
std::int16_t y,
char const *fname)
{ {
paint->drawImage(x, y, QImage(QString(fname))); paint->drawImage(x, y, QImage(QString(fname)));
} }
void paint_line(QPainter *paint, void paint_line(QPainter *paint, qint16 x1, qint16 y1, qint16 x2, qint16 y2)
std::int16_t x1,
std::int16_t y1,
std::int16_t x2,
std::int16_t y2)
{ {
paint->drawLine(x1, y1, x2, y2); paint->drawLine(x1, y1, x2, y2);
} }
void paint_point(QPainter *paint, std::int16_t x, std::int16_t y) void paint_point(QPainter *paint, qint16 x, qint16 y)
{ {
paint->drawPoint(x, y); paint->drawPoint(x, y);
} }
@ -69,39 +58,28 @@ extern "C" {
paint->drawPolygon(poly); paint->drawPolygon(poly);
} }
void paint_rect(QPainter *paint, void paint_rect(QPainter *paint, qint16 x, qint16 y, qint16 w, qint16 h)
std::int16_t x,
std::int16_t y,
std::int16_t w,
std::int16_t h)
{ {
paint->drawRect(x, y, w, h); paint->drawRect(x, y, w, h);
} }
void paint_squircle(QPainter *paint, void paint_squircle(QPainter *paint,
std::int16_t x, qint16 x,
std::int16_t y, qint16 y,
std::int16_t w, qint16 w,
std::int16_t h, qint16 h,
std::int16_t r1, qint16 r1,
std::int16_t r2) qint16 r2)
{ {
paint->drawRoundedRect(x, y, w, h, r1, r2); paint->drawRoundedRect(x, y, w, h, r1, r2);
} }
void paint_text(QPainter *paint, void paint_text(QPainter *paint, qint16 x, qint16 y, char const *text)
std::int16_t x,
std::int16_t y,
char const *text)
{ {
paint->drawText(x, y, QString(text)); paint->drawText(x, y, QString(text));
} }
void paint_fg(QPainter *paint, void paint_fg(QPainter *paint, quint8 r, quint8 g, quint8 b, quint8 a)
std::uint8_t r,
std::uint8_t g,
std::uint8_t b,
std::uint8_t a)
{ {
QColor color{r, g, b, a}; QColor color{r, g, b, a};
paint->setPen(color); paint->setPen(color);

13
tycho/cc/tycho.h
View File

@ -1,7 +1,6 @@
#pragma once #pragma once
#include <cstddef> #include <cstddef>
#include <cstdint>
#include <iostream> #include <iostream>
#include <optional> #include <optional>
#include <vector> #include <vector>
@ -28,7 +27,7 @@
class Project; class Project;
using byte = std::uint8_t; using byte = quint8;
class MapModel final : public IMapModel class MapModel final : public IMapModel
{ {
@ -143,12 +142,12 @@ void dbgPrint([[maybe_unused]] char const *fmt, [[maybe_unused]] VA &&...va)
#define dbgPrintFunc() dbgPrint("%s", __func__) #define dbgPrintFunc() dbgPrint("%s", __func__)
constexpr constexpr
std::uint32_t fourCC(byte a, byte b, byte c, byte d) quint32 fourCC(byte a, byte b, byte c, byte d)
{ {
return (static_cast<std::uint32_t>(a) << 24) | return (static_cast<quint32>(a) << 24) |
(static_cast<std::uint32_t>(b) << 16) | (static_cast<quint32>(b) << 16) |
(static_cast<std::uint32_t>(c) << 8) | (static_cast<quint32>(c) << 8) |
static_cast<std::uint32_t>(d); static_cast<quint32>(d);
} }
QIcon getIcon(QString const &name); QIcon getIcon(QString const &name);