|
@@ -15,10 +15,11 @@
|
|
|
#include <stdio.h>
|
|
|
#include <renderstat.h>
|
|
|
|
|
|
-Camera::Camera(uint32_t hsize, uint32_t vsize, double fov) : verticalSize(vsize), horizontalSize(hsize), fieldOfView(fov)
|
|
|
+Camera::Camera(uint32_t hsize, uint32_t vsize, double fov, double focal, double aperture, uint32_t rayCount) : verticalSize(vsize),
|
|
|
+ horizontalSize(hsize), fieldOfView(fov), focalDistance(focal), apertureSize(aperture), rayCount(rayCount)
|
|
|
{
|
|
|
double aspectRatio = (double)hsize / (double)vsize;
|
|
|
- double halfView = tan(fov / 2.0);
|
|
|
+ double halfView = tan(fov / 2.0) * this->focalDistance;
|
|
|
|
|
|
if (aspectRatio >= 1)
|
|
|
{
|
|
@@ -42,7 +43,7 @@ void Camera::setTransform(Matrix transform)
|
|
|
this->inverseTransform = transform.inverse();
|
|
|
}
|
|
|
|
|
|
-Ray Camera::rayForPixel(uint32_t pixelX, uint32_t pixelY)
|
|
|
+Ray Camera::rayForPixel(uint32_t pixelX, uint32_t pixelY, double horzOffset, double vertOffset)
|
|
|
{
|
|
|
double xOffset = ((double)pixelX + 0.5) * this->pixelSize;
|
|
|
double yOffset = ((double)pixelY + 0.5) * this->pixelSize;
|
|
@@ -50,8 +51,8 @@ Ray Camera::rayForPixel(uint32_t pixelX, uint32_t pixelY)
|
|
|
double worldX = this->halfWidth - xOffset;
|
|
|
double worldY = this->halfHeight - yOffset;
|
|
|
|
|
|
- Tuple pixel = this->inverseTransform * Point(worldX, worldY, -1);
|
|
|
- Tuple origin = this->inverseTransform * Point(0, 0, 0);
|
|
|
+ Tuple pixel = this->inverseTransform * Point(worldX, worldY, -this->focalDistance);
|
|
|
+ Tuple origin = this->inverseTransform * Point(horzOffset, vertOffset, 0);
|
|
|
Tuple direction = (pixel - origin).normalise();
|
|
|
|
|
|
stats.addCastedRay();
|
|
@@ -70,9 +71,25 @@ Canvas Camera::render(World world, uint32_t depth)
|
|
|
{
|
|
|
for (x = 0 ; x < this->horizontalSize ; x++)
|
|
|
{
|
|
|
- Ray r = this->rayForPixel(x, y);
|
|
|
- Tuple colour = world.colourAt(r, depth);
|
|
|
+ Tuple colour;
|
|
|
+ if (this->apertureSize > 0)
|
|
|
+ {
|
|
|
+ int i;
|
|
|
+ for (i = 0 ; i < this->rayCount ; i++)
|
|
|
+ {
|
|
|
+ double horz = frandclip(-this->apertureSize/2, this->apertureSize / 2);
|
|
|
+ double vert = frandclip(-this->apertureSize/2, this->apertureSize / 2);
|
|
|
+ Ray r = this->rayForPixel(x, y, horz, vert);
|
|
|
+ colour = colour + world.colourAt(r, depth);
|
|
|
+ }
|
|
|
|
|
|
+ colour = colour / this->rayCount;
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ Ray r = this->rayForPixel(x, y);
|
|
|
+ colour = world.colourAt(r, depth);
|
|
|
+ }
|
|
|
stats.addPixel();
|
|
|
image.putPixel(x, y, colour);
|
|
|
}
|