Second approximation to modularization + compilation

luckylionheart · Aug 5, 2015 · e065e15 · e065e15
1 parent 0c44353
commit e065e15
Show file tree

Hide file tree

Showing 17 changed files with 179 additions and 1,005 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+src/libs/*.custom.js
diff --git a/KNOWN_BUGS b/KNOWN_BUGS
@@ -1,3 +1,6 @@
 Balls are rotated incorrectly while rendering
 Window resize doesn't work properly
 Atoms are neither translated nor recreated by symmetry
+CIF frames not supported
+Phonon visualization with tween.js temporarily dropped
+Labels temporarily dropped
diff --git a/README.md b/README.md
@@ -1,10 +1,10 @@
 Materials Informatics Player
 ======
 
-Browser-based renderer of the [crystallographic information files (CIF)](https://en.wikipedia.org/wiki/Crystallographic_Information_File) written in a pure javascript.
-Requires some web-server to run.
+Browser-based modular (though minimalistic) renderer of the [crystallographic information files (CIF)](https://en.wikipedia.org/wiki/Crystallographic_Information_File) written in a pure javascript.
+Requires some web-server (preferably, Python- or PHP-powered) to run.
 
-E.g. if Python available:
+E.g. for Python:
 ```shell
 python proxy.py 7777
 ```
@@ -14,8 +14,11 @@ Or using an internal web-server in PHP:
 php -S localhost:7777
 ```
 
-GUI is then accessible via the local address http://localhost:7777/ in the browser (or other address, depending on used server).
+GUI is then accessible in the browser via the [localhost address](http://localhost:7777) (or other address, depending on used server).
+See [online](https://tilde.pro/player.html).
+
+
 To display a local CIF file, drag and drop it inside the browser window.
-To display a CIF file on the web, paste its web address in the browser's address bar, after sharp (#) symbol and hit enter. (PHP or Python proxy for javascript requests should be then used.)
+To display a remote CIF file on the web, paste its web address in the browser's address bar, after sharp (#) symbol and hit enter. (PHP or Python proxy for remote requests should be then used.)
 
 Two external javascript libraries ([three.js](https://github.com/mrdoob/three.js) and [math.js](http://mathjs.org)) are embedded.
diff --git a/build.sh b/build.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+if [[! -d "three.js" ]]; then
+    sh prepare.sh
+fi
+
+cd src/js/app
+webpack --config build.config.js main.js ../../../player.dist.js
+cd ../../../
+java -jar three.js/utils/build/compiler/compiler.jar --jscomp_off checkTypes --language_in ECMASCRIPT5_STRICT --js player.dist.js --js_output_file player.min.js
+rm player.dist.js
+cp src/index.html index.html
+
+echo "Compiled successfully"
+
+exit 0
diff --git a/index.html b/index.html
@@ -20,11 +20,6 @@
 </style>
 </head>
 <body>
-<script type="text/javascript" src="js/deps/three.custom.min.js"></script>
-<!--script type="text/javascript" src="stats.min.js"></script-->
-<script type="text/javascript" src="js/deps/tween.min.js"></script>
-<script type="text/javascript" src="js/app/polyfills.js"></script>
-<script type="text/javascript" src="js/app/chemical_elements.js"></script>
 <script type="text/javascript" data-main="js/app/main" src="js/deps/require.js"></script>
 </body>
 </html>
diff --git a/js/app/build.config.js b/js/app/build.config.js
@@ -0,0 +1,12 @@
+var path = require('path');
+
+module.exports = {
+    resolve: {
+    root: path.resolve('.'),
+    extensions: ['', '.js'],
+    alias: {
+        'deps/math.custom': '../deps/math.custom',
+        'deps/three.custom': '../deps/three.custom'
+        }
+    }
+}
diff --git a/js/app/chemical_elements.js b/js/app/chemical_elements.js