Merge pull request #31 from RSGL/main

ColleagueRiley · web-flow · commit a6b31dc25efc · 2025-10-21T22:06:53.000-04:00
update web examples
diff --git a/examples/Makefile b/examples/Makefile
@@ -60,8 +60,7 @@ else ifeq ($(CC),emcc)
 	LINK_GL1 = -s LEGACY_GL_EMULATION -D LEGACY_GL_EMULATION -sGL_UNSAFE_OPTS=0
 	LINK_GL3 = -s FULL_ES3
 	LINK_GL2 = -s FULL_ES2
-	# --preload-file logo.png@logo.png
-	PRELOAD = --embed-file logo.png
+	PRELOAD = --embed-file logo.png --embed-file COMICSANS.ttf
 	EXPORTED_JS = $(PRELOAD) -s EXPORTED_RUNTIME_METHODS="['stringToNewUTF8']"
 	LIBS = -s WASM=1 -s ASYNCIFY -s GL_SUPPORT_EXPLICIT_SWAP_CONTROL=1 $(EXPORTED_JS)
 	EXT = .js
diff --git a/examples/advanced/shader.c b/examples/advanced/shader.c
@@ -13,6 +13,7 @@
     this example is designed for Opengl 3.3 GLSL shaders
 */
 
+#ifndef __EMSCRIPTEN__
 static const char* MY_VShaderCode = RSGL_MULTILINE_STR(
     \x23version 330                     \n
     in vec3 vertexPosition;            \n
@@ -26,7 +27,6 @@ static const char* MY_VShaderCode = RSGL_MULTILINE_STR(
     uniform mat4 pv; \n
 
     uniform vec2 u_mouse;
-    uniform vec2 u_resolution;
 
     void main() {
         fragTexCoord = vertexTexCoord;
@@ -45,8 +45,56 @@ static const char* MY_FShaderCode = RSGL_MULTILINE_STR(
     uniform float u_time;
 
     uniform vec2 pos;
+
+    precision mediump float;
+    vec2 pitch  = vec2(50., 50.);
+
+    void main() {
+        vec2 uv = gl_FragCoord.xy / u_resolution.xy;
+        vec3 color = 0.5 + 0.5 * cos(u_time + uv.xyx + vec3(0, 2, 4));
+
+        if (mod(gl_FragCoord.x, pitch[0]) < 1. ||
+            mod(gl_FragCoord.y, pitch[1]) < 1.) {
+            gl_FragColor = vec4(color, 1.0);
+        } else {
+            gl_FragColor = vec4(0, 0, 0, 1);
+        }
+    }
+);
+#else
+static const char* MY_VShaderCode = RSGL_MULTILINE_STR(
+	\x23version 100                      \n
+    attribute  vec3 vertexPosition;            \n
+    attribute vec2 vertexTexCoord;            \n
+    attribute vec4 vertexColor;               \n
+    varying vec2 fragTexCoord;             \n
+    varying vec4 fragColor;                \n
+    varying vec4 position;                \n
+
+    uniform mat4 model; \n
+    uniform mat4 pv; \n
+
     uniform vec2 u_mouse;
 
+    void main() {
+        fragTexCoord = vertexTexCoord;
+        fragColor = vertexColor;
+        gl_Position = model * pv  * (vec4(vertexPosition, 1.0) + vec4(u_mouse.x, u_mouse.y, 0, 0));
+        position = gl_Position;
+    }
+);
+
+static const char* MY_FShaderCode = RSGL_MULTILINE_STR(
+	\x23version 100                      \n
+	precision mediump float;           \n
+
+    varying vec4 FragColor;
+
+    uniform vec2 u_resolution;
+    uniform float u_time;
+
+    uniform vec2 pos;
+
     precision mediump float;
     vec2 pitch  = vec2(50., 50.);
 
@@ -62,6 +110,7 @@ static const char* MY_FShaderCode = RSGL_MULTILINE_STR(
         }
     }
 );
+#endif
 
 int main(void) {
 	RGFW_glHints* hints = RGFW_getGlobalHints_OpenGL();
diff --git a/index.html b/index.html
@@ -52,7 +52,7 @@
         height: 100px;
         background: #555;
       }
-      
+
       .header h1 {
         position: relative;
         top: 18px;
@@ -61,8 +61,8 @@
 </style>
 </head>
 <body style="background-color:rgb(15, 25, 45);">
-    
- 
+
+
 	<div class="header">
     <img src="RSGL_logo.png" alt="RSGL logo">
     </div>
@@ -84,8 +84,8 @@ <h2>Shapes</h2>
         </a>
 
 
-        <a href="./webasm/basics_text.html" class="link-card">
-            <img src="webasm/basics_text.png" alt="Text Example">
+        <a href="./webasm/basics_rfont.html" class="link-card">
+            <img src="webasm/basics_rfont.png" alt="RFont Example">
             <h2>Text</h2>
         </a>
 
@@ -98,11 +98,6 @@ <h2>Textures</h2>
             <img src="webasm/advanced_shader.png" alt="Shader Example">
             <h2>Shader</h2>
         </a>
-
-        <a href="./webasm/advanced_rsoft.html" class="link-card">
-            <img src="webasm/advanced_rsoft.png" alt="RSoft Example">
-            <h2>RSoft</h2>
-        </a>
 	</div>
 </body>
 </html>
diff --git a/webasm/advanced_rsoft.html b/webasm/advanced_rsoft.html
diff --git a/webasm/basics_rfont.html b/webasm/basics_rfont.html
@@ -51,8 +51,8 @@
   <div class="header">
     <a href="../index.html"> <img src="../RSGL_logo.png" alt="RSGL logo"> </a>
     <h1>RSGL WebASM Example &nbsp;&nbsp;&nbsp;&nbsp;
-  
-    <a href="https://github.com/ColleagueRiley/RSGL/blob/main/examples/basics/text.c">Source Code</h4> </a>
+
+    <a href="https://github.com/ColleagueRiley/RSGL/blob/main/examples/basics/rfont.c">Source Code</h4> </a>
 
     </h1>
   </div>
@@ -64,7 +64,7 @@ <h1>RSGL WebASM Example &nbsp;&nbsp;&nbsp;&nbsp;
   </div>
 
 
-  <script src="../examples/basics/text.js"> </script>
+  <script src="../examples/basics/rfont.js"> </script>
 
   <div id="log"></div>
 
diff --git a/webasm/basics_rfont.png b/webasm/basics_rfont.png
