tweek the graph

Author: jafu888

desktop/graph3d/com/support/constraintlayout/extlib/graph3d/Graph3dPanel.java

@@ -41,21 +41,21 @@ public class Graph3dPanel extends JPanel {
     Surface3D mSurface;
     AxisBox mAxisBox;
     float range = 20;
-    float minZ = -6;
-    float maxZ  = 40;
+    float minZ = -10;
+    float maxZ = 10;
     float mZoomFactor = 1;
 
     public void buildSurface() {
 
         mSurface = new Surface3D((x, y) -> {
             double d = Math.sqrt(x * x + y * y);
-            return 10 * ((d == 0) ? 1f : (float) (Math.sin(d)/(1+d) ));
+            return  0.3f * (float) (Math.cos(d) *(y*y-x*x) /(1+d));
         });
-        mSurface.setRange(-range, range, -range, range);
+        mSurface.setRange(-range, range, -range, range,minZ,maxZ);
         mScene3D.setObject(mSurface);
         mScene3D.resetCamera();
         mAxisBox = new AxisBox();
-        mAxisBox.setRange(-range, range, -range, range, -2, 20);
+        mAxisBox.setRange(-range, range, -range, range, minZ, maxZ);
         mScene3D.addPostObject(mAxisBox);
     }
 
@@ -143,14 +143,12 @@ public void onMouseWheel(MouseWheelEvent ev) {
         if (ev.isControlDown()) {
             mZoomFactor *= (float) Math.pow(1.01, ev.getWheelRotation());
             mScene3D.setZoom(mZoomFactor);
-            mScene3D.setUpMatrix(getWidth(),getHeight());
+            mScene3D.setUpMatrix(getWidth(), getHeight());
             mScene3D.update();
-        }  else {
-
+        } else {
             range = range * (float) Math.pow(1.01, ev.getWheelRotation());
-            mSurface.setArraySize((int) (range * 5));
-            System.out.println(range);
-            mSurface.setRange(-range, range, -range, range);
+            mSurface.setArraySize(Math.min(300, (int) (range * 5)));
+            mSurface.setRange(-range, range, -range, range,minZ,maxZ);
             mAxisBox.setRange(-range, range, -range, range, minZ, maxZ);
             mScene3D.update();
         }

desktop/graph3d/com/support/constraintlayout/extlib/graph3d/objects/Surface3D.java

@@ -24,17 +24,20 @@ public class Surface3D extends Object3D {
     private Function mFunction;
     private float mZoomZ = 1;
     int mSize = 100;
-    public void setRange(float minX, float maxX, float minY, float maxY) {
+
+    public void setRange(float minX, float maxX, float minY, float maxY, float minZ, float maxZ) {
         mMinX = minX;
         mMaxX = maxX;
         mMinY = minY;
         mMaxY = maxY;
-        computeSurface(true);
+        mMinZ = minZ;
+        mMaxZ = maxZ;
+        computeSurface(Float.isNaN(mMinZ));
     }
 
     public void setArraySize(int size) {
         mSize = size;
-        computeSurface(true);
+        computeSurface(false);
     }
 
     public interface Function {
@@ -105,8 +108,8 @@ public void computeSurface(boolean resetZ) {
         // normalize range in z
         float xrange = mMaxX - mMinX;
         float yrange = mMaxY - mMinY;
-        float zrange = max_z - min_z;
-        if (zrange != 0) {
+        float zrange = mMaxZ - mMinZ;
+        if (zrange != 0 && resetZ) {
             float xyrange = (xrange + yrange) / 2;
             float scalez = xyrange / zrange;