Commit 40c8f00c authored by frankie's avatar frankie 💬

fix on ui behaviour + updated styles + reformating of info messages

parent 729ae239
......@@ -329,10 +329,10 @@ a {
#inventory_info div {
position: relative;
margin: 20px auto 0 auto;
background: rgba( 0,0,0,0.75 );
padding: 10px 15px;
background: rgba( 0,0,0,1 );
padding: 5px 5px;
display: inline-block;
border-radius: 5px;
border-radius: 0px;
font-weight: bold;
}
......@@ -726,15 +726,21 @@ a {
left: 0px;
right: 0px;
width:100%;
background: rgba( 0,0,0,0.8 );
background: rgba( 0,0,0,1 );
font-family: 'space_monoregular';
visibility: hidden;
}
#model_info {
position: absolute;
left: 0px;
margin: -25px 0 0 15px;
right: 0px;
margin: -65px 10px 0 0;
text-align: right;
text-shadow:
-1px -1px 0 #000,
1px -1px 0 #000,
-1px 1px 0 #000,
1px 1px 0 #000;
}
#range_area {
......
......@@ -31,13 +31,6 @@
</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>
......@@ -52,14 +45,11 @@
<div id="about_panel">
<div class="goto_back_left">
<button onclick="javascript:goto_mainmenu()"><img src="textures/icon-arrow-left.png"></button>
<button onclick="javascript:goto_mainmenu()">X</button>
</div>
<div class="goto_gallery">
<button onclick="javascript:goto_inventory()">chair archive</button>
</div>
<div class="goto_share">
<button onclick=""><img src="textures/icon-share-alt.png"></button>
</div>
<div class="panel_content">
<p class="big">Sisyphus is an absurd ergonomic simulation producing chairs.</p>
<p class="big">Ergonomic simulations are software used for evaluation in architectural and product design processes by imitating the average body of an end user. Body measurement databases define the shape and size of digital human models that are able to test comfort, assess safety and efficiency on virtual design prototypes. In the virtual space of the ergonomic simulation these avatars can outperform physical prototyping by being free of time and pain.</p>
......@@ -75,7 +65,7 @@
under MIT and CCO licenses.</p>
<p class="small">Made possible with the generous support of the Belgian FWB and Creative
Industries Fund NL.</p>
<p class="small">All chairs have been produced during the Simone Niquille’s installation SAFETY MEASURES in the Dutch Pavilion of the 16th Venice Architecture Biennale 2018 between the 26th of May and the 25th November 2018.</p>
<p class="small">All chairs have been produced during Simone Niquille’s installation SAFETY MEASURES in the Dutch Pavilion of the 16th Venice Architecture Biennale 2018 between the 26th of May and the 25th November 2018.</p>
</div>
</div>
......@@ -84,25 +74,11 @@
<button onclick="javascript:goto_about()">about</button>
</div>
<div id="inventory_panel_back" class="goto_back_right">
<button onclick="javascript:goto_mainmenu()"><img src="textures/icon-arrow-right.png"></button>
<button onclick="javascript:goto_mainmenu()">X</button>
</div>
<div class="goto_share">
<button onclick=""><img src="textures/icon-share-alt.png"></button>
</div>
<!--style="background-image:url('textures/checkboard.png')"-->
<div id="inventory_list" class="panel_content">
<!--
<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>
<div id="inventory_info"><div><span>SOME TEXT DISPLAYED</span> <span>HERE</span></div></div>
<div id="inventory_info"><!-- <div><span>TEXT</span></div> --></div>
</div>
<div id="timeline">
......@@ -110,14 +86,13 @@
<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>-->
<button id="display_info" onclick="javascript:info_toggle()"><img id="display_info_icon" src="textures/icon-question.png"></a>
<div id="model_info">blah blah</div>
</div>
<div id="model_loading">
<img id="loading_img" src="models/sisyphus_cube_2018.10.05.19.31.34_icon.png">
<img id="loading_img" src="">
<div class="description">
<p id="loading_name">sisyphus_cube_2018.10.05.19.31.34</p>
<p id="loading_name">loading chair</p>
</div>
</div>
......
......@@ -108,7 +108,7 @@ function Cube() {
if ( this.legs != undefined ) {
console.log( this.legs );
//console.log( this.legs );
var xobj1 = new XMLHttpRequest();
xobj1.caller = this;
......@@ -257,7 +257,7 @@ function Cube() {
}
console.log( this.bones_rotations );
//console.log( this.bones_rotations );
} else {
......@@ -321,8 +321,8 @@ function Cube() {
}
*/
console.log( this.total_frames );
console.log( this.trackers );
//console.log( this.total_frames );
//console.log( this.trackers );
function disposeArray() { this.array = null; }
......@@ -336,11 +336,11 @@ function Cube() {
buffgeom.addAttribute( 'normal', new THREE.Float32BufferAttribute( this.morph_data.normals, 3 ).onUpload( disposeArray ) );
}
if ( this.morph_data.colors !== undefined && this.morph_data.colors.length != 0 ) {
console.log( 'color loaded' );
//console.log( 'color loaded' );
buffgeom.addAttribute( 'color', new THREE.Float32BufferAttribute( this.morph_data.colors, 3 ).onUpload( disposeArray ) );
}
if ( this.morph_data.uvs !== undefined && this.morph_data.uvs.length != 0 ) {
console.log( 'uv loaded' );
//console.log( 'uv loaded' );
buffgeom.addAttribute( 'uv', new THREE.Float32BufferAttribute( this.morph_data.uvs, 2 ).onUpload( disposeArray ) );
}
buffgeom.computeBoundingSphere();
......@@ -449,7 +449,7 @@ function Cube() {
for ( var k in ks ) {
this.morph_keys.push( parseInt( ks[k] ) );
}
console.log( this.morph_keys );
//console.log( this.morph_keys );
this.ready = true;
......@@ -468,7 +468,7 @@ function Cube() {
this.correction_rotation,
this.correction_scale );
console.log( "\t!!!!! > " + this.path + " loaded successfully!" );
//console.log( "\t!!!!! > " + this.path + " loaded successfully!" );
var km = Object.keys(data.morphs);
this.morph_keys = [];
......@@ -544,8 +544,8 @@ this.trackers[k]['obj'].add( this.trackers[k]['debug'] );
}
*/
console.log( this.total_frames );
console.log( this.trackers );
//console.log( this.total_frames );
//console.log( this.trackers );
function disposeArray() { this.array = null; }
......@@ -559,11 +559,11 @@ this.trackers[k]['obj'].add( this.trackers[k]['debug'] );
buffgeom.addAttribute( 'normal', new THREE.Float32BufferAttribute( data.normals, 3 ).onUpload( disposeArray ) );
}
if ( data.colors !== undefined && data.colors.length != 0 ) {
console.log( 'color loaded' );
//console.log( 'color loaded' );
buffgeom.addAttribute( 'color', new THREE.Float32BufferAttribute( data.colors, 3 ).onUpload( disposeArray ) );
}
if ( data.uvs !== undefined && data.uvs.length != 0 ) {
console.log( 'uv loaded' );
//console.log( 'uv loaded' );
buffgeom.addAttribute( 'uv', new THREE.Float32BufferAttribute( data.uvs, 2 ).onUpload( disposeArray ) );
}
buffgeom.computeBoundingSphere();
......@@ -672,7 +672,7 @@ this.trackers[k]['obj'].add( this.trackers[k]['debug'] );
for ( var k in ks ) {
this.morph_keys.push( parseInt( ks[k] ) );
}
console.log( this.morph_keys );
//console.log( this.morph_keys );
this.ready = true;
......
......@@ -206,7 +206,7 @@ function Ground() {
cell.rotateY( Math.PI * 1.5 );
}
} else {
cell.rotateX( Math.PI * -0.5 );
cell.rotateX( Math.PI * -0.5 );
}
switcher = ( switcher + 1 ) % 2;
current.x += this.config.size.x;
......
This diff is collapsed.
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