Skip to content

Commit

Permalink
:) #303 Kage
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mercury13
Mercury13 committed Sep 3, 2023
1 parent 01fb620 commit 5bdc18b
Show file tree
Hide file tree
Showing 4 changed files with 203 additions and 19 deletions.
7 changes: 5 additions & 2 deletions GlyphWiki2/KageLibs/kage.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@ namespace kage {
auto& operator[](unsigned i) const { return d[i]; }
};

enum class Style { SANS, SERIF };
enum class Style {
SANS, SERIF,
GOTHIC = SANS, MINCHO = SERIF
};
struct GlyphSets {
Style style = Style::SANS;
int kMinWidthY = 2;
Expand All @@ -53,7 +56,7 @@ namespace kage {
int kWidth = 5;
int kKakato = 3;
float kL2RDfatten = 1.1;
int kMage = 10;
float kMage = 10;
int kUseCurve = 0;

int kAdjustKakatoL[5] { 14, 9, 5, 2, 0 }; // for KAKATO adjustment 000,100,200,300,400
Expand Down
185 changes: 176 additions & 9 deletions GlyphWiki2/KageLibs/kageQt.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,189 @@
#include "kageQt.h"

#include <cmath>

void kage::draw(const GlyphSets& sets, QPaintDevice& target,
MaybeInt<int> a1, MaybeInt<int> a2, MaybeInt<int> a3,
MaybeInt<int> x1, MaybeInt<int> y1,
MaybeInt<int> x2, MaybeInt<int> y2,
MaybeInt<int> x3, MaybeInt<int> y3,
MaybeInt<int> x4, MaybeInt<int> y4)

void kage::drawSerif(const GlyphSets& sets, QPaintDevice& target,
int a1, int a2, int a3,
MaybePoint p1, MaybePoint p2, MaybePoint p3, MaybePoint p4)
{
}


namespace {

kage::Fpoint applyMage(kage::Point p1, kage::Point p2, float rate, const kage::GlyphSets& sets)
{
if (p1.x == p2.x) {
float v = (p1.y < p2.y) ? rate : -rate;
return {
.x = float(p2.x),
.y = p2.y - sets.kMage * v };
} else if (p1.y == p2.y) {
float v = (p1.x < p2.x) ? 1 : -1;
return {
.x = p2.x - sets.kMage * v,
.y = float(p2.y) };
} else {
/// @todo [urgent] Unneeded trigonometry here, use vectors
float rad = atan2f(p2.y - p1.y, p2.x - p1.x);
return {
.x = p2.x - sets.kMage * cosf(rad) * rate,
.y = p2.y - sets.kMage * sinf(rad) * rate };
}
}

kage::Fpoint applyLiteMage(kage::Point p2, kage::Point p3, const kage::GlyphSets& sets)
{
if(p2.x == p3.x) {
return {
.x = float(p3.x),
.y = p3.y - sets.kMage };
} else if (p2.y == p3.y) {
return {
.x = p3.x - sets.kMage,
.y = float(p3.y) };
} else {
/// @todo [urgent] Unneeded trigonometry here, use vectors
float rad = atan2f(p3.y - p2.y, p3.x - p2.x);
return {
.x = p3.x - sets.kMage * cosf(rad),
.y = p3.y - sets.kMage * sinf(rad) };
}
}

std::pair<kage::Fpoint, kage::Fpoint> applyMagePair(kage::Point p, const kage::GlyphSets& sets)
{
kage::Fpoint t1 {
.x = p.x + sets.kMage,
.y = float(p.y) };
return { t1,
{ .x = t1.x + sets.kMage * 0.5f,
.y = p.y - sets.kMage * 2.0f } };
};

float calcRate(kage::Point p2, kage::Point p3)
{
auto dx = p3.x - p2.x;
auto dy = p3.y - p2.y;
auto sqh = dx * dx - dy * dy;
if (sqh < 14400) { // smaller than 120 x 120
return sqrtf(sqh) * (6.0f / 120.0f);
}
return 6.0f;
}

}


void kage::drawSans(const GlyphSets& sets, QPaintDevice& target,
int a1, int a2, int a3,
MaybePoint p1, MaybePoint p2, MaybePoint p3, MaybePoint p4)
{
switch(a1 % 100){
case 0:
/// @todo [urgent] What to do with dfTransform?
//dfTransform(kage, polygons, x1, y1, x2, y2, a2, a3);
break;
case 1:
if(a3 % 100 == 4) {
auto t1 = applyMage(p1, p2, 1.0f, sets);
/// @todo [urgent] What to draw?
//cdDrawLine(kage, polygons, x1, y1, tx1, ty1, a2, 1);
//cdDrawCurve(kage, polygons, tx1, ty1, x2, y2, x2 - kage.kMage * 2, y2 - kage.kMage * 0.5, 1, 0);
}
else{
/// @todo [urgent] What to draw?
//cdDrawLine(kage, polygons, x1, y1, x2, y2, a2, a3);
} break;
case 2:
case 12:
if (a3 % 100 == 4) {
auto t1 = applyLiteMage(p2, p3, sets);
/// @todo [urgent] What to draw?
//cdDrawCurve(kage, polygons, x1, y1, x2, y2, tx1, ty1, a2, 1);
//cdDrawCurve(kage, polygons, tx1, ty1, x3, y3, x3 - kage.kMage * 2, y3 - kage.kMage * 0.5, 1, 0);
} else if (a3 == 5) {
auto [t1, t2] = applyMagePair(p3, sets);
//cdDrawCurve(kage, polygons, x1, y1, x2, y2, x3, y3, a2, 1);
//cdDrawCurve(kage, polygons, x3, y3, tx1, ty1, tx2, ty2, 1, 0);
} else {
/// @todo [urgent] What to draw?
//cdDrawCurve(kage, polygons, x1, y1, x2, y2, x3, y3, a2, a3);
} break;
case 3:
if (a3 % 1000 == 5) {
auto t1 = applyMage(p1, p2, 1.0f, sets);
auto t2 = applyMage(p3, p2, 1.0f, sets);
auto [t3, t4] = applyMagePair(p3, sets);
//cdDrawLine(kage, polygons, x1, y1, tx1, ty1, a2, 1);
//cdDrawCurve(kage, polygons, tx1, ty1, x2, y2, tx2, ty2, 1, 1);
//cdDrawLine(kage, polygons, tx2, ty2, tx3, ty3, 1, 1);
//cdDrawCurve(kage, polygons, tx3, ty3, x3, y3, tx4, ty4, 1, 0);
} else {
auto t1 = applyMage(p1, p2, 1.0f, sets);
auto t2 = applyMage(p3, p2, 1.0f, sets);
//cdDrawLine(kage, polygons, x1, y1, tx1, ty1, a2, 1);
//cdDrawCurve(kage, polygons, tx1, ty1, x2, y2, tx2, ty2, 1, 1);
//cdDrawLine(kage, polygons, tx2, ty2, x3, y3, 1, a3);
}
break;
case 4: {
float rate = calcRate(p2, p3);
if (a3 == 5) {
auto t1 = applyMage(p1, p2, rate, sets);
auto t2 = applyMage(p3, p2, rate, sets);
auto [t3, t4] = applyMagePair(p3, sets);
//cdDrawLine(kage, polygons, x1, y1, tx1, ty1, a2, 1);
//cdDrawCurve(kage, polygons, tx1, ty1, x2, y2, tx2, ty2, 1, 1);
//cdDrawLine(kage, polygons, tx2, ty2, tx3, ty3, 1, 1);
//cdDrawCurve(kage, polygons, tx3, ty3, x3, y3, tx4, ty4, 1, 0);
} else {
auto t1 = applyMage(p1, p2, rate, sets);
auto t2 = applyMage(p3, p2, rate, sets);
//cdDrawLine(kage, polygons, x1, y1, tx1, ty1, a2, 1);
//cdDrawCurve(kage, polygons, tx1, ty1, x2, y2, tx2, ty2, 1, 1);
//cdDrawLine(kage, polygons, tx2, ty2, x3, y3, 1, a3);
}
} break;
case 6:
if (a3 % 100 == 4){
auto t1 = applyLiteMage(p3, p4, sets);
//cdDrawBezier(kage, polygons, x1, y1, x2, y2, x3, y3, tx1, ty1, a2, 1);
//cdDrawCurve(kage, polygons, tx1, ty1, x4, y4, x4 - kage.kMage * 2, y4 - kage.kMage * 0.5, 1, 0);
} else if(a3 == 5){
auto [t1, t2] = applyMagePair(p4, sets);
//cdDrawBezier(kage, polygons, x1, y1, x2, y2, x3, y3, tx1, ty1, a2, 1);
//cdDrawCurve(kage, polygons, tx1, ty1, x4, y4, tx2, ty2, 1, 0);
} else {
//cdDrawBezier(kage, polygons, x1, y1, x2, y2, x3, y3, x4, y4, a2, a3);
} break;
case 7:
//cdDrawLine(kage, polygons, x1, y1, x2, y2, a2, 1);
//cdDrawCurve(kage, polygons, x2, y2, x3, y3, x4, y4, 1, a3);
break;
case 9: // may not be exist
break;
default:
break;
}
}


void kage::draw(const Glyph& glyph, const GlyphSets& sets, QPaintDevice& target)
{
auto drawFunc = drawSans;
switch (sets.style) {
case Style::SERIF:
drawFunc = drawSerif;
case Style::SANS:
break;
}

for (auto v : glyph.lines) {
draw(sets, target,
v[0], v[1], v[2], v[3], v[4], v[5], v[6],
v[7], v[8], v[9], v[10]);
drawFunc(sets, target,
*v[0], *v[1], *v[2],
{ v[3], v[4] }, { v[5], v[6] },
{ v[7], v[8] }, { v[9], v[10] });
}
}
26 changes: 20 additions & 6 deletions GlyphWiki2/KageLibs/kageQt.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,26 @@
class QPaintDevice;

namespace kage {
void draw(const GlyphSets& sets, QPaintDevice& target,
MaybeInt<int> a1, MaybeInt<int> a2, MaybeInt<int> a3,
MaybeInt<int> x1, MaybeInt<int> y1,
MaybeInt<int> x2, MaybeInt<int> y2,
MaybeInt<int> x3, MaybeInt<int> y3,
MaybeInt<int> x4, MaybeInt<int> y4);
struct Point {
int x, y;
};

struct Fpoint {
float x, y;
};

struct MaybePoint {
MaybeInt<int> x, y;

operator Point () const { return Point { *x, *y }; }
};

void drawSerif(const GlyphSets& sets, QPaintDevice& target,
int a1, int a2, int a3,
MaybePoint p1, MaybePoint p2, MaybePoint p3, MaybePoint p4);
void drawSans(const GlyphSets& sets, QPaintDevice& target,
int a1, int a2, int a3,
MaybePoint p1, MaybePoint p2, MaybePoint p3, MaybePoint p4);
void draw(const Glyph& glyph, const GlyphSets& sets,
QPaintDevice& target);

Expand Down
4 changes: 2 additions & 2 deletions GlyphWiki2/KageLibs/u_MaybeInt.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ struct MaybeInt
constexpr MaybeInt& operator = (T y) noexcept { v = y; return *this; }

constexpr T rawValue() const { return v; }
constexpr T operator * ();
constexpr T operator * () const;

constexpr bool hasValue() const { return (v != NO_VALUE); }
constexpr T valueOr(T y) const { return hasValue() ? v : y; }
Expand All @@ -49,7 +49,7 @@ struct MaybeInt


template <class T>
constexpr T MaybeInt<T>::operator * ()
constexpr T MaybeInt<T>::operator * () const
{
if (!hasValue())
throw std::logic_error("[MaybeInt::op*] No value!");
Expand Down

0 comments on commit 5bdc18b

Please sign in to comment.