Merge remote-tracking branch 'origin/master'
This commit is contained in:
File diff suppressed because one or more lines are too long
@@ -24,20 +24,12 @@
|
||||
|
||||
| {% if children %}
|
||||
| {% for child in children %}
|
||||
| {% if child.properties.status == 'published' %}
|
||||
| {% if child.properties.status == 'published' or child.user == current_user.objectid %}
|
||||
|
||||
a.list-node-children-container(
|
||||
href="#",
|
||||
data-node_id="{{ child._id }}",
|
||||
class="item_icon {{child.node_type}} {% if child.picture %}thumbnail{% endif %}")
|
||||
.list-node-children-item-preview
|
||||
span.texture-name {{child.name}}
|
||||
| {% if child.picture %}
|
||||
img.texture-preview(
|
||||
src="",
|
||||
data-preview="{{ child.picture.thumbnail('m', api=api)}}",
|
||||
alt='{{child.name}}')
|
||||
| {% endif %}
|
||||
.list-node-children-item(class="{{child.node_type}}")
|
||||
.list-node-children-item-thumbnail
|
||||
| {% if child.picture %}
|
||||
@@ -77,9 +69,6 @@
|
||||
| {% endif %}
|
||||
| {% endif %}
|
||||
|
||||
.list-node-children-item-name
|
||||
span {{ child.name }}
|
||||
|
||||
| {% endif %}
|
||||
| {% endfor %}
|
||||
| {% else %}
|
||||
|
@@ -5,12 +5,13 @@
|
||||
section.node-preview
|
||||
| {% if node.picture %}
|
||||
iframe(
|
||||
id='vrview_window'
|
||||
width='100%',
|
||||
height='450px',
|
||||
scrolling='no',
|
||||
frameborder='0',
|
||||
allowfullscreen='',
|
||||
src="{{url_for('main.vrview', preview=node.picture.thumbnail('l', api=api), image=node.picture.thumbnail('h', api=api), is_stereo='false')}}")
|
||||
src="{{url_for('main.vrview', preview=node.picture.thumbnail('l', api=api), image=node.picture.thumbnail('h', api=api), default_yaw=(node.properties.default_yaw or 0))}}")
|
||||
| {% endif %}
|
||||
|
||||
section.node-details-container
|
||||
@@ -130,4 +131,3 @@ script.
|
||||
});
|
||||
|
||||
| {% endblock %}
|
||||
|
||||
|
@@ -13,4 +13,13 @@ html(lang='en')
|
||||
.wrap
|
||||
h1.title Error
|
||||
p.message An unknown error occurred.
|
||||
script(src="{{url_for('static_pillar', filename='assets/js/vrview-analytics.min.js')}}")
|
||||
script(src="{{url_for('static_pillar', filename='assets/vrview/three.min.js')}}")
|
||||
script(src="{{url_for('static_pillar', filename='assets/vrview/embed.min.js')}}")
|
||||
script.
|
||||
/** Returns the current yaw in degrees. */
|
||||
function yaw() {
|
||||
console.log('default yaw:', worldRenderer.sceneInfo.defaultYaw * 180 / Math.PI);
|
||||
console.log('camera rotation: ', worldRenderer.camera.rotation.y * 180 / Math.PI);
|
||||
var the_yaw = worldRenderer.sceneInfo.defaultYaw + worldRenderer.camera.rotation.y;
|
||||
return the_yaw * 180 / Math.PI;
|
||||
}
|
||||
|
Reference in New Issue
Block a user