diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-08-29 22:42:43 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-08-29 22:42:43 -0400 |
| commit | b399eac505b15ae1a36e7b257fda2338611c8a98 (patch) | |
| tree | 402ea608c692668f05a31094fe02f6ec9dfb3543 /public/assets/javascripts/ui/reader/ReaderView.js | |
| parent | 01755335859b19756f6d64a2f8a10ae98abceb5f (diff) | |
| parent | ee1a3043f286f226a7bff690ed258d92fc9d2882 (diff) | |
merge
Diffstat (limited to 'public/assets/javascripts/ui/reader/ReaderView.js')
| -rw-r--r-- | public/assets/javascripts/ui/reader/ReaderView.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/public/assets/javascripts/ui/reader/ReaderView.js b/public/assets/javascripts/ui/reader/ReaderView.js index 9d38daa..d80f225 100644 --- a/public/assets/javascripts/ui/reader/ReaderView.js +++ b/public/assets/javascripts/ui/reader/ReaderView.js @@ -26,9 +26,16 @@ var ReaderView = View.extend({ $("#map").hide() data.rooms && Rooms.deserialize(data.rooms) + data.walls && Walls.deserialize(data.walls) data.media && Scenery.deserialize(data.media) data.startPosition && scene.camera.move(data.startPosition) + var colors = data.colors || app.defaults.colors + var modes = [ "wall", "outline", "floor", "ceiling" ] + modes.forEach(function(mode){ + Walls.setColor[mode](colors[mode]) + }) + editor.permissions.clear() this.listen() |
