Completed integration

Author: opiepj

Makefile

@@ -3,21 +3,26 @@ SRCS = main.c
 
 FILES = $(addprefix src/, $(SRCS)) # Add 'src/' to each source
 OBJS = $(FILES:.c=.o) # Modify file extensions of FILES
-EOPT = USE_WEBGL2=1 FULL_ES3=1 USE_GLFW=3 WASM=1 SIDE_MODULE=1 # Emscripten specific options
+EOPT = USE_WEBGL2=1 FULL_ES3=1 USE_GLFW=3  # Emscripten specific options
 EOPTS = $(addprefix -s $(EMPTY), $(EOPT))	# Add '-s ' to each option
 
 # Builds necessary files
 build: $(OBJS)
 		mkdir build
 		mkdir app/wasm
-		$(CC) $(FILES) -O3 $(EOPTS) -o app/wasm/module.wasm
-		$(CC) src/counter.c -O3 $(EOPTS) -o app/wasm/counter.wasm
+		$(CC) $(FILES) -O3 $(EOPTS) -o app/wasm/module.js -s WASM=1 -Wall -s MODULARIZE=1
+		$(CC) src/counter.c -O3 $(EOPTS) -s SIDE_MODULE=1 -s WASM=1 -o app/wasm/counter.wasm
 		emcc src/engine.c -O3 -o app/wasm/engine.js -s WASM=1 -Wall -s MODULARIZE=1
 
 # O3 is is a optimization setting
 # WASM=1 means set web assembly to ture
+# SIDE_MODULE=1 will only produce a wasm file, you have to build out your own integration
 # MODULARIZE provides a ASM JS module we can interact with our client code, so we don't need to build any integration code from scratch
 
+# Test run
+test:
+		emcc src/main.c -O3 $(EOPTS) -o build/index.html -s WASM=1
+
 # Removes object files, but leaves build for serving
 dist: build
 		rm $(OBJS)

app/index.js

@@ -1,16 +1,18 @@
 import './style.scss';
 import { Counter } from './counter';
+import { OpenGLDemo } from "./opengl-demo";
 import Module from './wasm/engine.js'
 
 // Get Worker Thread
-const WorkerThread = require('worker-loader!./worker.js');
+// const WorkerThread = require('worker-loader!./worker.js');
 
 function main() {
   addHeader();
   const counter = new Counter();
-  const worker = new WorkerThread();
+  const demo = new OpenGLDemo();
   let module = Module({wasmBinaryFile: '/wasm/engine.wasm'});
-  handleWorkerThread(worker);
+  // const worker = new WorkerThread();
+  // handleWorkerThread(worker);
 }
 
 function addHeader() {

app/opengl-demo.js

@@ -1,21 +1,25 @@
-import ModuleWA from './wasm/module.wasm';
+import Module from './wasm/module.js'
 
 export class OpenGLDemo {
 
   module;
 
   constructor() {
+    this.insertCanvas();
     this.loadDemoWasm();
   }
 
+  /**
+   * Insert the canvas with id 'canvas' for GLFW to pick up
+   */
+  insertCanvas() {
+    document.querySelector('#app').insertAdjacentHTML('afterend', '<div id="opengl-demo"><canvas id="canvas"></canvas></div>');
+  }
+
   loadDemoWasm() {
-    this.module = new ModuleWA({
-      'env': {
-        'memoryBase': 0,
-        'tableBase': 0,
-        'memory': new WebAssembly.Memory({initial: 256}),
-        'table': new WebAssembly.Table({initial: 0, element: 'anyfunc'})
-      }
+    this.module = Module({
+      wasmBinaryFile: '/wasm/module.wasm',
+      canvas: document.getElementById('canvas')
     });
   }
 

app/wasm/module.js

@@ -192,7 +192,7 @@ static inline void mat4x4_rotate(mat4x4 R, mat4x4 M, float x, float y, float z,
   vec3 u = {x, y, z};
 
   if(vec3_len(u) > 1e-4) {
-    mat4x4 T, C, S = {0};
+    mat4x4 T, C, S = {};
 
     vec3_norm(u, u);
     mat4x4_from_vec3_mul_outer(T, u, u);

app/wasm/module.wasm

@@ -1,6 +1,6 @@
 #include "linmath.h"
 
-#include <emscripten/emscripten.h>
+#include <emscripten.h>
 
 #define GLFW_INCLUDE_ES3
 
@@ -41,10 +41,12 @@ static const char* fragment_shader_text =
     "    o_color = vec4(i_color, 1.0);\n"
     "}\n";
 
+EMSCRIPTEN_KEEPALIVE
 static void output_error(int error, const char* msg) {
   fprintf(stderr, "Error: %s\n", msg);
 }
 
+EMSCRIPTEN_KEEPALIVE
 static void generate_frame() {
   float ratio;
   int width, height;
@@ -65,6 +67,7 @@ static void generate_frame() {
   glfwPollEvents();
 }
 
+EMSCRIPTEN_KEEPALIVE
 static int check_compiled(shader) {
   GLint success = 0;
   glGetShaderiv(shader, GL_COMPILE_STATUS, &success);
@@ -83,6 +86,7 @@ static int check_compiled(shader) {
   return success;
 }
 
+EMSCRIPTEN_KEEPALIVE
 static int check_linked(program) {
   GLint success = 0;
   glGetProgramiv(program, GL_LINK_STATUS, &success);
@@ -100,8 +104,7 @@ static int check_linked(program) {
   return success;
 }
 
-extern void run();
-
+EMSCRIPTEN_KEEPALIVE
 int main() {
   glfwSetErrorCallback(output_error);