Commit 169c1840 authored by frankie's avatar frankie 💬

adjustements on archive scripts for kiosk mode + sync of latest cubes

parent a8ad5625
......@@ -579,8 +579,12 @@ function render() {
if ( menu_close_timer > 0 ) {
menu_close_timer -= delta;
if ( menu_close_timer <= 0 && !mainmenu_visible() ) {
goto_mainmenu();
if ( menu_close_timer <= 0 && !menu_visible() ) {
if ( cube === undefined || !cube.ready ) {
gallery_item_click( parseInt( Math.random() * sisyphus_cubes_library.length - 1 ) );
} else {
goto_mainmenu();
}
}
}
......@@ -756,7 +760,7 @@ function on_cube_listing_loaded( e ) {
}
function mainmenu_visible() {
function menu_visible() {
return document.getElementById( 'ui_3d' ).style.visible == 'visible';
......
......@@ -55,20 +55,14 @@
<div id="container"></div>
<!-- UI -->
<div id="splash">
<div class="splash_bg">
<div class="splash_title">
<h1>Sisyphus</h1>
</div>
<div class="splash_bg">
<div class="splash_title">
<h1>Sisyphus</h1>
</div>
</div>
</div>
<!-- <div id="question">
<canvas id="question_canvas"></canvas>
<div id="question_link"><a href="javascript:question_ok()">OK</a></div>
</div> -->
<div id="ui_3d" class="menu_opening">
<div class="goto_about">
<button onclick="javascript:goto_about()">about</button>
......@@ -107,31 +101,38 @@
</div>
</div>
<div id="inventory_preview">
<div id="inventory_panel">
<div id="inventory_panel_about" class="goto_about">
<button onclick="javascript:goto_about()">about</button>
</div>
<div id="inventory_panel_back" class="goto_back_right">
<button onclick="javascript:goto_mainmenu()">X</button>
</div>
<div id="inventory_list" class="panel_content" style="background-image:url('textures/checkboard.png')">
<!-- <div class="chair">
<img src="textures/chair-big.png"/><br/>
<div>14/05/18<br/>Production 23:46</div>
</div>
<div class="chair">
<img src="textures/chair-big.png"/><br/>
<div>14/05/18<br/>Production 23:46</div>
</div> -->
<div id="inventory_list" class="panel_content">
</div>
<div id="inventory_info"><!-- <div><span>TEXT</span></div> --></div>
</div>
<div id="timeline">
<div id="production_duration">time info</div>
<div id="range_area">
<input id="timeline_range" type="range" min="0" max="100" step="0.001" value="0" data-rangeSlider/>
</div>
<div id="duration">time info</div>
<div id="model_info">blah blah</div>
</div>
<div id="model_loading">
<img id="loading_img" src="">
<div class="description">
<p id="loading_name">loading chair</p>
</div>
</div>
<script src="js/kiosk.js"></script>
<!-- range slider -->
<script src="js/slider/range-slider.js"></script>
<!-- three.js includes -->
<script src="build/three.js"></script>
<script src="js/threejs/objects/Sky.js"></script>
......@@ -165,11 +166,12 @@
<script src="js/SysiphusBone.js"></script>
<script src="js/SysiphusAvatar.js"></script>
<script src="js/PantonPouf.js"></script>
<script src="js/Cube.js"></script>
<script src="js/TimeManager.js"></script>
<script src="js/ObjectTracker.js"></script>
<!-- letś start the app -->
<script src="js/main.js"></script>
<script src="js/main_avatar_only.js"></script>
</body>
</html>
This diff is collapsed.
......@@ -58,13 +58,14 @@ export_files = [
'js/ObjectTracker.js',
'js/main.js'
],
'html_dst': 'index.html',
'html_dst': 'production.html',
'js_dst': 'sisyphus_prod_#.js'
},
{
'html_tmpl': 'template.html',
'html_tmpl': 'template_archive.html',
'js_src' : [
'js/kiosk.js',
'js/slider/range-slider.js',
'js/utils/Basics.js',
'js/utils/Interpolation.js',
'js/utils/MorphableMesh.js',
......@@ -72,10 +73,10 @@ export_files = [
'js/BoneScalePreset.js',
'js/SysiphusBone.js',
'js/SysiphusAvatar.js',
'js/PantonPouf.js',
'js/Cube.js',
'js/TimeManager.js',
'js/ObjectTracker.js',
'js/main.js'
'js/main_avatar_only.js'
],
'html_dst': 'kiosk.html',
'js_dst': 'sisyphus_kiosk_#.js'
......@@ -96,7 +97,7 @@ export_files = [
'js/ObjectTracker.js',
'js/main_avatar_only.js'
],
'html_dst': 'archive.html',
'html_dst': 'index.html',
'js_dst': 'sisyphus_archive_#.js'
}
]
......@@ -148,7 +149,7 @@ copy_dirs = [
create_dir = []
copy_files = [
['README.md'],
['LICENSE'],
['LICENSE.md'],
['server/.htaccess','.htaccess']
]
......
crash4|19/11/18|0-9-35-55
\ No newline at end of file
crash5|20/11/18|0-3-41-33
\ No newline at end of file
crash6|20/11/18|0-3-0-5
\ No newline at end of file
crash7|20/11/18|0-3-0-7
\ No newline at end of file
crash1|20/11/18|0-3-0-4
\ No newline at end of file
crash2|20/11/18|0-3-0-2
\ No newline at end of file
crash3|20/11/18|0-3-0-7
\ No newline at end of file
crash4|20/11/18|0-3-0-5
\ No newline at end of file
crash5|21/11/18|0-3-0-16
\ No newline at end of file
crash6|21/11/18|0-3-0-0
\ No newline at end of file
crash7|21/11/18|0-8-29-12
\ No newline at end of file
crash1|21/11/18|0-3-0-1
\ No newline at end of file
crash2|21/11/18|0-12-21-0
\ No newline at end of file
crash3|22/11/18|0-3-0-0
\ No newline at end of file
crash4|22/11/18|0-3-0-1
\ No newline at end of file
crash5|22/11/18|0-3-0-2
\ No newline at end of file
crash6|22/11/18|0-15-20-10
\ No newline at end of file
crash7|23/11/18|0-3-0-4
\ No newline at end of file
crash1|23/11/18|0-3-0-2
\ No newline at end of file
crash2|23/11/18|0-3-0-0
\ No newline at end of file
crash3|23/11/18|0-3-49-54
\ No newline at end of file
crash4|23/11/18|0-12-31-15
\ No newline at end of file
crash5|24/11/18|0-3-0-1
\ No newline at end of file
crash6|24/11/18|0-3-0-1
\ No newline at end of file
crash7|24/11/18|0-17-55-8
\ No newline at end of file
crash1|25/11/18|0-3-0-3
\ No newline at end of file
2018-11-19T18:59:47.396
\ No newline at end of file
2018-11-25T12:45:09.973
\ No newline at end of file
crash4
\ No newline at end of file
crash2
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment