diff options
| -rw-r--r-- | photoblaster/server.py | 4 | ||||
| -rw-r--r-- | run_server.py | 2 | ||||
| -rw-r--r-- | share/frontend/imlandscape/js/3D_Landscape.js | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/photoblaster/server.py b/photoblaster/server.py index 1205854..1b98ad0 100644 --- a/photoblaster/server.py +++ b/photoblaster/server.py @@ -268,8 +268,8 @@ class Server(object): sys.stderr.write(str(request_form)) raise e - def run(self, host=SERVER_HOST, port=SERVER_PORT): - self.app.run(host=host, port=port, debug=True) + def run(self, host=SERVER_HOST, port=SERVER_PORT, **kwargs): + self.app.run(host=host, port=port, debug=True, **kwargs) def run_wsgi(self, server_port=SERVER_PORT, host=SERVER_HOST): # http://fgimian.github.io/blog/2012/12/08/setting-up-a-rock-solid-python-development-web-server/ diff --git a/run_server.py b/run_server.py index 2e0a3c1..32c714b 100644 --- a/run_server.py +++ b/run_server.py @@ -24,6 +24,6 @@ if __name__ == "__main__": "ERROR:\n" "you must start nginx to serve static content\n") sys.exit(1) - server.run() + server.run(threaded=True) else: server.run_wsgi() diff --git a/share/frontend/imlandscape/js/3D_Landscape.js b/share/frontend/imlandscape/js/3D_Landscape.js index 411bfe7..7431bcd 100644 --- a/share/frontend/imlandscape/js/3D_Landscape.js +++ b/share/frontend/imlandscape/js/3D_Landscape.js @@ -31,7 +31,8 @@ function initGraphics(textureFile, heightmapFile, cb) { //Get heightmap data
//Generates the heightmap data from the heightmap image
- var size = worldWidth * worldDepth, data = new Float32Array(size);
+ var size = worldWidth * worldDepth
+ var data = new Float32Array(size);
var canvas = document.createElement('canvas');
canvas.width = worldWidth;
|