godzil/dorayme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A new scene and some optimisations.

Browse Source
This commit is contained in:
Godzil
2020-03-12 17:45:29 +00:00
parent 7a43a98816
commit c858b4dcde
11 changed files with 259 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/CMakeLists.txt
View File

@@ -128,7 +128,7 @@ file(DOWNLOAD
)
add_custom_command(
TARGET uvmap_skybox POST_BUILD
COMMAND unzip -o ${CMAKE_SOURCE_DIR}/external/LancellottiChapel.zip -d LancellottiChapel
COMMAND unzip -qq -o ${CMAKE_SOURCE_DIR}/external/LancellottiChapel.zip -d LancellottiChapel
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/external/
)
add_custom_command(
@@ -138,6 +138,26 @@ add_custom_command(
${CMAKE_CURRENT_BINARY_DIR}/
)
# Dragon scene
add_executable(dragon_scene)
target_sources(dragon_scene PRIVATE dragon_scene.cpp)
file(DOWNLOAD
http://raytracerchallenge.com/bonus/assets/dragon.zip
${CMAKE_SOURCE_DIR}/external/dragon.zip
EXPECTED_HASH MD5=308b0f2aca1d48d24e6fc4584dfdf345
)
add_custom_command(
TARGET dragon_scene POST_BUILD
COMMAND unzip -qq -o ${CMAKE_SOURCE_DIR}/external/dragon.zip
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/external/
)
add_custom_command(
TARGET dragon_scene POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_SOURCE_DIR}/external/dragon.obj
${CMAKE_CURRENT_BINARY_DIR}/
)
add_test(NAME Chapter05_Test COMMAND $<TARGET_FILE:ch5_test>)
add_test(NAME Chapter06_Test COMMAND $<TARGET_FILE:ch6_test>)
add_test(NAME Chapter07_Test COMMAND $<TARGET_FILE:ch7_test>)
@@ -160,6 +180,7 @@ add_test(NAME UVMap_AlignCheckPlane COMMAND $<TARGET_FILE:uvmap_aligncheckplane>
add_test(NAME UVMap_CheckeredCube COMMAND $<TARGET_FILE:uvmap_checkeredcube>)
add_test(NAME UVMap_Earth COMMAND $<TARGET_FILE:uvmap_earth>)
add_test(NAME UVMap_Skybox COMMAND $<TARGET_FILE:uvmap_skybox>)
add_test(NAME Dragon_Sceme COMMAND $<TARGET_FILE:dragon_scene>)
add_test(NAME Test_Rendering COMMAND $<TARGET_FILE:test_render>)
add_test(NAME Triangle_RenderTest COMMAND $<TARGET_FILE:triangle_rendertest>)
add_test(NAME ChristmasBall_Rendering COMMAND $<TARGET_FILE:christmasball_render>)

143
tests/dragon_scene.cpp Normal file
View File

@@ -0,0 +1,143 @@
/*
* DoRayMe - a quick and dirty Raytracer
* Render test for OBJ File using teapots in chapter 15.
*
* Created by Manoël Trapier
* Copyright (c) 2020 986-Studio.
*
*/
#include <world.h>
#include <light.h>
#include <plane.h>
#include <cube.h>
#include <sphere.h>
#include <material.h>
#include <colour.h>
#include <canvas.h>
#include <camera.h>
#include <objfile.h>
#include <pattern.h>
#include <strippattern.h>
#include <gradientpattern.h>
#include <checkerspattern.h>
#include <ringpattern.h>
#include <transformation.h>
#include <cylinder.h>
int main()
{
World w = World();
/* Add lights */
/* Light light1 = Light(POINT_LIGHT, Point(10, 100, 10), Colour(.1, .1, .1));
w.addLight(&light1);
Light light2 = Light(POINT_LIGHT, Point(10, 100, -10), Colour(.1, .1, .2));
w.addLight(&light2);
Light light3 = Light(POINT_LIGHT, Point(-10, 100, 10), Colour(.1, .1, .1));
w.addLight(&light3);
Light light4 = Light(POINT_LIGHT, Point(-10, 100, -10), Colour(.1, .1, .1));
w.addLight(&light4);*/
Light light1 = Light(POINT_LIGHT, Point(0, 100, 0), Colour(.3, .3, .3));
w.addLight(&light1);
Point lightPos = Point(3.8, 6.8, 4.5);
Light mouthLight = Light(POINT_LIGHT, lightPos, Colour(0.5, 0.5, 0.5));
w.addLight(&mouthLight);
Light mainLight = Light(POINT_LIGHT, Point(8, 10, 16), Colour(1, 1, 1));
w.addLight(&mainLight);
/* ----------------------------- */
#if 0
/* Spot light */
Sphere spot = Sphere();
spot.dropShadow = false;
spot.setTransform(translation(lightPos.x, lightPos.y, lightPos.z) * scaling(0.2, 0.2, 0.2));
w.addObject(&spot);
Cylinder X = Cylinder();
X.minCap = 0;
X.maxCap = 4;
Cylinder Y = Cylinder();
Y.minCap = 0;
Y.maxCap = 4;
Cylinder Z = Cylinder();
Z.minCap = 0;
Z.maxCap = 4;
Z.materialSet = Y.materialSet = X.materialSet = true;
X.material.ambient = 1;
X.material.specular = 0;
X.material.diffuse = 0;
Z.material = Y.material = X.material;
Z.dropShadow = Y.dropShadow = X.dropShadow = false;
X.material.colour = Colour(1, 0, 0);
Y.material.colour = Colour(0, 1, 0);
Z.material.colour = Colour(0, 0, 1);
Y.setTransform(translation(lightPos.x, lightPos.y, lightPos.z) * scaling(0.1, 1, 0.1));
X.setTransform(translation(lightPos.x, lightPos.y, lightPos.z) * rotationZ(M_PI/2) * scaling(0.1, 1, 0.1));
Z.setTransform(translation(lightPos.x, lightPos.y, lightPos.z) * rotationX(M_PI/2) * scaling(0.1, 1, 0.1));
w.addObject(&X);
w.addObject(&Y);
w.addObject(&Z);
#endif
/* Floor */
Material floorMaterial;
floorMaterial.colour = Colour(0.2, 0.3, 0.3);
floorMaterial.reflective = 0.3;
floorMaterial.specular = 0.4;
floorMaterial.shininess = 5;
floorMaterial.ambient = 0;
floorMaterial.diffuse = 0.8;
/* Let's use a cube for the floor */
Cube floor = Cube();
floor.setMaterial(floorMaterial);
floor.setTransform(translation(0, -0.1, 0) * scaling(10, 0.1, 10));
w.addObject(&floor);
Material dragonMat;
dragonMat.colour = Colour(0.23, 0.75, 0.39);
dragonMat.reflective = 0.9;
dragonMat.transparency = 0.99;
dragonMat.specular = 0.9;
dragonMat.shininess = 50;
dragonMat.refractiveIndex = 1.6;
dragonMat.ambient = 0;
dragonMat.diffuse = 0.7;
Shape *dragon = OBJFile("dragon.obj").getBaseGroup();
dragon->setTransform(rotationY(M_PI * 0.75) * scaling(2, 2, 2));
dragon->setMaterial(dragonMat);
w.addObject(dragon);
/* ----------------------------- */
/*
FILE *fpOut = fopen("dragon_worlddump.json", "wt");
if (fpOut)
{
w.dumpMe(fpOut);
fclose(fpOut);
}
*/
OctreeOptimisation opt;
w.finalise(opt);
/* Set the camera */
Camera camera = Camera(800, 600, M_PI/2);
camera.setTransform(viewTransform(Point(-5, 10, 13),
Point(0, 1, 0),
Vector(0, 1, 0)));
/* Now render it */
Canvas image = camera.render(w, 5);
image.SaveAsPNG("ch15_teapot_objfile.png");
return 0;
}

4
tests/objfile_test.cpp
View File

@@ -156,8 +156,8 @@ TEST(OBJFileTest, Faces_with_normal)
Group *g0 = parser.groups(OBJ_DEFAULT_GROUP);
SmoothTriangle *t1 = (SmoothTriangle *)(*g0)[0];
SmoothTriangle *t2 = (SmoothTriangle *)(*g0)[1];
SmoothTriangle *t1 = (SmoothTriangle *)g0->getObject(0);
SmoothTriangle *t2 = (SmoothTriangle *)g0->getObject(1);
ASSERT_EQ(t1->p1, parser.vertices(1));
ASSERT_EQ(t1->p2, parser.vertices(2));