Skip to content

multi merge #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pedroeusebio wants to merge 16 commits into
base: multi-mesh
Choose a base branch
from
Open

multi merge #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b8f1b9f
Finding pretty acceptable region local maximum points. They'll be use…
mseefelder Mar 2, 2016
06c8ea6
Impĺementing rounded inflation.
mseefelder Mar 2, 2016
952ea65
Still working on inflation. Next step is to refer to Teddy (Igarashi …
mseefelder Mar 3, 2016
4283376
Inflation working almost correctly. Need to adjust contour.
mseefelder Mar 3, 2016
ff6c636
Preparing for merge
mseefelder Mar 3, 2016
65e8027
Merge pull request #3 from mseefelder/regionMaxima
mseefelder Mar 4, 2016
06ef761
resolving conflicts and adding removeEventListener on main.js
pedroeusebio Mar 4, 2016
9b12a3a
changing some points in some functions
pedroeusebio Mar 4, 2016
a293291
Correcting smoothing
mseefelder Mar 4, 2016
55f87be
adding function Delete
pedroeusebio Mar 4, 2016
66d909e
Merge pull request #5 from mseefelder/delete
mseefelder Mar 4, 2016
58f313b
Corrected errors
mseefelder Mar 4, 2016
5598b9b
Conflicts solved
mseefelder Mar 4, 2016
bf75ede
Merge branch 'smoothing'
mseefelder Mar 4, 2016
b34dbbe
Scene rotation is now working.
mseefelder Mar 8, 2016
575cf32
Added smoothing using three.js (on js/world.js)
mseefelder Mar 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 5 additions & 28 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<script type="text/javascript" src="js/sketchSingleton.js"></script>
<script type="text/javascript" src="bower_components/jquery/dist/jquery.min.js"></script>
<script type="text/javascript" src="style/js/bootstrap.min.js"></script>
<script type="text/javascript" src="bower_components/three.js/three.min.js"></script>
<script type="text/javascript" src="bower_components/three.js/three.js"></script>
<script type="text/javascript" src="js/world.js"></script>
<script type="text/javascript" src="style/js/style.js"></script>
<script type="text/javascript" src="js/main.js"></script>
Expand Down Expand Up @@ -45,47 +45,24 @@
<div class="" id="bs-sidebar-navbar-collapse-1">
<ul class="nav navbar-nav">
<li id="edit">
<a href="#">Edit
<a href="#">Sketch
<img src="./style/icons/edit-icon.png" width="25px" class="pull-right hidden-xs showopacity">
</a>
</li>
<li id="manipulate">
<a href="#">Manipulate
<img src="./style/icons/manipulate-icon.png" width="25px" class="pull-right hidden-xs showopacity">
</a>
</li>
<li id="delete">
<a href="#">Delete
<img src="./style/icons/delete-icon.png" width="25px" class="pull-right hidden-xs showopacity">
</a>
</li>
<li id="rotate">
<a href="#">Rotate
<img src="./style/icons/rotate-icon.png" width="25px" class="pull-right hidden-xs showopacity">
</a>
</li>
<li id="translate">
<a href="#">Translate
<img src="./style/icons/translate-icon.png" width="25px" class="pull-right hidden-xs showopacity">
</a>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Download<span class="caret"></span>
<img src="./style/icons/download-button.png" width="25px" class="pull-right hidden-xs showopacity">
<li id="rotate">
<a href="#">Rotate
<img src="./style/icons/rotate-icon.png" width="25px" class="pull-right hidden-xs showopacity">
</a>
<ul class="dropdown-menu forAnimate" role="menu">
<li id="d_image">
<a href="#">As image
<img src="./style/icons/download-img-icon.png" width="25px" class="pull-right hidden-xs showopacity">
</a>
</li>
<li class="divider"></li>
<li id="d_mesh">
<a href="#">As Mesh
<img src="./style/icons/download-mesh-icon.png" width="25px" class="pull-right hidden-xs showopacity">
</a>
</li>
</ul>
</li>

</ul>
Expand Down
54 changes: 44 additions & 10 deletions js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,26 @@ var main = new function () {

document.addEventListener("mousemove", sketch1.mouseMoveHandle, false);
document.addEventListener("mousedown", sketch1.mouseDownHandle, false);
//document.addEventListener("mouseup", sketch.mouseUpHandle, false);
document.addEventListener("mouseup",function(){
document.addEventListener("mouseup",function( event ){
sketchToMesh(event, sketch1);
} , false);
canvas3d.addEventListener("mouseout", sketch1.mouseOutHandle, false);
//document.addEventListener("mouseup", sketch1.mouseUpHandle, false);
document.addEventListener("mouseout", sketch1.mouseOutHandle, false);
//canvas3d.addEventListener("mouseout", sketch1.mouseOutHandle, false);
};

//Function to be called on sketching mouseup to create mesh
function sketchToMesh (e,sketch) {
sketch.mouseUpHandle(e);
try{
sketch.mouseUpHandle(e);
} catch (err) {
alert("Invalid sketch.");
}

if(world.canvas3d.style.display == 'none') {
if(sketch.proportion.y) {
world.proportion = {y: sketch.proportion.y, h:sketch.h, w: sketch.w};
}
if(sketch.proportion.y) {
world.proportion = {y: sketch.proportion.y, h:sketch.h, w: sketch.w};
}
world.buildObject(sketch.contour, sketch.steiner, sketch.arrayDistance, sketch.triangles);
displaying = sketch.canvas2d.style.display;
sketch.canvas2d.style.display = "none";
Expand All @@ -44,7 +50,10 @@ $(document).ready(function () {
var canvas3d = document.getElementById('3dcanvas');

$('#edit').on('click', function() {
console.log("asdasdasdf");
document.removeEventListener('mousemove', world.onMouseMove, false);
document.removeEventListener('mousedown',world.onMouseDown,false);
document.removeEventListener('mouseup',world.onMouseUp,false);
document.removeEventListener('click', world.onDelete, false);
if(canvas2d.style.display == "none") {
canvas2d.style.display = 'block';
canvas3d.style.display = 'none';
Expand All @@ -59,16 +68,41 @@ $(document).ready(function () {
});

$('#translate').on('click', function() {
world.isRotating = false;
var canvas2d = document.getElementById('2dcanvas');
var canvas3d = document.getElementById('3dcanvas');
canvas2d.style.display == 'none';
canvas3d.style.display = 'block';
document.addEventListener('mousemove', world.onMouseMove, false);

document.removeEventListener('mousedown',world.onMouseDownRotate,false);
document.addEventListener('mousedown',world.onMouseDownTranslate,false);
document.addEventListener('mouseup',world.onMouseUp,false);
document.removeEventListener('click', world.onDelete, false);


});

$('#rotate').on('click', function() {
world.isTranslating = false;
var canvas2d = document.getElementById('2dcanvas');
var canvas3d = document.getElementById('3dcanvas');
canvas2d.style.display == 'none';
canvas3d.style.display = 'block';
console.log(world.isDragging);
document.addEventListener('mousemove', world.onMouseMove, false);

document.addEventListener('mousedown',world.onMouseDown,false);
document.removeEventListener('mousedown', world.onMouseDownTranslate, false);
document.addEventListener('mousedown',world.onMouseDownRotate,false);
document.addEventListener('mouseup',world.onMouseUp,false);
document.removeEventListener('click', world.onDelete, false);


});

$('#delete').on('click', function(){
document.addEventListener('mousemove', world.onMouseMove, false);
document.removeEventListener('mousedown',world.onMouseDown,false);
document.removeEventListener('mouseup',world.onMouseUp,false);
document.addEventListener('click', world.onDelete, false);
});
})
Loading