wanmay
/
yaw-audio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dessiner cercles

This commit is contained in:
yaw-man 2022-08-09 16:51:23 -03:00
parent 8e1108d534
commit f2aae2a502
2 changed files with 189 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/yaw-tab/tab.cpp
View File

@ -38,6 +38,10 @@ public:
bool wintabAvailable = false; bool wintabAvailable = false;
PACKET pkt = { 0 }; PACKET pkt = { 0 };
UINT maxPressure = 1; UINT maxPressure = 1;
float extX;
float extY;
float extZ;
float extP;
private: private:
@ -66,16 +70,21 @@ private:
ctx.lcInExtX = TabletX.axMax; ctx.lcInExtX = TabletX.axMax;
ctx.lcOutOrgX = TabletX.axMin; ctx.lcOutOrgX = TabletX.axMin;
ctx.lcOutExtX = TabletX.axMax; ctx.lcOutExtX = TabletX.axMax;
extX = TabletX.axMax;
ctx.lcInOrgY = TabletY.axMin; ctx.lcInOrgY = TabletY.axMin;
ctx.lcInExtY = TabletY.axMax; ctx.lcInExtY = TabletY.axMax;
ctx.lcOutOrgY = TabletY.axMin; ctx.lcOutOrgY = TabletY.axMin;
ctx.lcOutExtY = TabletY.axMax; ctx.lcOutExtY = TabletY.axMax;
extY = TabletY.axMax;
ctx.lcInOrgZ = TabletZ.axMin; ctx.lcInOrgZ = TabletZ.axMin;
ctx.lcInExtZ = TabletZ.axMax; ctx.lcInExtZ = TabletZ.axMax;
ctx.lcOutOrgZ = TabletZ.axMin; ctx.lcOutOrgZ = TabletZ.axMin;
ctx.lcOutExtZ = TabletZ.axMax; ctx.lcOutExtZ = TabletZ.axMax;
extZ = TabletZ.axMax;
extP = TabletPressure.axMax;
hctx = gpWTOpenA(hwnd, &ctx, FALSE); hctx = gpWTOpenA(hwnd, &ctx, FALSE);

59
src/yaw-tab/ui.cpp
View File

@ -38,10 +38,16 @@ protected:
//Lire donnés de la tablet //Lire donnés de la tablet
tab.NewPacket(); tab.NewPacket();
fParameters[kParameterTabletX] = static_cast<float>(tab.pkt.pkX);
fParameters[kParameterTabletY] = static_cast<float>(tab.pkt.pkY); float x = 1000.0f * static_cast<float>(tab.pkt.pkX) / tab.extX;
fParameters[kParameterTabletZ] = static_cast<float>(tab.pkt.pkZ); float y = 1000.0f * static_cast<float>(tab.pkt.pkY) / tab.extY;
fParameters[kParameterTabletPressure] = static_cast<float>(tab.pkt.pkNormalPressure); float z = 1000.0f * static_cast<float>(tab.pkt.pkZ) / tab.extZ;
float p = 1000.0f * static_cast<float>(tab.pkt.pkNormalPressure) / tab.extP;
fParameters[kParameterTabletX] = x;
fParameters[kParameterTabletY] = y;
fParameters[kParameterTabletZ] = z;
fParameters[kParameterTabletPressure] = p;
repaint(); repaint();
@ -57,6 +63,13 @@ protected:
void onNanoDisplay() override void onNanoDisplay() override
{ {
drawCircle(
fParameters[kParameterTabletX],
fParameters[kParameterTabletY],
fParameters[kParameterTabletZ],
fParameters[kParameterTabletPressure]
);
const float lineHeight = 20 * fScale; const float lineHeight = 20 * fScale;
fontSize(15.0f * fScale); fontSize(15.0f * fScale);
@ -87,6 +100,44 @@ protected:
drawLeft(x, y, "p:"); drawLeft(x, y, "p:");
drawRight(x, y, getTextBufFloat(fParameters[kParameterTabletPressure])); drawRight(x, y, getTextBufFloat(fParameters[kParameterTabletPressure]));
y += lineHeight; y += lineHeight;
}
void drawCircle(float x, float y, float z, float p) {
static constexpr float circleRadius = 25.f;
x *= getWidth() * 0.001f;
y = (1000.f - y) * getHeight() * 0.001f;
z = 1.f - z * 0.001f;
p *= 0.001f;
beginPath();
strokeColor(1.f, 1.f, 1.f, 0.5f);
moveTo(x - z * circleRadius, y);
lineTo(x + z * circleRadius, y);
stroke();
closePath();
beginPath();
strokeColor(1.f, 1.f, 1.f, 0.5f);
moveTo(x , y - z * circleRadius);
lineTo(x , y + z * circleRadius);
stroke();
closePath();
beginPath();
fillColor(1.f, 1.f, 1.f, p);
strokeColor(255, 255, 255, 255);
circle(x, y, circleRadius);
fill();
stroke();
closePath();
beginPath();
strokeColor(1.f, 1.f, 1.f, z);
circle(x, y, z * circleRadius);
stroke();
closePath();
} }
void onResize(const ResizeEvent& ev) override void onResize(const ResizeEvent& ev) override