yggdrasil75/stupidsimcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed 1 direction

Browse Source
This commit is contained in:
yggdrasil75
2026-01-02 05:15:08 -05:00
parent a9caaeb40f
commit 7bc711a3ad
3 changed files with 75 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
util/grid/grid3.hpp
View File

@@ -147,7 +147,7 @@ public:
tDelta.x = std::abs(1.0 / rayDir.x);
tDelta.y = std::abs(1.0 / rayDir.y);
tDelta.z = std::abs(1.0 / rayDir.z);
tMax = mix((rayOrigin - currentVoxel) / -rayDir, ((currentVoxel + 1) - rayOrigin) / rayDir, rayDir > 0);
tMax = mix(((rayOrigin - currentVoxel.toFloat()) / -rayDir).toFloat(), (((currentVoxel.toFloat() + 1) - rayOrigin) / rayDir).toFloat(), rayDir.mask([](float x, float value) { return x > 0; }, 0));
if (!inGrid(rayOrigin)) {
/*
The initialization phase begins by identifying the voxel in which the ray origin, →
@@ -179,9 +179,9 @@ public:
if (tEntry < 0.0) tEntry = 0.0;
if (tEntry > 0.0) {
rayOrigin = rayOrigin + rayDir + tEntry;
rayOrigin = rayOrigin + rayDir * tEntry;
currentVoxel = rayOrigin.floorToT();
tMax = mix(((currentVoxel + 1) - rayOrigin) / rayDir, (rayOrigin - currentVoxel) / -rayDir, rayDir > 0 );
tMax = mix(((currentVoxel.toFloat() + 1) - rayOrigin) / rayDir, (rayOrigin - currentVoxel) / -rayDir, rayDir.mask([](float x, float value) { return x > 0; }, 0) );
}
}
@@ -238,6 +238,9 @@ public:
}
}
}
if (aalpha > EPSILON) {
std::cout << "hit at: " << currentVoxel << " with value of " << aalpha << std::endl;
}
return hit;
}

75
util/vectorlogic/vec3.hpp
View File

@@ -27,19 +27,23 @@ public:
}
// Arithmetic operations
Vec3 operator+(const Vec3& other) const {
template<typename U>
Vec3 operator+(const Vec3<U>& other) const {
return Vec3(x + other.x, y + other.y, z + other.z);
}
Vec3 operator-(const Vec3& other) const {
template<typename U>
Vec3 operator-(const Vec3<U>& other) const {
return Vec3(x - other.x, y - other.y, z - other.z);
}
Vec3 operator*(const Vec3& other) const {
template<typename U>
Vec3 operator*(const Vec3<U>& other) const {
return Vec3(x * other.x, y * other.y, z * other.z);
}
Vec3 operator/(const Vec3& other) const {
template<typename U>
Vec3 operator/(const Vec3<U>& other) const {
return Vec3(x / other.x, y / other.y, z / other.z);
}
@@ -233,6 +237,17 @@ public:
return x >= other.x || y >= other.y || z >= other.z;
}
template<typename CompareFunc>
Vec3<bool> mask(CompareFunc comp, T value) const {
return Vec3<bool>(comp(x, value), comp(y, value), comp(z, value));
}
template<typename CompareFunc>
Vec3<bool> mask(CompareFunc comp, const Vec3& other) const {
return Vec3<bool>(comp(x, other.x), comp(y, other.y), comp(z, other.z));
}
Vec3 abs() const {
return Vec3(std::abs(x), std::abs(y), std::abs(z));
}
@@ -248,6 +263,10 @@ public:
Vec3<size_t> floorToT() const {
return Vec3<size_t>(static_cast<size_t>(std::floor(x)), static_cast<size_t>(std::floor(x)), static_cast<size_t>(std::floor(z)));
}
Vec3<float> toFloat() const {
return Vec3<float>(static_cast<float>(x), static_cast<float>(y), static_cast<float>(z));
}
Vec3 ceil() const {
return Vec3(std::ceil(x), std::ceil(y), std::ceil(z));
@@ -292,33 +311,33 @@ public:
}
// Template friend operators to allow different scalar types
template<typename S>
friend Vec3<T> operator+(S scalar, const Vec3<T>& vec) {
return Vec3<T>(static_cast<T>(scalar + vec.x),
static_cast<T>(scalar + vec.y),
static_cast<T>(scalar + vec.z));
}
// template<typename S>
// friend Vec3<T> operator+(S scalar, const Vec3<T>& vec) {
// return Vec3<T>(static_cast<T>(scalar + vec.x),
// static_cast<T>(scalar + vec.y),
// static_cast<T>(scalar + vec.z));
// }
template<typename S>
friend Vec3<T> operator-(S scalar, const Vec3<T>& vec) {
return Vec3<T>(static_cast<T>(scalar - vec.x),
static_cast<T>(scalar - vec.y),
static_cast<T>(scalar - vec.z));
}
// template<typename S>
// friend Vec3<T> operator-(S scalar, const Vec3<T>& vec) {
// return Vec3<T>(static_cast<T>(scalar - static_cast<S>(vec.x)),
// static_cast<T>(scalar - static_cast<S>(vec.y)),
// static_cast<T>(scalar - static_cast<S>(vec.z)));
// }
template<typename S>
friend Vec3<T> operator*(S scalar, const Vec3<T>& vec) {
return Vec3<T>(static_cast<T>(scalar * vec.x),
static_cast<T>(scalar * vec.y),
static_cast<T>(scalar * vec.z));
}
// template<typename S>
// friend Vec3<T> operator*(S scalar, const Vec3<T>& vec) {
// return Vec3<T>(static_cast<T>(scalar * vec.x),
// static_cast<T>(scalar * vec.y),
// static_cast<T>(scalar * vec.z));
// }
template<typename S>
friend Vec3<T> operator/(S scalar, const Vec3<T>& vec) {
return Vec3<T>(static_cast<T>(scalar / vec.x),
static_cast<T>(scalar / vec.y),
static_cast<T>(scalar / vec.z));
}
// template<typename S>
// friend Vec3<T> operator/(S scalar, const Vec3<T>& vec) {
// return Vec3<T>(static_cast<T>(scalar / vec.x),
// static_cast<T>(scalar / vec.y),
// static_cast<T>(scalar / vec.z));
// }
Vec3 reflect(const Vec3& normal) const {
return *this - 2.0f * this->dot(normal) * normal;