Commit 89f7b4a6 authored by amandaghassaei's avatar amandaghassaei

small changes

parent 2a87ea87
...@@ -1101,7 +1101,7 @@ ...@@ -1101,7 +1101,7 @@
<div id="animationsSettings" class="fullWidth hide"> <div id="animationsSettings" class="fullWidth hide">
<div class="doubleIndent"> <div class="doubleIndent">
<span class="smallTxt">&Delta;t = <span id="deltaT"></span> seconds</span><br/> <span class="smallTxt">&Delta;t = <span id="deltaT"></span> seconds</span><br/>
<span class="smallTxt">Num simulation steps per render: &nbsp;&nbsp;<input id="numStepsPerRender" value="" placeholder="" class="int form-control" type="text"></span> <span class="smallTxt">Num simulation steps per frame: &nbsp;&nbsp;<input value="" placeholder="" class="numStepsPerRender int form-control" type="text"></span>
</div> </div>
</div> </div>
</div><br/> </div><br/>
...@@ -1294,10 +1294,11 @@ ...@@ -1294,10 +1294,11 @@
This is especially interesting if you set the <b>Mesh Material</b> to <b>Strain Visualization</b> so you can see how your interactions This is especially interesting if you set the <b>Mesh Material</b> to <b>Strain Visualization</b> so you can see how your interactions
change the internal strains in the material. change the internal strains in the material.
<br/><br/> <br/><br/>
If the simulation looks choppy, consider lowering the <b>Num simulation steps per render</b> setting under <b>Animation Settings</b> in the right hand menu. If the simulation looks choppy, consider lowering the <b>Num simulation steps per frame</b> setting under <b>Animation Settings</b> in the right hand menu.
WebVR is changing rapidly, if you cannot connect be sure you have the latest browser version and install any firmware updates on headset, controllers, and trackers.
<br/><br/> <br/><br/>
VR mode currently does not support all the UI of the regular app, so you will need someone in the "outside world" to VR mode currently does not support all the UI of the regular app, so you will need someone in the "outside world" to
help you load new files, change the fold percent, etc. help you load new files, change the fold percent, etc.
</p> </p>
</div> </div>
</div><!-- /.modal-content --> </div><!-- /.modal-content -->
...@@ -1316,9 +1317,9 @@ ...@@ -1316,9 +1317,9 @@
based on the material stiffnesses set in the <b>Simulation Settings</b> section: more stiff settings based on the material stiffnesses set in the <b>Simulation Settings</b> section: more stiff settings
require shorter time steps to solve and will slow down the simulation.<br/> require shorter time steps to solve and will slow down the simulation.<br/>
<br/> <br/>
<b>Num simulation steps per render</b> allows you to control the number of tiny time steps forward to take on each <b>Num simulation steps per frame</b> allows you to control the number of tiny time steps forward to take on each
render cycle. If the simulation looks choppy to you, you might consider lowering this setting. render cycle. If the simulation looks choppy to you, you might consider lowering this setting.
Lowering the number of steps per render will slow down the simulation, but will result in a more smooth animation. Lowering the number of steps per frame will slow down the simulation, but will result in a more smooth animation.
</p> </p>
</div> </div>
</div><!-- /.modal-content --> </div><!-- /.modal-content -->
...@@ -1717,15 +1718,15 @@ ...@@ -1717,15 +1718,15 @@
<span class="smallTxt">( resize browser window to change aspect ratio )</span><br/><br/> <span class="smallTxt">( resize browser window to change aspect ratio )</span><br/><br/>
<span class="video"> <span class="video">
Quality ( 0-63 ): &nbsp;&nbsp;<input id="capturerQuality" value="" placeholder="" class="float int form-control" type="text"><br/><br/> Quality ( 0-63 ): &nbsp;&nbsp;<input id="capturerQuality" value="" placeholder="" class="float int form-control" type="text"><br/><br/>
FrameRate ( 1-60 fps ): &nbsp;&nbsp;<input id="capturerFPS" value="" placeholder="" class="float int form-control" type="text"><br/><br/> Framerate ( 1-60 fps ): &nbsp;&nbsp;<input id="capturerFPS" value="" placeholder="" class="float int form-control" type="text"><br/><br/>
</span> </span>
<span class="gif"> <span class="gif">
FrameRate ( 1-60 fps ): &nbsp;&nbsp;<input id="gifFPS" value="" placeholder="" class="float int form-control" type="text"><br/><br/> Framerate ( 1-60 fps ): &nbsp;&nbsp;<input id="gifFPS" value="" placeholder="" class="float int form-control" type="text"><br/><br/>
</span> </span>
Num simulation steps per frame: &nbsp;&nbsp;<input value="" placeholder="" class="numStepsPerRender int form-control" type="text"><br/><br/>
<span class="smallTxt">Notes: This feature records the output of the canvas only - no UI or cursor <span class="smallTxt">Notes: This feature records the output of the canvas only - no UI or cursor
will be included. Do not resize window while recording. You can increase the will be included. Do not resize window while recording. You can increase the
amount of motion per frame by increasing the "Num simulation steps per render" amount of motion per frame by increasing the "Num simulation steps per frame". Check the <b>View</b> menu (above) for more rendering options.</span><br/>
in <b>Animation Settings</b> (right). Check the <b>View</b> menu (above) for more rendering options.</span><br/>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button id="doGifRecord" type="button" class="gif actionButton btn btn-success" data-dismiss="modal">Start</button> <button id="doGifRecord" type="button" class="gif actionButton btn btn-success" data-dismiss="modal">Start</button>
......
...@@ -628,7 +628,7 @@ function initControls(globals){ ...@@ -628,7 +628,7 @@ function initControls(globals){
globals.shouldCenterGeo = true; globals.shouldCenterGeo = true;
}); });
setInput("#numStepsPerRender", globals.numSteps, function(val){ setInput(".numStepsPerRender", globals.numSteps, function(val){
globals.numSteps = val; globals.numSteps = val;
}, 1); }, 1);
...@@ -662,11 +662,13 @@ function initControls(globals){ ...@@ -662,11 +662,13 @@ function initControls(globals){
function setInput(id, val, callback, min, max){ function setInput(id, val, callback, min, max){
var $input = $(id); var $input = $(id);
$input.change(function(){ $input.change(function(){
var val = $input.val(); var $this = $(this);
if ($input.hasClass("int")){ if ($input.length == 1) $this = $input;//probably not necessary
var val = $this.val();
if ($this.hasClass("int")){
if (isNaN(parseInt(val))) return; if (isNaN(parseInt(val))) return;
val = parseInt(val); val = parseInt(val);
} else if ($input.hasClass("text")){ } else if ($this.hasClass("text")){
} else { } else {
if (isNaN(parseFloat(val))) return; if (isNaN(parseFloat(val))) return;
val = parseFloat(val); val = parseFloat(val);
......
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