merge

jzy3d-core-awt/src/test/java/org/jzy3d/mocks/jzy3d/AWTViewMock.java

@@ -0,0 +1,63 @@
+package org.jzy3d.mocks.jzy3d;
+
+import org.jzy3d.chart.factories.IChartFactory;
+import org.jzy3d.plot3d.rendering.canvas.ICanvas;
+import org.jzy3d.plot3d.rendering.canvas.Quality;
+import org.jzy3d.plot3d.rendering.scene.Scene;
+import org.jzy3d.plot3d.rendering.view.AWTView;
+
+public class AWTViewMock extends AWTView {
+
+  public AWTViewMock(IChartFactory factory, Scene scene, ICanvas canvas, Quality quality) {
+    super(factory, scene, canvas, quality);
+  }
+
+  protected int counter_shoot = 0;
+  protected int counter_initInstance = 0;
+
+  @Override
+  public void initInstance(IChartFactory factory, Scene scene, ICanvas canvas, Quality quality) {
+    super.initInstance(factory, scene, canvas, quality);
+
+    counter_initInstance+=1;
+  }
+
+  @Override
+  public void shoot() {
+    super.shoot();
+
+    counter_shoot++;
+  }
+
+  public int getCounter_shoot() {
+    return counter_shoot;
+  }
+
+  public void resetCounter_shoot() {
+    this.counter_shoot = 0;
+  }
+
+  public int getCounter_initInstance() {
+    return counter_initInstance;
+  }
+
+  //public void resetCounter_initInstance() {
+  //  this.counter_initInstance = 0;
+ // }
+
+
+
+  /*
+   * verify(chart.getView(), atLeast(1)).initInstance(factory, chart.getScene(), canvas,
+        chart.getQuality());
+    verify(chart.getView(), atLeast(1)).shoot();
+
+    // undesired
+    verify(chart.getView(), atLeast(1)).shoot(); // VIEW IS CALLED 2 OR 3 TIMES !!!!!!!!!!!!!!!!!!!!!!
+
+    // Then camera was called at least once
+    verify(chart.getView().getCamera(), atLeast(1)).shoot(chart.getPainter(),
+        chart.getView().getCameraMode());
+   * 
+   */
+}

jzy3d-core/data/objfiles/bunny.url

@@ -1 +1 @@
-http://download.jzy3d.org/objfiles/bunny.obj
+https://download.jzy3d.org/objfiles/bunny.obj

jzy3d-core/data/objfiles/dragon.url

@@ -1 +1 @@
-http://download.jzy3d.org/objfiles/dragon.obj
+https://download.jzy3d.org/objfiles/dragon.obj

jzy3d-core/src/main/java/org/jzy3d/maths/Coord2d.java

