From 18d8741915da614c6b7712496a7c7a634d4f9211 Mon Sep 17 00:00:00 2001 From: Meow J Date: Thu, 8 Dec 2016 22:45:32 +0800 Subject: [PATCH 1/3] 04-05 04-09 --- docs/04 Advanced OpenGL/05 Framebuffers.md | 4 ++-- docs/04 Advanced OpenGL/09 Geometry Shader.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/04 Advanced OpenGL/05 Framebuffers.md b/docs/04 Advanced OpenGL/05 Framebuffers.md index 13ac4df..302257c 100644 --- a/docs/04 Advanced OpenGL/05 Framebuffers.md +++ b/docs/04 Advanced OpenGL/05 Framebuffers.md @@ -295,7 +295,7 @@ void main() 虽然反相是一种相对简单的后处理特效，但是已经很有趣了： -![image description](../img/04/05/framebuffers_grayscale.png) +![image description](../img/04/05/framebuffers_inverse.png) 整个场景现在的颜色都反转了，只需在着色器中写一行代码就能做到，酷吧？ @@ -391,7 +391,7 @@ void main() 创建模糊(Blur)效果的kernel定义如下： $$ -\(\begin{bmatrix} 1 & 2 & 1 \\ 2 & 4 & 2 \\ 1 & 2 & 1 \end{bmatrix} / 16\) +\begin{bmatrix} 1 & 2 & 1 \\ 2 & 4 & 2 \\ 1 & 2 & 1 \end{bmatrix} / 16 $$ 由于所有数值加起来的总和为16,简单返回结合起来的采样颜色是非常亮的,所以我们必须将kernel的每个值除以16.最终的kernel数组会是这样的: diff --git a/docs/04 Advanced OpenGL/09 Geometry Shader.md b/docs/04 Advanced OpenGL/09 Geometry Shader.md index bc8d104..15b7add 100644 --- a/docs/04 Advanced OpenGL/09 Geometry Shader.md +++ b/docs/04 Advanced OpenGL/09 Geometry Shader.md @@ -149,7 +149,7 @@ glBindVertexArray(0); ![](../img/04/09/geometry_shader_points.png) -但我们不是已经学到了所有内容了吗？对，现在我们将通过为场景添加一个几何着色器来为这个小场景增加点活力。 +但是这些不都是我们之前学过的内容吗？是的，但现在我们会给这个场景加入一个几何着色器，给它增加点活力。 出于学习的目的我们将创建一个叫pass-through的几何着色器，它用一个point基本图形作为它的输入，并把它无修改地传（pass）到下一个着色器。 From cb7b8f2113792ced0db2b4212ed5eaf585ea55ef Mon Sep 17 00:00:00 2001 From: Meow J Date: Wed, 4 Jan 2017 00:30:19 +0800 Subject: [PATCH 2/3] Add links to the original site in unfinished sections. --- docs/06 In Practice/2D-Game/04 Levels.md | 7 +++++++ docs/06 In Practice/2D-Game/05 Collisions/01 Ball.md | 7 +++++++ .../2D-Game/05 Collisions/02 Collision detection.md | 7 +++++++ .../2D-Game/05 Collisions/03 Collision resolution.md | 7 +++++++ docs/06 In Practice/2D-Game/07 Postprocessing.md | 7 +++++++ docs/06 In Practice/2D-Game/08 Powerups.md | 7 +++++++ docs/06 In Practice/2D-Game/09 Audio.md | 7 +++++++ docs/06 In Practice/2D-Game/10 Render Text.md | 7 +++++++ docs/06 In Practice/2D-Game/11 Final thoughts.md | 7 +++++++ docs/07 PBR/01 Theory.md | 4 ++-- docs/07 PBR/02 Lighting.md | 4 ++-- docs/07 PBR/03 IBL/01 Diffuse irradiance.md | 7 +++++++ docs/07 PBR/{03 IBL.md => 03 IBL/02 Specular IBL.md} | 4 ++-- mkdocs.yml | 12 ++++++++++++ 14 files changed, 88 insertions(+), 6 deletions(-) create mode 100644 docs/06 In Practice/2D-Game/04 Levels.md create mode 100644 docs/06 In Practice/2D-Game/05 Collisions/01 Ball.md create mode 100644 docs/06 In Practice/2D-Game/05 Collisions/02 Collision detection.md create mode 100644 docs/06 In Practice/2D-Game/05 Collisions/03 Collision resolution.md create mode 100644 docs/06 In Practice/2D-Game/07 Postprocessing.md create mode 100644 docs/06 In Practice/2D-Game/08 Powerups.md create mode 100644 docs/06 In Practice/2D-Game/09 Audio.md create mode 100644 docs/06 In Practice/2D-Game/10 Render Text.md create mode 100644 docs/06 In Practice/2D-Game/11 Final thoughts.md create mode 100644 docs/07 PBR/03 IBL/01 Diffuse irradiance.md rename docs/07 PBR/{03 IBL.md => 03 IBL/02 Specular IBL.md} (62%) diff --git a/docs/06 In Practice/2D-Game/04 Levels.md b/docs/06 In Practice/2D-Game/04 Levels.md new file mode 100644 index 0000000..face05a --- /dev/null +++ b/docs/06 In Practice/2D-Game/04 Levels.md @@ -0,0 +1,7 @@ +# 关卡 + +**暂无翻译** + +这篇教程暂时还没有进行翻译，您可以先阅读[原文](https://learnopengl.com/#!In-Practice/2D-Game/Levels)，或经常来刷新看看是否有更新的进展。当然，我们更欢迎您在[GitHub上](https://github.com/LearnOpenGL-CN/LearnOpenGL-CN)认领翻译这篇文章，帮助我们完善这个教程系列。 + + \ No newline at end of file diff --git a/docs/06 In Practice/2D-Game/05 Collisions/01 Ball.md b/docs/06 In Practice/2D-Game/05 Collisions/01 Ball.md new file mode 100644 index 0000000..f7efba2 --- /dev/null +++ b/docs/06 In Practice/2D-Game/05 Collisions/01 Ball.md @@ -0,0 +1,7 @@ +# 球 + +**暂无翻译** + +这篇教程暂时还没有进行翻译，您可以先阅读[原文](https://learnopengl.com/#!In-Practice/2D-Game/Collisions/Ball)，或经常来刷新看看是否有更新的进展。当然，我们更欢迎您在[GitHub上](https://github.com/LearnOpenGL-CN/LearnOpenGL-CN)认领翻译这篇文章，帮助我们完善这个教程系列。 + + \ No newline at end of file diff --git a/docs/06 In Practice/2D-Game/05 Collisions/02 Collision detection.md b/docs/06 In Practice/2D-Game/05 Collisions/02 Collision detection.md new file mode 100644 index 0000000..5813e79 --- /dev/null +++ b/docs/06 In Practice/2D-Game/05 Collisions/02 Collision detection.md @@ -0,0 +1,7 @@ +# 碰撞检测 + +**暂无翻译** + +这篇教程暂时还没有进行翻译，您可以先阅读[原文](https://learnopengl.com/#!In-Practice/2D-Game/Collisions/Collision-resolution)，或经常来刷新看看是否有更新的进展。当然，我们更欢迎您在[GitHub上](https://github.com/LearnOpenGL-CN/LearnOpenGL-CN)认领翻译这篇文章，帮助我们完善这个教程系列。 + + \ No newline at end of file diff --git a/docs/06 In Practice/2D-Game/05 Collisions/03 Collision resolution.md b/docs/06 In Practice/2D-Game/05 Collisions/03 Collision resolution.md new file mode 100644 index 0000000..eb51c36 --- /dev/null +++ b/docs/06 In Practice/2D-Game/05 Collisions/03 Collision resolution.md @@ -0,0 +1,7 @@ +# 碰撞处理 + +**暂无翻译** + +这篇教程暂时还没有进行翻译，您可以先阅读[原文](https://learnopengl.com/#!In-Practice/2D-Game/Collisions/Collision-resolution)，或经常来刷新看看是否有更新的进展。当然，我们更欢迎您在[GitHub上](https://github.com/LearnOpenGL-CN/LearnOpenGL-CN)认领翻译这篇文章，帮助我们完善这个教程系列。 + + \ No newline at end of file diff --git a/docs/06 In Practice/2D-Game/07 Postprocessing.md b/docs/06 In Practice/2D-Game/07 Postprocessing.md new file mode 100644 index 0000000..230f4e5 --- /dev/null +++ b/docs/06 In Practice/2D-Game/07 Postprocessing.md @@ -0,0 +1,7 @@ +# 后期处理 + +**暂无翻译** + +这篇教程暂时还没有进行翻译，您可以先阅读[原文](https://learnopengl.com/#!In-Practice/2D-Game/Postprocessing)，或经常来刷新看看是否有更新的进展。当然，我们更欢迎您在[GitHub上](https://github.com/LearnOpenGL-CN/LearnOpenGL-CN)认领翻译这篇文章，帮助我们完善这个教程系列。 + + \ No newline at end of file diff --git a/docs/06 In Practice/2D-Game/08 Powerups.md b/docs/06 In Practice/2D-Game/08 Powerups.md new file mode 100644 index 0000000..347e824 --- /dev/null +++ b/docs/06 In Practice/2D-Game/08 Powerups.md @@ -0,0 +1,7 @@ +# 道具 + +**暂无翻译** + +这篇教程暂时还没有进行翻译，您可以先阅读[原文](https://learnopengl.com/#!In-Practice/2D-Game/Powerups)，或经常来刷新看看是否有更新的进展。当然，我们更欢迎您在[GitHub上](https://github.com/LearnOpenGL-CN/LearnOpenGL-CN)认领翻译这篇文章，帮助我们完善这个教程系列。 + + \ No newline at end of file diff --git a/docs/06 In Practice/2D-Game/09 Audio.md b/docs/06 In Practice/2D-Game/09 Audio.md new file mode 100644 index 0000000..3d5b660 --- /dev/null +++ b/docs/06 In Practice/2D-Game/09 Audio.md @@ -0,0 +1,7 @@ +# 音效 + +**暂无翻译** + +这篇教程暂时还没有进行翻译，您可以先阅读[原文](https://learnopengl.com/#!In-Practice/2D-Game/Audio)，或经常来刷新看看是否有更新的进展。当然，我们更欢迎您在[GitHub上](https://github.com/LearnOpenGL-CN/LearnOpenGL-CN)认领翻译这篇文章，帮助我们完善这个教程系列。 + + \ No newline at end of file diff --git a/docs/06 In Practice/2D-Game/10 Render Text.md b/docs/06 In Practice/2D-Game/10 Render Text.md new file mode 100644 index 0000000..34ac9bc --- /dev/null +++ b/docs/06 In Practice/2D-Game/10 Render Text.md @@ -0,0 +1,7 @@ +# 渲染文字 + +**暂无翻译** + +这篇教程暂时还没有进行翻译，您可以先阅读[原文](https://learnopengl.com/#!In-Practice/2D-Game/Render-text)，或经常来刷新看看是否有更新的进展。当然，我们更欢迎您在[GitHub上](https://github.com/LearnOpenGL-CN/LearnOpenGL-CN)认领翻译这篇文章，帮助我们完善这个教程系列。 + + \ No newline at end of file diff --git a/docs/06 In Practice/2D-Game/11 Final thoughts.md b/docs/06 In Practice/2D-Game/11 Final thoughts.md new file mode 100644 index 0000000..c8d7ba5 --- /dev/null +++ b/docs/06 In Practice/2D-Game/11 Final thoughts.md @@ -0,0 +1,7 @@ +# 结语 + +**暂无翻译** + +这篇教程暂时还没有进行翻译，您可以先阅读[原文](https://learnopengl.com/#!In-Practice/2D-Game/Final-thoughts)，或经常来刷新看看是否有更新的进展。当然，我们更欢迎您在[GitHub上](https://github.com/LearnOpenGL-CN/LearnOpenGL-CN)认领翻译这篇文章，帮助我们完善这个教程系列。 + + \ No newline at end of file diff --git a/docs/07 PBR/01 Theory.md b/docs/07 PBR/01 Theory.md index 62f395f..b318e61 100644 --- a/docs/07 PBR/01 Theory.md +++ b/docs/07 PBR/01 Theory.md @@ -1,7 +1,7 @@ # 理论 -**未完成** +**暂无翻译** -这篇教程暂时还没有完成，您可以经常来刷新看看是否有更新的进展。 +这篇教程暂时还没有进行翻译，您可以先阅读[原文](https://learnopengl.com/#!PBR/Theory)，或经常来刷新看看是否有更新的进展。当然，我们更欢迎您在[GitHub上](https://github.com/LearnOpenGL-CN/LearnOpenGL-CN)认领翻译这篇文章，帮助我们完善这个教程系列。 \ No newline at end of file diff --git a/docs/07 PBR/02 Lighting.md b/docs/07 PBR/02 Lighting.md index a2b908a..5f4eec8 100644 --- a/docs/07 PBR/02 Lighting.md +++ b/docs/07 PBR/02 Lighting.md @@ -1,7 +1,7 @@ # 光照 -**未完成** +**暂无翻译** -这篇教程暂时还没有完成，您可以经常来刷新看看是否有更新的进展。 +这篇教程暂时还没有进行翻译，您可以先阅读[原文](https://learnopengl.com/#!PBR/Lighting)，或经常来刷新看看是否有更新的进展。当然，我们更欢迎您在[GitHub上](https://github.com/LearnOpenGL-CN/LearnOpenGL-CN)认领翻译这篇文章，帮助我们完善这个教程系列。 \ No newline at end of file diff --git a/docs/07 PBR/03 IBL/01 Diffuse irradiance.md b/docs/07 PBR/03 IBL/01 Diffuse irradiance.md new file mode 100644 index 0000000..dd3c032 --- /dev/null +++ b/docs/07 PBR/03 IBL/01 Diffuse irradiance.md @@ -0,0 +1,7 @@ +# 漫反射辐照 + +**未完成** + +这篇教程暂时还没有完成，您可以经常来刷新看看是否有更新的进展。 + + \ No newline at end of file diff --git a/docs/07 PBR/03 IBL.md b/docs/07 PBR/03 IBL/02 Specular IBL.md similarity index 62% rename from docs/07 PBR/03 IBL.md rename to docs/07 PBR/03 IBL/02 Specular IBL.md index b6c0548..7b10792 100644 --- a/docs/07 PBR/03 IBL.md +++ b/docs/07 PBR/03 IBL/02 Specular IBL.md @@ -1,7 +1,7 @@ -# IBL +# 镜面IBL **未完成** 这篇教程暂时还没有完成，您可以经常来刷新看看是否有更新的进展。 - \ No newline at end of file + \ No newline at end of file diff --git a/mkdocs.yml b/mkdocs.yml index 414eca7..ae53f1a 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -54,6 +54,8 @@ pages: - 理论: '07 PBR/01 Theory.md' - 光照: '07 PBR/02 Lighting.md' - IBL: '07 PBR/03 IBL.md' + - 漫反射辐照: '07 PBR/03 IBL/01 Diffuse irradiance.md' + - 镜面IBL: '07 PBR/03 IBL/02 Specular IBL.md' - 实战: - 调试: '06 In Practice/01 Debugging.md' - 文本渲染: '06 In Practice/02 Text Rendering.md' @@ -61,7 +63,17 @@ pages: - Breakout: '06 In Practice/2D-Game/01 Breakout.md' - 准备工作: '06 In Practice/2D-Game/02 Setting up.md' - 渲染精灵: '06 In Practice/2D-Game/03 Rendering Sprites.md' + - 关卡: '06 In Practice/2D-Game/04 Levels.md' + - 碰撞: + - 球: '06 In Practice/2D-Game/05 Collisions/01 Ball.md' + - 碰撞检测: '06 In Practice/2D-Game/05 Collisions/02 Collision detection.md' + - 碰撞处理: '06 In Practice/2D-Game/05 Collisions/03 Collision resolution.md' - 粒子: '06 In Practice/2D-Game/06 Particles.md' + - 后期处理: '06 In Practice/2D-Game/07 Postprocessing.md' + - 道具: '06 In Practice/2D-Game/08 Powerups.md' + - 音效: '06 In Practice/2D-Game/09 Audio.md' + - 渲染文字: '06 In Practice/2D-Game/10 Render Text.md' + - 结语: '06 In Practice/2D-Game/11 Final thoughts.md' site_name: 'LearnOpenGL CN' From 41ad1d2b4328e2654421db986d921af0ad1465f7 Mon Sep 17 00:00:00 2001 From: Meow J Date: Wed, 4 Jan 2017 00:34:09 +0800 Subject: [PATCH 3/3] No, it no longer exists --- mkdocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkdocs.yml b/mkdocs.yml index ae53f1a..b5c6ed5 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -53,7 +53,7 @@ pages: - PBR: - 理论: '07 PBR/01 Theory.md' - 光照: '07 PBR/02 Lighting.md' - - IBL: '07 PBR/03 IBL.md' + - IBL: - 漫反射辐照: '07 PBR/03 IBL/01 Diffuse irradiance.md' - 镜面IBL: '07 PBR/03 IBL/02 Specular IBL.md' - 实战: