Corrected template duplication
This commit is contained in:
parent
50c7845c99
commit
a8c2deb560
|
@ -3,7 +3,8 @@ module.exports.index = function(req, res) {
|
||||||
res.locals.session = null;
|
res.locals.session = null;
|
||||||
res.setHeader('Content-Type', 'text/html');
|
res.setHeader('Content-Type', 'text/html');
|
||||||
|
|
||||||
res.render('index.jade', res.locals, function(err, out) {
|
res.render('../../index/views/index.jade', res.locals, function(err, out) {
|
||||||
|
console.log(err);
|
||||||
res.send(out);
|
res.send(out);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,38 +0,0 @@
|
||||||
extends ../../../views/main
|
|
||||||
|
|
||||||
block title
|
|
||||||
title #{title} - Index
|
|
||||||
|
|
||||||
block content
|
|
||||||
h2 Index
|
|
||||||
ul
|
|
||||||
li
|
|
||||||
a(href="#{urls.bouncing}") A bouncing cube that jumps when you click on it
|
|
||||||
p.
|
|
||||||
Jumps and bounce when you click on it.
|
|
||||||
|
|
||||||
li
|
|
||||||
a(href="#{urls.multisphere}") Sphere with multi-resolution
|
|
||||||
p.
|
|
||||||
Lots of obj files loaded and displayed. When you click
|
|
||||||
somewhere, the current obj is hidden and the next one, with a
|
|
||||||
better resolution is shown.
|
|
||||||
|
|
||||||
li
|
|
||||||
a(href="#{urls.prototype}") A proto of the real thing
|
|
||||||
p.
|
|
||||||
You can move the camera with the arrow keys and move the angle of
|
|
||||||
the camera with 2, 4, 6 and 8 (the arrows of the numpad), or you
|
|
||||||
can do a drag-and-drop like (click on the mouse to grap the scene,
|
|
||||||
and move the mouse to rotate the camera). You can also select a
|
|
||||||
camera by clicking on the red part of it, and get back to the free
|
|
||||||
camera by clicking again. You can also select a camera by simply
|
|
||||||
clicking on the object you want to see. The program will choose the
|
|
||||||
camera that you want, and move to it progressively.
|
|
||||||
|
|
||||||
li
|
|
||||||
a(href="#{urls.stream}") Streaming simulation
|
|
||||||
p.
|
|
||||||
A mesh of a sphere is fully loaded, and displayed
|
|
||||||
progressively. This test is here to prove that we can
|
|
||||||
dynamically add vertices and faces to a mesh.
|
|
Loading…
Reference in New Issue