Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement Materials #17

Merged
merged 35 commits into from
May 26, 2021
Merged

Implement Materials #17

merged 35 commits into from
May 26, 2021

Conversation

Samuele-Colombo
Copy link
Collaborator

@Samuele-Colombo Samuele-Colombo commented May 21, 2021 •
edited
Loading

Implement flat material rendering of shapes.
The following are needed:

  • Pigment abstract type
    • UniformPigment for solid color
    • CheckeredPigment for checkered pattern between two colors
    • (optional) ImagePigment maps a image onto the shape
  • BRDF abstract type wrapping a BRDF function
    • DiffuseBRDF type representing diffusion on a coloured surface
  • Material a combination of a BRDF and an emitted radiance pigment
  • modify Shape so that it contains a Material
  • modify HitRecord so that it remembers the shape or material it had hit
  • implement a flat renderer and include it as an option for the demo

@Samuele-Colombo
Add Pigments
1f239b1
@Samuele-Colombo
Rename pigments.jl to materials.jl
cfd7435
@Samuele-Colombo
Add convenienc function for Pigment functor
67c4b33
@Samuele-Colombo
Add BRDF and DiffuseBRDF
ccd4967
@Samuele-Colombo
Fix overflowing
d57889e
@Samuele-Colombo
Fix CheckeredPigment constructor
6c055cd
@Samuele-Colombo
Add Pigment tests
a75e032
@Samuele-Colombo
Fix inheritance in DiffuseBRDF
8c2c877
@Samuele-Colombo
Define Material
022f791
@Samuele-Colombo
Fix Material definition
6ec18ae
@Samuele-Colombo
Fix DiffuseBRDF default pigment
dfbde1d
@Samuele-Colombo
Fix Pigment subtyping
79d8e44
@Samuele-Colombo
Change inclusion order to be able to use materials in shapes
602e2a6
@Samuele-Colombo
As previous commit but for tests
4d1bcbc
@Samuele-Colombo
Add needed exports
3459e0b
@Samuele-Colombo
Add materials to Shape and HitRecord
e9e0189 
Also changed methods and tests accordingly
@Samuele-Colombo
Fix user utils according to the previous changes
d3fa232
@Samuele-Colombo
Fix "Change name from 'inverse' to 'inv'" #12
57a9ced
@Samuele-Colombo
update .gitignore to ignore .mp4
fd576ac
@Samuele-Colombo
Fix Sphere uv coordinates
ef8920d
@Samuele-Colombo
Add ray_intersection to World
98fcff7
@Samuele-Colombo
Fix naming convention for fire_all_rays
14b479c
@Samuele-Colombo
Fix Checkered_Pigment
83f9b42
@Samuele-Colombo
Implement Renderers and reorganize user_utils
8569d26
@Samuele-Colombo
Update raytracer_cli
e81b09f
@Samuele-Colombo
update video_demo
0aac55a
@Samuele-Colombo
Uncomment needed constructor
f645725
@Samuele-Colombo
Remove testing renderer
1f78447
@Samuele-Colombo
Fix limit case handling
5eb7201
@Samuele-Colombo
Solve possible type mismatch
fb28d04
Paolo97Gll
Paolo97Gll approved these changes May 26, 2021
View reviewed changes
Copy link
Owner

@Paolo97Gll Paolo97Gll left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok

@Samuele-Colombo @Paolo97Gll
Last tweaks
7a47e3d 
Co-authored-by: Paolo Galli <Paolo97Gll@users.noreply.github.com>
@Samuele-Colombo Samuele-Colombo merged commit c6331d6 into master May 26, 2021
@Paolo97Gll Paolo97Gll deleted the implement_materials branch May 26, 2021 08:48
@Paolo97Gll Paolo97Gll mentioned this pull request May 26, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Paolo97Gll Paolo97Gll Paolo97Gll approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Samuele-Colombo @Paolo97Gll