diff --git a/controllers/prototype/index.js b/controllers/prototype/index.js index 7f2db59..1047287 100644 --- a/controllers/prototype/index.js +++ b/controllers/prototype/index.js @@ -88,6 +88,14 @@ module.exports.arrows = protoHelper('prototype_arrows.jade'); module.exports.viewports = protoHelper('prototype_viewports.jade'); module.exports.reverse = protoHelper('prototype_reverse.jade'); +module.exports.sponza = function(req, res) { + res.setHeader('Content-Type', 'text/html'); + + res.render('sponza.jade', res.locals, function(err, result) { + res.send(result); + }); +} + module.exports.replay_info = function(req, res) { res.setHeader('Content-Type', 'text/plain'); diff --git a/controllers/prototype/urls.js b/controllers/prototype/urls.js index 25f84df..6c7399a 100644 --- a/controllers/prototype/urls.js +++ b/controllers/prototype/urls.js @@ -6,5 +6,6 @@ module.exports = { '/prototype/replay': 'replay_index', '/prototype/replay/:id': 'replay', '/prototype/replay_info/:id': 'replay_info', - '/prototype/tutorial': 'tutorial' + '/prototype/tutorial': 'tutorial', + '/prototype/sponza': 'sponza' } diff --git a/controllers/prototype/views/sponza.jade b/controllers/prototype/views/sponza.jade new file mode 100644 index 0000000..40dd646 --- /dev/null +++ b/controllers/prototype/views/sponza.jade @@ -0,0 +1,17 @@ +extends ./prototype_interactive + +block title + title #{title} - Prototype - Arrows + +block mainjs + script(src="/static/js/sponza.min.js") + +block configjs + script RecommendedCamera = FixedCamera; + +//-block preciseDescription + p + | Recommended views are displayed with a + | transparent blue arrow. They disappear when you + | come closer to them, and shows the motion between + | your current position and the recommendation. diff --git a/js/Makefile b/js/Makefile index ff87c0a..9bfa743 100644 --- a/js/Makefile +++ b/js/Makefile @@ -6,7 +6,7 @@ else CLOSURE=./compiler.sh endif -all: List ListTest Socket Three Stats ThreeTools Bouncing Multisphere StreamingSimulator PrototypeTools PrototypeReplay PrototypeInteractive Tutorial +all: List ListTest Socket Three Stats ThreeTools Bouncing Multisphere StreamingSimulator PrototypeTools PrototypeReplay PrototypeInteractive Tutorial Sponza Socket: cp socket.io/socket.io.min.js ../static/js @@ -104,5 +104,10 @@ Tutorial: --js prototype/tutorial.js \ --js_output_file ../static/js/tutorial.min.js +Sponza: + $(CLOSURE) $(OPT) \ + --js prototype/sponza.js \ + --js_output_file ../static/js/sponza.min.js + clean: rm -rf ../static/js/*