m.giller/cloudy-raytracer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Adds simple example scene for aliasing artifacts

Browse source
This commit is contained in:
Maximilian Giller 2022-12-13 19:15:15 +01:00
parent cc78c886c8
commit 9580b96868
1 changed files with 97 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

156
ex6.cpp
View file

@ -8,8 +8,11 @@
#include "primitive/sphere.h" #include "primitive/sphere.h"
#include "renderer/simplerenderer.h" #include "renderer/simplerenderer.h"
#ifdef SUPERRENDERER_FOUND #ifdef SUPERRENDERER_FOUND
#include "renderer/superrenderer.h" #include "renderer/superrenderer.h"
#endif #endif
#include "shader/materialshader.h" #include "shader/materialshader.h"
@ -17,73 +20,108 @@
#include "light/ambientlight.h" #include "light/ambientlight.h"
#include "light/pointlight.h" #include "light/pointlight.h"
#include "light/spotlight.h" #include "light/spotlight.h"
#include "shader/flatshader.h"
int main() { void renderAliasingScene()
FastScene scene; {
scene.setEnvironmentMap(std::make_shared<Texture>("data/TychoSkymapII.t5_04096x02048.png")); FastScene scene;
scene.setBackgroundColor(Color(0.5f, 0.5f, 1));
// Set up the camera // Set up the camera
PerspectiveCamera camera; PerspectiveCamera camera;
camera.setPosition(Vector3d(0.0f, -0.2f, 0.0f)); camera.setPosition(Vector3d(0, 0, 0));
camera.setForwardDirection(normalized(Vector3d(-1.0f, -0.15f, 0.6f))); camera.setForwardDirection(normalized(Vector3d(1, 0, 0)));
camera.setUpDirection(normalized(Vector3d(0.0f, -1.0f, 0.0f))); camera.setUpDirection(normalized(Vector3d(0.0f, 1.0f, 0.0f)));
camera.setFovAngle(90.0f); camera.setFovAngle(75.0f);
// Add the earth auto orange = std::make_shared<FlatShader>(Color(1, 0.8f, 0.2f));
auto earthDiffuse = std::make_shared<Texture>("data/earth_diffuse.ppm"); auto sphere = std::make_shared<Sphere>(Vector3d(5, 0, 0), 3, orange);
auto earthSpecular = std::make_shared<Texture>("data/earth_specular.ppm");
auto earthNormal = std::make_shared<Texture>("data/earth_normal.ppm");
auto earthClouds = std::make_shared<Texture>("data/earth_clouds.ppm");
auto earthCloudShader = std::make_shared<MaterialShader>();
earthCloudShader->setDiffuseMap(earthClouds);
earthCloudShader->setAlphaMap(earthClouds);
earthCloudShader->setDiffuseCoefficient(0.9f);
earthCloudShader->setSpecularCoefficient(0.1f);
auto earthShader = std::make_shared<MaterialShader>();
earthShader->setDiffuseMap(earthDiffuse);
earthShader->setDiffuseCoefficient(0.5f);
earthShader->setSpecularMap(earthSpecular);
earthShader->setSpecularCoefficient(0.5f);
earthShader->setShininessExponent(15.0f);
earthShader->setNormalMap(earthNormal);
scene.add(std::make_shared<Sphere>(Vector3d(-50.0f, 0.0f, 60.0f), 20.0f, earthShader));
scene.add(std::make_shared<Sphere>(Vector3d(-50.0f, 0.0f, 60.0f), 20.05f, earthCloudShader));
// Add the spaceship scene.add(sphere);
auto spaceshipDiffuse = std::make_shared<Texture>("data/space_frigate_6_diffuse.ppm");
auto spaceshipSpecular = std::make_shared<Texture>("data/space_frigate_6_specular.ppm");
auto spaceshipNormal = std::make_shared<Texture>("data/space_frigate_6_normal.ppm");
auto spaceshipReflection = std::make_shared<Texture>("data/space_frigate_6_specular.ppm");
auto spaceshipShader = std::make_shared<MaterialShader>();
spaceshipShader->setDiffuseMap(spaceshipDiffuse);
spaceshipShader->setDiffuseCoefficient(0.75f);
spaceshipShader->setSpecularMap(spaceshipSpecular);
spaceshipShader->setNormalMap(spaceshipNormal);
spaceshipShader->setNormalCoefficient(0.8f);
spaceshipShader->setSpecularCoefficient(0.25f);
spaceshipShader->setShininessExponent(30.0f);
spaceshipShader->setReflectionMap(spaceshipReflection);
spaceshipShader->setReflectance(0.75f);
scene.addObj("data/space_frigate_6.obj", Vector3d(-1.0f, 1.0f, 1.0f) / 20.0f, Vector3d(-1.3f, -0.3f, 0.7f), // build the tree
spaceshipShader); scene.buildTree();
// Add lights // Render the scene
scene.add(std::make_shared<PointLight>(Vector3d(0.0f, 0.0f, 30.0f), 1000.0f)); SimpleRenderer renderer;
scene.add(std::make_shared<AmbientLight>(0.3f)); renderer.renderImage(scene, camera, 64, 64).save("aliasing.png");
// build the tree
scene.buildTree();
// Render the scene
SimpleRenderer renderer;
renderer.renderImage(scene, camera, 1024, 768).save("result.png");
#ifdef SUPERRENDERER_FOUND #ifdef SUPERRENDERER_FOUND
SuperRenderer sr; SuperRenderer sr;
sr.setSuperSamplingFactor(4); sr.setSuperSamplingFactor(4);
sr.renderImage(scene, camera, 1024, 768).save("result_super.png"); sr.renderImage(scene, camera, 64, 64).save("aliasing_super.png");
#endif
}
int main()
{
FastScene scene;
scene.setEnvironmentMap(std::make_shared<Texture>("data/TychoSkymapII.t5_04096x02048.png"));
// Set up the camera
PerspectiveCamera camera;
camera.setPosition(Vector3d(0.0f, -0.2f, 0.0f));
camera.setForwardDirection(normalized(Vector3d(-1.0f, -0.15f, 0.6f)));
camera.setUpDirection(normalized(Vector3d(0.0f, -1.0f, 0.0f)));
camera.setFovAngle(90.0f);
// Add the earth
auto earthDiffuse = std::make_shared<Texture>("data/earth_diffuse.ppm");
auto earthSpecular = std::make_shared<Texture>("data/earth_specular.ppm");
auto earthNormal = std::make_shared<Texture>("data/earth_normal.ppm");
auto earthClouds = std::make_shared<Texture>("data/earth_clouds.ppm");
auto earthCloudShader = std::make_shared<MaterialShader>();
earthCloudShader->setDiffuseMap(earthClouds);
earthCloudShader->setAlphaMap(earthClouds);
earthCloudShader->setDiffuseCoefficient(0.9f);
earthCloudShader->setSpecularCoefficient(0.1f);
auto earthShader = std::make_shared<MaterialShader>();
earthShader->setDiffuseMap(earthDiffuse);
earthShader->setDiffuseCoefficient(0.5f);
earthShader->setSpecularMap(earthSpecular);
earthShader->setSpecularCoefficient(0.5f);
earthShader->setShininessExponent(15.0f);
earthShader->setNormalMap(earthNormal);
scene.add(std::make_shared<Sphere>(Vector3d(-50.0f, 0.0f, 60.0f), 20.0f, earthShader));
scene.add(std::make_shared<Sphere>(Vector3d(-50.0f, 0.0f, 60.0f), 20.05f, earthCloudShader));
// Add the spaceship
auto spaceshipDiffuse = std::make_shared<Texture>("data/space_frigate_6_diffuse.ppm");
auto spaceshipSpecular = std::make_shared<Texture>("data/space_frigate_6_specular.ppm");
auto spaceshipNormal = std::make_shared<Texture>("data/space_frigate_6_normal.ppm");
auto spaceshipReflection = std::make_shared<Texture>("data/space_frigate_6_specular.ppm");
auto spaceshipShader = std::make_shared<MaterialShader>();
spaceshipShader->setDiffuseMap(spaceshipDiffuse);
spaceshipShader->setDiffuseCoefficient(0.75f);
spaceshipShader->setSpecularMap(spaceshipSpecular);
spaceshipShader->setNormalMap(spaceshipNormal);
spaceshipShader->setNormalCoefficient(0.8f);
spaceshipShader->setSpecularCoefficient(0.25f);
spaceshipShader->setShininessExponent(30.0f);
spaceshipShader->setReflectionMap(spaceshipReflection);
spaceshipShader->setReflectance(0.75f);
scene.addObj("data/space_frigate_6.obj", Vector3d(-1.0f, 1.0f, 1.0f) / 20.0f, Vector3d(-1.3f, -0.3f, 0.7f),
spaceshipShader);
// Add lights
scene.add(std::make_shared<PointLight>(Vector3d(0.0f, 0.0f, 30.0f), 1000.0f));
scene.add(std::make_shared<AmbientLight>(0.3f));
// build the tree
scene.buildTree();
// Render the scene
SimpleRenderer renderer;
renderer.renderImage(scene, camera, 1024, 768).save("result.png");
#ifdef SUPERRENDERER_FOUND
SuperRenderer sr;
sr.setSuperSamplingFactor(4);
sr.renderImage(scene, camera, 1024, 768).save("result_super.png");
#endif #endif
return 0; renderAliasingScene();
return 0;
} }