tom/RT_GPU
1
0
Fork 0
mirror of https://github.com/TheRedShip/RT_GPU.git synced 2025-09-27 18:48:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ | Backface culling choosing on quad so euclidian map + portal

Browse Source
This commit is contained in:
TheRedShip
2025-02-04 00:07:32 +01:00
committed by tomoron
parent 7520515e03
commit e10e8e4cfc
14 changed files with 86 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
includes/RT/objects/Portal.hpp
View File

@ -24,8 +24,6 @@ class Portal : public Object
float x1, y1, z1;
float x2, y2, z2;
bool invert_normal;
int mat_index;
if (!(line >> x >> y >> z))
@ -37,7 +35,7 @@ class Portal : public Object
if (!(line >> x2 >> y2 >> z2))
throw std::runtime_error("Missing Portal's second edge");
if (!(line >> invert_normal))
if (!(line >> _invert_normal))
throw std::runtime_error("Missing invert_normal");
if (!(line >> mat_index))
@ -47,14 +45,18 @@ class Portal : public Object
_up = glm::vec3(x1, y1, z1);
_right = glm::vec3(x2, y2, z2);
glm::vec3 up = glm::normalize(_up);
// glm::vec3 temp_right = _right;
// _right = _invert_normal ? _up : _right;
// _up = _invert_normal ? temp_right : _up;
glm::vec3 right = glm::normalize(_right);
glm::vec3 up = glm::normalize(_up);
glm::vec3 forward = glm::normalize(glm::cross(right, up));
up = normalize(glm::cross(forward, right));
// up = normalize(glm::cross(forward, right));
_rotation = glm::mat3(right, up, forward);
_normal = forward * (invert_normal ? -1.0f : 1.0f);
_normal = forward * (_invert_normal ? -1.0f : 1.0f);
_linked_portal = -1;
@ -67,19 +69,23 @@ class Portal : public Object
{
float extension = 0.2f;
glm::vec3 right_dir = glm::normalize(_up);
glm::vec3 up_dir = glm::normalize(_right);
glm::vec3 right_dir = glm::normalize(_right);
glm::vec3 up_dir = glm::normalize(_up);
float right_length = glm::length(_up) + extension;
float up_length = glm::length(_right) + extension;
// glm::vec3 temp_right = right_dir;
// right_dir = _invert_normal ? right_dir : up_dir;
// up_dir = _invert_normal ? up_dir : temp_right;
float right_length = glm::length(_right) + extension;
float up_length = glm::length(_up) + extension;
glm::vec3 center_offset = -(right_dir * (extension / 2.0f) + up_dir * (extension / 2.0f));
glm::vec3 position = _position + _normal * -0.001f + center_offset;
glm::vec3 position = _position + _normal * 0.001f + center_offset;
glm::vec3 right = right_dir * right_length;
glm::vec3 up = up_dir * up_length;
return (new Quad(position, right, up, _mat_index));
// position += 10;
return (new Quad(position, right, up, _normal, 1, _mat_index));
}
glm::vec3 getUp() const { return (_up); }
@ -101,6 +107,7 @@ class Portal : public Object
glm::mat3 _rotation;
int _linked_portal;
int _invert_normal;
};
#endif

15
includes/RT/objects/Quad.hpp
View File

@ -23,6 +23,7 @@ class Quad : public Object
float x, y, z;
float x1, y1, z1;
float x2, y2, z2;
bool double_face;
int mat_index;
if (!(line >> x >> y >> z))
@ -33,6 +34,9 @@ class Quad : public Object
if (!(line >> x2 >> y2 >> z2))
throw std::runtime_error("Missing quad's second edge");
if (!(line >> _single_sided))
throw std::runtime_error("Missing double_face");
if (!(line >> mat_index))
throw std::runtime_error("Missing material properties");
@ -41,18 +45,25 @@ class Quad : public Object
_up = glm::vec3(x1, y1, z1);
_right = glm::vec3(x2, y2, z2);
_normal = glm::normalize(glm::cross(_up, _right));
_mat_index = mat_index;
}
Quad(const glm::vec3 &position, const glm::vec3 &edge1, const glm::vec3 &edge2, const int mat_index)
: Object(position, mat_index), _up(edge1), _right(edge2) {}
Quad(const glm::vec3 &position, const glm::vec3 &edge1, const glm::vec3 &edge2, const glm::vec3 &normal, const int single_sided, const int mat_index)
: Object(position, mat_index), _up(edge1), _right(edge2), _normal(normal), _single_sided(single_sided) {}
glm::vec3 getUp() const { return (_up); }
glm::vec3 getRight() const { return (_right); }
glm::vec3 getNormal() const { return (_normal); }
int getSingleSided() const { return (_single_sided); }
Type getType() const override { return Type::QUAD; }
private:
glm::vec3 _up;
glm::vec3 _right;
glm::vec3 _normal;
int _single_sided;
};
#endif