Skip to content

Commit

Permalink
review changes
Browse files Browse the repository at this point in the history
  • Loading branch information
diwi committed Jan 5, 2018
1 parent a1025ac commit 4c4be8d
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions src/peasy/PeasyCam.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
/**
*
* @author Jonathan Feinberg
* @author Thomas Diewald
*
*/
public class PeasyCam {

Expand Down Expand Up @@ -293,7 +295,7 @@ public int[] getViewport() {
public PGraphics getCanvas() {
return g;
}

public boolean insideViewport(double x, double y) {
float x0 = viewport[0], x1 = x0 + viewport[2];
float y0 = viewport[1], y1 = y0 + viewport[3];
Expand Down Expand Up @@ -369,7 +371,6 @@ public void mouseEvent(final MouseEvent e) {
}

private void mouseZoom(final double delta) {
// double new_distance = distance + delta * Math.log1p(distance);
double new_distance = distance + delta * distance * 0.02;
if (new_distance < minimumDistance) {
new_distance = minimumDistance;
Expand All @@ -383,16 +384,12 @@ private void mouseZoom(final double delta) {
}

private void mousePan(final double dxMouse, final double dyMouse) {
// final double panScale = Math.sqrt(distance * .005);
final double panScale = distance * 0.0025;
pan(dragConstraint == Constraint.PITCH ? 0 : -dxMouse * panScale,
dragConstraint == Constraint.YAW ? 0 : -dyMouse * panScale);
}

private void mouseRotate(final double dx, final double dy) {

// double mult = -0.0025;

double mult = -Math.pow(Math.log10(1 + distance), 0.5) * 0.00125f;

double dmx = dx * mult;
Expand Down

0 comments on commit 4c4be8d

Please sign in to comment.