Commit b6cb51de authored by Gunjan Yadu's avatar Gunjan Yadu
Browse files

Merge branch 'emscripten' of https://git.purrdata.net/jwilkes/purr-data into emscripten

parents b27e67da 0c9f7b5b
......@@ -12,4 +12,7 @@ main.wasm
# ignore copied files
components/dialogs/dialogs_*.html
css/*.css
\ No newline at end of file
css/*.css
# ignore build files
dist/
......@@ -19,7 +19,7 @@ This document describes the work that was done under [Google Summer of Code 2020
[Purr Data](https://agraef.github.io/purr-data/) serves the same purpose, but offers a new and much improved graphical user interface and includes many 3rd party plug-ins. Like Pd, it runs on Linux, macOS and Windows, and is open-source throughout.
The goal of this project is to make the Purr Data run in a web browser so it can be more accessible to users and make their work more easily shared with other people.
The goal of this project is to make the graphical programming environment Purr Data run in a web browser so it can be more accessible to users.
You can try the current version from https://cuinjune-purr-data.glitch.me/
......@@ -28,7 +28,7 @@ You can try the current version from https://cuinjune-purr-data.glitch.me/
- The frontend part of the software has been mainly done by Hugo Carvalho (hugonvsc@gmail.com)
## Accomplished Milestones
- Modified native Purr Data and libpd codebase to make them compatible with [Emscripten](https://emscripten.org/). (Zack)
- Modified the native Purr Data and libpd codebase to make them compatible with [Emscripten](https://emscripten.org/). (Zack)
- Modified and created Makefile to build for Emscripten and to generate WebAssembly(`.wasm`) binaries for external libraries. (Zack)
- Cleaned the backend codebase and organized the file system so the project can be easily maintained. (Zack)
- Modified the existing NW.js based source code to make them compatible with web browsers. (Hugo)
......@@ -56,9 +56,6 @@ git pull
./emsdk install latest
./emsdk activate latest
source ./emsdk_env.sh
./emsdk update-tags
./emsdk install tot
./emsdk activate tot
cd ..
```
......@@ -106,15 +103,15 @@ Method 2
- Fix or disable some of the global menu items not working.
- Fix graphical arrays being opened if the patch font size changes.
- Ask for saving the patch when the user closes an edited patch.
- Make the GUI(e.g. bang, toggle) property dialog window work.
- Make the dialog windows(e.g. property, text) appear in the right side of the patch instead of the left side bar.
- Make the GUI (e.g. bang, toggle) property dialog window work.
- Make the dialog windows (e.g. property, text) appear in the right side of the patch instead of the left side bar.
- Merge patch menu into the global menu and make it work depending on the focus of patches.
- Style the patch window menu bar so it can show the focus state and add some buttons (e.g. close) for convenience.
- Make the patch window resizable by dragging its border.
- Make the patch window rearrangeable by dragging its menu bar.
- Improve the file manager so the files/folders can be added/renamed/deleted.
- Clean the frontend codebase and organize the file system.
- Make the work storable and sharable between users.
- Make the work storable and shareable between users.
## Reporting Bugs
If you find any bugs, please let us know. You can contact using the [mailing list](http://disis.music.vt.edu/listinfo/l2ork-dev) or create an [issue](https://git.purrdata.net/jwilkes/purr-data/-/issues).
......@@ -7,10 +7,11 @@
<meta name="description" content="Purr Data compiled for web with Emscripten" />
<meta name="keywords" content="purr-data" />
<meta name="generator" content="emsripten" />
<link rel="stylesheet" type="text/css" href="./css/dejavu.css">
<link id="page_style" rel="stylesheet" type="text/css" href="./css/default.css">
<link rel="stylesheet" type="text/css" href="./css/webapp/webapp.css">
<link rel="stylesheet" href="libs/bootstrap/bootstrap.4.5.0.min.css">
</head>
<body id="container">
......@@ -40,13 +41,13 @@
<div class="card" id="sidebar">
<div class="card-body text-center" id="sidebar-body">
<div id="pd-info">
<img src="https://agraef.github.io/purr-data-intro/purr.png">
<img src="https://agraef.github.io/purr-data-intro/purr.png" alt="purr-data-logo">
<h4>Purr Data</h4>
</div>
<hr>
<div id="sidebar-body-dialog"></div>
<hr>
<div class="d-flex">
<div class="d-flex ml-3">
<i class="fa fa fa-volume-up text-primary" aria-hidden="true"></i>
<h5>DSP</h5>
<label class="dsp_toggle">
......@@ -57,7 +58,7 @@
</div>
<hr>
<div>
<div class="d-flex">
<div class="d-flex ml-3">
<i class="fa fa-folder-open-o text-primary" aria-hidden="true"></i>
<h5>Files</h5>
<i class="fa fa-refresh ml-auto text-primary" id="reload-i" aria-hidden="true"
......@@ -553,8 +554,6 @@
<!-- Bootstrap -->
<link rel="stylesheet" href="libs/bootstrap/bootstrap.4.5.0.min.css">
<script src="libs/bootstrap/popper.1.16.0.min.js"></script>
<script src="libs/bootstrap/bootstrap.4.5.0.min.js"></script>
......@@ -567,4 +566,4 @@
</script>
</body>
</html>
\ No newline at end of file
</html>
{
"name": "pd-webapp",
"version": "1.0.0",
"scripts" : {
"start" : "serve",
"build" : "browserify -i nw.gui --s pdbundle browserify_entries.js -o dist/bundle.js"
"scripts": {
"start": "serve",
"build": "browserify -i nw.gui --s pdbundle browserify_entries.js -o dist/bundle.js"
},
"devDependencies": {
"browserify": "^16.5.2",
"browserify": "^17.0.0",
"serve": "^11.3.2"
}
}
......@@ -103,7 +103,7 @@ body {
}
.dsp_toggle input:checked + span {
box-shadow: inset 0 0 0 0.73em #4cd964;
box-shadow: inset 0 0 0 0.73em blue;
}
.dsp_toggle input:checked + span:after {
......@@ -128,7 +128,7 @@ body {
}
.dsp_toggle input:focus:checked + span {
box-shadow: inset 0 0 0 0.73em #33be4b;
box-shadow: inset 0 0 0 0.73em blue;
}
/* reset accessibility style on hover */
......@@ -144,7 +144,7 @@ body {
}
.dsp_toggle:hover input:focus:checked + span {
box-shadow: inset 0 0 0 0.73em #4cd964;
box-shadow: inset 0 0 0 0.73em blue;
}
#printout {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment