improved lighting (phong) animation etc.)

Author: jafu888

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

@@ -44,6 +44,7 @@ public class Graph3dPanel extends JPanel {
     float minZ = -10;
     float maxZ = 10;
     float mZoomFactor = 1;
+    boolean animated = false;
 
     public void buildSurface() {
 
@@ -70,6 +71,13 @@ public void componentResized(ComponentEvent e) {
             }
 
         });
+        setFocusable(true);
+        addKeyListener(new KeyAdapter() {
+            @Override
+            public void keyTyped(KeyEvent e) {
+                onKeyTyped(e);
+            }
+        });
         MouseAdapter mouseAdapter = new MouseAdapter() {
             @Override
             public void mouseReleased(MouseEvent e) {
@@ -78,6 +86,7 @@ public void mouseReleased(MouseEvent e) {
 
             @Override
             public void mousePressed(MouseEvent e) {
+                requestFocus();
                 onMouseDown(e);
             }
 
@@ -96,6 +105,54 @@ public void mouseWheelMoved(MouseWheelEvent e) {
         addMouseMotionListener(mouseAdapter);
     }
 
+    public void onKeyTyped(KeyEvent e) {
+       char c=  e.getKeyChar();
+        System.out.println(c);
+        switch (c) {
+            case  ' ':
+                toggleAnimation();
+        }
+    }
+    Timer animationTimer;
+    long nanoTime;
+    float time = 0;
+    void toggleAnimation() {
+        animated = !animated;
+
+
+        if (!animated) {
+            animationTimer.stop();
+            animationTimer = null;
+            return;
+        }
+
+        mSurface = new Surface3D((x, y) -> {
+            float d = (float) Math.sqrt(x * x + y * y);
+            float d2 = (float) Math.pow(x * x + y * y,0.125);
+            float angle = (float) Math.atan2(y,x);
+            float s = (float) Math.sin(d+angle-time*5);
+            float s2 = (float) Math.sin(time);
+            float c = (float) Math.cos(d+angle-time*5);
+            return  (s2*s2+0.1f)*d2*5*(s+c)/(1+d*d/20);
+          //  return  (float) (s*s+0.1) * (float) (Math.cos(d-time*5) *(y*y-x*x) /(1+d*d));
+        });
+        nanoTime = System.nanoTime();
+        mScene3D.setObject(mSurface);
+        mSurface.setRange(-range, range, -range, range,minZ,maxZ);
+        animationTimer = new Timer(7, new AbstractAction() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                long now = System.nanoTime();
+                time += (now-nanoTime)*1E-9f;
+                nanoTime = now;
+                mSurface.calcSurface(false);
+                mScene3D.update();
+                repaint();
+            }
+        });
+        animationTimer.start();
+    }
+
     public void onSizeChanged(ComponentEvent c) {
         int width = getWidth();
         int height = getHeight();
@@ -155,6 +212,8 @@ public void onMouseWheel(MouseWheelEvent ev) {
         repaint();
     }
 
+    long previous = System.nanoTime();
+    int count = 0;
     public void paintComponent(Graphics g) {
         int w = getWidth();
         int h = getHeight();
@@ -167,6 +226,13 @@ public void paintComponent(Graphics g) {
             return;
         }
         g.drawImage(mImage, 0, 0, null);
+        count++;
+        long now = System.nanoTime();
+        if (now -previous > 1000000000) {
+          //  System.out.println(time+" fps "+count/((now-previous)*1E-9f));
+            count = 0;
+            previous = now;
+        }
     }
 
 

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

@@ -17,14 +17,38 @@
 package com.support.constraintlayout.extlib.graph3d;
 
 import javax.swing.*;
+import java.awt.*;
 
 /**
  * Simple driver for the Graph3dPanel
  */
 public class Main {
+    static class Controls extends JPanel {
+        Graph3dPanel gp;
+        Controls(Graph3dPanel gp) {
+            this.gp = gp;
+            JCheckBox cb1 = new JCheckBox("camera Light",false);
+            cb1.addActionListener((e)->{
+                gp.mScene3D.mLightMovesWithCamera = cb1.isSelected();
+                System.out.println(gp.mScene3D.mLightMovesWithCamera);
+            });
+            add(cb1);
+            JSlider sl1 = new JSlider();
+            sl1.getModel().addChangeListener((e)->{
+              gp.mSurface.mSaturation = sl1.getValue()/100f;
+              gp.mScene3D.update();
+              gp.repaint();
+            });
+            add(sl1);
+        }
+    }
+
     public static void main(String[] args) {
         JFrame frame =  new JFrame("3d Plot");
-        Graph3dPanel  p = new Graph3dPanel();
+        JPanel  p = new JPanel(new BorderLayout());
+        Graph3dPanel  gp = new Graph3dPanel();
+        p.add(gp);
+        p.add(new Controls(gp),BorderLayout.SOUTH);
         frame.setContentPane(p);
         frame.setBounds(100,100,500,500);
         frame.setVisible(true);

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

@@ -115,6 +115,16 @@ public void mult3v(float[]src,float [] dest){
             dest[i] =(float) sum;
         }
     }
+    public void mult3v(float[]src,int off,float [] dest){
+        for (int i = 0; i < 3; i++) {
+            int col = i*4;
+            double sum =  0;
+            for (int j = 0; j < 3; j++) {
+                sum += m[col+j]*src[off+j];
+            }
+            dest[i] =(float) sum;
+        }
+    }
 
     public void mult4(double[]src,double [] dest){
         for (int i = 0; i < 4; i++) {

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

@@ -27,6 +27,10 @@ public class Object3D {
     protected float mMinX, mMaxX, mMinY, mMaxY, mMinZ, mMaxZ; // bounds in x,y & z
     protected int mType = 4;
 
+    float mAmbient = 0.3f;
+    float mDefuse = 0.7f;
+    public float mSaturation = 0.6f;
+
     public int getType() {
         return mType;
     }
@@ -110,9 +114,6 @@ void raster_height(Scene3D s, float[] zbuff, int[] img, int w, int h) {
         }
     }
 
-    float mAmbient = 0.2f;
-    float mDefuse = 0.82f;
-
     // float mSpec = 0.2f;
     void raster_color(Scene3D s, float[] zbuff, int[] img, int w, int h) {
         for (int i = 0; i < index.length; i += 3) {
@@ -150,6 +151,10 @@ private float bright(float bright) {
         return Math.min(1, Math.max(0, bright));
     }
 
+    private float defuse(float[] normals, int off, float[] light) {
+        // s.mMatrix.mult3v(normal,off,s.tmpVec);
+        return Math.abs(VectorUtil.dot(normal, off, light));
+    }
 
     void raster_phong(Scene3D s, float[] zbuff, int[] img, int w, int h) {
         for (int i = 0; i < index.length; i += 3) {
@@ -160,9 +165,12 @@ void raster_phong(Scene3D s, float[] zbuff, int[] img, int w, int h) {
             //    VectorUtil.triangleNormal(tVert, p1, p2, p3, s.tmpVec);
 
 
-            float defuse1 = VectorUtil.dot(normal, p1, s.mTransformedLight);
-            float defuse2 = VectorUtil.dot(normal, p2, s.mTransformedLight);
-            float defuse3 = VectorUtil.dot(normal, p3, s.mTransformedLight);
+//            float defuse1 = VectorUtil.dot(normal, p1, s.mTransformedLight);
+//            float defuse2 = VectorUtil.dot(normal, p2, s.mTransformedLight);
+//            float defuse3 = VectorUtil.dot(normal, p3, s.mTransformedLight);
+            float defuse1 = defuse(normal, p1, s.mTransformedLight);
+            float defuse2 = defuse(normal, p2, s.mTransformedLight);
+            float defuse3 = defuse(normal, p3, s.mTransformedLight);
             float col1_hue = hue((vert[p1 + 2] - mMinZ) / (mMaxZ - mMinZ));
             float col2_hue = hue((vert[p2 + 2] - mMinZ) / (mMaxZ - mMinZ));
             float col3_hue = hue((vert[p3 + 2] - mMinZ) / (mMaxZ - mMinZ));
@@ -174,6 +182,7 @@ void raster_phong(Scene3D s, float[] zbuff, int[] img, int w, int h) {
                     col1_hue, col1_bright,
                     col2_hue, col2_bright,
                     col3_hue, col3_bright,
+                    mSaturation,
                     w, h,
                     tVert[p1], tVert[p1 + 1], tVert[p1 + 2],
                     tVert[p2], tVert[p2 + 1], tVert[p2 + 2],

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

@@ -32,8 +32,9 @@ public class Scene3D {
     float[] zBuff;
     int[] img;
 
-    private float[] light = {0, -0.3f, 1}; // The direction of the light source
-    public float[] mTransformedLight = {0, -1, -1}; // The direction of the light source
+    private float[] light = {0, 0, 1}; // The direction of the light source
+    public float[] mTransformedLight = {0, 1, 1}; // The direction of the light source
+    public boolean mLightMovesWithCamera = false;
 
     int width, height;
     public float[] tmpVec = new float[3];
@@ -43,7 +44,6 @@ public class Scene3D {
     private Function mFunction;
     private float mZoomZ = 1;
     int background;
-    private boolean mLightMovesWithCamera = true;
 
     public int getLineColor() {
         return lineColor;
@@ -95,7 +95,7 @@ public void transformTriangles() {
     public void transform() {
         Matrix m = mInverse;
         if (mLightMovesWithCamera) {
-            m.mult3v(light, mTransformedLight);
+            mMatrix.mult3v(light, mTransformedLight);
             VectorUtil.normalize(mTransformedLight);
         } else {
             System.arraycopy(light, 0, mTransformedLight, 0, 3);
@@ -451,6 +451,7 @@ public static void trianglePhong(float[] zbuff, int[] img,
                                 float h3, float b3,
                                 float h2, float b2,
                                 float h1, float b1,
+                                float sat,
                                 int w, int h,
                                 float fx3, float fy3, float fz3,
                                 float fx2, float fy2, float fz2,
@@ -583,7 +584,7 @@ public static void trianglePhong(float[] zbuff, int[] img,
                     float bright = pb + dbx * x;
                     if (zbuff[point] > zval) {
                         zbuff[point] = zval;
-                        img[point] = Scene3D.hsvToRgb(hue, 0.8f, bright);;
+                        img[point] = Scene3D.hsvToRgb(hue, sat, bright);;
                     }
                 }
                 CX1 -= FDY12;

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

@@ -15,6 +15,8 @@
  */
 package com.support.constraintlayout.extlib.graph3d;
 
+import java.text.DecimalFormat;
+
 /**
  * A few utilities for vector calculations.
  */
@@ -104,4 +106,22 @@ public static void cross(float a0, float a1, float a2, float b0, float b1, float
         out[1] = out1;
         out[2] = out2;
     }
+
+    private static String trim(String s){
+        return  s.substring(s.length()-7);
+    }
+
+    public static String vecToString(float[] light) {
+        DecimalFormat df =new DecimalFormat("        ##0.000");
+        String str = "[";
+        for (int i = 0; i < 3; i++) {
+            if (Float.isNaN(light[i])) {
+                str+=(((i == 0) ? "" : " , ") + trim("           NAN"));
+                continue;
+            }
+            str+=(((i == 0) ? "" : " , ") + trim(df.format(light[i])));
+        }
+           return str+ "]";
+
+    }
 }

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

@@ -23,7 +23,7 @@
  * Draws box along the axis
  */
 public class AxisBox extends Object3D {
-    int color = 0xFFFF3233;
+    int color = 0xFF1010FF;
     public AxisBox() {
    mType = 1;
     }
@@ -91,11 +91,19 @@ public void render(Scene3D s, float[] zbuff, int[] img, int w, int h) {
             int p2 = index[i + 1];
             int p3 = index[i + 2];
 
-            boolean back = Scene3D.isBackface(
+            boolean front = Scene3D.isBackface(
                     tVert[p1], tVert[p1 + 1], tVert[p1 + 2],
                     tVert[p2], tVert[p2 + 1], tVert[p2 + 2],
                     tVert[p3], tVert[p3 + 1], tVert[p3 + 2]);
-            if (back) continue;
+            if (front) {
+                Scene3D.drawline(zbuff, img, color, w, h,
+                        tVert[p1], tVert[p1 + 1], tVert[p1 + 2] - 0.01f,
+                        tVert[p2], tVert[p2 + 1], tVert[p2 + 2] - 0.01f);
+                Scene3D.drawline(zbuff, img, color, w, h,
+                        tVert[p1], tVert[p1 + 1], tVert[p1 + 2] - 0.01f,
+                        tVert[p3], tVert[p3 + 1], tVert[p3 + 2] - 0.01f);
+                continue;
+            }
 
             Scene3D.drawline(zbuff, img, color, w, h,
                     tVert[p1], tVert[p1 + 1], tVert[p1 + 2] - 0.01f,
@@ -113,9 +121,6 @@ public void render(Scene3D s, float[] zbuff, int[] img, int w, int h) {
                     tVert[p3], tVert[p3 + 1], tVert[p3 + 2] - 0.01f,
                     tVert[p2]-tVert[p1], tVert[p2 + 1]-tVert[p1+1], tVert[p2 + 2] -tVert[p1+2]);
 
-//            Scene3D.drawline(zbuff, img,0x000000, w, h,
-//                    tVert[p2], tVert[p2 + 1], tVert[p2 + 2] - 0.01f,
-//                    tVert[p3], tVert[p3 + 1], tVert[p3 + 2] - 0.01f);
         }
     }
     public static void drawTicks(float[] zbuff, int[] img, int color, int w, int h,
@@ -155,11 +160,11 @@ void raster_color(Scene3D s, float[] zbuff, int[] img, int w, int h) {
             VectorUtil.triangleNormal(tVert, p1, p3, p2, s.tmpVec);
             float ss = VectorUtil.dot(s.tmpVec, screen);
             float defuse = VectorUtil.dot(s.tmpVec, s.mTransformedLight);
-            float ambient = 0.3f;
+            float ambient = 0.5f;
 
             float bright = Math.min(Math.max(0, defuse + ambient), 1);
-            float hue = 0.2f;
-            float sat = 0.5f;
+            float hue = 0.4f;
+            float sat = 0.1f;
 
             int col = Scene3D.hsvToRgb(hue, sat, bright);
             Scene3D.triangle(zbuff, img, col, w, h, tVert[p1], tVert[p1 + 1],

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

@@ -53,7 +53,9 @@ public void computeSurface(boolean resetZ) {
         int n = (mSize + 1) * (mSize + 1);
         makeVert(n);
         makeIndexes(mSize * mSize * 2);
-        System.err.println("index "+index.length);
+        calcSurface(resetZ);
+    }
+    public void calcSurface(boolean resetZ) {
         float min_x = mMinX;
         float max_x = mMaxX;
         float min_y = mMinY;