Fix issues with missing preview pictures in webpage generator

Author: GeertArien

fips-files/verbs/webpage.py

@@ -18,7 +18,7 @@
         ]],
         [ 'Hello Triangle', 'https://learnopengl.com/Getting-started/Hello-Triangle', '1-4-hello-triangle', [
             [ 'triangle', '1-4-1-triangle', '1-triangle.c', '1-triangle.glsl'],
-            [ 'quad', '1-4-2-quad', '2-quad.c', '1-quad.glsl'],
+            [ 'quad', '1-4-2-quad', '2-quad.c', '2-quad.glsl'],
             [ 'quad-wireframe', '1-4-3-quad-wireframe', '3-quad-wireframe.c', '3-quad-wireframe.glsl']
         ]],
         [ 'Shaders', 'https://learnopengl.com/Getting-started/Shaders', '1-5-shaders', [
@@ -85,7 +85,7 @@
             [ 'depth-always', '4-1-1-depth-always', '1-depth-always.c', '1-depth-always.glsl'],
             [ 'depth-less', '4-1-2-depth-less', '2-depth-less.c', '2-depth-less.glsl'],
             [ 'depth-buffer', '4-1-3-depth-buffer', '3-depth-buffer.c', '3-depth-buffer.glsl'],
-            [ 'linear-depth-buffer', '4-1-4-linear-depth-buffer', '2-linear-depth-buffer.c', '2-linear-depth-buffer.glsl']
+            [ 'linear-depth-buffer', '4-1-4-linear-depth-buffer', '4-linear-depth-buffer.c', '4-linear-depth-buffer.glsl']
         ]],
         [ 'Stencil Testing', 'https://learnopengl.com/Advanced-OpenGL/Stencil-testing', '4-2-stencil-testing', [
             [ 'object-outlining', '4-2-1-object-outlining', '1-object-outlining.c', '1-object-outlining.glsl'],
@@ -150,7 +150,7 @@
         ]],
         [ 'Point Shadows', 'https://learnopengl.com/Advanced-Lighting/Shadows/Point-Shadows', '5-4-point-shadows', [
             [ 'omnidirectional-depth', '5-4-1-omnidirectional-depth', '1-omnidirectional-depth.c', '1-omnidirectional-depth.glsl'],
-            [ 'omnidirectional-shadows', '5-4-2-omnidirectional-shadows', '2-omnidirectional-shadows.c', '2-omnidirectional-shadows.glsl'],
+            [ 'omnidir-shadows', '5-4-2-omnidirectional-shadows', '2-omnidirectional-shadows.c', '2-omnidirectional-shadows.glsl'],
             [ 'omnidirectional-PCF', '5-4-3-omnidirectional-PCF', '3-omnidirectional-PCF.c', '3-omnidirectional-PCF.glsl'],
         ]],
         [ 'Normal Mapping', 'https://learnopengl.com/Advanced-Lighting/Normal-Mapping', '5-5-normal-mapping', [

src/4-10-instancing/1-instancing.c

@@ -4,10 +4,10 @@
 #include "sokol_app.h"
 #include "sokol_gfx.h"
 #include "sokol_glue.h"
-#define HANDMADE_MATH_IMPLEMENTATION
-#define HANDMADE_MATH_NO_SSE
 #include "../libs/hmm/HandmadeMath.h"
 #include "1-instancing.glsl.h"
+#define LOPGL_APP_IMPL
+#include "../lopgl_app.h"
 #include "string.h"
 
 /* application state */
@@ -19,10 +19,12 @@ static struct {
 } state;
 
 static void init(void) {
-    // TODO: use lopgl_app ?
-    sg_setup(&(sg_desc){
-        .context = sapp_sgcontext()
-    });
+    lopgl_setup();
+
+    if (sapp_gles2()) {
+        /* this demo needs GLES3/WebGL because we are using gl_InstanceID in the shader */
+        return;
+    }
 
     /* create shader from code-generated sg_shader_desc */
     sg_shader shd = sg_make_shader(simple_shader_desc());
@@ -72,6 +74,12 @@ static void init(void) {
 }
 
 void frame(void) {
+    /* can't do anything useful on GLES2/WebGL */
+    if (sapp_gles2()) {
+        lopgl_render_gles2_fallback();
+        return;
+    }
+
     sg_begin_default_pass(&state.pass_action, sapp_width(), sapp_height());
     sg_apply_pipeline(state.pip);
     sg_apply_bindings(&state.bind);
@@ -106,7 +114,6 @@ sapp_desc sokol_main(int argc, char* argv[]) {
         .event_cb = event,
         .width = 800,
         .height = 600,
-        .gl_force_gles2 = true,
         .window_title = "Instancing (LearnOpenGL)",
     };
 }

src/4-10-instancing/2-instanced-arrays.c

@@ -4,10 +4,10 @@
 #include "sokol_app.h"
 #include "sokol_gfx.h"
 #include "sokol_glue.h"
-#define HANDMADE_MATH_IMPLEMENTATION
-#define HANDMADE_MATH_NO_SSE
 #include "../libs/hmm/HandmadeMath.h"
 #include "2-instanced-arrays.glsl.h"
+#define LOPGL_APP_IMPL
+#include "../lopgl_app.h"
 #include "string.h"
 
 /* application state */
@@ -18,10 +18,12 @@ static struct {
 } state;
 
 static void init(void) {
-    // TODO: use lopgl_app ?
-    sg_setup(&(sg_desc){
-        .context = sapp_sgcontext()
-    });
+    lopgl_setup();
+    
+    if (sapp_gles2()) {
+        /* this demo needs GLES3/WebGL because we are using gl_InstanceID in the shader */
+        return;
+    }
 
     /* create shader from code-generated sg_shader_desc */
     sg_shader shd = sg_make_shader(simple_shader_desc());
@@ -82,6 +84,12 @@ static void init(void) {
 }
 
 void frame(void) {
+    /* can't do anything useful on GLES2/WebGL */
+    if (sapp_gles2()) {
+        lopgl_render_gles2_fallback();
+        return;
+    }
+
     sg_begin_default_pass(&state.pass_action, sapp_width(), sapp_height());
     sg_apply_pipeline(state.pip);
     sg_apply_bindings(&state.bind);
@@ -110,7 +118,6 @@ sapp_desc sokol_main(int argc, char* argv[]) {
         .event_cb = event,
         .width = 800,
         .height = 600,
-        .gl_force_gles2 = true,
         .window_title = "Instanced Arrays (LearnOpenGL)",
     };
 }