Skip to content
Snippets Groups Projects
Commit da61b779 authored by Amanda Ghassaei's avatar Amanda Ghassaei
Browse files

render on stl load

parent 388a5e10
Branches
No related tags found
No related merge requests found
...@@ -12,6 +12,7 @@ $(function(){ ...@@ -12,6 +12,7 @@ $(function(){
loader.addEventListener( 'load', function (e) { loader.addEventListener( 'load', function (e) {
var geometry = e.content; var geometry = e.content;
threeMain.scene.add( new THREE.Mesh( geometry ) ); threeMain.scene.add( new THREE.Mesh( geometry ) );
threeMain.render();
}); });
loader.load(file); loader.load(file);
......
...@@ -44,18 +44,19 @@ ...@@ -44,18 +44,19 @@
<!--<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-01">--> <!--<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-01">-->
<!--<span class="sr-only">Toggle navigation</span>--> <!--<span class="sr-only">Toggle navigation</span>-->
<!--</button>--> <!--</button>-->
<a id="mainNavLink" class="navbar-brand" href="#">Link</a> <a id="mainNavLink" class="navbar-brand" href="http://cba.mit.edu">CBA.MIT.EDU</a>
</div> </div>
<div class="collapse navbar-collapse" id="navbar-collapse-01"> <div class="collapse navbar-collapse" id="navbar-collapse-01">
<ul class="nav navbar-nav navbar-left"> <ul class="nav navbar-nav navbar-left">
<li><a data-menu-id="importGeometry" class="menuHoverControls" href="#">Import</a></li> <li><a data-menu-id="importGeometry" class="menuHoverControls" href="#">Import</a></li>
<li><a data-menu-id="controls1Menu" class="menuHoverControls" href="#">Controls1</a></li> <li><a data-menu-id="about" class="menuHoverControls" href="#">About</a></li>
<li><a data-menu-id="controls2Menu" class="menuHoverControls" href="#">Controls2</a></li> <!--<li><a data-menu-id="controls1Menu" class="menuHoverControls" href="#">Controls1</a></li>-->
<li><a data-menu-id="controls3Menu" class="menuHoverControls" href="#">Glyphs</a></li> <!--<li><a data-menu-id="controls2Menu" class="menuHoverControls" href="#">Controls2</a></li>-->
<li><a data-menu-id="controls4Menu" class="menuHoverControls" href="#">Buttons</a></li> <!--<li><a data-menu-id="controls3Menu" class="menuHoverControls" href="#">Glyphs</a></li>-->
<li><a data-menu-id="controls5Menu" class="menuHoverControls" href="#">Inputs</a></li> <!--<li><a data-menu-id="controls4Menu" class="menuHoverControls" href="#">Buttons</a></li>-->
<!--<li><a data-menu-id="controls5Menu" class="menuHoverControls" href="#">Inputs</a></li>-->
<li class="dropdown navDropdown"> <li class="dropdown navDropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Menu Dropdown <b class="caret"></b></a> <a href="#" class="dropdown-toggle" data-toggle="dropdown">Export <b class="caret"></b></a>
<span class="dropdown-arrow"></span> <span class="dropdown-arrow"></span>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="#">Action</a></li> <li><a href="#">Action</a></li>
...@@ -72,24 +73,32 @@ ...@@ -72,24 +73,32 @@
<div id="importGeometry" class="row navMenu"> <div id="importGeometry" class="row navMenu">
<div class="row demo-row"> <div class="row demo-row">
<div class="col-xs-3"> <div class="col-xs-3">
<div>
<span class="btn btn-default btn-file"> <span class="btn btn-default btn-file">
Upload STL<input id="uploadSTL" type="file"> Upload STL<input id="uploadSTL" type="file">
</span> </span>
<!--<a id="uploadSTL" href="#fakelink" class="btn btn-block btn-lg btn-default">Upload STL</a>-->
</div> </div>
<div class="col-xs-1"> <div>
OR OR
</div> </div>
<div class="col-xs-3"> <div>
<div class="btn-group"> <div class="btn-group">
<button data-toggle="dropdown" class="btn btn-primary dropdown-toggle" type="button">Select Model <span class="caret"></span></button> <button data-toggle="dropdown" class="btn btn-primary dropdown-toggle" type="button">Select Model <span class="caret"></span></button>
<ul role="menu" class="dropdown-menu"> <ul role="menu" class="dropdown-menu">
<li><a class="stlImport" data-file="Airbus_A300-600.stl" href="#">Plane</a></li> <li><a class="stlImport" data-file="Airbus_A300-600.stl" href="#">Plane</a></li>
</ul> </ul>
</div><!-- /btn-group --> </div><!-- /btn-group -->
</div>
</div> <!-- /.col-xs-3 --> </div> <!-- /.col-xs-3 -->
</div> </div>
</div> </div>
<div id="about" class="row navMenu">
<div class="row demo-row">
<div class="col-xs-3">
Latest code available on github
</div>
</div>
</div>
<div id="controls1Menu" class="row navMenu"> <div id="controls1Menu" class="row navMenu">
<div class="col-xs-5"> <div class="col-xs-5">
<h3 class="demo-panel-title">Progress bars &amp; Sliders</h3> <h3 class="demo-panel-title">Progress bars &amp; Sliders</h3>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment