ch09-10: restructure chapter setup

- Merge chapters 09 + 10 (shaders + particles) into ch10, effects. - Create placeholder chapter 09, shapes.
pthis · Sep 11, 2021 · 009f7f7 · 009f7f7
1 parent 418be2e
commit 009f7f7
Show file tree

Hide file tree

Showing 59 changed files with 30 additions and 20 deletions.
diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
@@ -169,28 +169,19 @@ function ch11Sidebar() {
 
 function ch10Sidebar() {
   return {
-    title: "OpenGL Shaders",
-    path: '/ch10-shaders/shader-effects',
-    collapsable: false,
-    children: [
-      '/ch10-shaders/shader-effects',
-      '/ch10-shaders/opengl-shaders',
-      '/ch10-shaders/shader-elements',
-      '/ch10-shaders/fragment-shaders',
-      '/ch10-shaders/wave-effect',
-      '/ch10-shaders/vertex-shader',
-      '/ch10-shaders/curtain-effect',
-      '/ch10-shaders/effect-library',
-    ]
-  }
-}
-
-function ch09Sidebar() {
-  return {
-    title: "Particles",
-    path: '/ch09-particles/particle-simulation',
+    title: "Effects (Qt6 - Draft)",
+    path: '/ch10-effects/effects',
     collapsable: false,
     children: [
+      '/ch10-effects/effects',
+      '/ch10-effects/shader-effects',
+      '/ch10-effects/opengl-shaders',
+      '/ch10-effects/shader-elements',
+      '/ch10-effects/fragment-shaders',
+      '/ch10-effects/wave-effect',
+      '/ch10-effects/vertex-shader',
+      '/ch10-effects/curtain-effect',
+      '/ch10-effects/effect-library',
       '/ch09-particles/particle-simulation',
       '/ch09-particles/concept',
       '/ch09-particles/simple-simulation',
@@ -203,6 +194,17 @@ function ch09Sidebar() {
   }
 }
 
+function ch09Sidebar() {
+  return {
+    title: "Shapes (Qt6 - Placeholder)",
+    path: '/ch09-shapes/placeholder',
+    collapsable: false,
+    children: [
+      '/ch09-shapes/placeholder',
+    ]
+  }
+}
+
 function ch08Sidebar() {
   return {
     title: "Canvas (Qt6 - Draft)",

diff --git a/docs/ch09-shapes/placeholder.md b/docs/ch09-shapes/placeholder.md
@@ -0,0 +1,3 @@
+# Placeholder
+
+This is a placeholder for a chapter on QML Shapes.
diff --git a/...-shaders/assets/chapter07_diagram.graffle → ...-effects/assets/chapter07_diagram.graffle b/...-shaders/assets/chapter07_diagram.graffle → ...-effects/assets/chapter07_diagram.graffle
diff --git a/docs/ch10-shaders/assets/curtain.png → docs/ch10-effects/assets/curtain.png b/docs/ch10-shaders/assets/curtain.png → docs/ch10-effects/assets/curtain.png
diff --git a/docs/ch10-shaders/assets/curtain_diagram.png → docs/ch10-effects/assets/curtain_diagram.png b/docs/ch10-shaders/assets/curtain_diagram.png → docs/ch10-effects/assets/curtain_diagram.png
diff --git a/docs/ch10-shaders/assets/curve.png → docs/ch10-effects/assets/curve.png b/docs/ch10-shaders/assets/curve.png → docs/ch10-effects/assets/curve.png
diff --git a/docs/ch10-shaders/assets/defaultshader.png → docs/ch10-effects/assets/defaultshader.png b/docs/ch10-shaders/assets/defaultshader.png → docs/ch10-effects/assets/defaultshader.png
diff --git a/docs/ch10-shaders/assets/fastblur.png → docs/ch10-effects/assets/fastblur.png b/docs/ch10-shaders/assets/fastblur.png → docs/ch10-effects/assets/fastblur.png
diff --git a/docs/ch10-shaders/assets/geniebending.png → docs/ch10-effects/assets/geniebending.png b/docs/ch10-shaders/assets/geniebending.png → docs/ch10-effects/assets/geniebending.png
diff --git a/docs/ch10-shaders/assets/genieeffect.png → docs/ch10-effects/assets/genieeffect.png b/docs/ch10-shaders/assets/genieeffect.png → docs/ch10-effects/assets/genieeffect.png
diff --git a/docs/ch10-shaders/assets/geniehalfside.png → docs/ch10-effects/assets/geniehalfside.png b/docs/ch10-shaders/assets/geniehalfside.png → docs/ch10-effects/assets/geniehalfside.png
diff --git a/docs/ch10-shaders/assets/genieminimize.png → docs/ch10-effects/assets/genieminimize.png b/docs/ch10-shaders/assets/genieminimize.png → docs/ch10-effects/assets/genieminimize.png
diff --git a/docs/ch10-shaders/assets/geniescene.png → docs/ch10-effects/assets/geniescene.png b/docs/ch10-shaders/assets/geniescene.png → docs/ch10-effects/assets/geniescene.png
diff --git a/...h10-shaders/assets/geniesimplebending.png → ...h10-effects/assets/geniesimplebending.png b/...h10-shaders/assets/geniesimplebending.png → ...h10-effects/assets/geniesimplebending.png
diff --git a/...h10-shaders/assets/geniesmoothbending.png → ...h10-effects/assets/geniesmoothbending.png b/...h10-shaders/assets/geniesmoothbending.png → ...h10-effects/assets/geniesmoothbending.png
diff --git a/docs/ch10-shaders/assets/graphicseffects.csv → docs/ch10-effects/assets/graphicseffects.csv b/docs/ch10-shaders/assets/graphicseffects.csv → docs/ch10-effects/assets/graphicseffects.csv
diff --git a/...shaders/assets/graphicseffectstestbed.png → ...effects/assets/graphicseffectstestbed.png b/...shaders/assets/graphicseffectstestbed.png → ...effects/assets/graphicseffectstestbed.png
diff --git a/docs/ch10-shaders/assets/openglpipeline.png → docs/ch10-effects/assets/openglpipeline.png b/docs/ch10-shaders/assets/openglpipeline.png → docs/ch10-effects/assets/openglpipeline.png
diff --git a/docs/ch10-shaders/assets/redlense1.png → docs/ch10-effects/assets/redlense1.png b/docs/ch10-shaders/assets/redlense1.png → docs/ch10-effects/assets/redlense1.png
diff --git a/docs/ch10-shaders/assets/redlense2.png → docs/ch10-effects/assets/redlense2.png b/docs/ch10-shaders/assets/redlense2.png → docs/ch10-effects/assets/redlense2.png
diff --git a/docs/ch10-shaders/assets/redlense3.png → docs/ch10-effects/assets/redlense3.png b/docs/ch10-shaders/assets/redlense3.png → docs/ch10-effects/assets/redlense3.png
diff --git a/docs/ch10-shaders/assets/redlense4.png → docs/ch10-effects/assets/redlense4.png b/docs/ch10-shaders/assets/redlense4.png → docs/ch10-effects/assets/redlense4.png
diff --git a/docs/ch10-shaders/assets/redlense5.png → docs/ch10-effects/assets/redlense5.png b/docs/ch10-shaders/assets/redlense5.png → docs/ch10-effects/assets/redlense5.png
diff --git a/docs/ch10-shaders/assets/wave.png → docs/ch10-effects/assets/wave.png b/docs/ch10-shaders/assets/wave.png → docs/ch10-effects/assets/wave.png
diff --git a/docs/ch10-shaders/curtain-effect.md → docs/ch10-effects/curtain-effect.md b/docs/ch10-shaders/curtain-effect.md → docs/ch10-effects/curtain-effect.md
diff --git a/docs/ch10-shaders/effect-library.md → docs/ch10-effects/effect-library.md b/docs/ch10-shaders/effect-library.md → docs/ch10-effects/effect-library.md
diff --git a/docs/ch10-effects/effects.md b/docs/ch10-effects/effects.md
@@ -0,0 +1,5 @@
+# Effects in QML
+
+* Shaders
+* Particles
+* Effecs module
diff --git a/docs/ch10-shaders/fragment-shaders.md → docs/ch10-effects/fragment-shaders.md b/docs/ch10-shaders/fragment-shaders.md → docs/ch10-effects/fragment-shaders.md
diff --git a/docs/ch10-shaders/opengl-shaders.md → docs/ch10-effects/opengl-shaders.md b/docs/ch10-shaders/opengl-shaders.md → docs/ch10-effects/opengl-shaders.md
diff --git a/docs/ch10-shaders/shader-effects.md → docs/ch10-effects/shader-effects.md b/docs/ch10-shaders/shader-effects.md → docs/ch10-effects/shader-effects.md
diff --git a/docs/ch10-shaders/shader-elements.md → docs/ch10-effects/shader-elements.md b/docs/ch10-shaders/shader-elements.md → docs/ch10-effects/shader-elements.md
diff --git a/...h10-shaders/src/effects/CurtainEffect.qml → ...h10-effects/src/effects/CurtainEffect.qml b/...h10-shaders/src/effects/CurtainEffect.qml → ...h10-effects/src/effects/CurtainEffect.qml
diff --git a/.../ch10-shaders/src/effects/GenieEffect.qml → .../ch10-effects/src/effects/GenieEffect.qml b/.../ch10-shaders/src/effects/GenieEffect.qml → .../ch10-effects/src/effects/GenieEffect.qml
diff --git a/...shaders/src/effects/assets/background.png → ...effects/src/effects/assets/background.png b/...shaders/src/effects/assets/background.png → ...effects/src/effects/assets/background.png
diff --git a/...ders/src/effects/assets/[email protected] → ...ects/src/effects/assets/[email protected] b/...ders/src/effects/assets/[email protected] → ...ects/src/effects/assets/[email protected]
diff --git a/docs/ch10-shaders/src/effects/assets/bug.jpg → docs/ch10-effects/src/effects/assets/bug.jpg b/docs/ch10-shaders/src/effects/assets/bug.jpg → docs/ch10-effects/src/effects/assets/bug.jpg
diff --git a/...-shaders/src/effects/assets/butterfly.png → ...-effects/src/effects/assets/butterfly.png b/...-shaders/src/effects/assets/butterfly.png → ...-effects/src/effects/assets/butterfly.png
diff --git a/...-shaders/src/effects/assets/coastline.jpg → ...-effects/src/effects/assets/coastline.jpg b/...-shaders/src/effects/assets/coastline.jpg → ...-effects/src/effects/assets/coastline.jpg
diff --git a/...h10-shaders/src/effects/assets/fabric.png → ...h10-effects/src/effects/assets/fabric.png b/...h10-shaders/src/effects/assets/fabric.png → ...h10-effects/src/effects/assets/fabric.png
diff --git a/...-shaders/src/effects/assets/[email protected] → ...-effects/src/effects/assets/[email protected] b/...-shaders/src/effects/assets/[email protected] → ...-effects/src/effects/assets/[email protected]
diff --git a/...shaders/src/effects/assets/lighthouse.jpg → ...effects/src/effects/assets/lighthouse.jpg b/...shaders/src/effects/assets/lighthouse.jpg → ...effects/src/effects/assets/lighthouse.jpg
diff --git a/...0-shaders/src/effects/assets/longroad.jpg → ...0-effects/src/effects/assets/longroad.jpg b/...0-shaders/src/effects/assets/longroad.jpg → ...0-effects/src/effects/assets/longroad.jpg
diff --git a/...h10-shaders/src/effects/assets/tulips.jpg → ...h10-effects/src/effects/assets/tulips.jpg b/...h10-shaders/src/effects/assets/tulips.jpg → ...h10-effects/src/effects/assets/tulips.jpg
diff --git a/.../ch10-shaders/src/effects/curtaindemo.qml → .../ch10-effects/src/effects/curtaindemo.qml b/.../ch10-shaders/src/effects/curtaindemo.qml → .../ch10-effects/src/effects/curtaindemo.qml
diff --git a/...h10-shaders/src/effects/defaultshader.qml → ...h10-effects/src/effects/defaultshader.qml b/...h10-shaders/src/effects/defaultshader.qml → ...h10-effects/src/effects/defaultshader.qml
diff --git a/...10-shaders/src/effects/effects.qmlproject → ...10-effects/src/effects/effects.qmlproject b/...10-shaders/src/effects/effects.qmlproject → ...10-effects/src/effects/effects.qmlproject
diff --git a/docs/ch10-shaders/src/effects/fastblur.qml → docs/ch10-effects/src/effects/fastblur.qml b/docs/ch10-shaders/src/effects/fastblur.qml → docs/ch10-effects/src/effects/fastblur.qml
diff --git a/docs/ch10-shaders/src/effects/genie.qml → docs/ch10-effects/src/effects/genie.qml b/docs/ch10-shaders/src/effects/genie.qml → docs/ch10-effects/src/effects/genie.qml
diff --git a/docs/ch10-shaders/src/effects/genie0.qml → docs/ch10-effects/src/effects/genie0.qml b/docs/ch10-shaders/src/effects/genie0.qml → docs/ch10-effects/src/effects/genie0.qml
diff --git a/docs/ch10-shaders/src/effects/genie1.qml → docs/ch10-effects/src/effects/genie1.qml b/docs/ch10-shaders/src/effects/genie1.qml → docs/ch10-effects/src/effects/genie1.qml
diff --git a/docs/ch10-shaders/src/effects/genie2.qml → docs/ch10-effects/src/effects/genie2.qml b/docs/ch10-shaders/src/effects/genie2.qml → docs/ch10-effects/src/effects/genie2.qml
diff --git a/docs/ch10-shaders/src/effects/genie3.qml → docs/ch10-effects/src/effects/genie3.qml b/docs/ch10-shaders/src/effects/genie3.qml → docs/ch10-effects/src/effects/genie3.qml
diff --git a/docs/ch10-shaders/src/effects/genie4.qml → docs/ch10-effects/src/effects/genie4.qml b/docs/ch10-shaders/src/effects/genie4.qml → docs/ch10-effects/src/effects/genie4.qml
diff --git a/docs/ch10-shaders/src/effects/geniedemo.qml → docs/ch10-effects/src/effects/geniedemo.qml b/docs/ch10-shaders/src/effects/geniedemo.qml → docs/ch10-effects/src/effects/geniedemo.qml
diff --git a/docs/ch10-shaders/src/effects/redlense1.qml → docs/ch10-effects/src/effects/redlense1.qml b/docs/ch10-shaders/src/effects/redlense1.qml → docs/ch10-effects/src/effects/redlense1.qml
diff --git a/docs/ch10-shaders/src/effects/redlense2.qml → docs/ch10-effects/src/effects/redlense2.qml b/docs/ch10-shaders/src/effects/redlense2.qml → docs/ch10-effects/src/effects/redlense2.qml
diff --git a/docs/ch10-shaders/src/effects/wave.qml → docs/ch10-effects/src/effects/wave.qml b/docs/ch10-shaders/src/effects/wave.qml → docs/ch10-effects/src/effects/wave.qml
diff --git a/docs/ch10-shaders/vertex-shader.md → docs/ch10-effects/vertex-shader.md b/docs/ch10-shaders/vertex-shader.md → docs/ch10-effects/vertex-shader.md
diff --git a/docs/ch10-shaders/wave-effect.md → docs/ch10-effects/wave-effect.md b/docs/ch10-shaders/wave-effect.md → docs/ch10-effects/wave-effect.md
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Placeholder

		This is a placeholder for a chapter on QML Shapes.