Modify worker and move C code (for C++ migration) remove wasm builds

Author: opiepj

Makefile

@@ -1,7 +1,7 @@
 CC = emcc
 SRCS = main.c
 
-FILES = $(addprefix src/, $(SRCS)) # Add 'src/' to each source
+FILES = $(addprefix src/c/, $(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  # Emscripten specific options
 EOPTS = $(addprefix -s $(EMPTY), $(EOPT))	# Add '-s ' to each option
@@ -11,8 +11,8 @@ build: $(OBJS)
 		mkdir build
 		mkdir app/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
+		$(CC) src/c/counter.c -O3 $(EOPTS) -s SIDE_MODULE=1 -s WASM=1 -o app/wasm/counter.wasm
+		emcc src/c/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
@@ -21,7 +21,7 @@ build: $(OBJS)
 
 # Test run
 test:
-		emcc src/main.c -O3 $(EOPTS) -o build/index.html -s WASM=1
+		emcc src/c/main.c -O3 $(EOPTS) -o build/index.html -s WASM=1
 
 # Removes object files, but leaves build for serving
 dist: build

app/engine.js

@@ -0,0 +1,18 @@
+import Module from './wasm/engine.js'
+
+export class Engine {
+
+  module;
+
+  constructor() {
+    this.loadDemoWasm();
+  }
+
+  loadDemoWasm() {
+    this.module = Module({
+      wasmBinaryFile: '/wasm/engine.wasm',
+    });
+  }
+
+}
+

app/index.js

@@ -1,7 +1,6 @@
 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');
@@ -10,7 +9,6 @@ function main() {
   addHeader();
   const counter = new Counter();
   const demo = new OpenGLDemo();
-  let module = Module({wasmBinaryFile: '/wasm/engine.wasm'});
   // const worker = new WorkerThread();
   // handleWorkerThread(worker);
 }

app/wasm/counter.wasm

@@ -1,5 +1,3 @@
-import { OpenGLDemo } from './opengl-demo';
-
 // Post data to parent thread
 postMessage({foo: 'foo'});
 
@@ -8,7 +6,6 @@ onmessage = (event) => {
 };
 
 function main() {
-  const demo = new OpenGLDemo();
 }
 
 main();

app/wasm/engine.js

@@ -15,7 +15,7 @@
     "type": "git",
     "url": "git+https://github.com/1337programming/WebAssemblyOpenGL.git"
   },
-  "author": "Patrick Opie <opiepj@plu.edu>",
+  "author": "Patrick Opie <opiepat@gmail.com>",
   "license": "ISC",
   "bugs": {
     "url": "https://github.com/1337programming/WebAssemblyOpenGL/issues"