PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

add 'rotate' and 'origin' box modifier to vcm

Browse Source
This commit is contained in:
MihailRis
2025-10-16 22:57:45 +03:00
parent fc122ef3e1
commit 18d4cff678
3 changed files with 78 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/graphics/commons/Model.cpp
+40 -27
View File
@@ -8,21 +8,6 @@ inline constexpr glm::vec3 X(1, 0, 0);
inline constexpr glm::vec3 Y(0, 1, 0);
inline constexpr glm::vec3 Z(0, 0, 1);
void Mesh::addPlane(
const glm::vec3& pos,
const glm::vec3& right,
const glm::vec3& up,
const glm::vec3& norm
) {
vertices.push_back({pos-right-up, {0,0}, norm});
vertices.push_back({pos+right-up, {1,0}, norm});
vertices.push_back({pos+right+up, {1,1}, norm});
vertices.push_back({pos-right-up, {0,0}, norm});
vertices.push_back({pos+right+up, {1,1}, norm});
vertices.push_back({pos-right+up, {0,1}, norm});
}
void Mesh::addPlane(
const glm::vec3& pos,
const glm::vec3& right,
@@ -39,6 +24,23 @@ void Mesh::addPlane(
vertices.push_back({pos-right+up, {uv.u1, uv.v2}, norm});
}
void Mesh::addPlane(
const glm::vec3& pos,
const glm::vec3& right,
const glm::vec3& up,
const glm::vec3& norm,
const UVRegion& region,
const glm::mat4& transform
) {
addPlane(
glm::vec3(transform * glm::vec4(pos, 1.0f)),
glm::vec3(transform * glm::vec4(right, 0.0f)),
glm::vec3(transform * glm::vec4(up, 0.0f)),
glm::normalize(glm::vec3(transform * glm::vec4(norm, 0.0f))),
region
);
}
void Mesh::addRect(
const glm::vec3& pos,
const glm::vec3& right,
@@ -56,14 +58,15 @@ void Mesh::addRect(
}
void Mesh::addBox(const glm::vec3& pos, const glm::vec3& size) {
addPlane(pos+Z*size, X*size, Y*size, Z);
addPlane(pos-Z*size, -X*size, Y*size, -Z);
UVRegion fullRegion (0, 0, 1, 1);
addPlane(pos+Z*size, X*size, Y*size, Z, fullRegion);
addPlane(pos-Z*size, -X*size, Y*size, -Z, fullRegion);
addPlane(pos+Y*size, X*size, -Z*size, Y);
addPlane(pos-Y*size, X*size, Z*size, -Y);
addPlane(pos+Y*size, X*size, -Z*size, Y, fullRegion);
addPlane(pos-Y*size, X*size, Z*size, -Y, fullRegion);
addPlane(pos+X*size, -Z*size, Y*size, X);
addPlane(pos-X*size, Z*size, Y*size, -X);
addPlane(pos+X*size, -Z*size, Y*size, X, fullRegion);
addPlane(pos-X*size, Z*size, Y*size, -X, fullRegion);
}
void Mesh::addBox(
@@ -71,19 +74,29 @@ void Mesh::addBox(
const glm::vec3& size,
const UVRegion (&uvs)[6],
const bool enabledSides[6]
) {
addBox(pos, size, uvs, enabledSides, glm::mat4(1.0f));
}
void Mesh::addBox(
const glm::vec3& pos,
const glm::vec3& size,
const UVRegion (&uvs)[6],
const bool enabledSides[6],
const glm::mat4& transform
) {
if (enabledSides[0]) // north
addPlane(pos+Z*size, X*size, Y*size, Z, uvs[0]);
addPlane(pos+Z*size, X*size, Y*size, Z, uvs[0], transform);
if (enabledSides[1]) // south
addPlane(pos-Z*size, -X*size, Y*size, -Z, uvs[1]);
addPlane(pos-Z*size, -X*size, Y*size, -Z, uvs[1], transform);
if (enabledSides[2]) // top
addPlane(pos+Y*size, X*size, -Z*size, Y, uvs[2] * glm::vec2(-1));
addPlane(pos+Y*size, X*size, -Z*size, Y, uvs[2] * glm::vec2(-1), transform);
if (enabledSides[3]) // bottom
addPlane(pos-Y*size, X*size, Z*size, -Y, uvs[3] * glm::vec2(-1, 1));
addPlane(pos-Y*size, X*size, Z*size, -Y, uvs[3] * glm::vec2(-1, 1), transform);
if (enabledSides[4]) // west
addPlane(pos+X*size, -Z*size, Y*size, X, uvs[4]);
addPlane(pos+X*size, -Z*size, Y*size, X, uvs[4], transform);
if (enabledSides[5]) // east
addPlane(pos-X*size, Z*size, Y*size, -X, uvs[5] * glm::vec2(-1, 1));
addPlane(pos-X*size, Z*size, Y*size, -X, uvs[5] * glm::vec2(-1, 1), transform);
}
void Mesh::scale(const glm::vec3& size) {