backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-04-26 20:43:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: remove PolygonArray

Browse source
This commit is contained in:
orng 2026-03-28 13:34:20 -05:00
parent 5ba20b155c
commit f614e661d2
4 changed files with 15 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
Minecraft.Client/Rendering/Cube.cpp
View file

@ -20,16 +20,8 @@ Cube::Cube(ModelPart* modelPart, int xTexOffs, int yTexOffs, float x0, float y0,
vertices({Vertex{0, 0, 0, 0, 0}, Vertex{0, 0, 0, 0, 0},
Vertex{0, 0, 0, 0, 0}, Vertex{0, 0, 0, 0, 0},
Vertex{0, 0, 0, 0, 0}, Vertex{0, 0, 0, 0, 0},
Vertex{0, 0, 0, 0, 0}, Vertex{0, 0, 0, 0, 0}}) {
// this->x0 = x0;
// this->y0 = y0;
// this->z0 = z0;
// this->x1 = x0 + w;
// this->y1 = y0 + h;
// this->z1 = z0 + d;
polygons = PolygonArray(6);
Vertex{0, 0, 0, 0, 0}, Vertex{0, 0, 0, 0, 0}}),
polygons({}) {
float x1 = x0 + w;
float y1 = y0 + h;
float z1 = z0 + d;
@ -69,55 +61,54 @@ Cube::Cube(ModelPart* modelPart, int xTexOffs, int yTexOffs, float x0, float y0,
// 4J - added ability to mask individual faces
int faceCount = 0;
if (faceMask & 1)
polygons[faceCount++] = new _Polygon(
polygons[faceCount++] = _Polygon(
std::array<const Vertex, 4>{l1, u1, u2, l2}, xTexOffs + d + w,
yTexOffs + d, xTexOffs + d + w + d, yTexOffs + d + h,
modelPart->xTexSize, modelPart->yTexSize); // Right
if (faceMask & 2)
polygons[faceCount++] = new _Polygon(
polygons[faceCount++] = _Polygon(
std::array<const Vertex, 4>{u0, l0, l3, u3}, xTexOffs + 0,
yTexOffs + d, xTexOffs + d, yTexOffs + d + h, modelPart->xTexSize,
modelPart->yTexSize); // Left
if (faceMask & 4)
polygons[faceCount++] = new _Polygon(
polygons[faceCount++] = _Polygon(
std::array<const Vertex, 4>{l1, l0, u0, u1}, xTexOffs + d,
yTexOffs + 0, xTexOffs + d + w, yTexOffs + d, modelPart->xTexSize,
modelPart->yTexSize); // Up
if (bFlipPoly3UVs) {
if (faceMask & 8)
polygons[faceCount++] = new _Polygon(
polygons[faceCount++] = _Polygon(
std::array<const Vertex, 4>{u2, u3, l3, l2}, xTexOffs + d + w,
yTexOffs + 0, xTexOffs + d + w + w, yTexOffs + d,
modelPart->xTexSize, modelPart->yTexSize); // Down
} else {
if (faceMask & 8)
polygons[faceCount++] = new _Polygon(
polygons[faceCount++] = _Polygon(
std::array<const Vertex, 4>{u2, u3, l3, l2}, xTexOffs + d + w,
yTexOffs + d, xTexOffs + d + w + w, yTexOffs + 0,
modelPart->xTexSize, modelPart->yTexSize); // Down
}
if (faceMask & 16)
polygons[faceCount++] = new _Polygon(
polygons[faceCount++] = _Polygon(
std::array<const Vertex, 4>{u1, u0, u3, u2}, xTexOffs + d,
yTexOffs + d, xTexOffs + d + w, yTexOffs + d + h,
modelPart->xTexSize, modelPart->yTexSize); // Front
if (faceMask & 32)
polygons[faceCount++] = new _Polygon(
polygons[faceCount++] = _Polygon(
std::array<const Vertex, 4>{l0, l1, l2, l3}, xTexOffs + d + w + d,
yTexOffs + d, xTexOffs + d + w + d + w, yTexOffs + d + h,
modelPart->xTexSize,
modelPart->yTexSize); // Back
polygons.length = faceCount;
if (modelPart->bMirror) {
for (unsigned int i = 0; i < polygons.length; i++)
polygons[i]->mirror();
for (unsigned int i = 0; i < polygons.size(); i++)
polygons[i].mirror();
}
}
void Cube::render(Tesselator* t, float scale) {
for (int i = 0; i < polygons.length; i++) {
polygons[i]->render(t, scale);
for (int i = 0; i < polygons.size(); i++) {
polygons[i].render(t, scale);
}
}

2
Minecraft.Client/Rendering/Cube.h
View file

@ -9,7 +9,7 @@ class Model;
class Cube {
private:
std::array<Vertex, 8> vertices;
PolygonArray polygons;
std::array<_Polygon, 6> polygons;
public:
const float x0, y0, z0, x1, y1, z1;

1
Minecraft.Client/Rendering/Polygon.h
View file

@ -15,6 +15,7 @@ private:
bool _flipNormal;
public:
_Polygon() = default;
_Polygon(std::span<const Vertex> vertices);
_Polygon(std::span<const Vertex, 4> vertices, int u0, int v0, int u1,
int v1, float xTexSize, float yTexSize);

1
Minecraft.World/Util/ArrayWithLength.h
View file

@ -114,7 +114,6 @@ typedef arrayWithLength<Tile*> TileArray;
typedef arrayWithLength<Stat*> StatArray;
typedef arrayWithLength<MobCategory*> MobCategoryArray;
typedef arrayWithLength<File*> FileArray;
typedef arrayWithLength<_Polygon*> PolygonArray;
typedef arrayWithLength<ServerLevel*> ServerLevelArray;
typedef arrayWithLength<MultiPlayerLevel*> MultiPlayerLevelArray;
typedef arrayWithLength<Level*> LevelArray;