Upgrading to Metashape(c) 1.8.4

README.md

@@ -19,12 +19,12 @@ To import the library just add the following dependency to your maven project:
 <dependency>
   <groupId>com.agisoft</groupId>
   <artifactId>metashape</artifactId>
-  <version>1.8.2</version>
+  <version>1.8.4</version>
 </dependency>
 ```
 
 ### Standalone
-The library can be used as a standalone by downloading the [metashape-1.8.3.jar](https://github.com/jseinturier/metashape-java-maven/releases/download/v1.8.3/metashape-1.8.3.jar) jar and integrating it to the classpath. 
+The library can be used as a standalone by downloading the [metashape-1.8.4.jar](https://github.com/jseinturier/metashape-java-maven/releases/download/v1.8.4/metashape-1.8.4.jar) jar and integrating it to the classpath. 
 
 ## Usage
 The usage is strictly the same as the original distribution from Agisoft (underlying classes are not modified).

pom.xml

@@ -5,7 +5,7 @@
   <groupId>com.agisoft</groupId>
   <artifactId>metashape</artifactId>
   <packaging>jar</packaging>
-  <version>1.8.3</version>
+  <version>1.8.4</version>
   <name>Metashape-java</name>
   <url>http://maven.apache.org</url>
 

src/main/java/com/agisoft/metashape/Antenna.java

@@ -7,17 +7,17 @@
  */
 public class Antenna {
 
-	private Optional<Vector> location;
-	private Optional<Vector> rotation;
+	private Vector location;
+	private Vector rotation;
 	private Optional<Vector> location_reference;
 	private Optional<Vector> rotation_reference;
 	private Vector location_accuracy;
 	private Vector rotation_accuracy;
 	private boolean fixed;
 
 	public Antenna() {
-		location = Optional.empty();
-		rotation = Optional.empty();
+		location = new Vector(0, 0, 0);
+		rotation = new Vector(0, 0, 0);
 		location_reference = Optional.empty();
 		rotation_reference = Optional.empty();
 		location_accuracy = new Vector(0.05, 0.05, 0.05);
@@ -40,30 +40,30 @@ public boolean isFixed() {
 	}
 
 	/**
-	 *  Antenna coordinates, may be null.
+	 *  Antenna coordinates.
 	 */
-	public void setLocation(Optional<Vector> location) {
+	public void setLocation(Vector location) {
 		this.location = location;
 	}
 
 	/**
-	 *  Antenna coordinates, may be null.
+	 *  Antenna coordinates.
 	 */
-	public Optional<Vector> getLocation() {
+	public Vector getLocation() {
 		return location;
 	}
 
 	/**
-	 *  Antenna rotation angles, may be null.
+	 *  Antenna rotation angles.
 	 */
-	public void setRotation(Optional<Vector> rotation) {
+	public void setRotation(Vector rotation) {
 		this.rotation = rotation;
 	}
 
 	/**
-	 *  Antenna rotation angles, may be null.
+	 *  Antenna rotation angles.
 	 */
-	public Optional<Vector> getRotation() {
+	public Vector getRotation() {
 		return rotation;
 	}
 

src/main/java/com/agisoft/metashape/Elevation.java

@@ -154,4 +154,11 @@ public float getMaxElevation() {
     return MetashapeJNI.Elevation_getMaxElevation(swigCPtr, this);
   }
 
+  /**
+   *  Get elevation value at the specified point.
+   */
+  public float getElevation(Vector pt) {
+    return MetashapeJNI.Elevation_getElevation(swigCPtr, this, pt);
+  }
+
 }

src/main/java/com/agisoft/metashape/ImageFormat.java

@@ -23,7 +23,12 @@ public enum ImageFormat {
   ImageFormatBIL,
   ImageFormatASCII,
   ImageFormatXYZ,
+  ImageFormatARA,
+  ImageFormatTGA,
+  ImageFormatDDS,
+  ImageFormatJP2,
   ImageFormatWebP,
-  ImageFormatJXL;
+  ImageFormatJXL,
+  ImageFormatKTX;
 }
 

src/main/java/com/agisoft/metashape/MetashapeJNI.java

@@ -449,6 +449,7 @@ class MetashapeJNI {
   public final static native double Elevation_getResolution(long jarg1, Elevation jarg1_);
   public final static native float Elevation_getMinElevation(long jarg1, Elevation jarg1_);
   public final static native float Elevation_getMaxElevation(long jarg1, Elevation jarg1_);
+  public final static native float Elevation_getElevation(long jarg1, Elevation jarg1_, Vector jarg2);
   public final static native void delete_Elevation(long jarg1);
   public final static native long new_Orthomosaic(long jarg1, Orthomosaic jarg1_);
   public final static native int Orthomosaic_getKey(long jarg1, Orthomosaic jarg1_);

src/main/java/com/agisoft/metashape/SwigHelpers.java

@@ -8,7 +8,7 @@ class SwigHelpers {
 
 	static <T> long[] cArrayUnwrap(T[] arrayWrapper, Class<T> type) {
 		try {
-			Method method = type.getMethod("getCPtr", type);
+			Method method = type.getDeclaredMethod("getCPtr", type);
 			long[] cArray = new long[arrayWrapper.length];
 			for (int i=0; i < arrayWrapper.length; i++)
 				cArray[i] = (long) method.invoke(null, arrayWrapper[i]);
@@ -21,7 +21,7 @@ static <T> long[] cArrayUnwrap(T[] arrayWrapper, Class<T> type) {
 
 	static <T> T[] cArrayWrap(long[] cArray, boolean cMemoryOwn, Class<T> type) {
 		try {
-			Constructor<T> ctor = type.getConstructor(long.class, boolean.class);
+			Constructor<T> ctor = type.getDeclaredConstructor(long.class, boolean.class);
 			@SuppressWarnings("unchecked")
 			T[] arrayWrapper = (T[]) Array.newInstance(type, cArray.length);
 			for (int i = 0; i < cArray.length; i++)

src/main/java/com/agisoft/metashape/tasks/ExportPoints.java

@@ -137,6 +137,20 @@ public CoordinateSystem getCRS() {
 		return (CoordinateSystem) getParameter("crs");
 	}
 
+	/**
+	 *  Tileset subdivision depth (Cesium format only). Default: 5
+	 */
+	public void setFolderDepth(int value) {
+		setParameter("folder_depth", (Object) value);
+	}
+
+	/**
+	 *  Tileset subdivision depth (Cesium format only). Default: 5
+	 */
+	public int getFolderDepth() {
+		return (int) getParameter("folder_depth");
+	}
+
 	/**
 	 *  Export format. Default: PointsFormat.PointsFormatNone
 	 */

src/main/java/com/agisoft/metashape/tasks/ExportTiledModel.java

@@ -39,6 +39,20 @@ public CoordinateSystem getCRS() {
 		return (CoordinateSystem) getParameter("crs");
 	}
 
+	/**
+	 *  Tileset subdivision depth (Cesium format only). Default: 5
+	 */
+	public void setFolderDepth(int value) {
+		setParameter("folder_depth", (Object) value);
+	}
+
+	/**
+	 *  Tileset subdivision depth (Cesium format only). Default: 5
+	 */
+	public int getFolderDepth() {
+		return (int) getParameter("folder_depth");
+	}
+
 	/**
 	 *  Export format. Default: TiledModelFormat.TiledModelFormatNone
 	 */

src/main/java/com/agisoft/metashape/tasks/ImportLaserScans.java

@@ -53,4 +53,18 @@ public String getImagePath() {
 		return (String) getParameter("image_path");
 	}
 
+	/**
+	 *  Import as a multi-camera system
+	 */
+	public void setMultiplane(boolean value) {
+		setParameter("multiplane", (Object) value);
+	}
+
+	/**
+	 *  Import as a multi-camera system
+	 */
+	public boolean getMultiplane() {
+		return (boolean) getParameter("multiplane");
+	}
+
 }

src/main/java/com/agisoft/metashape/tasks/ImportPoints.java

@@ -96,28 +96,28 @@ public Vector getShift() {
 	}
 
 	/**
-	 *  Trajectory file delimiter.
+	 *  Trajectory file column order (t - time, x/y/z - coordinates, 0 - skip column).
 	 */
 	public void setTrajColumns(String value) {
 		setParameter("traj_columns", (Object) value);
 	}
 
 	/**
-	 *  Trajectory file delimiter.
+	 *  Trajectory file column order (t - time, x/y/z - coordinates, 0 - skip column).
 	 */
 	public String getTrajColumns() {
 		return (String) getParameter("traj_columns");
 	}
 
 	/**
-	 *  Trajectory file column order in csv format (t - time, x/y/z - coordinates).
+	 *  Trajectory file delimiter.
 	 */
 	public void setTrajDelimiter(String value) {
 		setParameter("traj_delimiter", (Object) value);
 	}
 
 	/**
-	 *  Trajectory file column order in csv format (t - time, x/y/z - coordinates).
+	 *  Trajectory file delimiter.
 	 */
 	public String getTrajDelimiter() {
 		return (String) getParameter("traj_delimiter");

src/main/java/org/metashape/MetashapeNatives.java

@@ -20,7 +20,7 @@ public class MetashapeNatives {
 
 	private static boolean available = false;
 
-	private static String[] linuxX64Libs = new String[] {"libgfortran.so.3", "libgmp.so.10", "libmetashape.so", "libmpfr.so.4", "libopenblas.so.0", "libstdc++.so.6.compat"};
+	private static String[] linuxX64Libs = new String[] {"libgfortran.so.3", "libgmp.so.10.compat", "libmetashape.so", "libmpfr.so.4.compat", "libopenblas.so.0", "libstdc++.so.6.compat"};
 	private static String[] macosX64Libs = new String[] {"libgmp.10.dylib", "libmetashape.jnilib", "libomp.dylib"};
 	private static String[] winX32Libs   = new String[] {"libgmp-10.dll", "libopenblas.dll", "metashape.dll"};
 	private static String[] winX64Libs   = new String[] {"libgmp-10.dll", "libopenblas.dll", "metashape.dll"};