Normand Briere
2019-09-25 51e45bf615e1e2b4aca2edf9f7333b687c7d015e
CameraPane.java
....@@ -6962,30 +6962,30 @@
69626962 short residu = 0;
69636963
69646964 // wraparound workarounds
6965
- short fuck = (short) (buffer[i] & 0xFF);
6965
+ short ww = (short) (buffer[i] & 0xFF);
69666966 /*
6967
- residu += (fuck%2);
6968
- if(fuck/2 < 256-residu/2)
6967
+ residu += (ww%2);
6968
+ if(ww/2 < 256-residu/2)
69696969 {
6970
- fuck = (short)((fuck/2) + residu/2);
6970
+ ww = (short)((ww/2) + residu/2);
69716971 if(residu == 2)
69726972 residu = 0;
69736973 }
69746974 else
69756975 {
69766976 residu = 0;
6977
- fuck /= 2;
6977
+ ww /= 2;
69786978 }
69796979 */
6980
- if (i < imglength / 3 || rnd.nextFloat() < 0.5 || fuck >= 254)
6980
+ if (i < imglength / 3 || rnd.nextFloat() < 0.5 || ww >= 254)
69816981 {
6982
- fuck /= 2;
6982
+ ww /= 2;
69836983 } else
69846984 {
6985
- fuck = (short) ((fuck / 2) + fuck % 2);
6985
+ ww = (short) ((ww / 2) + ww % 2);
69866986 }
69876987
6988
- buffer[i] = (byte) fuck;
6988
+ buffer[i] = (byte) ww;
69896989 }
69906990 //System.out.print(bytes[i] + " ");
69916991 //if(buffer[i] >= 0 && buffer[i]<=eps-1) buffer[i] = eps;
....@@ -14341,10 +14341,13 @@
1434114341 public void mouseClicked(MouseEvent e)
1434214342 {
1434314343 System.out.println("mouseClicked: " + e);
14344
+ System.exit(0);
1434414345 }
1434514346
1434614347 public void mousePressed(MouseEvent e)
1434714348 {
14349
+ RigidBody.justclicked = true;
14350
+ System.out.println("justclicked: " + e);
1434814351 //System.out.println("mousePressed: " + e);
1434914352 clickStart(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1435014353 }
....@@ -14668,13 +14671,20 @@
1466814671 // only one thread!? synchronized
1466914672 void StepToTarget(boolean jump)
1467014673 {
14671
- RigidBody.pos.x = (float)manipCamera.lookAt.x;
14672
- RigidBody.pos.y = (float)manipCamera.lookAt.y;
14673
- RigidBody.pos.z = (float)manipCamera.lookAt.z;
14674
-// RigidBody.wind.x = (float)manipCamera.right.x;
14675
-// RigidBody.wind.y = (float)manipCamera.right.y;
14676
-// RigidBody.wind.z = (float)manipCamera.right.z;
14677
- //RigidBody.wind.normalize();
14674
+ RigidBody.pos.x = 0;
14675
+ RigidBody.pos.y = 0;
14676
+ RigidBody.pos.z = 0;
14677
+ if (RigidBody.justclicked)
14678
+ {
14679
+ RigidBody.pos.x = (float)manipCamera.lookAt.x;
14680
+ RigidBody.pos.y = (float)manipCamera.lookAt.y;
14681
+ RigidBody.pos.z = (float)manipCamera.lookAt.z;
14682
+ RigidBody.wind.set(RigidBody.pos);
14683
+ RigidBody.wind.x -= (float)manipCamera.location.x;
14684
+ RigidBody.wind.y -= (float)manipCamera.location.y;
14685
+ RigidBody.wind.z -= (float)manipCamera.location.z;
14686
+ RigidBody.wind.normalize();
14687
+ }
1467814688
1467914689 if (mute)
1468014690 return;
....@@ -15022,6 +15032,8 @@
1502215032
1502315033 void GoUp(int mod)
1502415034 {
15035
+ RigidBody.justclicked = true;
15036
+
1502515037 MODIFIERS |= COMMAND;
1502615038 /**/
1502715039 boolean isVR = (mouseMode&VR)!=0;
....@@ -16752,7 +16764,8 @@
1675216764
1675316765 public boolean mouseDrag(Event evt, int x, int y)
1675416766 {
16755
- //System.out.println("mouseDrag: " + evt);
16767
+ System.out.println("mouseDrag: " + evt);
16768
+ System.exit(0);
1675616769 /*
1675716770 drag = true;
1675816771 //System.out.println("Mouse DRAG");
....@@ -16871,6 +16884,7 @@
1687116884 public boolean mouseUp(Event evt, int x, int y)
1687216885 {
1687316886 System.out.println("mouseUp: " + evt);
16887
+ System.exit(0);
1687416888 /*
1687516889 locked = false;
1687616890 if (isRenderer)