Skip to content

Fix ShapeGenerator::getHexagonAngle index calculation and side 2 pattern #586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrxh merged 1 commit into from
Apr 8, 2026
Merged

Fix ShapeGenerator::getHexagonAngle index calculation and side 2 pattern #586

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 20 additions & 21 deletions source/EngineInterface/ShapeGenerator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,25 +494,24 @@ HOST_DEVICE float ShapeGenerator::getHexagonAngle(int n)
if (n == 0) {
return 0.0f;
}
--n;

if (n < 6) {
float ring1Angles[6] = {60.0f, 60.0f, 120.0f, -120.0f, 120.0f, -120.0f};
return ring1Angles[n];
}

int k = 2;
while (3 * k * (k + 1) <= n) {
int k = 1;
while (1 + 3 * k * (k + 1) <= n) {
++k;
}

bool odd = (k % 2 == 1);
int ringStart = 3 * (k - 1) * k;
int local = n - ringStart;
int block = local / k;
int firstIndex = 1 + 3 * (k - 1) * k;
int local = n - firstIndex;
int side = local / k;
int pos = local % k;
bool odd = (k % 2 == 1);

switch (block) {
if (k == 1) {
float ring1[6] = {60.0f, 60.0f, 120.0f, -120.0f, 120.0f, -120.0f};
return ring1[local];
}

switch (side) {
case 0:
if (pos == 0) {
return odd ? 60.0f : -60.0f;
Expand All @@ -521,14 +520,14 @@ HOST_DEVICE float ShapeGenerator::getHexagonAngle(int n)
case 1:
return (pos % 2 == 0) ? (odd ? 120.0f : -120.0f) : (odd ? -120.0f : 120.0f);
case 2:
if (odd) {
if (pos == 0) {
return -120.0f;
}
if (pos == 1) {
return 60.0f;
}
return (pos % 2 == 0) ? 120.0f : -120.0f;
if (!odd) {
return (pos % 2 == 0) ? -120.0f : 120.0f;
}
if (pos == k - 2) {
return 60.0f;
}
if (pos == k - 1) {
return 120.0f;
}
return (pos % 2 == 0) ? -120.0f : 120.0f;
case 3:
Expand Down