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

minimal effort global illumination

Browse Source
This commit is contained in:
yggdrasil75
2026-01-29 05:39:10 -05:00
parent aaa7b1e24e
commit 44068ba32c
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/g3etest.cpp
View File

@@ -145,7 +145,7 @@ void addCeilingLight(const defaults& config, const ceilingdefaults& ceilingconf,
void livePreview(Octree<int>& grid, defaults& config, const Camera& cam) { void livePreview(Octree<int>& grid, defaults& config, const Camera& cam) {
std::lock_guard<std::mutex> lock(PreviewMutex); std::lock_guard<std::mutex> lock(PreviewMutex);
updatePreview = true; updatePreview = true;
frame currentPreviewFrame = grid.renderFrame(cam, config.outWidth, config.outHeight, frame::colormap::RGB, 4, 3); frame currentPreviewFrame = grid.renderFrame(cam, config.outWidth, config.outHeight, frame::colormap::RGB, 4, 3, true);
glGenTextures(1, &textu); glGenTextures(1, &textu);
glBindTexture(GL_TEXTURE_2D, textu); glBindTexture(GL_TEXTURE_2D, textu);

11
util/grid/grid3eigen.hpp
View File

@@ -524,7 +524,8 @@ public:
return hits; return hits;
} }
frame renderFrame(const Camera& cam, int height, int width, frame::colormap colorformat = frame::colormap::RGB, int samplesPerPixel = 2, int maxBounces = 4) { frame renderFrame(const Camera& cam, int height, int width, frame::colormap colorformat = frame::colormap::RGB, int samplesPerPixel = 2,
int maxBounces = 4, bool globalIllumination = false) {
PointType origin = cam.origin; PointType origin = cam.origin;
PointType dir = cam.direction.normalized(); PointType dir = cam.direction.normalized();
PointType up = cam.up.normalized(); PointType up = cam.up.normalized();
@@ -547,19 +548,21 @@ public:
float tanHalfFov = tan(fovRad * 0.5f); float tanHalfFov = tan(fovRad * 0.5f);
float tanfovy = tanHalfFov; float tanfovy = tanHalfFov;
float tanfovx = tanHalfFov * aspect; float tanfovx = tanHalfFov * aspect;
PointType space(0,0,0);
if (globalIllumination) space = {0.1,0.1,0.1};
const Eigen::Vector3f defaultColor(0.01f, 0.01f, 0.01f); const Eigen::Vector3f defaultColor(0.01f, 0.01f, 0.01f);
float rayLength = std::numeric_limits<float>::max(); float rayLength = std::numeric_limits<float>::max();
std::function<Eigen::Vector3f(const PointType&, const PointType&, int, uint32_t&)> traceRay = std::function<Eigen::Vector3f(const PointType&, const PointType&, int, uint32_t&)> traceRay =
[&](const PointType& rayOrig, const PointType& rayDir, int bounces, uint32_t& rngState) -> Eigen::Vector3f { [&](const PointType& rayOrig, const PointType& rayDir, int bounces, uint32_t& rngState) -> Eigen::Vector3f {
if (bounces > maxBounces) return {0,0,0}; if (bounces > maxBounces) return space;
auto hits = voxelTraverse(rayOrig, rayDir, rayLength, true); auto hits = voxelTraverse(rayOrig, rayDir, rayLength, true);
if (hits.empty() && bounces == 0) { if (hits.empty() && bounces == 0) {
return defaultColor; return defaultColor;
} else if (hits.empty()) { } else if (hits.empty()) {
return {0,0,0}; return space;
} }
auto obj = hits[0]; auto obj = hits[0];
@@ -581,7 +584,7 @@ public:
PointType hitPoint = rayOrig + rayDir * t; PointType hitPoint = rayOrig + rayDir * t;
PointType normal = (hitPoint - center).normalized(); PointType normal = (hitPoint - center).normalized();
Eigen::Vector3f finalColor = {0,0,0}; Eigen::Vector3f finalColor = space;
if (obj->light) { if (obj->light) {
return obj->color * obj->emittance; return obj->color * obj->emittance;