Made camera not upside down

This commit is contained in:
Martin Opat 2025-01-11 15:13:23 +01:00
parent 079e0797e9
commit 340efd641d
2 changed files with 3 additions and 3 deletions

View File

@ -33,10 +33,10 @@ __device__ Point3 d_lightPos;
__device__ Color3 d_backgroundColor; __device__ Color3 d_backgroundColor;
// Point3 h_cameraPos = Point3::init(300.0f, 200.0f, -700.0f); // Camera for full data set // Point3 h_cameraPos = Point3::init(300.0f, 200.0f, -700.0f); // Camera for full data set
Point3 h_cameraPos = Point3::init(50.0f, -50.0f, -75.0f); // Camera for partially trimmed data set (TODO: Probably upside down atm) Point3 h_cameraPos = Point3::init(50.0f, -50.0f, -75.0f); // Camera for partially trimmed data set
Vec3 center = Vec3::init((float)VOLUME_WIDTH/2.0f, (float)VOLUME_HEIGHT/2.0f, (float)VOLUME_DEPTH/2.0f); Vec3 center = Vec3::init((float)VOLUME_WIDTH/2.0f, (float)VOLUME_HEIGHT/2.0f, (float)VOLUME_DEPTH/2.0f);
Vec3 h_cameraDir = (center - h_cameraPos).normalize(); Vec3 h_cameraDir = (center - h_cameraPos).normalize();
Vec3 h_cameraUp = Vec3::init(0.0, 0.0, 1.0).normalize(); Vec3 h_cameraUp = Vec3::init(0.0, 1.0, 0.0).normalize();
Point3 h_lightPos = Point3::init(1.5, 2.0, -1.0); Point3 h_lightPos = Point3::init(1.5, 2.0, -1.0);
Color3 h_backgroundColor = Color3::init(0.1f, 0.1f, 0.1f); Color3 h_backgroundColor = Color3::init(0.1f, 0.1f, 0.1f);

View File

@ -68,7 +68,7 @@ int main() {
if (data[i + 0*VOLUME_DEPTH*VOLUME_HEIGHT*VOLUME_WIDTH] + epsilon >= infty) hostVolume[i] = -infty; if (data[i + 0*VOLUME_DEPTH*VOLUME_HEIGHT*VOLUME_WIDTH] + epsilon >= infty) hostVolume[i] = -infty;
} }
// Reverse the order of hostVolume TODO: Idk why the volume upside down, this can probably be deleted and substituted with a minus sign somehwere (camera position?) // Reverse the order of hostVolume - why is it upside down anyway?
for (int i = 0; i < VOLUME_WIDTH; i++) { for (int i = 0; i < VOLUME_WIDTH; i++) {
for (int j = 0; j < VOLUME_HEIGHT; j++) { for (int j = 0; j < VOLUME_HEIGHT; j++) {
for (int k = 0; k < VOLUME_DEPTH/2; k++) { for (int k = 0; k < VOLUME_DEPTH/2; k++) {