Skip to content

#61 #73

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
Bartanakin merged 1 commit into from
May 10, 2025
Merged

#61 #73

Show file tree
Hide file tree
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
21 changes: 15 additions & 6 deletions include/Graphics/BartaSprite.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,17 @@ enum class SpriteType {
/*
x, y, z, // center coordinates
radius,
color (rgba)
color (rgba),
meshDensity
*/
CIRCLE,
/*
x, y, z, // center coordinates
radius,
color (rgba),
meshDensity
*/
BALL,
/*
x, y, z, // top-left coordinates
font_size,
Expand Down Expand Up @@ -56,20 +64,21 @@ class BartaSprite {
BartaSprite() = default;
~BartaSprite() = default;

inline int getResourceId() const { return this->resource; }
int getResourceId() const { return this->resource; }

inline bool reloadCache() const { return this->doReloadCache; }
bool reloadCache() const { return this->doReloadCache; }

inline const std::vector<float>& getData() const { return this->data; }
const std::vector<float>& getData() const { return this->data; }

inline const std::vector<SpriteType>& getSpriteType() const { return this->spriteTypes; }
const std::vector<SpriteType>& getSpriteType() const { return this->spriteTypes; }

static unsigned int getSpriteTypeSize(
SpriteType type
) {
switch (type) {
case SpriteType::RECTANGLE_WITH_COLORS: return 6 + 4 * 4;
case SpriteType::CIRCLE: return 8;
case SpriteType::CIRCLE: return 9;
case SpriteType::BALL: return 9;
case SpriteType::VARCHAR256: return 256 / 4 + 4;
case SpriteType::TRIANGLE: return 9 + 3 * 4;
}
Expand Down
6 changes: 3 additions & 3 deletions include/Graphics/OpenGL_Bridge/TrianglePrimitive.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

namespace Barta::Graphics::OpenGL_Bridge {
struct TrianglePrimitive {
GLubyte index1;
GLubyte index2;
GLubyte index3;
GLuint index1;
GLuint index2;
GLuint index3;
};

}
4 changes: 2 additions & 2 deletions include/Graphics/OpenGL_Bridge/VertexArray.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ class VertexArray {

void addVertices(const std::vector<Vertex>& vertices) noexcept;

GLubyte getNextVertexIndex() const noexcept { return this->vertices.size(); }
GLuint getNextVertexIndex() const noexcept { return this->triangles.size(); }

void addTrianglePrimitive(TrianglePrimitive t) noexcept;
void addTrianglePrimitive(unsigned int i1, unsigned int i2, unsigned int i3) noexcept;

void addTrianglePrimitives(std::vector<TrianglePrimitive> primitives) noexcept;

Expand Down
7 changes: 5 additions & 2 deletions include/Graphics/SpriteBuilder/CircleSprite.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@ namespace Barta {
struct CircleSprite {
CircleSprite(
Circle circle,
Color color
Color color,
float meshDensity
) noexcept:
circle(std::move(circle)),
color(color) {}
color(color),
meshDensity(meshDensity) {}

Circle circle;
Color color;
float meshDensity;
};
}
7 changes: 7 additions & 0 deletions include/Graphics/SpriteBuilder/SpriteBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,13 @@ class SpriteBuilder {
std::string string;
int fontSize;

float meshDensity;

CircleSprite buildCircleSprite() const {
return {
{this->radius, this->center},
this->color,
this->meshDensity
};
}

Expand Down Expand Up @@ -128,5 +131,9 @@ inline void from_json(
if (j.contains("fontSize")) {
j.at("fontSize").get_to(sprite.fontSize);
}

if (j.contains("meshDensity")) {
j.at("meshDensity").get_to(sprite.meshDensity);
}
}
}
2 changes: 2 additions & 0 deletions include/Graphics/SpriteBuilder/SpriteMerger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ class SpriteMerger {

SpriteMerger* addCircleSprite(const CircleSprite& circleSprite);

SpriteMerger* addBallSprite(const CircleSprite& ballSprite);

SpriteMerger* addString(const StringSprite& stringSprite);

SpriteMerger* addTriangle(const TriangleSprite& triangleSprite);
Expand Down
85 changes: 68 additions & 17 deletions lib/Graphics/OpenGL_Bridge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ void OpenGL_Bridge::createWindow(
void OpenGL_Bridge::drawObjects(
std::list<GraphicsDataAwareInterface*>& objects
) {
auto xd = 0;
for (const auto& object: objects) {
for (auto graphicsData_ptr: object->getGraphicsData()) {
if (graphicsData_ptr->resource.getResourceId() != 0) {
Expand All @@ -90,6 +89,7 @@ void OpenGL_Bridge::drawObjects(
Point center(data[0], data[1], data[2]);
float radius = data[3];
Color color(data[4], data[5], data[6], data[7]);
float meshDensity = data[8]; // TODO

auto segmentCount = static_cast<unsigned int>(2.f * M_PI * radius);
auto initialIndex = this->vertexArray->getNextVertexIndex();
Expand All @@ -99,11 +99,69 @@ void OpenGL_Bridge::drawObjects(
float angle = 2.f * static_cast<float>(i) * M_PI / segmentCount;
vertices.emplace_back(center + Vector(radius * cos(angle), radius * sin(angle), 0.f), color);

this->vertexArray->addTrianglePrimitive({
initialIndex,
static_cast<GLubyte>(initialIndex + 1u + i),
static_cast<GLubyte>(initialIndex + 1u + (i + 1u) % segmentCount),
});
this->vertexArray->addTrianglePrimitive(initialIndex, initialIndex + 1u + i, initialIndex + 1u + (i + 1u) % segmentCount);
}
} else if (type == SpriteType::BALL) {
Point center(data[0], data[1], data[2]);
float radius = data[3];
Color color(data[4], data[5], data[6], data[7]);
float meshDensity = data[8];

auto latitudeLineCount = static_cast<unsigned int>(M_PI * radius * meshDensity) + 1u; // +1 is a UV seam
auto longitudeLineCount = static_cast<unsigned int>(.5 * M_PI * radius * meshDensity) - 2u;
auto totalVertexCount = latitudeLineCount * longitudeLineCount + 2u;
auto initialIndex = this->vertexArray->getNextVertexIndex();
Vertex northPole{
center + Vector{0, 0, radius},
color
};
vertices.push_back(northPole);
for (int i = 0; i < longitudeLineCount; i++) {
auto alpha = static_cast<double>(i + 1) * M_PI / static_cast<double>(longitudeLineCount + 1);
auto cosAlpha = std::cos(alpha);
auto sinAlpha = std::sin(alpha);
for (int j = 0; j < latitudeLineCount; j++) {
auto beta = 2. * static_cast<double>(j) * M_PI / static_cast<double>(latitudeLineCount - 1);
Point p{
radius * sinAlpha * std::cos(beta),
radius * sinAlpha * std::sin(beta),
radius * cosAlpha,
};

vertices.emplace_back(p, color);
}
}

Vertex southPole{
center + Vector{0, 0, -radius},
color
};
vertices.push_back(southPole);

for (int j = 0; j < latitudeLineCount - 1; j++) {
this->vertexArray->addTrianglePrimitive(initialIndex, initialIndex + 1u + j, initialIndex + 2u + j);

this->vertexArray->addTrianglePrimitive(
initialIndex + totalVertexCount - 1u,
initialIndex + totalVertexCount - 2u - j,
initialIndex + totalVertexCount - 3u - j
);
}

for (int i = 0; i < longitudeLineCount - 1; i++) {
for (int j = 0; j < latitudeLineCount - 1; j++) {
this->vertexArray->addTrianglePrimitive(
initialIndex + 1u + i * latitudeLineCount + j,
initialIndex + 1u + (i + 1u) * latitudeLineCount + j,
initialIndex + 1u + i * latitudeLineCount + j + 1u
);

this->vertexArray->addTrianglePrimitive(
initialIndex + 1u + (i + 1u) * latitudeLineCount + j,
initialIndex + 1u + (i + 1u) * latitudeLineCount + j + 1u,
initialIndex + 1u + i * latitudeLineCount + j + 1
);
}
}
} else if (type == SpriteType::TRIANGLE) {
Point p1(data[0], data[1], data[2]);
Expand All @@ -119,10 +177,7 @@ void OpenGL_Bridge::drawObjects(
{p3, c3}
};

this->vertexArray->addTrianglePrimitive(
{initialIndex, static_cast<GLubyte>(initialIndex + 1u), static_cast<GLubyte>(initialIndex + 2)}
);
xd++;
this->vertexArray->addTrianglePrimitive(initialIndex, initialIndex + 1u, initialIndex + 2);
} else if (type == SpriteType::RECTANGLE_WITH_COLORS) {
Point p1(data[0], data[1], data[2]);
Point p2(data[0] + data[3], data[1], data[2]);
Expand All @@ -140,12 +195,8 @@ void OpenGL_Bridge::drawObjects(
{p4, c4}
};

this->vertexArray->addTrianglePrimitive(
{initialIndex, static_cast<GLubyte>(initialIndex + 1u), static_cast<GLubyte>(initialIndex + 2)}
);
this->vertexArray->addTrianglePrimitive(
{initialIndex, static_cast<GLubyte>(initialIndex + 2u), static_cast<GLubyte>(initialIndex + 3)}
);
this->vertexArray->addTrianglePrimitive(initialIndex, initialIndex + 1u, initialIndex + 2);
this->vertexArray->addTrianglePrimitive(initialIndex, initialIndex + 2u, initialIndex + 3);
}

for (auto& vertex: vertices) {
Expand Down Expand Up @@ -186,7 +237,7 @@ void OpenGL_Bridge::drawObjects(

{
AttributeArrayGuard attributeArrayGuard(*this->attributeArray);
glDrawElements(GL_TRIANGLES, 3 * this->vertexArray->getNextVertexIndex(), GL_UNSIGNED_BYTE, reinterpret_cast<GLvoid*>(0));
glDrawElements(GL_TRIANGLES, 3 * this->vertexArray->getNextVertexIndex(), GL_UNSIGNED_INT, reinterpret_cast<GLvoid*>(0));
}

glfwSwapBuffers(this->window);
Expand Down
10 changes: 8 additions & 2 deletions lib/Graphics/OpenGL_Bridge/VertexArray.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,15 @@ void VertexArray::clear() {
}

void VertexArray::addTrianglePrimitive(
TrianglePrimitive t
unsigned int i1,
unsigned int i2,
unsigned int i3
) noexcept {
this->triangles.push_back(t);
this->triangles.push_back({
static_cast<GLuint>(i1),
static_cast<GLuint>(i2),
static_cast<GLuint>(i3),
});
}

}
22 changes: 22 additions & 0 deletions lib/Graphics/SpriteBuilder/SpriteMerger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,28 @@ Barta::SpriteMerger* Barta::SpriteMerger::addCircleSprite(
this->data.push_back(circleSprite.color.b);
this->data.push_back(circleSprite.color.a);

this->data.push_back(circleSprite.meshDensity);

return this;
}

Barta::SpriteMerger* Barta::SpriteMerger::addBallSprite(
const CircleSprite& ballSprite
) {
this->types.push_back(SpriteType::BALL);

this->data.push_back(ballSprite.circle.getCenter().x());
this->data.push_back(ballSprite.circle.getCenter().y());
this->data.push_back(ballSprite.circle.getCenter().z());
this->data.push_back(ballSprite.circle.getRadius());

this->data.push_back(ballSprite.color.r);
this->data.push_back(ballSprite.color.g);
this->data.push_back(ballSprite.color.b);
this->data.push_back(ballSprite.color.a);

this->data.push_back(ballSprite.meshDensity);

return this;
}

Expand Down
8 changes: 7 additions & 1 deletion lib/SceneLoader/JsonDecoderRepository.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ std::unique_ptr<HitboxInterface> JsonDecoderRepository::decodeHitbox(
}

const auto& type = jsonType.get<std::string>();
if (type == "CIRCLE") {
if (type == "CIRCLE" || type == "BALL") {
return std::make_unique<CircleHitbox>(hitboxJson.get<Circle>());
}

Expand Down Expand Up @@ -61,6 +61,12 @@ GraphicsData JsonDecoderRepository::decodeGraphicsData(
continue;
}

if (type == "BALL") {
merger.addBallSprite(spriteBuilder.buildCircleSprite());

continue;
}

if (type == "RECTANGLE") {
merger.addRectangleWithColors(spriteBuilder.buildRectangleSprite());

Expand Down