Skip to content

Commit

Permalink
add more renders
Browse files Browse the repository at this point in the history
  • Loading branch information
dluisnothere committed Oct 9, 2022
1 parent e861677 commit 2e7a769
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 13 deletions.
Binary file added img/antialiasingCloseup.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/finalHD.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/main2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/main3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/noAntialiasingCloseup.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 30 additions & 12 deletions scenes/advanced.txt
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,16 @@ REFR 0.7
REFRIOR 1.6
EMITTANCE 0

// Imperfect specular refractive white
MATERIAL 16
RGB .98 .98 .98
SPECEX 0
SPECRGB .98 .98 .98
REFL 0.5
REFR 0.3
REFRIOR 0
EMITTANCE 0

// Box texture
TEXTURE 0
PATH ../Project3-CUDA-Path-Tracer/objs/textures/linkFlippedVertical.png
Expand All @@ -168,7 +178,7 @@ PATH ../Project3-CUDA-Path-Tracer/objs/textures/boxOutline.png

// Camera
CAMERA
RES 800 800
RES 1400 1400
FOVY 45
ITERATIONS 5000
DEPTH 8
Expand All @@ -194,21 +204,21 @@ TRANS 7 1 -1
ROTAT 0 0 0
SCALE 1 .3 1

// Ceiling light
// ceil light
OBJECT 2
cube
material 0
TRANS 0 5 10
ROTAT 90 0 0
SCALE 3 .3 3
TRANS 0 15 0
ROTAT 0 0 0
SCALE 10 .3 10

// larte ceiling light
// low ceiling light
OBJECT 3
cube
material 0
TRANS 0 15 0
ROTAT 0 0 90
SCALE .3 10 10
TRANS -3 5 13
ROTAT -45 0 0
SCALE 10 .3 5

// Floor
OBJECT 4
Expand Down Expand Up @@ -329,13 +339,13 @@ TRANS -1.5 0.5 4
ROTAT 0 0 0
SCALE 1 1 1

// fairy
// fairy in bottle
OBJECT 18
sphere
material 14
TRANS -1.5 2 4
TRANS -1.5 1 4
ROTAT 0 0 0
SCALE 0.25 0.25 0.25
SCALE 0.3 0.3 0.3

// fairy
OBJECT 19
Expand Down Expand Up @@ -434,3 +444,11 @@ material 14
TRANS -3 7 5
ROTAT 0 0 0
SCALE 0.25 0.25 0.25

// fairy
OBJECT 31
sphere
material 14
TRANS 4 2 4
ROTAT 0 0 0
SCALE 0.2 0.2 0.2
2 changes: 1 addition & 1 deletion src/pathtrace.cu
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#define ERRORCHECK 1
#define SORT_MATERIALS 0
#define CACHE_FIRST_BOUNCE 0 // note that Cache first bounce and antialiasing cannot be on at the same time.
#define ANTIALIASING 1
#define ANTIALIASING 0
#define DEPTH_OF_FIELD 0 // depth of field focus defined later
#define DIRECT_LIGHTING 1

Expand Down

0 comments on commit 2e7a769

Please sign in to comment.