summaryrefslogtreecommitdiff
path: root/frontend/_wasm
diff options
context:
space:
mode:
authorMatthew Kosarek <mattkae@protonmail.com>2021-03-22 20:54:51 -0400
committerMatthew Kosarek <mattkae@protonmail.com>2021-03-22 20:54:51 -0400
commitc36d05d5aed2f8f7c6342b174692146e2d11c386 (patch)
tree8e54047d7b6db7e3d21ccfad6b8c4965d42c09fa /frontend/_wasm
parentc29a911cd1a3f23f66478f205cace14487aadc56 (diff)
Refactored frontend, beginnings of general cpp layer, and beginning roadmap
Diffstat (limited to 'frontend/_wasm')
-rwxr-xr-xfrontend/_wasm/build.sh1
-rw-r--r--frontend/_wasm/intro/Shader.cpp (renamed from frontend/_wasm/Shader.cpp)0
-rw-r--r--frontend/_wasm/intro/Shader.h (renamed from frontend/_wasm/Shader.h)0
-rwxr-xr-xfrontend/_wasm/intro/build.sh1
-rw-r--r--frontend/_wasm/intro/dist/output.js (renamed from frontend/_wasm/output.js)0
-rwxr-xr-xfrontend/_wasm/intro/dist/output.wasm (renamed from frontend/_wasm/output.wasm)bin30239 -> 30239 bytes
-rw-r--r--frontend/_wasm/intro/intro.cpp (renamed from frontend/_wasm/wasm.cpp)2
-rw-r--r--frontend/_wasm/intro/intro.html (renamed from frontend/_wasm/intro.html)12
-rw-r--r--frontend/_wasm/intro/intro.js (renamed from frontend/_wasm/wasm.js)0
-rw-r--r--frontend/_wasm/intro/mathlib.h (renamed from frontend/_wasm/mathlib.h)0
10 files changed, 8 insertions, 8 deletions
diff --git a/frontend/_wasm/build.sh b/frontend/_wasm/build.sh
deleted file mode 100755
index 98bf2c4..0000000
--- a/frontend/_wasm/build.sh
+++ /dev/null
@@ -1 +0,0 @@
-emcc -o output.js wasm.cpp Shader.cpp -s ALLOW_MEMORY_GROWTH=1 -s USE_WEBGL2=1 -s FULL_ES3=1 -s WASM=1 -s NO_EXIT_RUNTIME=1 \ No newline at end of file
diff --git a/frontend/_wasm/Shader.cpp b/frontend/_wasm/intro/Shader.cpp
index 5f2b00e..5f2b00e 100644
--- a/frontend/_wasm/Shader.cpp
+++ b/frontend/_wasm/intro/Shader.cpp
diff --git a/frontend/_wasm/Shader.h b/frontend/_wasm/intro/Shader.h
index 6ee9981..6ee9981 100644
--- a/frontend/_wasm/Shader.h
+++ b/frontend/_wasm/intro/Shader.h
diff --git a/frontend/_wasm/intro/build.sh b/frontend/_wasm/intro/build.sh
new file mode 100755
index 0000000..3c82f7e
--- /dev/null
+++ b/frontend/_wasm/intro/build.sh
@@ -0,0 +1 @@
+emcc -o dist/output.js intro.cpp Shader.cpp -s ALLOW_MEMORY_GROWTH=1 -s USE_WEBGL2=1 -s FULL_ES3=1 -s WASM=1 -s NO_EXIT_RUNTIME=1
diff --git a/frontend/_wasm/output.js b/frontend/_wasm/intro/dist/output.js
index 6043271..6043271 100644
--- a/frontend/_wasm/output.js
+++ b/frontend/_wasm/intro/dist/output.js
diff --git a/frontend/_wasm/output.wasm b/frontend/_wasm/intro/dist/output.wasm
index 8f520dc..8f520dc 100755
--- a/frontend/_wasm/output.wasm
+++ b/frontend/_wasm/intro/dist/output.wasm
Binary files differ
diff --git a/frontend/_wasm/wasm.cpp b/frontend/_wasm/intro/intro.cpp
index 254a5e2..63c80ef 100644
--- a/frontend/_wasm/wasm.cpp
+++ b/frontend/_wasm/intro/intro.cpp
@@ -127,7 +127,7 @@ int main() {
{
attrs.majorVersion = 1;
context = emscripten_webgl_create_context( "#wasm_canvas", &attrs );
- if (context) printf("Skipping test: WebGL 2.0 is not available.\n");
+ if (context) printf("Skipping test: WebGL 3.0 is not available.\n");
else printf("Test failed: WebGL is not available!\n");
return 0;
}
diff --git a/frontend/_wasm/intro.html b/frontend/_wasm/intro/intro.html
index 9b0d6d5..92a6ea8 100644
--- a/frontend/_wasm/intro.html
+++ b/frontend/_wasm/intro/intro.html
@@ -2,12 +2,12 @@
<html lang="en">
<head>
<meta charset="utf-8">
- <script src="../../scripts/jquery-3.5.1.min.js"></script>
- <script src="../../index.js"></script>
- <script src="wasm.js"></script>
- <script src="output.js"></script>
- <link rel="stylesheet" href="../../index.css">
- <link rel="shortcut icon" href="../../favicon/favicon.ico" type="image/x-icon">
+ <script src="/scripts/jquery-3.5.1.min.js"></script>
+ <script src="/index.js"></script>
+ <script src="intro.js"></script>
+ <script src="dist/output.js"></script>
+ <link rel="stylesheet" href="/index.css">
+ <link rel="shortcut icon" href="/favicon/favicon.ico" type="image/x-icon">
<title>Physics for Games</title>
</head>
diff --git a/frontend/_wasm/wasm.js b/frontend/_wasm/intro/intro.js
index 37d5faf..37d5faf 100644
--- a/frontend/_wasm/wasm.js
+++ b/frontend/_wasm/intro/intro.js
diff --git a/frontend/_wasm/mathlib.h b/frontend/_wasm/intro/mathlib.h
index 93ddbbd..93ddbbd 100644
--- a/frontend/_wasm/mathlib.h
+++ b/frontend/_wasm/intro/mathlib.h