1
0
mirror of https://github.com/LearnOpenGL-CN/LearnOpenGL-CN.git synced 2025-08-23 20:55:27 +08:00

resolve conflicts

This commit is contained in:
aillieo
2017-08-16 22:16:45 +08:00
parent cb2d02b9d9
commit da8c0e2f79
7 changed files with 259 additions and 219 deletions

View File

@@ -50,6 +50,9 @@ pages:
- 泛光: '05 Advanced Lighting/07 Bloom.md'
- 延迟着色法: '05 Advanced Lighting/08 Deferred Shading.md'
- SSAO: '05 Advanced Lighting/09 SSAO.md'
- 特效:
- : '08 Effects/01 Fog.md'
- 卡通着色: '08 Effects/02 Toon shading.md'
- PBR:
- 理论: '07 PBR/01 Theory.md'
- 光照: '07 PBR/02 Lighting.md'