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

normals finished

Browse Source
This commit is contained in:
Ara
2023-12-10 00:38:32 +06:00
parent f5b5130e8b
commit 616057b2b9
3 changed files with 50 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/maths/rays.cpp
+37 -12
View File
@@ -136,13 +136,27 @@ RayRelation Rays::rayIntersectAAFace<AAFaceKind::Zperp>(
return RayRelation::None; return RayRelation::None;
} }
double Rays::updateNormal(
double newDistApprox,
const glm::ivec3& newNormal,
double currentDistApprox,
glm::ivec3& normal_ret
){
if (newDistApprox < currentDistApprox){
currentDistApprox = newDistApprox;
normal_ret = newNormal;
}
return currentDistApprox;
}
template <> template <>
RayRelation Rays::isRayIntersectsAAFace<AAFaceKind::Xperp>( RayRelation Rays::isRayIntersectsAAFace<AAFaceKind::Xperp>(
const rayvec3& rayOrigin, const rayvec3& rayOrigin,
const rayvec3& rayDir, const rayvec3& rayDir,
const rayvec3& faceMin, const rayvec3& faceMin,
const rayvec2& faceOppositeCorner, const rayvec2& faceOppositeCorner,
glm::ivec3& normal_ret glm::ivec3& normal_ret,
double& currentDistApprox
){ ){
if (fabs(glm::dot(rayDir, X_AXIS)) < 1.0E-8){ //precision of "parallelity" if (fabs(glm::dot(rayDir, X_AXIS)) < 1.0E-8){ //precision of "parallelity"
return RayRelation::Parallel; return RayRelation::Parallel;
@@ -158,6 +172,7 @@ RayRelation Rays::isRayIntersectsAAFace<AAFaceKind::Xperp>(
&& intersectPointMult.y <= faceOppositeCorner[0] * rayDir.x && intersectPointMult.y <= faceOppositeCorner[0] * rayDir.x
&& intersectPointMult.z >= faceMin.z * rayDir.x && intersectPointMult.z >= faceMin.z * rayDir.x
&& intersectPointMult.z <= faceOppositeCorner[1] * rayDir.x){ && intersectPointMult.z <= faceOppositeCorner[1] * rayDir.x){
currentDistApprox = updateNormal(fabs(rayCoef * rayDir.y * rayDir.z), -X_AXIS, currentDistApprox, normal_ret);
return RayRelation::Intersect; return RayRelation::Intersect;
} }
} }
@@ -166,6 +181,7 @@ RayRelation Rays::isRayIntersectsAAFace<AAFaceKind::Xperp>(
&& intersectPointMult.y >= faceOppositeCorner[0] * rayDir.x && intersectPointMult.y >= faceOppositeCorner[0] * rayDir.x
&& intersectPointMult.z <= faceMin.z * rayDir.x && intersectPointMult.z <= faceMin.z * rayDir.x
&& intersectPointMult.z >= faceOppositeCorner[1] * rayDir.x){ && intersectPointMult.z >= faceOppositeCorner[1] * rayDir.x){
currentDistApprox = updateNormal(fabs(rayCoef * rayDir.y * rayDir.z), X_AXIS, currentDistApprox, normal_ret);
return RayRelation::Intersect; return RayRelation::Intersect;
} }
} }
@@ -178,7 +194,8 @@ RayRelation Rays::isRayIntersectsAAFace<AAFaceKind::Yperp>(
const rayvec3& rayDir, const rayvec3& rayDir,
const rayvec3& faceMin, const rayvec3& faceMin,
const rayvec2& faceOppositeCorner, const rayvec2& faceOppositeCorner,
glm::ivec3& normal_ret glm::ivec3& normal_ret,
double& currentDistApprox
){ ){
if (fabs(glm::dot(rayDir, Y_AXIS)) < 1.0E-8){ //precision of "parallelity" if (fabs(glm::dot(rayDir, Y_AXIS)) < 1.0E-8){ //precision of "parallelity"
return RayRelation::Parallel; return RayRelation::Parallel;
@@ -194,6 +211,7 @@ RayRelation Rays::isRayIntersectsAAFace<AAFaceKind::Yperp>(
&& intersectPointMult.x <= faceOppositeCorner[0] * rayDir.y && intersectPointMult.x <= faceOppositeCorner[0] * rayDir.y
&& intersectPointMult.z >= faceMin.z * rayDir.y && intersectPointMult.z >= faceMin.z * rayDir.y
&& intersectPointMult.z <= faceOppositeCorner[1] * rayDir.y){ && intersectPointMult.z <= faceOppositeCorner[1] * rayDir.y){
currentDistApprox = updateNormal(fabs(rayCoef * rayDir.x * rayDir.z), -Y_AXIS, currentDistApprox, normal_ret);
return RayRelation::Intersect; return RayRelation::Intersect;
} }
} }
@@ -202,6 +220,7 @@ RayRelation Rays::isRayIntersectsAAFace<AAFaceKind::Yperp>(
&& intersectPointMult.x >= faceOppositeCorner[0] * rayDir.y && intersectPointMult.x >= faceOppositeCorner[0] * rayDir.y
&& intersectPointMult.z <= faceMin.z * rayDir.y && intersectPointMult.z <= faceMin.z * rayDir.y
&& intersectPointMult.z >= faceOppositeCorner[1] * rayDir.y){ && intersectPointMult.z >= faceOppositeCorner[1] * rayDir.y){
currentDistApprox = updateNormal(fabs(rayCoef * rayDir.x * rayDir.z), Y_AXIS, currentDistApprox, normal_ret);
return RayRelation::Intersect; return RayRelation::Intersect;
} }
} }
@@ -214,7 +233,8 @@ RayRelation Rays::isRayIntersectsAAFace<AAFaceKind::Zperp>(
const rayvec3& rayDir, const rayvec3& rayDir,
const rayvec3& faceMin, const rayvec3& faceMin,
const rayvec2& faceOppositeCorner, const rayvec2& faceOppositeCorner,
glm::ivec3& normal_ret glm::ivec3& normal_ret,
double& currentDistApprox
){ ){
if (fabs(glm::dot(rayDir, Z_AXIS)) < 1.0E-8){ //precision of "parallelity" if (fabs(glm::dot(rayDir, Z_AXIS)) < 1.0E-8){ //precision of "parallelity"
return RayRelation::Parallel; return RayRelation::Parallel;
@@ -230,6 +250,7 @@ RayRelation Rays::isRayIntersectsAAFace<AAFaceKind::Zperp>(
&& intersectPointMult.x <= faceOppositeCorner[0] * rayDir.z && intersectPointMult.x <= faceOppositeCorner[0] * rayDir.z
&& intersectPointMult.y >= faceMin.y * rayDir.z && intersectPointMult.y >= faceMin.y * rayDir.z
&& intersectPointMult.y <= faceOppositeCorner[1] * rayDir.z){ && intersectPointMult.y <= faceOppositeCorner[1] * rayDir.z){
currentDistApprox = updateNormal(fabs(rayCoef * rayDir.x * rayDir.y), -Z_AXIS, currentDistApprox, normal_ret);
return RayRelation::Intersect; return RayRelation::Intersect;
} }
} }
@@ -238,6 +259,7 @@ RayRelation Rays::isRayIntersectsAAFace<AAFaceKind::Zperp>(
&& intersectPointMult.x >= faceOppositeCorner[0] * rayDir.z && intersectPointMult.x >= faceOppositeCorner[0] * rayDir.z
&& intersectPointMult.y <= faceMin.y * rayDir.z && intersectPointMult.y <= faceMin.y * rayDir.z
&& intersectPointMult.y >= faceOppositeCorner[1] * rayDir.z){ && intersectPointMult.y >= faceOppositeCorner[1] * rayDir.z){
currentDistApprox = updateNormal(fabs(rayCoef * rayDir.x * rayDir.y), Z_AXIS, currentDistApprox, normal_ret);
return RayRelation::Intersect; return RayRelation::Intersect;
} }
} }
@@ -249,6 +271,7 @@ RayRelation Rays::rayIntersectAABB(
const rayvec3& rayDir, const rayvec3& rayDir,
const rayvec3& boxPos, const rayvec3& boxPos,
const AABB& box, const AABB& box,
float maxDist,
rayvec3& pointIn_ret, rayvec3& pointIn_ret,
rayvec3& pointOut_ret, rayvec3& pointOut_ret,
glm::ivec3& normal_ret){ glm::ivec3& normal_ret){
@@ -256,16 +279,16 @@ RayRelation Rays::rayIntersectAABB(
if (raysBoxCache_.find(boxPos) != raysBoxCache_.end()){ if (raysBoxCache_.find(boxPos) != raysBoxCache_.end()){
const AABBFaces& boxFaces = raysBoxCache_[boxPos]; const AABBFaces& boxFaces = raysBoxCache_[boxPos];
return rayIntersectAABBFaces(rayOrigin, rayDir, boxFaces, pointIn_ret, pointOut_ret, normal_ret); return rayIntersectAABBFaces(rayOrigin, rayDir, boxFaces, maxDist, pointIn_ret, pointOut_ret, normal_ret);
} else { } else {
const AABBFaces& boxFaces = AABBFaces(boxPos, box); const AABBFaces& boxFaces = AABBFaces(boxPos, box);
raysBoxCache_[boxPos] = boxFaces; raysBoxCache_[boxPos] = boxFaces;
return rayIntersectAABBFaces(rayOrigin, rayDir, boxFaces, pointIn_ret, pointOut_ret, normal_ret); return rayIntersectAABBFaces(rayOrigin, rayDir, boxFaces, maxDist, pointIn_ret, pointOut_ret, normal_ret);
} }
} else { } else {
const AABBFaces& boxFaces = AABBFaces(boxPos, box); const AABBFaces& boxFaces = AABBFaces(boxPos, box);
return rayIntersectAABBFaces(rayOrigin, rayDir, boxFaces, pointIn_ret, pointOut_ret, normal_ret); return rayIntersectAABBFaces(rayOrigin, rayDir, boxFaces, maxDist, pointIn_ret, pointOut_ret, normal_ret);
} }
} }
@@ -274,48 +297,50 @@ RayRelation Rays::rayIntersectAABBFaces(
const rayvec3& rayOrigin, const rayvec3& rayOrigin,
const rayvec3& rayDir, const rayvec3& rayDir,
const AABBFaces& boxFaces, const AABBFaces& boxFaces,
float maxDist,
rayvec3& pointIn_ret, rayvec3& pointIn_ret,
rayvec3& pointOut_ret, rayvec3& pointOut_ret,
glm::ivec3& normal_ret){//TODO: points returning glm::ivec3& normal_ret){//TODO: points returning
RayRelation rel; RayRelation rel;
double faceDistApprox = maxDist;
unsigned char intersectedCount = 0; //this code is very uncomfortable, DONT LEARN IT! unsigned char intersectedCount = 0; //this code is very uncomfortable, DONT LEARN IT!
rel = isRayIntersectsAAFace<AABBFaces::KINDS_ORDER[0]>( rel = isRayIntersectsAAFace<AABBFaces::KINDS_ORDER[0]>(
rayOrigin, rayDir, boxFaces.faces[0].first, boxFaces.faces[0].second, normal_ret rayOrigin, rayDir, boxFaces.faces[0].first, boxFaces.faces[0].second, normal_ret, faceDistApprox
); );
if (rel > RayRelation::None){ if (rel > RayRelation::None){
++intersectedCount; ++intersectedCount;
} }
rel = isRayIntersectsAAFace<AABBFaces::KINDS_ORDER[1]>( rel = isRayIntersectsAAFace<AABBFaces::KINDS_ORDER[1]>(
rayOrigin, rayDir, boxFaces.faces[1].first, boxFaces.faces[1].second, normal_ret rayOrigin, rayDir, boxFaces.faces[1].first, boxFaces.faces[1].second, normal_ret, faceDistApprox
); );
if (rel > RayRelation::None){ if (rel > RayRelation::None){
++intersectedCount; ++intersectedCount;
} }
rel = isRayIntersectsAAFace<AABBFaces::KINDS_ORDER[2]>( rel = isRayIntersectsAAFace<AABBFaces::KINDS_ORDER[2]>(
rayOrigin, rayDir, boxFaces.faces[2].first, boxFaces.faces[2].second, normal_ret rayOrigin, rayDir, boxFaces.faces[2].first, boxFaces.faces[2].second, normal_ret, faceDistApprox
); );
if (rel > RayRelation::None){ if (rel > RayRelation::None){
++intersectedCount; ++intersectedCount;
} }
rel = isRayIntersectsAAFace<AABBFaces::KINDS_ORDER[3]>( rel = isRayIntersectsAAFace<AABBFaces::KINDS_ORDER[3]>(
rayOrigin, rayDir, boxFaces.faces[3].first, boxFaces.faces[3].second, normal_ret rayOrigin, rayDir, boxFaces.faces[3].first, boxFaces.faces[3].second, normal_ret, faceDistApprox
); );
if (rel > RayRelation::None){ if (rel > RayRelation::None){
++intersectedCount; ++intersectedCount;
} }
rel = isRayIntersectsAAFace<AABBFaces::KINDS_ORDER[4]>( rel = isRayIntersectsAAFace<AABBFaces::KINDS_ORDER[4]>(
rayOrigin, rayDir, boxFaces.faces[4].first, boxFaces.faces[4].second, normal_ret rayOrigin, rayDir, boxFaces.faces[4].first, boxFaces.faces[4].second, normal_ret, faceDistApprox
); );
if (rel > RayRelation::None){ if (rel > RayRelation::None){
++intersectedCount; ++intersectedCount;
} }
rel = isRayIntersectsAAFace<AABBFaces::KINDS_ORDER[5]>( rel = isRayIntersectsAAFace<AABBFaces::KINDS_ORDER[5]>(
rayOrigin, rayDir, boxFaces.faces[5].first, boxFaces.faces[5].second, normal_ret rayOrigin, rayDir, boxFaces.faces[5].first, boxFaces.faces[5].second, normal_ret, faceDistApprox
); );
if (rel > RayRelation::None){ if (rel > RayRelation::None){
++intersectedCount; ++intersectedCount;
src/maths/rays.h
+11 -1
View File
@@ -56,6 +56,13 @@ static RayRelation rayIntersectAAFace(
rayvec3& intersectPoint_ret rayvec3& intersectPoint_ret
); );
static double updateNormal(
double newDistApprox,
const glm::ivec3& newNormal,
double currentDistApprox,
glm::ivec3& normal_ret
);
//optimized, not returns intersectPoint coordinates //optimized, not returns intersectPoint coordinates
template <AAFaceKind faceKind> template <AAFaceKind faceKind>
static RayRelation isRayIntersectsAAFace( static RayRelation isRayIntersectsAAFace(
@@ -63,7 +70,8 @@ static RayRelation isRayIntersectsAAFace(
const rayvec3& rayDir, const rayvec3& rayDir,
const rayvec3& faceMin, const rayvec3& faceMin,
const rayvec2& faceOppositeCorner, const rayvec2& faceOppositeCorner,
glm::ivec3& normal_ret glm::ivec3& normal_ret,
double& currentDistApprox
); );
static RayRelation rayIntersectAABB( static RayRelation rayIntersectAABB(
@@ -71,6 +79,7 @@ static RayRelation rayIntersectAABB(
const rayvec3& rayDir, const rayvec3& rayDir,
const rayvec3& boxPos, const rayvec3& boxPos,
const AABB& box, const AABB& box,
float maxDist,
rayvec3& pointIn_ret, rayvec3& pointIn_ret,
rayvec3& pointOut_ret, rayvec3& pointOut_ret,
glm::ivec3& normal_ret); glm::ivec3& normal_ret);
@@ -79,6 +88,7 @@ static RayRelation rayIntersectAABBFaces(
const rayvec3& rayOrigin, const rayvec3& rayOrigin,
const rayvec3& rayDir, const rayvec3& rayDir,
const AABBFaces& boxFaces, const AABBFaces& boxFaces,
float maxDist,
rayvec3& pointIn_ret, rayvec3& pointIn_ret,
rayvec3& pointOut_ret, rayvec3& pointOut_ret,
glm::ivec3& normal_ret); glm::ivec3& normal_ret);
src/voxels/Chunks.cpp
+2 -2
View File
@@ -223,7 +223,7 @@ voxel* Chunks::rayCast(vec3 start,
const Block* def = contentIds->getBlockDef(voxel->id); const Block* def = contentIds->getBlockDef(voxel->id);
if (def->selectable){ if (def->selectable){
//timeutil::ScopeLogTimer lg((long long)def); timeutil::ScopeLogTimer lg((long long)def);
end.x = px + t * dx; end.x = px + t * dx;
end.y = py + t * dy; end.y = py + t * dy;
end.z = pz + t * dz; end.z = pz + t * dz;
@@ -236,7 +236,7 @@ voxel* Chunks::rayCast(vec3 start,
? def->rt.hitboxes[voxel->rotation()] ? def->rt.hitboxes[voxel->rotation()]
: def->hitbox; : def->hitbox;
rayvec3 in, out; // <- now not used, but for future... rayvec3 in, out; // <- now not used, but for future...
if (Rays::rayIntersectAABB(start, dir, iend, box, in, out, norm) > RayRelation::None){ if (Rays::rayIntersectAABB(start, dir, iend, box, maxDist, in, out, norm) > RayRelation::None){
return voxel; return voxel;
} }