@@ -214,7 +214,7 @@ public Coord2d polar() {
 
   /**
    * Return a real polar value, with an angle in the range [0;2*PI]
-   * http://fr.wikipedia.org/wiki/Coordonn%C3%A9es_polaires
+   * https://en.wikipedia.org/wiki/Polar_coordinate_system
    */
   public Coord2d fullPolar() {
     double radius = Math.sqrt(x * x + y * y);

jzy3d-core/src/main/java/org/jzy3d/maths/algorithms/interpolation/algorithms/Spline3D.java

@@ -9,7 +9,7 @@
  * <p>
  * This is a generic 3D B-Spline class for curves of arbitrary length, control handles and patches
  * are created and joined automatically as described here:
- * <a href="http://www.ibiblio.org/e-notes/Splines/Bint.htm">ibiblio.org/e-notes/
+ * <a href="https://www.ibiblio.org/e-notes/Splines/Bint.htm">ibiblio.org/e-notes/
  * Splines/Bint.htm</a>
  * </p>
  * 

jzy3d-core/src/main/java/org/jzy3d/plot3d/primitives/Geometry.java

@@ -243,7 +243,7 @@ protected void drawFace(IPainter painter) {
         polygonOffsetFillDisable(painter); // DISABLE OFFSET
 
       if (wireframeDisplayed && polygonWireframeDepthTrick)
-        applyDepthRangeDefault(painter); // DISAABLE RANGE FOR UNDER
+        applyDepthRangeDefault(painter); // DISABLE RANGE FOR UNDER
 
     }
   }

jzy3d-core/src/main/java/org/jzy3d/plot3d/primitives/LineStrip.java

@@ -25,7 +25,7 @@
  * 
  * Dotted line are built using
  * 
- * http://www.glprogramming.com/red/images/Image35.gif
+ * https://www.glprogramming.com/red/images/Image35.gif
  * 
  * @author Martin Pernollet
  */
@@ -316,7 +316,7 @@ public void setShowSymbols(boolean showSymbols) {
   /**
    * Indicates if stippled rendering is enabled for this line.
    * 
-   * @see http://www.glprogramming.com/red/chapter02.html (Stippled line section)
+   * @see https://www.glprogramming.com/red/chapter02.html (Stippled line section)
    */
   public boolean isStipple() {
     return stipple;
@@ -325,7 +325,7 @@ public boolean isStipple() {
   /**
    * Enable or disable stippled rendering.
    * 
-   * @see http://www.glprogramming.com/red/chapter02.html (Stippled line section)
+   * @see https://www.glprogramming.com/red/chapter02.html (Stippled line section)
    */
   public void setStipple(boolean stipple) {
     this.stipple = stipple;
@@ -334,8 +334,8 @@ public void setStipple(boolean stipple) {
   /**
    * Stippled line factor.
    * 
-   * @see http://www.glprogramming.com/red/images/Image35.gif
-   * @see http://www.glprogramming.com/red/chapter02.html (Stippled line section)
+   * @see https://www.glprogramming.com/red/images/Image35.gif
+   * @see https://www.glprogramming.com/red/chapter02.html (Stippled line section)
    */
   public int getStippleFactor() {
     return stippleFactor;
@@ -344,8 +344,8 @@ public int getStippleFactor() {
   /**
    * Stippled line factor.
    * 
-   * @see http://www.glprogramming.com/red/images/Image35.gif
-   * @see http://www.glprogramming.com/red/chapter02.html (Stippled line section)
+   * @see https://www.glprogramming.com/red/images/Image35.gif
+   * @see https://www.glprogramming.com/red/chapter02.html (Stippled line section)
    */
   public void setStippleFactor(int stippleFactor) {
     this.stippleFactor = stippleFactor;
@@ -354,8 +354,8 @@ public void setStippleFactor(int stippleFactor) {
   /**
    * Stippled line pattern.
    * 
-   * @see http://www.glprogramming.com/red/images/Image35.gif
-   * @see http://www.glprogramming.com/red/chapter02.html (Stippled line section)
+   * @see https://www.glprogramming.com/red/images/Image35.gif
+   * @see https://www.glprogramming.com/red/chapter02.html (Stippled line section)
    */
   public short getStipplePattern() {
     return stipplePattern;
@@ -364,8 +364,8 @@ public short getStipplePattern() {
   /**
    * Stippled line pattern.
    * 
-   * @see http://www.glprogramming.com/red/images/Image35.gif
-   * @see http://www.glprogramming.com/red/chapter02.html (Stippled line section)
+   * @see https://www.glprogramming.com/red/images/Image35.gif
+   * @see https://www.glprogramming.com/red/chapter02.html (Stippled line section)
    */
   public void setStipplePattern(short stipplePattern) {
     this.stipplePattern = stipplePattern;

jzy3d-core/src/main/java/org/jzy3d/plot3d/primitives/axis/AxisBox.java

@@ -113,7 +113,7 @@ public AxisBox(BoundingBox3d bbox, AxisLayout layout) {
   }
 
   /**
-   * Draws the AxeBox. The camera is used to determine which axis is closest to the ur point ov
+   * Draws the AxisBox. The camera is used to determine which axis is closest to the ur point ov
    * view, in order to decide for an axis on which to diplay the tick values.
    */
   @Override
@@ -142,8 +142,6 @@ protected void drawAnnotations(IPainter painter) {
 
   /**
    * reset to identity and apply scaling
-   * 
-   * @param painter TODO
    */
   public void doTransform(IPainter painter) {
     painter.glLoadIdentity();

jzy3d-core/src/main/java/org/jzy3d/plot3d/rendering/lights/LightSet.java

@@ -34,7 +34,7 @@ public void apply(IPainter painter, Coord3d scale) {
     }
   }
 
-  // http://www.sjbaker.org/steve/omniv/opengl_lighting.html
+  // https://www.sjbaker.org/steve/omniv/opengl_lighting.html
   protected void initLight(IPainter painter) {
     painter.glEnable_ColorMaterial();
     painter.glEnable_Lighting();

jzy3d-core/src/main/java/org/jzy3d/plot3d/rendering/view/Camera.java

@@ -592,7 +592,7 @@ public void shoot(IPainter painter, CameraMode projection, boolean doPushMatrixB
   public void doShoot(IPainter painter, CameraMode projection) {
     // Set viewport
     ViewportConfiguration viewport = applyViewport(painter);
-
+    
     // Set projection
     if (projection == CameraMode.PERSPECTIVE) {
       projectionPerspective(painter, viewport);

jzy3d-core/src/main/java/org/jzy3d/plot3d/rendering/view/ViewportConfiguration.java

@@ -7,7 +7,7 @@
  * 
  * It is define by a width and height, and support an X and Y offset
  * 
- * @see http://www.opengl.org/sdk/docs/man/xhtml/glViewport.xml
+ * @see https://www.khronos.org/registry/OpenGL-Refpages/gl4/html/glViewport.xhtml
  * @author Martin Pernollet
  */
 public class ViewportConfiguration {

jzy3d-core/src/test/java/org/jzy3d/mocks/jzy3d/Mocks.java

@@ -15,13 +15,12 @@
 import org.jzy3d.plot3d.rendering.canvas.ICanvasListener;
 import org.jzy3d.plot3d.rendering.view.View;
 import org.mockito.Mockito;
-import org.smurn.jply.util.Axis;
 
 public class Mocks {
   public static AxisLayout AxisLayout() {
     return mock(AxisLayout.class);
   }
-  
+
   public static AxisBox Axis() {
     return mock(AxisBox.class);
   }
@@ -31,17 +30,17 @@ public static AxisBox Axis(AxisLayout layout) {
     when(axis.getLayout()).thenReturn(layout);
     return axis;
   }
-  
+
   public static View View2D() {
     View view = mock(View.class);
     when(view.is2D()).thenReturn(true);
     return view;
   }
-  
+
   public static View View() {
     return Mockito.mock(View.class);
   }
-  
+
   public static View View(AxisBox axis, IPainter painter) {
     return View(axis, painter, null);
   }
@@ -55,7 +54,7 @@ public static View View(AxisBox axis, IPainter painter, ICanvas canvas) {
     return view;
   }
 
-  
+
   public static View ViewAndPainter(float viewScale) {
     return ViewAndPainter(viewScale, "macos", "10", null, null);
   }
@@ -68,7 +67,7 @@ public static View ViewAndPainter(float viewScale, String os, String version, Co
     IPainter painter = Painter(os, version);
 
     ICanvas canvas = mock(ICanvas.class);
-    
+
     if (gpuScale != null)
       when(canvas.getPixelScale()).thenReturn(gpuScale);
     if (jvmScale != null)
@@ -101,7 +100,7 @@ public static ICanvas Canvas(boolean isNative) {
     when(canvas.isNative()).thenReturn(isNative);
     return canvas;
   }
-  
+
   public static ICanvas Canvas(Coord2d scaleHard, Coord2d scaleVM) {
     return new ICanvas() {
       @Override
@@ -178,7 +177,7 @@ public void removeCanvasListener(ICanvasListener listener) {}
       public List<ICanvasListener> getCanvasListeners() {
         return null;
       }
-      
+
       @Override
       public boolean isNative() {
         return true;

jzy3d-emul-gl-awt/pom.xml

@@ -22,6 +22,13 @@
 			<artifactId>jzy3d-core-awt</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>jzy3d-core-awt</artifactId>
+			<version>${project.version}</version>
+			<type>test-jar</type>
+		</dependency>
 
 		<dependency>
 			<groupId>${project.groupId}</groupId>

jzy3d-emul-gl-awt/src/main/java/org/jzy3d/chart/factories/EmulGLChartFactory.java

@@ -3,11 +3,14 @@
 import org.jzy3d.chart.AWTChart;
 import org.jzy3d.chart.Chart;
 import org.jzy3d.chart.controllers.thread.camera.CameraThreadControllerWithTime;
+import org.jzy3d.painters.EmulGLPainter;
+import org.jzy3d.plot3d.rendering.canvas.EmulGLCanvas;
 import org.jzy3d.plot3d.rendering.canvas.ICanvas;
 import org.jzy3d.plot3d.rendering.canvas.Quality;
 import org.jzy3d.plot3d.rendering.scene.Scene;
 import org.jzy3d.plot3d.rendering.view.AWTView;
 import org.jzy3d.plot3d.rendering.view.modes.ViewBoundMode;
+import jgl.wt.awt.GL;
 
 public class EmulGLChartFactory extends ChartFactory {
   public EmulGLChartFactory() {
@@ -38,5 +41,28 @@ public CameraThreadControllerWithTime newCameraThreadController(Chart chart) {
     CameraThreadControllerWithTime controller = new CameraThreadControllerWithTime(chart, 60);
     return controller;
   }
+
+  /**
+   * This return a factory with a custom GL instance which can be used for manual mocking
+   * @return
+   */
+  public static EmulGLChartFactory forGL(GL glMock) {
+
+    // Given a surface chart with a mock GL injected for spying calls to glDepthRange
+    EmulGLPainterFactory painterF = new EmulGLPainterFactory() {
+      protected EmulGLCanvas newEmulGLCanvas(IChartFactory factory, Scene scene, Quality quality) {
+        EmulGLCanvas c = new EmulGLCanvas(factory, scene, quality);
+        c.setGL(glMock);
+        return c;
+      }
+    };
+
+    EmulGLChartFactory factory = new EmulGLChartFactory(painterF);
+    Chart chart = factory.newChart(Quality.Advanced());
+    EmulGLPainter painter = (EmulGLPainter)chart.getPainter();
+    painter.setGL(glMock); // << spy
+
+    return factory;
+  }
 
 }

jzy3d-emul-gl-awt/src/main/java/org/jzy3d/painters/EmulGLPainter.java

@@ -695,7 +695,9 @@ public int getTextLengthInPixels(Font font, String string) {
     // Try getting an offscreen image graphics
     if(g==null) {
       BufferedImage image = getGL().getRenderedImage();
-      g = image.getGraphics();
+      if(image!=null) {
+        g = image.getGraphics();
+      }
     }
 
     // Hope to have a graphics and process string width

jzy3d-emul-gl-awt/src/test/java/org/jzy3d/emulgl/opengl/TestDepthRange.java

@@ -4,6 +4,7 @@
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.jzy3d.chart.Chart;
 import org.jzy3d.chart.factories.EmulGLChartFactory;
@@ -21,10 +22,10 @@
 import org.jzy3d.plot3d.rendering.canvas.Quality;
 
 /**
- * {@AxisBox} and 
  * @author martin
  *
  */
+@Ignore("This test is replaced by TestShape and TestAxisBox which handle mocking more efficiently")
 public class TestDepthRange {
   @Test
   public void whenRenderAxis_DepthRangeModifiedByAxis() {