merge

docs/guide/render.md

@@ -25,10 +25,11 @@ To freely move the camera without updating its field of view/aspect ratio to mat
 
 ## Create light
 
-To create a lighting for your scene, simply go to the menu on the left side, click "New Light", and you will be able to choose from a variaty of light objects and environmental lights. (you will implement the support for environmental light in Task 7. See the corresponding documentation for more guide.)
+To add lighting to the scene, simply go to the menu on the left side, click "New Light", and you will be able to choose from a variety of point objects and infinite environment lights. (To implement support for environment lights, see PathTracer task 7.)
 
 ![light](light.png)
 
+Additionally, any object can be made into an emissive area light by changing its material to `Diffuse Light`. Mesh-based area lights can produce much more realistic lighting conditions.
 
 ## Enable Ray Logging for Debugging
 

docs/pathtracer/environment_lighting.md

@@ -79,6 +79,7 @@ if we want our new distribution to still integrate to 1, we must divide by sin(\
 
 Altogether, the final Jacobian is (wh / 2pi^2 sin(\theta)).
 
+<<<<<<< HEAD
 ---
 
 ### Tips
@@ -91,9 +92,16 @@ Altogether, the final Jacobian is (wh / 2pi^2 sin(\theta)).
 - If you didn't use the ray log to debug area light sampling, start using it now to visualize what directions are being sampled from the environment map.
 
 ---
+=======
+![uffiz](new_results/uffiz32importance.png)
+>>>>>>> c0f8c29adcde9b20b76232cedf6298f12af43f03
 
 ## Reference Results
 
+<<<<<<< HEAD
 ![ennis](images/ennis.png)
 ![uffiz](images/uffiz.png)
 ![grace](images/grace.png)
+=======
+![ennis](new_results/field1024importance.png)
+>>>>>>> c0f8c29adcde9b20b76232cedf6298f12af43f03