Commit 73101280 authored by frankie's avatar frankie 💬

fix on production javascripts

parent edfedbab
*.sublime-project
*.sublime-workspace
server/node_modules/*
server/generated/*
models/generated/log_*
rangeSlider-master/*
slider.html
css/style_4669676a757d0641b43f027d229f5de6d95b901f.css
......@@ -226,6 +226,7 @@ a {
#about_panel button,
#inventory_panel button,
#inventory_preview button,
#ui_3d button,
#display_info
{
......@@ -271,7 +272,9 @@ a {
.goto_share { left: auto; right: 20px; visibility: hidden; }
#about_panel,
#inventory_panel {
#inventory_panel,
#inventory_preview
{
z-index: 10001;
position: absolute;
top: 0px;
......@@ -290,11 +293,14 @@ a {
text-align: left;
}
#inventory_panel .panel_content {
#inventory_panel .panel_content,
#inventory_preview .panel_content
{
display:block;
float:left;
margin-left: 20px;
margin-right: 5px;
margin-right: 10px;
width:1811px;
height: auto;
min-height:363px;
overflow: hidden;
......@@ -340,37 +346,36 @@ a {
white-space: nowrap;
}
/*
@media ( max-width:1839px ) {
#inventory_panel .panel_content { width:1630px; }
#inventory_preview .panel_content { width:1630px; }
}
@media ( max-width:1659px ) {
#inventory_panel .panel_content { width:1449px; }
#inventory_preview .panel_content { width:1449px; }
}
@media ( max-width:1659px ) {
#inventory_panel .panel_content { width:1449px; }
#inventory_preview .panel_content { width:1449px; }
}
@media ( max-width:1479px ) {
#inventory_panel .panel_content { width:1268px; }
#inventory_preview .panel_content { width:1268px; }
}
@media ( max-width:1299px ) {
#inventory_panel .panel_content { width:1087px; }
#inventory_preview .panel_content { width:1087px; }
}
@media ( max-width:1119px ) {
#inventory_panel .panel_content { width:906px; }
#inventory_preview .panel_content { width:906px; }
}
@media ( max-width:939px ) {
#inventory_panel .panel_content { width:725px; }
#inventory_preview .panel_content { width:725px; }
}
@media ( max-width:759px ) {
#inventory_panel .panel_content { width:544px; }
#inventory_preview .panel_content { width:544px; }
}
@media ( max-width:579px ) {
#inventory_panel .panel_content { width:363px; }
#inventory_preview .panel_content { width:363px; }
}
@media ( max-width:390px ) {
#inventory_panel .panel_content { width:360px; }
}*/
#inventory_preview .panel_content { width:360px; }
}
.panel_content a {
color: #fff;
......@@ -383,10 +388,75 @@ a {
margin: 0 0 0.5em 0;
}
.panel_content .small,
.panel_content .chair {
.panel_content .chair,
.panel_content .chair_preview {
font-family:space_monoregular;
}
.panel_content .chair_preview {
float: left;
display: block;
width: 180px;
height: 180px;
border: 1px solid #fff;
margin: 0 -1px -1px 0;
overflow: hidden;
background: #000;
text-align: left;
animation-name: chair_anim;
animation-duration: 1s;
animation-iteration-count: 1;
}
.panel_content .chair.odd { background: transparent; }
.panel_content .chair.even { background: transparent; }
.panel_content .chair_preview img {
position: absolute;
z-index: 1;
margin: 0;
width:180px;
height:180px;
}
.panel_content .placeholder img {
margin: 25px;
width: 130px;
height: 130px;
}
.panel_content .chair_preview .content {
position: absolute;
z-index: 2;
width: 160px;
height: 160px;
margin: 10px;
line-height: 160px;
vertical-align: bottom;
}
.panel_content .chair_preview .wrapper {
display: inline-block;
vertical-align: bottom;
line-height: 20px;
font-size: 13px;
}
.panel_content .chair_preview .date:before,
.panel_content .chair_preview .time:before {
content: " ";
float:left;
display: block;
width:12px;
height:12px;
margin: 3px 3px 0 0;
background-size: 12px 12px;
}
.panel_content .chair_preview .date:before {
background-image: url( '../textures/icon-notestasks.png' );
}
.panel_content .chair_preview .time:before {
background-image: url( '../textures/icon-timer.png' );
}
@keyframes chair_anim {
0% {
opacity: 0;
......@@ -436,7 +506,10 @@ a {
.panel_content .chair.odd { /*background: transparent;*/ }
.panel_content .chair.even { /*background: transparent;*/ }
#inventory_panel .panel_content .chair .thumb a,
#inventory_panel .panel_content .chair .thumb button {
#inventory_panel .panel_content .chair .thumb button,
#inventory_preview .panel_content .chair .thumb a,
#inventory_preview .panel_content .chair .thumb button
{
background: transparent;
overflow: hidden;
padding: 0;
......@@ -623,11 +696,14 @@ a {
#ui_3d,
#about_panel,
#inventory_panel,
#inventory_preview,
#model_loading
{ visibility: hidden; }
#inventory_panel.no_icon .goto_about,
#inventory_panel.no_icon .goto_back_right
#inventory_panel.no_icon .goto_back_right,
#inventory_preview.no_icon .goto_about,
#inventory_preview.no_icon .goto_back_right
{
visibility: hidden;
}
......@@ -747,6 +823,14 @@ a {
font-size: 0.7em;
}
#production_duration {
position: absolute;
right: 1em;
margin: -2em 0 0 0;
padding: 0.1em 0.4em;
background: rgba( 0,0,0,0.8 );
}
#model_info {
position: absolute;
right: 0px;
......
......@@ -28,41 +28,39 @@
<div class="splash_title">
<h1>Sisyphus</h1>
</div>
<div class="splash_warning"><div class="biohazard"><img src="textures/icon-biohazard.png"></div>!!under development!!<div class="biohazard"><img src="textures/icon-biohazard.png"></div></div>
</div>
</div>
<div id="question">
<!-- <div id="question">
<canvas id="question_canvas"></canvas>
<div id="question_link"><a href="javascript:question_ok()">OK</a></div>
</div>
</div> -->
<div id="ui_3d"class="menu_opening">
<div id="ui_3d" class="menu_opening">
<div class="goto_about">
<a href="javascript:goto_about()"><img src="textures/icon-notes.png"></a>
<button onclick="javascript:goto_about()">about</button>
</div>
<div id="toggle_camera">
<a href="javascript:toggle_camera()"><img src="textures/icon-videocamerathree.png"></a>
<button onclick="javascript:toggle_camera()">toggle camera</button>
</div>
<div class="goto_gallery">
<button onclick="javascript:goto_inventory()">chair archive</button>
</div>
</div>
<div id="about_panel">
<div class="goto_back">
<a href="javascript:goto_mainmenu()"><img src="textures/icon-arrow-left.png"></a>
<div class="goto_back_left">
<button onclick="javascript:goto_mainmenu()">X</button>
</div>
<div class="goto_gallery">
<a href="javascript:goto_inventory()"><img src="textures/icon-chair.png"></a>
</div>
<div class="goto_share">
<a href=""><img src="textures/icon-share-alt.png"></a>
<button onclick="javascript:goto_inventory()">chair archive</button>
</div>
<div class="panel_content">
<p class="big">Sisyphus is An absurd ergonomic simulation
Producing ‘Chairs’.</p>
<p class="big">Used as part of the parametric design process in architecture and
product design, such software is dependent on standardized bodies.</p>
<p class="big">What data is used to define a digital human model?</p>
<p class="big">Are these simulations ultimately defining and designing the body?</p>
<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>
<p class="big">Sisyphus subverts the ergonomic simulation process, in this case a seating material durability assessment, into a chair design method. The avatar’s data dictates the design process: By sitting on a cube for an extended period of time, the material deforms through the simulated body weight, pose and sitting time.</p>
<p class="big">To create a digital human model as stand in for a speculative future user, ergonomic simulation software is dependent on actual body data.</p>
<p class="big">Are these simulations ultimately defining and designing the human body by projecting an average user into the future?</p>
<br/>
<p class="small">An experiment by
<a href="http://technofle.sh/" target="_blank">Simone Niquille</a> &
......@@ -72,20 +70,16 @@
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">Part of Simone Niquille’s installation SAFETY MEASURES in the Dutch
Pavilion of the 16th Venice Architecture Biennale 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>
<div id="inventory_panel">
<div class="goto_back">
<a href="javascript:goto_mainmenu()"><img src="textures/icon-arrow-left.png"></a>
</div>
<div class="goto_gallery">
<a href="javascript:goto_about()"><img src="textures/icon-notes.png"></a>
<div id="inventory_preview">
<div id="inventory_panel_about" class="goto_about">
<button onclick="javascript:goto_about()">about</button>
</div>
<div class="goto_share">
<a href=""><img src="textures/icon-share-alt.png"></a>
<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">
......@@ -100,7 +94,7 @@
</div>
<div id="timeline">
<div id="duration">time info</div>
<div id="production_duration">time info</div>
</div>
<!-- three.js includes -->
......
......@@ -270,7 +270,7 @@ function PantonPouf() {
skinning: this.morphable.obj3d.material.skinning,
color: 0xffffff,
specular: 0xdddddd,
shininess: 10
shininess: 0
// map: textureLoader.load( this.config.diffuse_map ),
// specularMap: textureLoader.load( "obj/leeperrysmith/Map-SPEC.jpg" ),
// normalMap: textureLoader.load( this.config.normal_map ),
......@@ -288,10 +288,13 @@ function PantonPouf() {
}
this.morphable.obj3d.material = mat;
this.morphable.obj3d.material.needsUpdate = true;
this.morphable.obj3d.castShadow = SHADOW_ENABLED;
this.morphable.obj3d.receiveShadow = SHADOW_ENABLED;
} else {
var mat = new THREE.MeshNormalMaterial( {
//lights: true,
morphTargets: this.morphable.obj3d.material.morphTargets,
morphNormals: this.morphable.obj3d.material.morphNormals
} );
......
This diff is collapsed.
......@@ -41,11 +41,6 @@
*/
var request_chairid = undefined;
var SHADOW_ENABLED = true;
var SHADOW_MAP_WIDTH = 2048, SHADOW_MAP_HEIGHT = 2048;
if ( ! Detector.webgl ) {
Detector.addGetWebGLMessage();
}
......@@ -55,6 +50,11 @@ if ( ! Detector.webgl ) {
// *********************************
{
var request_chairid = undefined;
var SHADOW_ENABLED = true;
var SHADOW_MAP_WIDTH = 2048, SHADOW_MAP_HEIGHT = 2048;
// GROUND
var config_ground = new GroundConfig();
......
......@@ -8,6 +8,9 @@ log_folder = '../server/generated'
files = os.listdir( model_folder )
files.sort()
if not os.path.exists(log_folder):
os.makedirs(log_folder)
for f in files:
if f[-len(model_needle):] == model_needle:
......
......@@ -72,11 +72,11 @@ js_replace = [
'var skip_splash = false;'
],
[
'var remote_timestamp_server = "http://127.0.0.1:3001";',
'var remote_timestamp_server = "server/json/timestamp.json";',
'var remote_timestamp_server = "http://51.15.234.17/timestamp";'
],
[
'var remote_gallery_server = "http://127.0.0.1:3002";',
'var remote_gallery_server = "server/json/gallery.json";',
'var remote_gallery_server = "http://51.15.234.17/gallery";'
]
]
......
This diff is collapsed.
{
"delta": 962052,
"max": 10800000,
"speed": 0.00009259259259259259,
"revisit": 5000,
"shape": "crash4",
"shape_swap": false,
"info": "below the maximum time, keeping shape crash4"
}
\ No newline at end of file
......@@ -32,41 +32,39 @@
<div class="splash_title">
<h1>Sisyphus</h1>
</div>
<div class="splash_warning"><div class="biohazard"><img src="textures/icon-biohazard.png"></div>!!under development!!<div class="biohazard"><img src="textures/icon-biohazard.png"></div></div>
</div>
</div>
<div id="question">
<!-- <div id="question">
<canvas id="question_canvas"></canvas>
<div id="question_link"><a href="javascript:question_ok()">OK</a></div>
</div>
</div> -->
<div id="ui_3d"class="menu_opening">
<div id="ui_3d" class="menu_opening">
<div class="goto_about">
<a href="javascript:goto_about()"><img src="textures/icon-notes.png"></a>
<button onclick="javascript:goto_about()">about</button>
</div>
<div id="toggle_camera">
<a href="javascript:toggle_camera()"><img src="textures/icon-videocamerathree.png"></a>
<button onclick="javascript:toggle_camera()">toggle camera</button>
</div>
<div class="goto_gallery">
<button onclick="javascript:goto_inventory()">chair archive</button>
</div>
</div>
<div id="about_panel">
<div class="goto_back">
<a href="javascript:goto_mainmenu()"><img src="textures/icon-arrow-left.png"></a>
<div class="goto_back_left">
<button onclick="javascript:goto_mainmenu()">X</button>
</div>
<div class="goto_gallery">
<a href="javascript:goto_inventory()"><img src="textures/icon-chair.png"></a>
</div>
<div class="goto_share">
<a href=""><img src="textures/icon-share-alt.png"></a>
<button onclick="javascript:goto_inventory()">chair archive</button>
</div>
<div class="panel_content">
<p class="big">Sisyphus is An absurd ergonomic simulation
Producing ‘Chairs’.</p>
<p class="big">Used as part of the parametric design process in architecture and
product design, such software is dependent on standardized bodies.</p>
<p class="big">What data is used to define a digital human model?</p>
<p class="big">Are these simulations ultimately defining and designing the body?</p>
<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>
<p class="big">Sisyphus subverts the ergonomic simulation process, in this case a seating material durability assessment, into a chair design method. The avatar’s data dictates the design process: By sitting on a cube for an extended period of time, the material deforms through the simulated body weight, pose and sitting time.</p>
<p class="big">To create a digital human model as stand in for a speculative future user, ergonomic simulation software is dependent on actual body data.</p>
<p class="big">Are these simulations ultimately defining and designing the human body by projecting an average user into the future?</p>
<br/>
<p class="small">An experiment by
<a href="http://technofle.sh/" target="_blank">Simone Niquille</a> &
......@@ -76,22 +74,19 @@
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">Part of Simone Niquille’s installation SAFETY MEASURES in the Dutch
Pavilion of the 16th Venice Architecture Biennale 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>
<div id="inventory_panel">
<div class="goto_back">
<a href="javascript:goto_mainmenu()"><img src="textures/icon-arrow-left.png"></a>
<div id="inventory_preview">
<div id="inventory_panel_about" class="goto_about">
<button onclick="javascript:goto_about()">about</button>
</div>
<div class="goto_gallery">
<a href="javascript:goto_about()"><img src="textures/icon-notes.png"></a>
<div id="inventory_panel_back" class="goto_back_right">
<button onclick="javascript:goto_mainmenu()">X</button>
</div>
<div class="goto_share">
<a href=""><img src="textures/icon-share-alt.png"></a>
<div id="inventory_list" class="panel_content" style="background-image:url('textures/checkboard.png')">
</div>
<div id="inventory_list" class="panel_content" style="background-image:url('textures/checkboard.png')"></div>
</div>
<div id="timeline">
......
textures/checkboard.png

156 Bytes | W: | H:

textures/checkboard.png

1.42 KB | W: | H:

textures/checkboard.png
textures/checkboard.png
textures/checkboard.png
textures/checkboard.png
  • 2-up
  • Swipe
  • Onion skin
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