refactor. ich habe den teil aus dem exampleSphere rausgezogen der generell gebraucht wird. displaySzene() nimmt eine szene an und lässt den raytracer fr jeden Pixel laufen
This commit is contained in:
+16
-52
@@ -7,22 +7,23 @@
|
||||
#include "vectorOp.h"
|
||||
#include "raytrace.h"
|
||||
#include <stdlib.h>
|
||||
#include "interface.h"
|
||||
|
||||
void example_color(int width, int height, int channels, unsigned char *image) {
|
||||
void example_color(int width, int height, int channels, unsigned char **image) {
|
||||
for (int i = 0; i < height * width; i++) {
|
||||
int step = i *channels;
|
||||
int x = i % width;
|
||||
int y = i / width;
|
||||
image[step] = 0 + (int)((((double)x)/width) * 255);
|
||||
image[step+1] = 0 + (int)((((double)y)/width) * 255);
|
||||
image[step+2] = 0;
|
||||
(*image)[step] = 0 + (int)((((double)x)/width) * 255);
|
||||
(*image)[step+1] = 0 + (int)((((double)y)/width) * 255);
|
||||
(*image)[step+2] = 0;
|
||||
if (channels == 4) {
|
||||
image[step+3] = 255;
|
||||
(*image)[step+3] = 255;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void exampleSphere( int width, int height, int channels, unsigned char *image) {
|
||||
void exampleSphere( int width, int height, int channels, unsigned char **image) {
|
||||
camera cam1;
|
||||
cam1.origin.x = 0;
|
||||
cam1.origin.y = 0;
|
||||
@@ -37,58 +38,21 @@ void exampleSphere( int width, int height, int channels, unsigned char *image) {
|
||||
cam1.height = 1.080;
|
||||
vec3 sphereOrigin = (vec3){0,0,5};
|
||||
double sphereRadius = 1.0;
|
||||
sphere obj1 = (sphere){sphereOrigin, sphereRadius};
|
||||
sphere **objectList = (sphere **) calloc(4+1, sizeof(sphere*));;
|
||||
sphere obj1 = (sphere){sphereOrigin, sphereRadius,(RGBA){1,0.5,1,1},0};
|
||||
sphere **objectList = (sphere **) calloc(5+1, sizeof(sphere*));;
|
||||
objectList[0] = &obj1;
|
||||
sphere obj2 = (sphere){vec3Add(sphereOrigin, (vec3){3,0,0}), sphereRadius};
|
||||
sphere obj2 = (sphere){vec3Add(sphereOrigin, (vec3){3,0,0}), sphereRadius, (RGBA){1,1,0.5,1},0};
|
||||
objectList[1] = &obj2;
|
||||
sphere obj3 = (sphere){vec3Add(sphereOrigin, (vec3){-3,0,0}), sphereRadius};
|
||||
sphere obj3 = (sphere){vec3Add(sphereOrigin, (vec3){-2,1,0}), sphereRadius, (RGBA){1,1,1,1},0};
|
||||
objectList[2] = &obj3;
|
||||
sphere obj4 = (sphere){vec3Add(sphereOrigin, (vec3){1,1,3}), sphereRadius};
|
||||
sphere obj4 = (sphere){vec3Add(sphereOrigin, (vec3){1,1,3}), sphereRadius, (RGBA){0.5,1,1,1},0};
|
||||
objectList[3] = &obj4;
|
||||
sphere light1 = (sphere){(vec3){2,1,0}, sphereRadius, (RGBA){1,1,1,1},1};
|
||||
objectList[4] = &light1;
|
||||
int objectCount = 5;
|
||||
|
||||
vec3 worldUp = (vec3){0, 1, 0};
|
||||
vec3 screenX = vec3Cross(worldUp, cam1.direction);
|
||||
vec3 screenY = vec3Cross(screenX, cam1.direction);
|
||||
vec3 screenMiddlePoint = vec3Add(cam1.origin, vec3Scale(cam1.direction, cam1.screenDistance));
|
||||
vec3 screenTopLeft = vec3Add(
|
||||
vec3Add(screenMiddlePoint,
|
||||
vec3Scale(screenY, -cam1.height/2.0)),///////////////////////////////////////////////////////////////////////////////////////////////////////////////aendern minus weg
|
||||
vec3Scale(screenX, -cam1.width/2.0)
|
||||
);
|
||||
double pixelStepX = cam1.width / cam1.resolutionX;
|
||||
double pixelStepY = cam1.height / cam1.resolutionY;
|
||||
vec3 vecPixelStepX = vec3Scale(screenX, pixelStepX);
|
||||
vec3 vecPixelStepY = vec3Scale(screenY, pixelStepY);
|
||||
for (int i = 0; i < height * width; i++) {
|
||||
int step = i *channels;
|
||||
int x = i % width;
|
||||
int y = i / width;
|
||||
RGBA pixelColor;
|
||||
|
||||
vec3 *pixelOrigin = (vec3 *)malloc(sizeof(vec3));
|
||||
*pixelOrigin = vec3Add(screenTopLeft,
|
||||
vec3Add(
|
||||
vec3Scale(vecPixelStepX, x),
|
||||
vec3Scale(vecPixelStepY, y)
|
||||
)
|
||||
);
|
||||
displaySzene(objectList, objectCount, cam1, width, height, channels, image);
|
||||
|
||||
ray *lightRay = (ray *)malloc(sizeof(ray));;
|
||||
lightRay->origin = cam1.origin;
|
||||
|
||||
lightRay->direction = vec3Normalize(vec3Subtract(*pixelOrigin, cam1.origin));
|
||||
|
||||
pixelColor = raytraceSphere(objectList, lightRay);
|
||||
free(pixelOrigin);
|
||||
free(lightRay);
|
||||
|
||||
image[step] = (int)(pixelColor.r * 255.0);
|
||||
image[step+1] = (int)(pixelColor.g * 255.0);
|
||||
image[step+2] = (int)(pixelColor.b * 255.0);
|
||||
if (channels == 4) {
|
||||
image[step+3] = 255;
|
||||
}
|
||||
}
|
||||
free(objectList);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user