From 3227b3df1129584ad430a65e2efd939837053404 Mon Sep 17 00:00:00 2001 From: Meow J Date: Tue, 5 Jul 2016 19:15:32 +0800 Subject: [PATCH] Clean up images. Fix minor mistakes --- docs/01 Getting started/01 OpenGL.md | 2 +- docs/01 Getting started/04 Hello Triangle.md | 2 +- docs/02 Lighting/05 Light casters.md | 6 +++--- docs/04 Advanced OpenGL/05 Framebuffers.md | 2 ++ docs/05 Advanced Lighting/01 Advanced Lighting.md | 2 ++ docs/05 Advanced Lighting/02 Gamma Correction.md | 4 ++-- docs/img/{ => 01/01}/opengl.jpg | Bin docs/img/{ => 01/04}/OpenGL_pipline_cn.png | Bin {docs => old}/img/01-08-01.png | Bin {docs => old}/img/05_01_01.png | Bin {docs => old}/img/05_01_F_depth.png | Bin {docs => old}/img/05_01_F_depth_nonliner.png | Bin {docs => old}/img/05_05_Edge_detection.png | Bin {docs => old}/img/05_05_blur_sample.png | Bin .../img/05_05framebuffers_ kernel_sample.png | Bin {docs => old}/img/5256.png | Bin {docs => old}/img/F_light.png | Bin {docs => old}/img/I.png | Bin {docs => old}/img/I_max.png | Bin {docs => old}/img/Kc.png | Bin {docs => old}/img/Kl.png | Bin {docs => old}/img/Kq.png | Bin {docs => old}/img/Light_casters1.png | Bin {docs => old}/img/Light_casters2.png | Bin {docs => old}/img/Light_casters3.png | Bin {docs => old}/img/blending_C_result.png | Bin {docs => old}/img/camera3.png | Bin {docs => old}/img/camera4.png | Bin {docs => old}/img/coordinate_system_1.png | Bin {docs => old}/img/coordinate_system_2.png | Bin {docs => old}/img/d.png | Bin {docs => old}/img/deferred_shading_1.png | Bin {docs => old}/img/deferred_shading_2.png | Bin {docs => old}/img/deferred_shading_3.png | Bin {docs => old}/img/deferred_shading_4.png | Bin {docs => old}/img/deferred_shading_5.png | Bin {docs => old}/img/deferred_shading_6.png | Bin {docs => old}/img/deferred_shading_7.png | Bin {docs => old}/img/deferred_shading_8.png | Bin {docs => old}/img/epsilon.png | Bin {docs => old}/img/gamma.png | Bin {docs => old}/img/look_at.png | Bin {docs => old}/img/look_at_D.png | Bin {docs => old}/img/look_at_P.png | Bin {docs => old}/img/look_at_R.png | Bin {docs => old}/img/look_at_U.png | Bin {docs => old}/img/phi.png | Bin {docs => old}/img/quad_formula.png | Bin {docs => old}/img/shaders1.jpg | Bin {docs => old}/img/shaders2.jpg | Bin {docs => old}/img/theta.png | Bin {docs => old}/img/trans/arccos.png | Bin {docs => old}/img/trans/commutative.png | Bin {docs => old}/img/trans/costheta.png | Bin {docs => old}/img/trans/costheta2.png | Bin {docs => old}/img/trans/k_black.png | Bin {docs => old}/img/trans/k_green.png | Bin {docs => old}/img/trans/n_unit.png | Bin {docs => old}/img/trans/rxryrz.png | Bin {docs => old}/img/trans/s1s2s3.png | Bin {docs => old}/img/trans/s_blue.png | Bin {docs => old}/img/trans/t1t2t3.png | Bin {docs => old}/img/trans/transformations1.png | Bin {docs => old}/img/trans/transformations10.png | Bin {docs => old}/img/trans/transformations11.png | Bin {docs => old}/img/trans/transformations12.png | Bin {docs => old}/img/trans/transformations13.png | Bin {docs => old}/img/trans/transformations14.png | Bin {docs => old}/img/trans/transformations15.png | Bin {docs => old}/img/trans/transformations16.png | Bin {docs => old}/img/trans/transformations17.png | Bin {docs => old}/img/trans/transformations18.png | Bin {docs => old}/img/trans/transformations19.png | Bin {docs => old}/img/trans/transformations2.png | Bin {docs => old}/img/trans/transformations20.png | Bin {docs => old}/img/trans/transformations21.png | Bin {docs => old}/img/trans/transformations22.png | Bin {docs => old}/img/trans/transformations23.png | Bin {docs => old}/img/trans/transformations24.png | Bin {docs => old}/img/trans/transformations25.png | Bin {docs => old}/img/trans/transformations26.png | Bin {docs => old}/img/trans/transformations27.png | Bin {docs => old}/img/trans/transformations28.png | Bin {docs => old}/img/trans/transformations29.png | Bin {docs => old}/img/trans/transformations3.png | Bin {docs => old}/img/trans/transformations30.png | Bin {docs => old}/img/trans/transformations31.png | Bin {docs => old}/img/trans/transformations32.png | Bin {docs => old}/img/trans/transformations4.png | Bin {docs => old}/img/trans/transformations5.png | Bin {docs => old}/img/trans/transformations6.png | Bin {docs => old}/img/trans/transformations7.png | Bin {docs => old}/img/trans/transformations8.png | Bin {docs => old}/img/trans/transformations9.png | Bin {docs => old}/img/trans/v.k.png | Bin {docs => old}/img/trans/v_black.png | Bin {docs => old}/img/trans/v_mag.png | Bin {docs => old}/img/trans/v_red.png | Bin {docs => old}/img/trans/vxk.png | Bin {docs => old}/img/trans/w_blue.png | Bin {docs => old}/img/trans/z_sq.png | Bin styleguide.md | 4 ++-- 102 files changed, 13 insertions(+), 9 deletions(-) rename docs/img/{ => 01/01}/opengl.jpg (100%) rename docs/img/{ => 01/04}/OpenGL_pipline_cn.png (100%) rename {docs => old}/img/01-08-01.png (100%) rename {docs => old}/img/05_01_01.png (100%) rename {docs => old}/img/05_01_F_depth.png (100%) rename {docs => old}/img/05_01_F_depth_nonliner.png (100%) rename {docs => old}/img/05_05_Edge_detection.png (100%) rename {docs => old}/img/05_05_blur_sample.png (100%) rename {docs => old}/img/05_05framebuffers_ kernel_sample.png (100%) rename {docs => old}/img/5256.png (100%) rename {docs => old}/img/F_light.png (100%) rename {docs => old}/img/I.png (100%) rename {docs => old}/img/I_max.png (100%) rename {docs => old}/img/Kc.png (100%) rename {docs => old}/img/Kl.png (100%) rename {docs => old}/img/Kq.png (100%) rename {docs => old}/img/Light_casters1.png (100%) rename {docs => old}/img/Light_casters2.png (100%) rename {docs => old}/img/Light_casters3.png (100%) rename {docs => old}/img/blending_C_result.png (100%) rename {docs => old}/img/camera3.png (100%) rename {docs => old}/img/camera4.png (100%) rename {docs => old}/img/coordinate_system_1.png (100%) rename {docs => old}/img/coordinate_system_2.png (100%) rename {docs => old}/img/d.png (100%) rename {docs => old}/img/deferred_shading_1.png (100%) rename {docs => old}/img/deferred_shading_2.png (100%) rename {docs => old}/img/deferred_shading_3.png (100%) rename {docs => old}/img/deferred_shading_4.png (100%) rename {docs => old}/img/deferred_shading_5.png (100%) rename {docs => old}/img/deferred_shading_6.png (100%) rename {docs => old}/img/deferred_shading_7.png (100%) rename {docs => old}/img/deferred_shading_8.png (100%) rename {docs => old}/img/epsilon.png (100%) rename {docs => old}/img/gamma.png (100%) rename {docs => old}/img/look_at.png (100%) rename {docs => old}/img/look_at_D.png (100%) rename {docs => old}/img/look_at_P.png (100%) rename {docs => old}/img/look_at_R.png (100%) rename {docs => old}/img/look_at_U.png (100%) rename {docs => old}/img/phi.png (100%) rename {docs => old}/img/quad_formula.png (100%) rename {docs => old}/img/shaders1.jpg (100%) rename {docs => old}/img/shaders2.jpg (100%) rename {docs => old}/img/theta.png (100%) rename {docs => old}/img/trans/arccos.png (100%) rename {docs => old}/img/trans/commutative.png (100%) rename {docs => old}/img/trans/costheta.png (100%) rename {docs => old}/img/trans/costheta2.png (100%) rename {docs => old}/img/trans/k_black.png (100%) rename {docs => old}/img/trans/k_green.png (100%) rename {docs => old}/img/trans/n_unit.png (100%) rename {docs => old}/img/trans/rxryrz.png (100%) rename {docs => old}/img/trans/s1s2s3.png (100%) rename {docs => old}/img/trans/s_blue.png (100%) rename {docs => old}/img/trans/t1t2t3.png (100%) rename {docs => old}/img/trans/transformations1.png (100%) rename {docs => old}/img/trans/transformations10.png (100%) rename {docs => old}/img/trans/transformations11.png (100%) rename {docs => old}/img/trans/transformations12.png (100%) rename {docs => old}/img/trans/transformations13.png (100%) rename {docs => old}/img/trans/transformations14.png (100%) rename {docs => old}/img/trans/transformations15.png (100%) rename {docs => old}/img/trans/transformations16.png (100%) rename {docs => old}/img/trans/transformations17.png (100%) rename {docs => old}/img/trans/transformations18.png (100%) rename {docs => old}/img/trans/transformations19.png (100%) rename {docs => old}/img/trans/transformations2.png (100%) rename {docs => old}/img/trans/transformations20.png (100%) rename {docs => old}/img/trans/transformations21.png (100%) rename {docs => old}/img/trans/transformations22.png (100%) rename {docs => old}/img/trans/transformations23.png (100%) rename {docs => old}/img/trans/transformations24.png (100%) rename {docs => old}/img/trans/transformations25.png (100%) rename {docs => old}/img/trans/transformations26.png (100%) rename {docs => old}/img/trans/transformations27.png (100%) rename {docs => old}/img/trans/transformations28.png (100%) rename {docs => old}/img/trans/transformations29.png (100%) rename {docs => old}/img/trans/transformations3.png (100%) rename {docs => old}/img/trans/transformations30.png (100%) rename {docs => old}/img/trans/transformations31.png (100%) rename {docs => old}/img/trans/transformations32.png (100%) rename {docs => old}/img/trans/transformations4.png (100%) rename {docs => old}/img/trans/transformations5.png (100%) rename {docs => old}/img/trans/transformations6.png (100%) rename {docs => old}/img/trans/transformations7.png (100%) rename {docs => old}/img/trans/transformations8.png (100%) rename {docs => old}/img/trans/transformations9.png (100%) rename {docs => old}/img/trans/v.k.png (100%) rename {docs => old}/img/trans/v_black.png (100%) rename {docs => old}/img/trans/v_mag.png (100%) rename {docs => old}/img/trans/v_red.png (100%) rename {docs => old}/img/trans/vxk.png (100%) rename {docs => old}/img/trans/w_blue.png (100%) rename {docs => old}/img/trans/z_sq.png (100%) diff --git a/docs/01 Getting started/01 OpenGL.md b/docs/01 Getting started/01 OpenGL.md index 56d4e13..e605a4f 100644 --- a/docs/01 Getting started/01 OpenGL.md +++ b/docs/01 Getting started/01 OpenGL.md @@ -9,7 +9,7 @@ 在开始这段旅程之前我们先了解一下OpenGL到底是什么。一般它被认为是一个API(**Application Programming Interface**, 应用程序编程接口)，包含了一系列可以操作图形、图像的函数。然而，OpenGL本身并不是一个API，它仅仅是一个由[Khronos组织](http://www.khronos.org/)制定并维护的规范(Specification)。 -OpenGL Logo +OpenGL Logo OpenGL规范严格规定了每个函数该如何执行，以及它们的输出值。至于内部具体每个函数是如何实现(Implement)的，将由OpenGL库的开发者自行决定（注：这里开发者是指编写OpenGL库的人）。因为OpenGL规范并没有规定实现的细节，具体的OpenGL库允许使用不同的实现，只要其功能和结果与规范相匹配（亦即，作为用户不会感受到功能上的差异）。 diff --git a/docs/01 Getting started/04 Hello Triangle.md b/docs/01 Getting started/04 Hello Triangle.md index 77a4bdb..7305b97 100644 --- a/docs/01 Getting started/04 Hello Triangle.md +++ b/docs/01 Getting started/04 Hello Triangle.md @@ -20,7 +20,7 @@ 在下面，你会看到一个图形渲染管线的每个阶段的抽象表达。要注意蓝色部分代表的是我们可以自定义的着色器。 -![](../img/OpenGL_pipline_cn.png) +![](../img/01/04/OpenGL_pipline_cn.png) 如你所见，图形渲染管线包含很多部分，每个都是将你的顶点数据转变为最后渲染出来的像素这个大过程中的一个特定阶段。我们会概括性地解释渲染管线的每个部分，从而使你对图形渲染管线的工作方式有个大概了解。 diff --git a/docs/02 Lighting/05 Light casters.md b/docs/02 Lighting/05 Light casters.md index fc3d4df..e2fdcc6 100644 --- a/docs/02 Lighting/05 Light casters.md +++ b/docs/02 Lighting/05 Light casters.md @@ -208,8 +208,8 @@ OpenGL中的聚光灯用世界空间位置，一个方向和一个指定了聚 * `LightDir`：从片段指向光源的向量。 * `SpotDir`：聚光灯所指向的方向。 -* `Phi\(\phi\)`：定义聚光灯半径的切光角。每个落在这个角度之外的，聚光灯都不会照亮。 -* `Theta\(\theta\)`：`LightDir`向量和`SpotDir`向量之间的角度。\(\theta\)值应该比\(\Phi\)值小，这样才会在聚光灯内。 +* `Phi`\(\phi\)：定义聚光灯半径的切光角。每个落在这个角度之外的，聚光灯都不会照亮。 +* `Theta`\(\theta\)：`LightDir`向量和`SpotDir`向量之间的角度。\(\theta\)值应该比\(\Phi\)值小，这样才会在聚光灯内。 所以我们大致要做的是，计算`LightDir`向量和`SpotDir`向量的点乘（返回两个单位向量的点乘，还记得吗？），然后在和切光角\(\phi\)对比。现在你应该明白聚光灯是我们下面将创建的手电筒的范例。 @@ -288,7 +288,7 @@ $$ 很难用图画描述出这个公式是怎样工作的，所以我们尝试使用一个例子： -\(\theta\)|角度制\(\theta\)|\(\phi\)（内切）|角度制\(\phi\)|\(\gamma\)（外切）|角度制\(\gamma\)|\(\epsilon\)|\(I\) +\(\theta\)|\(\theta\)（角度）|\(\phi\)（内切）|\(\phi\)（角度）|\(\gamma\)（外切）|\(\gamma\)（角度）|\(\epsilon\)|\(I\) --|---|---|---|---|---|---|--- 0.87|30|0.91|25|0.82|35|0.91 - 0.82 = 0.09|0.87 - 0.82 / 0.09 = 0.56 0.9|26|0.91|25|0.82|35|0.91 - 0.82 = 0.09|0.9 - 0.82 / 0.09 = 0.89 diff --git a/docs/04 Advanced OpenGL/05 Framebuffers.md b/docs/04 Advanced OpenGL/05 Framebuffers.md index b113efd..f83479f 100644 --- a/docs/04 Advanced OpenGL/05 Framebuffers.md +++ b/docs/04 Advanced OpenGL/05 Framebuffers.md @@ -392,7 +392,9 @@ void main() 创建模糊效果的kernel定义如下： +$$ \(\begin{bmatrix} 1 & 2 & 1 \\ 2 & 4 & 2 \\ 1 & 2 & 1 \end{bmatrix} / 16\) +$$ 由于所有数值加起来的总和为16,简单返回结合起来的采样颜色是非常亮的,所以我们必须将kernel的每个值除以16.最终的kernel数组会是这样的: diff --git a/docs/05 Advanced Lighting/01 Advanced Lighting.md b/docs/05 Advanced Lighting/01 Advanced Lighting.md index 25e0354..06b96e2 100644 --- a/docs/05 Advanced Lighting/01 Advanced Lighting.md +++ b/docs/05 Advanced Lighting/01 Advanced Lighting.md @@ -34,7 +34,9 @@ Phong光照很棒，而且性能较高，但是它的镜面反射在某些条件 得到半程向量很容易，我们将光的方向向量和视线向量相加，然后将结果归一化（normalize）； +$$ \(\bar{H} = \frac{\bar{L} + \bar{V}}{||\bar{L} + \bar{V}||}\) +$$ 翻译成GLSL代码如下： diff --git a/docs/05 Advanced Lighting/02 Gamma Correction.md b/docs/05 Advanced Lighting/02 Gamma Correction.md index 1a0c5af..39f6b75 100644 --- a/docs/05 Advanced Lighting/02 Gamma Correction.md +++ b/docs/05 Advanced Lighting/02 Gamma Correction.md @@ -67,7 +67,7 @@ void main() 这些单行代码代表了gamma校正的实现。不太令人印象深刻，但当你进行gamma校正的时候有一些额外的事情别忘了考虑。 -#### sRGB纹理 +### sRGB纹理 因为监视器总是在sRGB空间中显示应用了gamma的颜色，无论什么时候当你在计算机上绘制、编辑或者画出一个图片的时候，你所选的颜色都是根据你在监视器上看到的那种。这实际意味着所有你创建或编辑的图片并不是在线性空间，而是在sRGB空间中（译注：sRGB空间定义的gamma接近于2.2），假如在你的屏幕上对暗红色翻一倍，便是根据你所感知到的亮度进行的，并不等于将红色元素加倍。 @@ -131,7 +131,7 @@ float attenuation = 1.0 / distance; -### 附加资源 +## 附加资源 [cambridgeincolour.com](http://www.cambridgeincolour.com/tutorials/gamma-correction.htm):更多关于gamma和gamma校正的内容。 diff --git a/docs/img/opengl.jpg b/docs/img/01/01/opengl.jpg similarity index 100% rename from docs/img/opengl.jpg rename to docs/img/01/01/opengl.jpg diff --git a/docs/img/OpenGL_pipline_cn.png b/docs/img/01/04/OpenGL_pipline_cn.png similarity index 100% rename from docs/img/OpenGL_pipline_cn.png rename to docs/img/01/04/OpenGL_pipline_cn.png diff --git a/docs/img/01-08-01.png b/old/img/01-08-01.png similarity index 100% rename from docs/img/01-08-01.png rename to old/img/01-08-01.png diff --git a/docs/img/05_01_01.png b/old/img/05_01_01.png similarity index 100% rename from docs/img/05_01_01.png rename to old/img/05_01_01.png diff --git a/docs/img/05_01_F_depth.png b/old/img/05_01_F_depth.png similarity index 100% rename from docs/img/05_01_F_depth.png rename to old/img/05_01_F_depth.png diff --git a/docs/img/05_01_F_depth_nonliner.png b/old/img/05_01_F_depth_nonliner.png similarity index 100% rename from docs/img/05_01_F_depth_nonliner.png rename to old/img/05_01_F_depth_nonliner.png diff --git a/docs/img/05_05_Edge_detection.png b/old/img/05_05_Edge_detection.png similarity index 100% rename from docs/img/05_05_Edge_detection.png rename to old/img/05_05_Edge_detection.png diff --git a/docs/img/05_05_blur_sample.png b/old/img/05_05_blur_sample.png similarity index 100% rename from docs/img/05_05_blur_sample.png rename to old/img/05_05_blur_sample.png diff --git a/docs/img/05_05framebuffers_ kernel_sample.png b/old/img/05_05framebuffers_ kernel_sample.png similarity index 100% rename from docs/img/05_05framebuffers_ kernel_sample.png rename to old/img/05_05framebuffers_ kernel_sample.png diff --git a/docs/img/5256.png b/old/img/5256.png similarity index 100% rename from docs/img/5256.png rename to old/img/5256.png diff --git a/docs/img/F_light.png b/old/img/F_light.png similarity index 100% rename from docs/img/F_light.png rename to old/img/F_light.png diff --git a/docs/img/I.png b/old/img/I.png similarity index 100% rename from docs/img/I.png rename to old/img/I.png diff --git a/docs/img/I_max.png b/old/img/I_max.png similarity index 100% rename from docs/img/I_max.png rename to old/img/I_max.png diff --git a/docs/img/Kc.png b/old/img/Kc.png similarity index 100% rename from docs/img/Kc.png rename to old/img/Kc.png diff --git a/docs/img/Kl.png b/old/img/Kl.png similarity index 100% rename from docs/img/Kl.png rename to old/img/Kl.png diff --git a/docs/img/Kq.png b/old/img/Kq.png similarity index 100% rename from docs/img/Kq.png rename to old/img/Kq.png diff --git a/docs/img/Light_casters1.png b/old/img/Light_casters1.png similarity index 100% rename from docs/img/Light_casters1.png rename to old/img/Light_casters1.png diff --git a/docs/img/Light_casters2.png b/old/img/Light_casters2.png similarity index 100% rename from docs/img/Light_casters2.png rename to old/img/Light_casters2.png diff --git a/docs/img/Light_casters3.png b/old/img/Light_casters3.png similarity index 100% rename from docs/img/Light_casters3.png rename to old/img/Light_casters3.png diff --git a/docs/img/blending_C_result.png b/old/img/blending_C_result.png similarity index 100% rename from docs/img/blending_C_result.png rename to old/img/blending_C_result.png diff --git a/docs/img/camera3.png b/old/img/camera3.png similarity index 100% rename from docs/img/camera3.png rename to old/img/camera3.png diff --git a/docs/img/camera4.png b/old/img/camera4.png similarity index 100% rename from docs/img/camera4.png rename to old/img/camera4.png diff --git a/docs/img/coordinate_system_1.png b/old/img/coordinate_system_1.png similarity index 100% rename from docs/img/coordinate_system_1.png rename to old/img/coordinate_system_1.png diff --git a/docs/img/coordinate_system_2.png b/old/img/coordinate_system_2.png similarity index 100% rename from docs/img/coordinate_system_2.png rename to old/img/coordinate_system_2.png diff --git a/docs/img/d.png b/old/img/d.png similarity index 100% rename from docs/img/d.png rename to old/img/d.png diff --git a/docs/img/deferred_shading_1.png b/old/img/deferred_shading_1.png similarity index 100% rename from docs/img/deferred_shading_1.png rename to old/img/deferred_shading_1.png diff --git a/docs/img/deferred_shading_2.png b/old/img/deferred_shading_2.png similarity index 100% rename from docs/img/deferred_shading_2.png rename to old/img/deferred_shading_2.png diff --git a/docs/img/deferred_shading_3.png b/old/img/deferred_shading_3.png similarity index 100% rename from docs/img/deferred_shading_3.png rename to old/img/deferred_shading_3.png diff --git a/docs/img/deferred_shading_4.png b/old/img/deferred_shading_4.png similarity index 100% rename from docs/img/deferred_shading_4.png rename to old/img/deferred_shading_4.png diff --git a/docs/img/deferred_shading_5.png b/old/img/deferred_shading_5.png similarity index 100% rename from docs/img/deferred_shading_5.png rename to old/img/deferred_shading_5.png diff --git a/docs/img/deferred_shading_6.png b/old/img/deferred_shading_6.png similarity index 100% rename from docs/img/deferred_shading_6.png rename to old/img/deferred_shading_6.png diff --git a/docs/img/deferred_shading_7.png b/old/img/deferred_shading_7.png similarity index 100% rename from docs/img/deferred_shading_7.png rename to old/img/deferred_shading_7.png diff --git a/docs/img/deferred_shading_8.png b/old/img/deferred_shading_8.png similarity index 100% rename from docs/img/deferred_shading_8.png rename to old/img/deferred_shading_8.png diff --git a/docs/img/epsilon.png b/old/img/epsilon.png similarity index 100% rename from docs/img/epsilon.png rename to old/img/epsilon.png diff --git a/docs/img/gamma.png b/old/img/gamma.png similarity index 100% rename from docs/img/gamma.png rename to old/img/gamma.png diff --git a/docs/img/look_at.png b/old/img/look_at.png similarity index 100% rename from docs/img/look_at.png rename to old/img/look_at.png diff --git a/docs/img/look_at_D.png b/old/img/look_at_D.png similarity index 100% rename from docs/img/look_at_D.png rename to old/img/look_at_D.png diff --git a/docs/img/look_at_P.png b/old/img/look_at_P.png similarity index 100% rename from docs/img/look_at_P.png rename to old/img/look_at_P.png diff --git a/docs/img/look_at_R.png b/old/img/look_at_R.png similarity index 100% rename from docs/img/look_at_R.png rename to old/img/look_at_R.png diff --git a/docs/img/look_at_U.png b/old/img/look_at_U.png similarity index 100% rename from docs/img/look_at_U.png rename to old/img/look_at_U.png diff --git a/docs/img/phi.png b/old/img/phi.png similarity index 100% rename from docs/img/phi.png rename to old/img/phi.png diff --git a/docs/img/quad_formula.png b/old/img/quad_formula.png similarity index 100% rename from docs/img/quad_formula.png rename to old/img/quad_formula.png diff --git a/docs/img/shaders1.jpg b/old/img/shaders1.jpg similarity index 100% rename from docs/img/shaders1.jpg rename to old/img/shaders1.jpg diff --git a/docs/img/shaders2.jpg b/old/img/shaders2.jpg similarity index 100% rename from docs/img/shaders2.jpg rename to old/img/shaders2.jpg diff --git a/docs/img/theta.png b/old/img/theta.png similarity index 100% rename from docs/img/theta.png rename to old/img/theta.png diff --git a/docs/img/trans/arccos.png b/old/img/trans/arccos.png similarity index 100% rename from docs/img/trans/arccos.png rename to old/img/trans/arccos.png diff --git a/docs/img/trans/commutative.png b/old/img/trans/commutative.png similarity index 100% rename from docs/img/trans/commutative.png rename to old/img/trans/commutative.png diff --git a/docs/img/trans/costheta.png b/old/img/trans/costheta.png similarity index 100% rename from docs/img/trans/costheta.png rename to old/img/trans/costheta.png diff --git a/docs/img/trans/costheta2.png b/old/img/trans/costheta2.png similarity index 100% rename from docs/img/trans/costheta2.png rename to old/img/trans/costheta2.png diff --git a/docs/img/trans/k_black.png b/old/img/trans/k_black.png similarity index 100% rename from docs/img/trans/k_black.png rename to old/img/trans/k_black.png diff --git a/docs/img/trans/k_green.png b/old/img/trans/k_green.png similarity index 100% rename from docs/img/trans/k_green.png rename to old/img/trans/k_green.png diff --git a/docs/img/trans/n_unit.png b/old/img/trans/n_unit.png similarity index 100% rename from docs/img/trans/n_unit.png rename to old/img/trans/n_unit.png diff --git a/docs/img/trans/rxryrz.png b/old/img/trans/rxryrz.png similarity index 100% rename from docs/img/trans/rxryrz.png rename to old/img/trans/rxryrz.png diff --git a/docs/img/trans/s1s2s3.png b/old/img/trans/s1s2s3.png similarity index 100% rename from docs/img/trans/s1s2s3.png rename to old/img/trans/s1s2s3.png diff --git a/docs/img/trans/s_blue.png b/old/img/trans/s_blue.png similarity index 100% rename from docs/img/trans/s_blue.png rename to old/img/trans/s_blue.png diff --git a/docs/img/trans/t1t2t3.png b/old/img/trans/t1t2t3.png similarity index 100% rename from docs/img/trans/t1t2t3.png rename to old/img/trans/t1t2t3.png diff --git a/docs/img/trans/transformations1.png b/old/img/trans/transformations1.png similarity index 100% rename from docs/img/trans/transformations1.png rename to old/img/trans/transformations1.png diff --git a/docs/img/trans/transformations10.png b/old/img/trans/transformations10.png similarity index 100% rename from docs/img/trans/transformations10.png rename to old/img/trans/transformations10.png diff --git a/docs/img/trans/transformations11.png b/old/img/trans/transformations11.png similarity index 100% rename from docs/img/trans/transformations11.png rename to old/img/trans/transformations11.png diff --git a/docs/img/trans/transformations12.png b/old/img/trans/transformations12.png similarity index 100% rename from docs/img/trans/transformations12.png rename to old/img/trans/transformations12.png diff --git a/docs/img/trans/transformations13.png b/old/img/trans/transformations13.png similarity index 100% rename from docs/img/trans/transformations13.png rename to old/img/trans/transformations13.png diff --git a/docs/img/trans/transformations14.png b/old/img/trans/transformations14.png similarity index 100% rename from docs/img/trans/transformations14.png rename to old/img/trans/transformations14.png diff --git a/docs/img/trans/transformations15.png b/old/img/trans/transformations15.png similarity index 100% rename from docs/img/trans/transformations15.png rename to old/img/trans/transformations15.png diff --git a/docs/img/trans/transformations16.png b/old/img/trans/transformations16.png similarity index 100% rename from docs/img/trans/transformations16.png rename to old/img/trans/transformations16.png diff --git a/docs/img/trans/transformations17.png b/old/img/trans/transformations17.png similarity index 100% rename from docs/img/trans/transformations17.png rename to old/img/trans/transformations17.png diff --git a/docs/img/trans/transformations18.png b/old/img/trans/transformations18.png similarity index 100% rename from docs/img/trans/transformations18.png rename to old/img/trans/transformations18.png diff --git a/docs/img/trans/transformations19.png b/old/img/trans/transformations19.png similarity index 100% rename from docs/img/trans/transformations19.png rename to old/img/trans/transformations19.png diff --git a/docs/img/trans/transformations2.png b/old/img/trans/transformations2.png similarity index 100% rename from docs/img/trans/transformations2.png rename to old/img/trans/transformations2.png diff --git a/docs/img/trans/transformations20.png b/old/img/trans/transformations20.png similarity index 100% rename from docs/img/trans/transformations20.png rename to old/img/trans/transformations20.png diff --git a/docs/img/trans/transformations21.png b/old/img/trans/transformations21.png similarity index 100% rename from docs/img/trans/transformations21.png rename to old/img/trans/transformations21.png diff --git a/docs/img/trans/transformations22.png b/old/img/trans/transformations22.png similarity index 100% rename from docs/img/trans/transformations22.png rename to old/img/trans/transformations22.png diff --git a/docs/img/trans/transformations23.png b/old/img/trans/transformations23.png similarity index 100% rename from docs/img/trans/transformations23.png rename to old/img/trans/transformations23.png diff --git a/docs/img/trans/transformations24.png b/old/img/trans/transformations24.png similarity index 100% rename from docs/img/trans/transformations24.png rename to old/img/trans/transformations24.png diff --git a/docs/img/trans/transformations25.png b/old/img/trans/transformations25.png similarity index 100% rename from docs/img/trans/transformations25.png rename to old/img/trans/transformations25.png diff --git a/docs/img/trans/transformations26.png b/old/img/trans/transformations26.png similarity index 100% rename from docs/img/trans/transformations26.png rename to old/img/trans/transformations26.png diff --git a/docs/img/trans/transformations27.png b/old/img/trans/transformations27.png similarity index 100% rename from docs/img/trans/transformations27.png rename to old/img/trans/transformations27.png diff --git a/docs/img/trans/transformations28.png b/old/img/trans/transformations28.png similarity index 100% rename from docs/img/trans/transformations28.png rename to old/img/trans/transformations28.png diff --git a/docs/img/trans/transformations29.png b/old/img/trans/transformations29.png similarity index 100% rename from docs/img/trans/transformations29.png rename to old/img/trans/transformations29.png diff --git a/docs/img/trans/transformations3.png b/old/img/trans/transformations3.png similarity index 100% rename from docs/img/trans/transformations3.png rename to old/img/trans/transformations3.png diff --git a/docs/img/trans/transformations30.png b/old/img/trans/transformations30.png similarity index 100% rename from docs/img/trans/transformations30.png rename to old/img/trans/transformations30.png diff --git a/docs/img/trans/transformations31.png b/old/img/trans/transformations31.png similarity index 100% rename from docs/img/trans/transformations31.png rename to old/img/trans/transformations31.png diff --git a/docs/img/trans/transformations32.png b/old/img/trans/transformations32.png similarity index 100% rename from docs/img/trans/transformations32.png rename to old/img/trans/transformations32.png diff --git a/docs/img/trans/transformations4.png b/old/img/trans/transformations4.png similarity index 100% rename from docs/img/trans/transformations4.png rename to old/img/trans/transformations4.png diff --git a/docs/img/trans/transformations5.png b/old/img/trans/transformations5.png similarity index 100% rename from docs/img/trans/transformations5.png rename to old/img/trans/transformations5.png diff --git a/docs/img/trans/transformations6.png b/old/img/trans/transformations6.png similarity index 100% rename from docs/img/trans/transformations6.png rename to old/img/trans/transformations6.png diff --git a/docs/img/trans/transformations7.png b/old/img/trans/transformations7.png similarity index 100% rename from docs/img/trans/transformations7.png rename to old/img/trans/transformations7.png diff --git a/docs/img/trans/transformations8.png b/old/img/trans/transformations8.png similarity index 100% rename from docs/img/trans/transformations8.png rename to old/img/trans/transformations8.png diff --git a/docs/img/trans/transformations9.png b/old/img/trans/transformations9.png similarity index 100% rename from docs/img/trans/transformations9.png rename to old/img/trans/transformations9.png diff --git a/docs/img/trans/v.k.png b/old/img/trans/v.k.png similarity index 100% rename from docs/img/trans/v.k.png rename to old/img/trans/v.k.png diff --git a/docs/img/trans/v_black.png b/old/img/trans/v_black.png similarity index 100% rename from docs/img/trans/v_black.png rename to old/img/trans/v_black.png diff --git a/docs/img/trans/v_mag.png b/old/img/trans/v_mag.png similarity index 100% rename from docs/img/trans/v_mag.png rename to old/img/trans/v_mag.png diff --git a/docs/img/trans/v_red.png b/old/img/trans/v_red.png similarity index 100% rename from docs/img/trans/v_red.png rename to old/img/trans/v_red.png diff --git a/docs/img/trans/vxk.png b/old/img/trans/vxk.png similarity index 100% rename from docs/img/trans/vxk.png rename to old/img/trans/vxk.png diff --git a/docs/img/trans/w_blue.png b/old/img/trans/w_blue.png similarity index 100% rename from docs/img/trans/w_blue.png rename to old/img/trans/w_blue.png diff --git a/docs/img/trans/z_sq.png b/old/img/trans/z_sq.png similarity index 100% rename from docs/img/trans/z_sq.png rename to old/img/trans/z_sq.png diff --git a/styleguide.md b/styleguide.md index 2e7ad9e..7551253 100644 --- a/styleguide.md +++ b/styleguide.md @@ -44,8 +44,8 @@ ## 图片 -- 图片请尽量搬运到`docs/img`目录，之后在文中引用的时候地址填写`../../img/filename.jpg` -- 如果想要让图片放在页面一侧，可以使用HTML代码： +- 图片请尽量搬运到`docs/img`目录，之后在文中引用的时候地址填写`../img/filename.jpg` +- 如果想要让图片放在页面一侧，可以使用HTML代码，注意HTML代码中要多一层`../`： ```html OpenGL Logo