Merge branch 'tyrav2-develop' into tyrav2-static-dynamic-pipelines

This commit is contained in:
h4570
2022-07-21 17:56:17 +02:00
9 changed files with 280 additions and 40 deletions
+89
View File
@@ -0,0 +1,89 @@
/*
# ______ ____ ___
# | \/ ____| |___|
# | | | \ | |
#-----------------------------------------------------------------------
# Copyright 2020-2022, tyra - https://github.com/h4570/tyra
# Licenced under Apache License 2.0
# Wellinator Carvalho <wellcoj@gmail.com>
*/
#include "physics/ray.hpp"
#include <tamtypes.h>
#include <math.h>
#include <algorithm>
namespace Tyra {
Ray::Ray() {}
Ray::Ray(const Vec4& origin, const Vec4& direction) {
this->_origin.set(origin);
this->_direction.set(direction);
}
Ray::~Ray() {}
void Ray::set(const Vec4& origin, const Vec4& direction) {
this->_origin.set(origin);
this->_direction.set(direction);
}
void Ray::setOrigin(const Vec4& origin) { this->_origin.set(origin); }
void Ray::setDirection(const Vec4& direction) {
this->_direction.set(direction);
}
Vec4 Ray::at(const float& t) { return (this->_direction * t) + this->_origin; }
float Ray::distanceToPoint(const Vec4& point) {
return this->_origin.distanceTo(point);
}
u8 Ray::intersectBox(const Vec4& minCorner, const Vec4& maxCorner,
float& distance) {
float tmin, tmax, tymin, tymax, tzmin, tzmax;
Vec4 invDir = this->invDir();
invDir.normalize();
tmin = (minCorner.x - this->_origin.x) * invDir.x;
tmax = (maxCorner.x - this->_origin.x) * invDir.x;
tymin = (minCorner.y - this->_origin.y) * invDir.y;
tymax = (maxCorner.y - this->_origin.y) * invDir.y;
if ((tmin > tymax) || (tymin > tmax)) {
distance = -1.0f;
return 0;
}
if (tymin > tmin) tmin = tymin;
if (tymax < tmax) tmax = tymax;
tzmin = (minCorner.z - this->_origin.z) * invDir.z;
tzmax = (maxCorner.z - this->_origin.z) * invDir.z;
if ((tmin > tzmax) || (tzmin > tmax)) {
distance = -1.0f;
return 0;
}
if (tzmin > tmin) tmin = tzmin;
if (tzmax < tmax) tmax = tzmax;
if (tmax < 0) {
distance = -1.0f;
return 0;
}
distance = tmin >= 0 ? tmin : tmax;
return 1;
}
const Vec4 Ray::invDir() {
return Vec4(1 / this->_direction.x, 1 / this->_direction.y,
1 / this->_direction.z, 1);
}
} // Namespace Tyra
+64
View File
@@ -50,4 +50,68 @@ void BBox::setData() {
_bottomFace = BBoxFace(_vertices[0], _vertices[5], _vertices[0].y);
}
Vec4 BBox::min() {
Vec4 temp, _min;
u8 isInitialized = 0;
const Vec4* vertices = getVertices();
for (u8 i = 0; i < 8; i++) {
temp.set(vertices[i].x, vertices[i].y, vertices[i].z, 1.0F);
if (isInitialized == 0) {
isInitialized = 1;
_min.set(temp);
}
if (_min.x > temp.x) _min.x = temp.x;
if (_min.y > temp.y) _min.y = temp.y;
if (_min.z > temp.z) _min.z = temp.z;
}
return _min;
}
Vec4 BBox::max() {
Vec4 temp, _max;
u8 isInitialized = 0;
const Vec4* vertices = getVertices();
for (u8 i = 0; i < 8; i++) {
temp.set(vertices[i].x, vertices[i].y, vertices[i].z, 1.0F);
if (isInitialized == 0) {
isInitialized = 1;
_max.set(temp);
}
if (temp.x > _max.x) _max.x = temp.x;
if (temp.y > _max.y) _max.y = temp.y;
if (temp.z > _max.z) _max.z = temp.z;
}
return _max;
}
void BBox::getMinMax(Vec4* res_min, Vec4* res_max) {
Vec4 temp = Vec4();
u8 isInitialized = 0;
const Vec4* vertices = getVertices();
for (u8 i = 0; i < 8; i++) {
temp.set(vertices[i].x, vertices[i].y, vertices[i].z, 1.0F);
if (isInitialized == 0) {
isInitialized = 1;
res_min->set(temp);
res_max->set(temp);
}
if (res_min->x > temp.x) res_min->x = temp.x;
if (temp.x > res_max->x) res_max->x = temp.x;
if (res_min->y > temp.y) res_min->y = temp.y;
if (temp.y > res_max->y) res_max->y = temp.y;
if (res_min->z > temp.z) res_min->z = temp.z;
if (temp.z > res_max->z) res_max->z = temp.z;
}
}
} // namespace Tyra
@@ -167,4 +167,37 @@ std::string CoreBBox::getPrint(const char* name) const {
return res.str();
}
CoreBBoxFrustum CoreBBox::isInFrustum(const Plane* frustumPlanes,
const M4x4& model,
const float* margins) const {
CoreBBoxFrustum result = IN_FRUSTUM;
Vec4 boxCalcTemp;
u8 boxIn = 0, boxOut = 0;
for (u8 i = 0; i < 6; i++) {
const auto margin = margins == nullptr ? 0.0F : margins[i];
boxOut = 0;
boxIn = 0;
// for each corner of the box do ...
// get out of the cycle as soon as a box as corners
// both inside and out of the frustum
for (u8 y = 0; y < 8 && (boxIn == 0 || boxOut == 0); y++) {
boxCalcTemp = model * _vertices[y];
auto isOut = frustumPlanes[i].distanceTo(boxCalcTemp) < margin;
if (isOut)
boxOut++;
else
boxIn++;
}
// if all corners are out
if (!boxIn)
return OUTSIDE_FRUSTUM;
else if (boxOut)
result = PARTIALLY_IN_FRUSTUM;
}
return result;
}
} // namespace Tyra
@@ -58,37 +58,4 @@ CoreBBoxFrustum RenderBBox::clipIsInFrustum(const Plane* frustumPlanes,
return isInFrustum(frustumPlanes, model, margins); // Let's check it again
}
CoreBBoxFrustum RenderBBox::isInFrustum(const Plane* frustumPlanes,
const M4x4& model,
const float* margins) const {
CoreBBoxFrustum result = IN_FRUSTUM;
Vec4 boxCalcTemp;
u8 boxIn = 0, boxOut = 0;
for (u8 i = 0; i < 6; i++) {
const auto margin = margins == nullptr ? 0.0F : margins[i];
boxOut = 0;
boxIn = 0;
// for each corner of the box do ...
// get out of the cycle as soon as a box as corners
// both inside and out of the frustum
for (u8 y = 0; y < 8 && (boxIn == 0 || boxOut == 0); y++) {
boxCalcTemp = model * _vertices[y];
auto isOut = frustumPlanes[i].distanceTo(boxCalcTemp) < margin;
if (isOut)
boxOut++;
else
boxIn++;
}
// if all corners are out
if (!boxIn)
return OUTSIDE_FRUSTUM;
else if (boxOut)
result = PARTIALLY_IN_FRUSTUM;
}
return result;
}
} // namespace Tyra