[DEV] add some feature

This commit is contained in:
Edouard DUPIN 2021-04-04 15:26:54 +02:00
parent 3a2f186f85
commit ab18170a8c
15 changed files with 1042 additions and 107 deletions

View File

@ -11,11 +11,6 @@
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/scenarium-logger">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-14"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-14">
<attributes> <attributes>
<attribute name="module" value="true"/> <attribute name="module" value="true"/>
@ -31,5 +26,10 @@
<attribute name="test" value="true"/> <attribute name="test" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/scenarium-logger">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="out/eclipse/classes"/> <classpathentry kind="output" path="out/eclipse/classes"/>
</classpath> </classpath>

View File

@ -162,7 +162,7 @@ public record Color(
public static final Color YELLOW = new Color(0xFF, 0xFF, 0x00, 0xFF); public static final Color YELLOW = new Color(0xFF, 0xFF, 0x00, 0xFF);
public static final Color YELLOW_GREEN = new Color(0x9A, 0xCD, 0x32, 0xFF); public static final Color YELLOW_GREEN = new Color(0x9A, 0xCD, 0x32, 0xFF);
private static final Map<String, Color> NAMED_COLORS = Map.<String, Color>ofEntries( private static final Map<String, Color> NAMED_COLORS = Map.<String, Color> ofEntries(
//@formatter:off //@formatter:off
Map.entry("none", NONE), Map.entry("none", NONE),
Map.entry("aliceblue", ALICE_BLUE), Map.entry("aliceblue", ALICE_BLUE),
@ -414,9 +414,29 @@ public record Color(
this.a = a; this.a = a;
} }
public Color(final double r, final double g, final double b, final double a) {
this((float) r, (float) g, (float) b, (float) a);
}
@Override @Override
public String toString() { public String toString() {
return "rgba(" + this.r + ", " + this.g + ", " + this.b + ", " + this.a + ")"; return "rgba(" + this.r + ", " + this.g + ", " + this.b + ", " + this.a + ")";
} }
public Color withR(final float value) {
return new Color(value, this.g, this.b, this.a);
}
public Color withG(final float value) {
return new Color(this.r, value, this.b, this.a);
}
public Color withB(final float value) {
return new Color(this.r, this.g, value, this.a);
}
public Color withA(final float value) {
return new Color(this.r, this.g, this.b, value);
}
} }

View File

@ -0,0 +1,313 @@
/** @file
* @author Edouard DUPIN
* @copyright 2011, Edouard DUPIN, all right reserved
* @license MPL v2.0 (see license file)
*/
package org.atriasoft.etk;
import org.atriasoft.etk.internal.Log;
import org.atriasoft.etk.math.Vector2f;
import org.atriasoft.etk.math.Vector2i;
/**
* in the dimension class we store the data as the more usefull unit (pixel)
* but one case need to be dynamic the %, then when requested in % the register the % value
*/
@SuppressWarnings("preview")
public record Dimension(
Vector2f size,
Distance type) {
public static final Dimension ZERO = new Dimension(Vector2f.ZERO, Distance.PIXEL);
private static Vector2f ratio = new Vector2f(9999999, 888888);
private static Vector2f invRatio = new Vector2f(1, 1);
private static Dimension windowsSize = new Dimension(Vector2f.MAX_VALUE, Distance.PIXEL);
public static final float INCH_TO_MILLIMETER = 1.0f / 25.4f;
public static final float FOOT_TO_MILLIMETER = 1.0f / 304.8f;
public static final float METER_TO_MILLIMETER = 1.0f / 1000.0f;
public static final float CENTIMETER_TO_MILLIMETER = 1.0f / 10.0f;
public static final float KILOMETER_TO_MILLIMETER = 1.0f / 1000000.0f;
public static final float MILLIMETER_TO_INCH = 25.4f;
public static final float MILLIMETER_TO_FOOT = 304.8f;
public static final float MILLIMETER_TO_METER = 1000.0f;
public static final float MILLIMETER_TO_CENTIMETER = 10.0f;
public static final float MILLIMETER_TO_KILOMETER = 1000000.0f;
/**
* basic init
*/
static {
final Dimension conversion = new Dimension(new Vector2f(72, 72), Distance.INCH);
ratio = conversion.getMillimeter();
invRatio = new Vector2f(1.0f / ratio.x(), 1.0f / ratio.y());
windowsSize = new Dimension(new Vector2f(200, 200), Distance.PIXEL);
}
/**
* get the Windows diagonal size in the request unit
* @param type Unit type requested.
* @return the requested size
*/
public static float getWindowsDiag(final Distance type) {
final Vector2f size = getWindowsSize(type);
return size.length();
}
/**
* get the Windows size in the request unit
* @param type Unit type requested.
* @return the requested size
*/
public static Vector2f getWindowsSize(final Distance type) {
return windowsSize.get(type);
}
/**
* set the Milimeter ratio for calculation
* @param ratio Milimeter ration for the screen calculation interpolation
* @param type Unit type requested.
* @note: same as @ref setPixelPerInch (internal manage convertion)
*/
public static void setPixelRatio(final Vector2f ratio, final Distance type) {
Log.info("Set a new screen ratio for the screen : ratio=" + ratio + " type=" + type);
final Dimension conversion = new Dimension(ratio, type);
Log.info(" == > " + conversion);
Dimension.ratio = conversion.getMillimeter();
invRatio = new Vector2f(1.0f / Dimension.ratio.x(), 1.0f / Dimension.ratio.y());
Log.info("Set a new screen ratio for the screen : ratioMm=" + Dimension.ratio);
}
/**
* set the current Windows size
* @param size size of the current windows in pixel.
*/
public static void setPixelWindowsSize(final Vector2f size) {
windowsSize = new Dimension(size);
Log.verbose("Set a new Windows property size " + windowsSize + "px");
}
/**
* Constructor (default :0,0 mode pixel)
*/
public Dimension() {
this(Vector2f.ZERO, Distance.PIXEL);
}
/**
* Constructor
* @param size Requested dimension
*/
public Dimension(final Vector2f size) {
this(size, Distance.PIXEL);
}
public Dimension(final Vector2f size, final Distance type) {
this.size = size;
this.type = type;
}
/**
* get the current dimension in requested type
* @param type Type of unit requested.
* @return dimension requested.
*/
public Vector2f get(final Distance type) {
return switch (type) {
case POURCENT -> getPourcent();
case PIXEL -> getPixel();
case METER -> getMeter();
case CENTIMETER -> getCentimeter();
case MILLIMETER -> getMillimeter();
case KILOMETER -> getKilometer();
case INCH -> getInch();
case FOOT -> getFoot();
case ELEMENT -> throw new UnsupportedOperationException("Unimplemented case: " + type);
case EX -> throw new UnsupportedOperationException("Unimplemented case: " + type);
case PC -> {
Log.error("Does not support other than Px and % type of dimention : " + type + " automaticly convert with {72,72} pixel/inch");
yield null;
}
case POINT -> throw new UnsupportedOperationException("Unimplemented case: " + type);
default -> throw new IllegalArgumentException("Unexpected value: " + type);
};
}
/**
* get the current dimension in Centimeter
* @return dimension in Centimeter
*/
public Vector2f getCentimeter() {
return getMillimeter().multiply(MILLIMETER_TO_CENTIMETER);
}
/**
* get the current dimension in Foot
* @return dimension in Foot
*/
public Vector2f getFoot() {
return getMillimeter().multiply(MILLIMETER_TO_FOOT);
}
/**
* get the current dimension in Inch
* @return dimension in Inch
*/
public Vector2f getInch() {
return getMillimeter().multiply(MILLIMETER_TO_INCH);
}
/**
* get the current dimension in Kilometer
* @return dimension in Kilometer
*/
public Vector2f getKilometer() {
return getMillimeter().multiply(MILLIMETER_TO_KILOMETER);
}
/**
* get the current dimension in Meter
* @return dimension in Meter
*/
public Vector2f getMeter() {
return getMillimeter().multiply(MILLIMETER_TO_METER);
}
/**
* get the current dimension in Millimeter
* @return dimension in Millimeter
*/
public Vector2f getMillimeter() {
return new Vector2f(getPixel().x() * invRatio.x(), getPixel().y() * invRatio.y());
}
/**
* get the current dimension in pixel
* @return dimension in Pixel
*/
public Vector2f getPixel() {
return getPixel(windowsSize.getPixel());
}
public Vector2f getPixel(final Vector2f uppersize) {
if (this.type != Distance.POURCENT) {
return this.size;
}
final Vector2f res = new Vector2f(uppersize.x() * this.size.x(), uppersize.y() * this.size.y());
//GALE_DEBUG("Get % : " + m_data + " / " + windDim + " == > " + res);
return res;
}
public Vector2i getPixeli() {
Vector2f tmpSize = windowsSize.getPixel();
return getPixeli(new Vector2i((int) tmpSize.x(), (int) tmpSize.y()));
}
public Vector2i getPixeli(final Vector2i uppersize) {
if (this.type != Distance.POURCENT) {
return new Vector2i((int) this.size.x(), (int) this.size.y());
}
final Vector2i res = new Vector2i((int) (uppersize.x() * this.size.x()), (int) (uppersize.y() * this.size.y()));
//GALE_DEBUG("Get % : " + m_data + " / " + windDim + " == > " + res);
return res;
}
/**
* get the current dimension in Pourcent
* @return dimension in Pourcent
*/
public Vector2f getPourcent() {
if (this.type != Distance.POURCENT) {
final Vector2f windDim = windowsSize.getPixel();
//GALE_DEBUG(" windows dimension : " /*+ windowsSize*/ + " == > " + windDim + "px"); // ==> infinite loop ...
//printf(" windows dimension : %f,%f", windDim.x(),windDim.y());
//printf(" data : %f,%f", m_data.x(),m_data.y());
return new Vector2f((this.size.x() / windDim.x()) * 100.0f, (this.size.y() / windDim.y()) * 100.0f);
}
return new Vector2f(this.size.x() * 100.0f, this.size.y() * 100.0f);
};
/**
* get the dimension type
* @return the type
*/
public Distance getType() {
return this.type;
}
/**
* set the current dimension in requested type
* @param config dimension configuration.
*/
public static Dimension valueOf(String config) {
final Vector2f size = Vector2f.ZERO;
Distance type = Distance.PIXEL;
if (config.endsWith("%")) {
type = Distance.POURCENT;
config = config.substring(0, config.length() - 1);
} else if (config.endsWith("px")) {
type = Distance.PIXEL;
config = config.substring(0, config.length() - 2);
} else if (config.endsWith("ft")) {
type = Distance.FOOT;
config = config.substring(0, config.length() - 2);
} else if (config.endsWith("in")) {
type = Distance.INCH;
config = config.substring(0, config.length() - 2);
} else if (config.endsWith("km")) {
type = Distance.KILOMETER;
config = config.substring(0, config.length() - 2);
} else if (config.endsWith("mm")) {
type = Distance.MILLIMETER;
config = config.substring(0, config.length() - 2);
} else if (config.endsWith("cm")) {
type = Distance.CENTIMETER;
config = config.substring(0, config.length() - 2);
} else if (config.endsWith("m")) {
type = Distance.METER;
config = config.substring(0, config.length() - 1);
} else if (config.endsWith("em")) {
type = Distance.ELEMENT;
config = config.substring(0, config.length() - 2);
} else if (config.endsWith("ex")) {
type = Distance.EX;
config = config.substring(0, config.length() - 2);
} else if (config.endsWith("pt")) {
type = Distance.POINT;
config = config.substring(0, config.length() - 2);
} else if (config.endsWith("pc")) {
type = Distance.PC;
config = config.substring(0, config.length() - 2);
} else {
Log.critical("Can not parse dimension : '" + config + "'");
return null;
}
final Vector2f tmp = Vector2f.valueOf(config);
final Dimension ret = new Dimension(tmp, type);
Log.verbose(" config dimension : '" + config + "' == > " + ret.toString());
return ret;
}
/**
* string cast :
*/
@Override
public String toString() {
String str = get(getType()).toString();
switch (getType()) {
case POURCENT -> str += "%";
case PIXEL -> str += "px";
case METER -> str += "m";
case CENTIMETER -> str += "cm";
case MILLIMETER -> str += "mm";
case KILOMETER -> str += "km";
case INCH -> str += "in";
case FOOT -> str += "ft";
case ELEMENT -> str += "em";
case EX -> str += "ex";
case POINT -> str += "pt";
case PC -> str += "pc";
default -> str += "";
}
return str;
}
}

View File

@ -0,0 +1,164 @@
/** @file
* @author Edouard DUPIN
* @copyright 2011, Edouard DUPIN, all right reserved
* @license MPL v2.0 (see license file)
*/
package org.atriasoft.etk;
import org.atriasoft.etk.internal.Log;
import org.atriasoft.etk.math.Vector2f;
/**
* in the dimension class we store the data as the more usefull unit (pixel)
* but one case need to be dynamic the %, then when requested in % the register the % value
*/
@SuppressWarnings("preview")
public record Dimension1D(
float size,
Distance type) {
private static final float BASIC_RATIO = 72.0f / 25.4f;
public static final Dimension1D ZERO = new Dimension1D(0);
public static final float INCH_TO_MILLIMETER = 1.0f / 25.4f;
public static final float FOOT_TO_MILLIMETER = 1.0f / 304.8f;
public static final float METER_TO_MILLIMETER = 1.0f / 1000.0f;
public static final float CENTIMETER_TO_MILLIMETER = 1.0f / 10.0f;
public static final float KILOMETER_TO_MILLIMETER = 1.0f / 1000000.0f;
public static final float MILLIMETER_TO_INCH = 25.4f;
public static final float MILLIMETER_TO_FOOT = 304.8f;
public static final float MILLIMETER_TO_METER = 1000.0f;
public static final float MILLIMETER_TO_CENTIMETER = 10.0f;
public static final float MILLIMETER_TO_KILOMETER = 1000000.0f;
/**
* Constructor (default :0,0 mode pixel)
*/
public Dimension1D() {
this(0, Distance.PIXEL);
}
/**
* Constructor
* @param size Requested dimension
*/
public Dimension1D(final float size) {
this(size, Distance.PIXEL);
}
public Dimension1D(final float size, final Distance type) {
this.size = size;
this.type = type;
}
/**
* get the current dimension in pixel
* @return dimension in Pixel
*/
public float getPixel(final float upperSize) {
switch (this.type) {
case POURCENT:
return upperSize * this.size * 0.01f;
case PIXEL:
return this.size;
case METER:
return this.size * METER_TO_MILLIMETER * BASIC_RATIO;
case CENTIMETER:
return this.size * CENTIMETER_TO_MILLIMETER * BASIC_RATIO;
case MILLIMETER:
return this.size * BASIC_RATIO;
case KILOMETER:
return this.size * KILOMETER_TO_MILLIMETER * BASIC_RATIO;
case INCH:
return this.size * INCH_TO_MILLIMETER * BASIC_RATIO;
case FOOT:
return this.size * FOOT_TO_MILLIMETER * BASIC_RATIO;
default:
return 128.0f;
}
}
/**
* get the dimension type
* @return the type
*/
public Distance getType() {
return this.type;
}
/**
* set the current dimension in requested type
* @param config dimension configuration.
*/
public static Dimension1D valueOf(String config) {
final Vector2f size = Vector2f.ZERO;
Distance type = Distance.PIXEL;
if (config.endsWith("%")) {
type = Distance.POURCENT;
config = config.substring(0, config.length() - 1);
} else if (config.endsWith("px")) {
type = Distance.PIXEL;
config = config.substring(0, config.length() - 2);
} else if (config.endsWith("ft")) {
type = Distance.FOOT;
config = config.substring(0, config.length() - 2);
} else if (config.endsWith("in")) {
type = Distance.INCH;
config = config.substring(0, config.length() - 2);
} else if (config.endsWith("km")) {
type = Distance.KILOMETER;
config = config.substring(0, config.length() - 2);
} else if (config.endsWith("mm")) {
type = Distance.MILLIMETER;
config = config.substring(0, config.length() - 2);
} else if (config.endsWith("cm")) {
type = Distance.CENTIMETER;
config = config.substring(0, config.length() - 2);
} else if (config.endsWith("m")) {
type = Distance.METER;
config = config.substring(0, config.length() - 1);
} else if (config.endsWith("em")) {
type = Distance.ELEMENT;
config = config.substring(0, config.length() - 2);
} else if (config.endsWith("ex")) {
type = Distance.EX;
config = config.substring(0, config.length() - 2);
} else if (config.endsWith("pt")) {
type = Distance.POINT;
config = config.substring(0, config.length() - 2);
} else if (config.endsWith("pc")) {
type = Distance.PC;
config = config.substring(0, config.length() - 2);
} else {
Log.critical("Can not parse dimension : '" + config + "'");
return null;
}
final float tmp = Float.valueOf(config);
final Dimension1D ret = new Dimension1D(tmp, type);
Log.verbose(" config dimension : '" + config + "' == > " + ret.toString());
return ret;
}
/**
* string cast :
*/
@Override
public String toString() {
String str = Float.toString(this.size);
switch (getType()) {
case POURCENT -> str += "%";
case PIXEL -> str += "px";
case METER -> str += "m";
case CENTIMETER -> str += "cm";
case MILLIMETER -> str += "mm";
case KILOMETER -> str += "km";
case INCH -> str += "in";
case FOOT -> str += "ft";
case ELEMENT -> str += "em";
case EX -> str += "ex";
case POINT -> str += "pt";
case PC -> str += "pc";
default -> str += "";
}
return str;
}
}

View File

@ -0,0 +1,16 @@
package org.atriasoft.etk;
public enum Distance {
POURCENT, //!< "%"
PIXEL, //!< "px"
METER, //!< "m"
CENTIMETER, //!< "cm"
MILLIMETER, //!< "mm"
KILOMETER, //!< "km"
INCH, //!< "in"
FOOT, //!< "ft"
ELEMENT, //!< "em"
EX, //!< "ex"
POINT, //!< "pt"
PC; //!< "pc"
}

View File

@ -1,5 +1,7 @@
package org.atriasoft.etk; package org.atriasoft.etk;
import java.io.BufferedWriter;
import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.URL; import java.net.URL;
@ -22,7 +24,8 @@ public class Uri {
static { static {
genericMap.put("DATA", "data/"); genericMap.put("DATA", "data/");
genericMap.put("THEME_GUI", "theme/"); genericMap.put("THEME", "theme/");
genericMap.put("TRANSLATE", "translate/");
} }
public static void addLibrary(final String libName, final Class<?> classHandle, String basePath) { public static void addLibrary(final String libName, final Class<?> classHandle, String basePath) {
@ -84,6 +87,7 @@ public class Uri {
Log.warning(" !! Application data class is not defined ..."); Log.warning(" !! Application data class is not defined ...");
} else { } else {
String tmpPath = applicationBasePath + offsetGroup + uri.path; String tmpPath = applicationBasePath + offsetGroup + uri.path;
tmpPath = tmpPath.replace("//", "/");
Log.info("(appl) Try to load '" + tmpPath + "' in " + applicationClass.getCanonicalName()); Log.info("(appl) Try to load '" + tmpPath + "' in " + applicationClass.getCanonicalName());
URL realFileName = applicationClass.getClassLoader().getResource(tmpPath); URL realFileName = applicationClass.getClassLoader().getResource(tmpPath);
if (realFileName != null) { if (realFileName != null) {
@ -107,6 +111,7 @@ public class Uri {
return null; return null;
} }
String tmpPath = libraryElement.basePath + offsetGroup + uri.path; String tmpPath = libraryElement.basePath + offsetGroup + uri.path;
tmpPath = tmpPath.replace("//", "/");
Log.info("(lib) Try to load '" + tmpPath + "' in " + libraryElement.klass.getCanonicalName()); Log.info("(lib) Try to load '" + tmpPath + "' in " + libraryElement.klass.getCanonicalName());
URL realFileName = libraryElement.klass.getClassLoader().getResource(tmpPath); URL realFileName = libraryElement.klass.getClassLoader().getResource(tmpPath);
if (realFileName != null) { if (realFileName != null) {
@ -131,6 +136,10 @@ public class Uri {
return out; return out;
} }
public static void setApplication(final Class<?> classHandle) {
setApplication(classHandle, "");
}
public static void setApplication(final Class<?> classHandle, String basePath) { public static void setApplication(final Class<?> classHandle, String basePath) {
Log.info("Set application reference : " + classHandle.getCanonicalName() + " base path=" + basePath); Log.info("Set application reference : " + classHandle.getCanonicalName() + " base path=" + basePath);
applicationClass = classHandle; applicationClass = classHandle;
@ -178,12 +187,36 @@ public class Uri {
return new Uri(group, path, lib); return new Uri(group, path, lib);
} }
public static void writeAll(final Uri uri, final String data) {
BufferedWriter out = null;
try {
FileWriter fstream = new FileWriter(uri.getPath(), true); //true tells to append data.
out = new BufferedWriter(fstream);
out.write(data);
} catch (IOException e) {
Log.error("Error: " + e.getMessage());
} finally {
if (out != null) {
try {
out.close();
} catch (IOException e) {
// TODO Auto-generated catch block
Log.error("Error: ", e);
}
}
}
}
private final String group; private final String group;
private final String path; private final String path;
private final String lib; private final String lib;
public Uri(final String path) {
this(null, path, null);
}
public Uri(final String group, final String path) { public Uri(final String group, final String path) {
this(group, path, null); this(group, path, null);
} }

View File

@ -33,6 +33,13 @@ public class Log {
} }
} }
public static void error(final String data, final Exception e) {
e.printStackTrace();
if (PRINT_ERROR) {
Logger.error(LIB_NAME_DRAW, data);
}
}
public static void info(final String data) { public static void info(final String data) {
if (PRINT_INFO) { if (PRINT_INFO) {
Logger.info(LIB_NAME_DRAW, data); Logger.info(LIB_NAME_DRAW, data);

View File

@ -12,6 +12,10 @@ public class FMath {
return a; return a;
} }
public static float acos(final float value) {
return (float) Math.acos(value);
}
/** /**
* Test if the value id in the correct range * Test if the value id in the correct range
* *
@ -36,6 +40,10 @@ public class FMath {
return (abs(difference) < epsilon); return (abs(difference) < epsilon);
} }
public static float asin(final float value) {
return (float) Math.asin(value);
}
public static float atan(final float value) { public static float atan(final float value) {
return (float) Math.atan(value); return (float) Math.atan(value);
} }
@ -48,6 +56,10 @@ public class FMath {
return Math.max(min, Math.min(value, max)); return Math.max(min, Math.min(value, max));
} }
public static int avg(final int min, final int value, final int max) {
return Math.max(min, Math.min(value, max));
}
/// Function that returns the result of the "value" clamped by /// Function that returns the result of the "value" clamped by
/// two others values "lowerLimit" and "upperLimit" /// two others values "lowerLimit" and "upperLimit"
public static float clamp(final float value, final float lowerLimit, final float upperLimit) { public static float clamp(final float value, final float lowerLimit, final float upperLimit) {
@ -80,6 +92,48 @@ public class FMath {
return (int) Math.floor(f); return (int) Math.floor(f);
} }
public static double[] getTableDouble(final String data, final String separator, final int nbElement) {
double[] out = new double[nbElement];
String[] values = data.split(separator);
if (values.length != nbElement) {
return null;
}
for (int iii = 0; iii < nbElement; iii++) {
out[iii] = Double.parseDouble(values[iii]);
}
return out;
}
public static float[] getTableFloat(final String data, final String separator, final int nbElement) {
float[] out = new float[nbElement];
String[] values = data.split(separator);
if (values.length != nbElement) {
return null;
}
for (int iii = 0; iii < nbElement; iii++) {
out[iii] = Float.parseFloat(values[iii]);
}
return out;
}
// return list of read and the number of char read.
/*
public static Pair<float[], Integer> getTableFloatMax(final String data, final String separator, final int nbElement) {
data = data.replace(",", " ");
List<Float> out = new ArrayList<>();
String[] values = data.split(separator);
for (int iii = 0; iii < values.length; iii++) {
try {
float val = Float.parseFloat(values[iii]);
} catch (NumberFormatException e) {
break;
}
}
return out;
}
*/
public static float max(final float a, final float b) { public static float max(final float a, final float b) {
return Math.max(a, b); return Math.max(a, b);
} }

View File

@ -0,0 +1,230 @@
package org.atriasoft.etk.math;
/**
*Internal data
* sx shx tx
* sy shy ty
*/
@SuppressWarnings("preview")
public record Matrix2x3f(
float sx,
float shy,
float shx,
float sy,
float tx,
float ty) {
/**
*Configuration ructor.
* @param sx Scale threw X axis
* @param shy Rotate in radian threw Y axis
* @param shx Rotate in radian threw X axis
* @param sy Scale threw Y axis
* @param tx Translate threw X axis
* @param ty translate threw Y axis
*/
public Matrix2x3f(final float sx, final float shy, final float shx, final float sy, final float tx, final float ty) {
this.sx = sx;
this.shy = shy;
this.shx = shx;
this.sy = sy;
this.tx = tx;
this.ty = ty;
}
/**
*Configuration ructor.
* @param values vector of values in float
*/
public Matrix2x3f(final float[] values) {
this(values[0], values[1], values[2], values[3], values[4], values[5]);
}
/**
*Configuration ructor.
* @param values vector of values in double
*/
public Matrix2x3f(final double[] values) {
this((float) values[0], (float) values[1], (float) values[2], (float) values[3], (float) values[4], (float) values[5]);
}
/**
*Load Identity matrix
*/
public static final Matrix2x3f IDENTITY = new Matrix2x3f(1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f);
/**
*Operator+= Addition an other matrix with this one
* @param obj Reference on the external object
* @return Local reference of the vector additionned
*/
public Matrix2x3f add(final Matrix2x3f obj) {
return new Matrix2x3f(this.sx + obj.sx, this.shy + obj.shy, this.shx + obj.shx, this.sy + obj.sy, this.tx + obj.tx, this.ty + obj.ty);
}
/**
*Operator-= Decrement an other matrix with this one
* @param obj Reference on the external object
* @return Local reference of the vector decremented
*/
public Matrix2x3f less(final Matrix2x3f obj) {
return new Matrix2x3f(this.sx - obj.sx, this.shy - obj.shy, this.shx - obj.shx, this.sy - obj.sy, this.tx - obj.tx, this.ty - obj.ty);
}
/**
*Operator*= Multiplication an other matrix with this one
* @param obj Reference on the external object
* @return Local reference of the vector multiplicated
*/
public Matrix2x3f multiply(final Matrix2x3f obj) {
float sx = this.sx * obj.sx + this.shy * obj.shx;
float shx = this.shx * obj.sx + this.sy * obj.shx;
float tx = this.tx * obj.sx + this.ty * obj.shx + obj.tx;
float shy = this.sx * obj.shy + this.shy * obj.sy;
float sy = this.shx * obj.shy + this.sy * obj.sy;
float ty = this.tx * obj.shy + this.ty * obj.sy + obj.ty;
return new Matrix2x3f(sx, shy, shx, sy, tx, ty);
}
/**
*Operator* apply matrix on a vector
* @param point Point value to apply the matrix
* @return New vector containing the value
*/
public Vector2f multiply(final Vector2f point) {
return new Vector2f(point.x() * this.sx + point.y() * this.shx + this.tx, point.x() * this.shy + point.y() * this.sy + this.ty);
}
/**
*Apply matrix on a vector Scale Rotate, but NOT the translation
* @param point Point value to apply the matrix
* @return New vector containing the value
*/
public Vector2f applyScaleRotation(final Vector2f point) {
return new Vector2f(point.x() * this.sx + point.y() * this.shx, point.x() * this.shy + point.y() * this.sy);
}
/**
*Flip the mathix threw the X axis
*/
public Matrix2x3f flipX() {
return new Matrix2x3f(-this.sx, this.shy, -this.shx, this.sy, -this.tx, this.ty);
}
/**
*Flip the mathix threw the Y axis
*/
public Matrix2x3f flipY() {
return new Matrix2x3f(this.sx, -this.shy, this.shx, -this.sy, this.tx, -this.ty);
}
/**
*Scale the current Matrix.
* @param vect Vector to scale matrix.
*/
public Matrix2x3f scale(final Vector2f vect) {
return new Matrix2x3f(this.sx * vect.x(), this.shy * vect.y(), this.shx * vect.x(), this.sy * vect.y(), this.tx * vect.x(), this.ty * vect.y());
}
/**
*Scale the current Matrix.
* @param value Single value to scale in X andf Y.
*/
public Matrix2x3f scale(final float value) {
return new Matrix2x3f(this.sx * value, this.shy * value, this.shx * value, this.sy * value, this.tx * value, this.ty * value);
}
/**
*Makes a rotation matrix.
* @param angleRad angle to apply.
*/
public Matrix2x3f rotate(final float angleRad) {
float ca = FMath.cos(angleRad);
float sa = FMath.sin(angleRad);
float sx = this.sx * ca - this.shy * sa;
float shx = this.shx * ca - this.sy * sa;
float tx = this.tx * ca - this.ty * sa;
float shy = this.sx * sa + this.shy * ca;
float sy = this.shx * sa + this.sy * ca;
float ty = this.tx * sa + this.ty * ca;
return new Matrix2x3f(sx, shy, shx, sy, tx, ty);
}
/**
*Makes a translation of the matrix
* @param vect Translation to apply.
*/
public Matrix2x3f translate(final Vector2f vect) {
return new Matrix2x3f(this.sx, this.shy, this.shx, this.sy, this.tx + vect.x(), this.ty + vect.y());
}
/**
*Computes the determinant of the matrix.
* @return The determinent Value.
*/
public float determinant() {
return this.sx * this.sy - this.shy * this.shx;
}
/**
*Inverts the matrix.
* @note The determinant must be != 0, otherwithe the matrix can't be inverted.
* @return The inverted matrix.
*/
public Matrix2x3f invert() {
double det = 1.0 / determinant();
float sx = (float) (this.sy * det);
float sy = (float) (this.sx * det);
float shy = (float) (-this.shy * det);
float shx = (float) (-this.shx * det);
float tx = -this.tx * sx - this.ty * this.shx;
float ty = -this.tx * this.shy - this.ty * this.sy;
return new Matrix2x3f(sx, shy, shx, sy, tx, ty);
}
/**
* Create a matrix 2D with a simple rotation
* @param angleRad Radian angle to set at the matrix
* @return New matrix of the transformation requested
*/
public static Matrix2x3f createRotate(final float angleRad) {
return new Matrix2x3f(FMath.cos(angleRad), FMath.sin(angleRad), -FMath.sin(angleRad), FMath.cos(angleRad), 0.0f, 0.0f);
};
/**
* Create a matrix 2D with a simple scale
* @param scale 2 dimention scale
* @return New matrix of the transformation requested
*/
public static Matrix2x3f createScale(final Vector2f scale) {
return new Matrix2x3f(scale.x(), 0.0f, 0.0f, scale.y(), 0.0f, 0.0f);
};
/**
*Create a matrix 2D with a simple scale
* @param scale same scale in 2 and Y
* @return New matrix of the transformation requested
*/
public static Matrix2x3f createScale(final float scale) {
return new Matrix2x3f(scale, 0.0f, 0.0f, scale, 0.0f, 0.0f);
};
/**
*Create a matrix 2D with a simple translation
* @param translate 2 dimention translation
* @return New matrix of the transformation requested
*/
public static Matrix2x3f createTranslate(final Vector2f translate) {
return new Matrix2x3f(1.0f, 0.0f, 0.0f, 1.0f, translate.x(), translate.y());
};
/**
*Create a matrix 2D with a simple skew
* @param skew 2 dimention skew
* @return New matrix of the transformation requested
*/
public static Matrix2x3f createSkew(final Vector2f skew) {
return new Matrix2x3f(1.0f, FMath.tan(skew.y()), FMath.tan(skew.x()), 1.0f, 0.0f, 0.0f);
};
}

View File

@ -1,10 +1,13 @@
package org.atriasoft.etk.math; package org.atriasoft.etk.math;
import edu.umd.cs.findbugs.annotations.CheckReturnValue;
import org.atriasoft.etk.internal.Log; import org.atriasoft.etk.internal.Log;
import edu.umd.cs.findbugs.annotations.CheckReturnValue;
@SuppressWarnings("preview") @SuppressWarnings("preview")
public record Vector2f(float x, float y) { public record Vector2f(
float x,
float y) {
public static Vector2f valueOf(String value) { public static Vector2f valueOf(String value) {
float val1 = 0; float val1 = 0;
float val2 = 0; float val2 = 0;
@ -40,22 +43,27 @@ public record Vector2f(float x, float y) {
this.y = y; this.y = y;
} }
@CheckReturnValue @CheckReturnValue
public static Vector2f clipInt(final Vector2f obj1) { public static Vector2f clipInt(final Vector2f obj1) {
return new Vector2f((int)obj1.x, (int)obj1.y); return new Vector2f((int) obj1.x, (int) obj1.y);
} }
public static Vector2f max(final Vector2f obj1, final Vector2f obj2) { public static Vector2f max(final Vector2f obj1, final Vector2f obj2) {
return new Vector2f(Math.max(obj1.x, obj2.x), Math.max(obj1.y, obj2.y)); return new Vector2f(Math.max(obj1.x, obj2.x), Math.max(obj1.y, obj2.y));
} }
public static Vector2f max(final Vector2f obj1, final Vector2f obj2, final Vector2f obj3) {
return new Vector2f(FMath.max(obj1.x, obj2.x, obj3.x), FMath.max(obj1.y, obj2.y, obj3.y));
}
public static Vector2f min(final Vector2f obj1, final Vector2f obj2) { public static Vector2f min(final Vector2f obj1, final Vector2f obj2) {
return new Vector2f(Math.min(obj1.x, obj2.x), Math.min(obj1.y, obj2.y)); return new Vector2f(Math.min(obj1.x, obj2.x), Math.min(obj1.y, obj2.y));
} }
public static Vector2f min(final Vector2f obj1, final Vector2f obj2, final Vector2f obj3) {
return new Vector2f(FMath.min(obj1.x, obj2.x, obj3.x), FMath.min(obj1.y, obj2.y, obj3.y));
}
/** /**
* Return a vector will the absolute values of each element * Return a vector will the absolute values of each element
* @return New vector containing the value * @return New vector containing the value
@ -70,14 +78,26 @@ public record Vector2f(float x, float y) {
return new Vector2f(this.x + val, this.y + val); return new Vector2f(this.x + val, this.y + val);
} }
@CheckReturnValue
public Vector2f addX(final float val) {
return new Vector2f(this.x + val, this.y);
}
@CheckReturnValue
public Vector2f addY(final float val) {
return new Vector2f(this.x, this.y + val);
}
@CheckReturnValue @CheckReturnValue
public Vector2f add(final Vector2f obj) { public Vector2f add(final Vector2f obj) {
return new Vector2f(this.x + obj.x, this.y + obj.y); return new Vector2f(this.x + obj.x, this.y + obj.y);
} }
@CheckReturnValue @CheckReturnValue
public Vector2f add(final Vector2i obj) { public Vector2f add(final Vector2i obj) {
return new Vector2f(this.x + obj.x(), this.y + obj.y()); return new Vector2f(this.x + obj.x(), this.y + obj.y());
} }
@CheckReturnValue @CheckReturnValue
public Vector2f add(final float xxx, final float yyy) { public Vector2f add(final float xxx, final float yyy) {
return new Vector2f(this.x + xxx, this.y + yyy); return new Vector2f(this.x + xxx, this.y + yyy);
@ -275,6 +295,17 @@ public record Vector2f(float x, float y) {
public Vector2f less(final float val) { public Vector2f less(final float val) {
return new Vector2f(this.x - val, this.y - val); return new Vector2f(this.x - val, this.y - val);
} }
@CheckReturnValue
public Vector2f lessX(final float val) {
return new Vector2f(this.x - val, this.y);
}
@CheckReturnValue
public Vector2f lessY(final float val) {
return new Vector2f(this.x, this.y - val);
}
@CheckReturnValue @CheckReturnValue
public Vector2f less(final float xxx, final float yyy) { public Vector2f less(final float xxx, final float yyy) {
return new Vector2f(this.x - xxx, this.y - yyy); return new Vector2f(this.x - xxx, this.y - yyy);
@ -284,6 +315,7 @@ public record Vector2f(float x, float y) {
public Vector2f less(final Vector2f obj) { public Vector2f less(final Vector2f obj) {
return new Vector2f(this.x - obj.x, this.y - obj.y); return new Vector2f(this.x - obj.x, this.y - obj.y);
} }
@CheckReturnValue @CheckReturnValue
public Vector2f less(final Vector2i obj) { public Vector2f less(final Vector2i obj) {
return new Vector2f(this.x - obj.x(), this.y - obj.y()); return new Vector2f(this.x - obj.x(), this.y - obj.y());
@ -372,6 +404,16 @@ public record Vector2f(float x, float y) {
public static final Vector2f MIN_VALUE = new Vector2f(Float.MIN_VALUE, Float.MIN_VALUE); public static final Vector2f MIN_VALUE = new Vector2f(Float.MIN_VALUE, Float.MIN_VALUE);
public static final Vector2f ZERO = new Vector2f(0, 0); public static final Vector2f ZERO = new Vector2f(0, 0);
public static final Vector2f ONE = new Vector2f(1, 1); public static final Vector2f ONE = new Vector2f(1, 1);
public static final Vector2f VALUE_2 = new Vector2f(2, 2);
public static final Vector2f VALUE_4 = new Vector2f(4, 4);
public static final Vector2f VALUE_8 = new Vector2f(8, 8);
public static final Vector2f VALUE_16 = new Vector2f(16, 16);
public static final Vector2f VALUE_32 = new Vector2f(32, 32);
public static final Vector2f VALUE_64 = new Vector2f(64, 64);
public static final Vector2f VALUE_128 = new Vector2f(128, 128);
public static final Vector2f VALUE_256 = new Vector2f(256, 256);
public static final Vector2f VALUE_512 = new Vector2f(512, 512);
public static final Vector2f VALUE_1024 = new Vector2f(1024, 1024);
@Override @Override
public String toString() { public String toString() {

View File

@ -21,7 +21,7 @@ public record Vector2i(
} }
final String[] values = value.split(","); final String[] values = value.split(",");
if (values.length > 2) { if (values.length > 2) {
Log.error("Can not parse Vector2f with more than 2 values: '" + value + "'"); Log.error("Can not parse Vector2i with more than 2 values: '" + value + "'");
} }
if (values.length == 1) { if (values.length == 1) {
// no coma ... // no coma ...
@ -318,6 +318,16 @@ public record Vector2i(
*/ */
public static final Vector2i ZERO = new Vector2i(0, 0); public static final Vector2i ZERO = new Vector2i(0, 0);
public static final Vector2i ONE = new Vector2i(1, 1); public static final Vector2i ONE = new Vector2i(1, 1);
public static final Vector2i VALUE_2 = new Vector2i(2, 2);
public static final Vector2i VALUE_4 = new Vector2i(4, 4);
public static final Vector2i VALUE_8 = new Vector2i(8, 8);
public static final Vector2i VALUE_16 = new Vector2i(16, 16);
public static final Vector2i VALUE_32 = new Vector2i(32, 32);
public static final Vector2i VALUE_64 = new Vector2i(64, 64);
public static final Vector2i VALUE_128 = new Vector2i(128, 128);
public static final Vector2i VALUE_256 = new Vector2i(256, 256);
public static final Vector2i VALUE_512 = new Vector2i(512, 512);
public static final Vector2i VALUE_1024 = new Vector2i(1024, 1024);
@Override @Override
public String toString() { public String toString() {

View File

@ -1,9 +1,13 @@
package org.atriasoft.etk.math; package org.atriasoft.etk.math;
import edu.umd.cs.findbugs.annotations.CheckReturnValue;
import org.atriasoft.etk.internal.Log; import org.atriasoft.etk.internal.Log;
public record Vector3f(float x, float y, float z) { import edu.umd.cs.findbugs.annotations.CheckReturnValue;
public record Vector3f(
float x,
float y,
float z) {
/** /**
* Get the length square between the 2 vectors * Get the length square between the 2 vectors
* @param start First vector * @param start First vector
@ -79,13 +83,15 @@ public record Vector3f(float x, float y, float z) {
public Vector3f add(final float value) { public Vector3f add(final float value) {
return new Vector3f(this.x + value, this.y + value, this.z + value); return new Vector3f(this.x + value, this.y + value, this.z + value);
} }
@CheckReturnValue @CheckReturnValue
public Vector3f add(final float xxx, final float yyy, final float zzz) { public Vector3f add(final float xxx, final float yyy, final float zzz) {
return new Vector3f(this.x + xxx, this.y + yyy, this.z + zzz); return new Vector3f(this.x + xxx, this.y + yyy, this.z + zzz);
} }
@CheckReturnValue @CheckReturnValue
public Vector3f clipInteger() { public Vector3f clipInteger() {
return new Vector3f((int)x, (int)y, (int)z); return new Vector3f((int) this.x, (int) this.y, (int) this.z);
} }
/** /**
@ -135,8 +141,7 @@ public record Vector3f(float x, float y, float z) {
*/ */
@CheckReturnValue @CheckReturnValue
public Vector3f cross(final Vector3f obj) { public Vector3f cross(final Vector3f obj) {
return new Vector3f(this.y * obj.z - this.z * obj.y, this.z * obj.x - this.x * obj.z, return new Vector3f(this.y * obj.z - this.z * obj.y, this.z * obj.x - this.x * obj.z, this.x * obj.y - this.y * obj.x);
this.x * obj.y - this.y * obj.x);
} }
/** /**
@ -381,14 +386,14 @@ public record Vector3f(float x, float y, float z) {
*/ */
@CheckReturnValue @CheckReturnValue
public Vector3f lerp(final Vector3f obj, final float ratio) { public Vector3f lerp(final Vector3f obj, final float ratio) {
return new Vector3f(this.x + (obj.x - this.x) * ratio, this.y + (obj.y - this.y) * ratio, return new Vector3f(this.x + (obj.x - this.x) * ratio, this.y + (obj.y - this.y) * ratio, this.z + (obj.z - this.z) * ratio);
this.z + (obj.z - this.z) * ratio);
} }
@CheckReturnValue @CheckReturnValue
public Vector3f less(final float value) { public Vector3f less(final float value) {
return new Vector3f(this.x - value, this.y - value, this.z - value); return new Vector3f(this.x - value, this.y - value, this.z - value);
} }
@CheckReturnValue @CheckReturnValue
public Vector3f less(final float xxx, final float yyy, final float zzz) { public Vector3f less(final float xxx, final float yyy, final float zzz) {
return new Vector3f(this.x - xxx, this.y - yyy, this.z - zzz); return new Vector3f(this.x - xxx, this.y - yyy, this.z - zzz);
@ -497,8 +502,7 @@ public record Vector3f(float x, float y, float z) {
@CheckReturnValue @CheckReturnValue
public Vector3f setInterpolate3(final Vector3f obj0, final Vector3f obj1, final float ratio) { public Vector3f setInterpolate3(final Vector3f obj0, final Vector3f obj1, final float ratio) {
final float inverse = 1.0f - ratio; final float inverse = 1.0f - ratio;
return new Vector3f(inverse * obj0.x + ratio * obj1.x, inverse * obj0.y + ratio * obj1.y, return new Vector3f(inverse * obj0.x + ratio * obj1.x, inverse * obj0.y + ratio * obj1.y, inverse * obj0.z + ratio * obj1.z);
inverse * obj0.z + ratio * obj1.z);
// this.co[3] = s * v0[3] + rt * v1[3]; // this.co[3] = s * v0[3] + rt * v1[3];
} }
@ -552,11 +556,20 @@ public record Vector3f(float x, float y, float z) {
*/ */
public static final Vector3f ZERO = new Vector3f(0, 0, 0); public static final Vector3f ZERO = new Vector3f(0, 0, 0);
public static final Vector3f ONE = new Vector3f(1, 1, 1); public static final Vector3f ONE = new Vector3f(1, 1, 1);
public static final Vector3f VALUE_2 = new Vector3f(2, 2, 2);
public static final Vector3f VALUE_4 = new Vector3f(4, 4, 4);
public static final Vector3f VALUE_8 = new Vector3f(8, 8, 8);
public static final Vector3f VALUE_16 = new Vector3f(16, 16, 16);
public static final Vector3f VALUE_32 = new Vector3f(32, 32, 32);
public static final Vector3f VALUE_64 = new Vector3f(64, 64, 64);
public static final Vector3f VALUE_128 = new Vector3f(128, 128, 128);
public static final Vector3f VALUE_256 = new Vector3f(256, 256, 256);
public static final Vector3f VALUE_512 = new Vector3f(512, 512, 512);
public static final Vector3f VALUE_1024 = new Vector3f(1024, 1024, 1024);
@Override @Override
public String toString() { public String toString() {
return "Vector3f(" + FMath.floatToString(this.x) + "," + FMath.floatToString(this.y) + "," return "Vector3f(" + FMath.floatToString(this.x) + "," + FMath.floatToString(this.y) + "," + FMath.floatToString(this.z) + ")";
+ FMath.floatToString(this.z) + ")";
} }
/** /**
@ -567,7 +580,6 @@ public record Vector3f(float x, float y, float z) {
*/ */
@CheckReturnValue @CheckReturnValue
public float triple(final Vector3f obj1, final Vector3f obj2) { public float triple(final Vector3f obj1, final Vector3f obj2) {
return this.x * (obj1.y * obj2.z - obj1.z * obj2.y) + this.y * (obj1.z * obj2.x - obj1.x * obj2.z) return this.x * (obj1.y * obj2.z - obj1.z * obj2.y) + this.y * (obj1.z * obj2.x - obj1.x * obj2.z) + this.z * (obj1.x * obj2.y - obj1.y * obj2.x);
+ this.z * (obj1.x * obj2.y - obj1.y * obj2.x);
} }
} }

View File

@ -1,8 +1,9 @@
package org.atriasoft.etk.math; package org.atriasoft.etk.math;
import edu.umd.cs.findbugs.annotations.CheckReturnValue;
import org.atriasoft.etk.internal.Log; import org.atriasoft.etk.internal.Log;
import edu.umd.cs.findbugs.annotations.CheckReturnValue;
public record Vector3i( public record Vector3i(
int x, int x,
int y, int y,
@ -20,7 +21,7 @@ public record Vector3i(
} }
final String[] values = value.split(","); final String[] values = value.split(",");
if (values.length > 3) { if (values.length > 3) {
Log.error("Can not parse Vector3f with more than 3 values: '" + value + "'"); Log.error("Can not parse Vector3i with more than 3 values: '" + value + "'");
} }
if (values.length == 1) { if (values.length == 1) {
// no coma ... // no coma ...
@ -92,10 +93,12 @@ public record Vector3i(
public Vector3i add(final Vector3i obj) { public Vector3i add(final Vector3i obj) {
return new Vector3i(this.x + obj.x, this.y + obj.y, this.z + obj.z); return new Vector3i(this.x + obj.x, this.y + obj.y, this.z + obj.z);
} }
@CheckReturnValue @CheckReturnValue
public Vector3i add(final int value) { public Vector3i add(final int value) {
return new Vector3i(this.x + value, this.y + value, this.z + value); return new Vector3i(this.x + value, this.y + value, this.z + value);
} }
@CheckReturnValue @CheckReturnValue
public Vector3i add(final int xxx, final int yyy, final int zzz) { public Vector3i add(final int xxx, final int yyy, final int zzz) {
return new Vector3i(this.x + xxx, this.y + yyy, this.z + zzz); return new Vector3i(this.x + xxx, this.y + yyy, this.z + zzz);
@ -225,6 +228,7 @@ public record Vector3i(
public int getMinAxis() { public int getMinAxis() {
return (this.x < this.y ? (this.x < this.z ? 0 : 2) : (this.y < this.z ? 1 : 2)); return (this.x < this.y ? (this.x < this.z ? 0 : 2) : (this.y < this.z ? 1 : 2));
} }
@CheckReturnValue @CheckReturnValue
public Vector3i getSkewSymmetricMatrix0() { public Vector3i getSkewSymmetricMatrix0() {
return new Vector3i(0, -this.z, this.y); return new Vector3i(0, -this.z, this.y);
@ -309,10 +313,12 @@ public record Vector3i(
public Vector3i less(final Vector3i obj) { public Vector3i less(final Vector3i obj) {
return new Vector3i(this.x - obj.x, this.y - obj.y, this.z - obj.z); return new Vector3i(this.x - obj.x, this.y - obj.y, this.z - obj.z);
} }
@CheckReturnValue @CheckReturnValue
public Vector3i less(final int value) { public Vector3i less(final int value) {
return new Vector3i(this.x - value, this.y - value, this.z - value); return new Vector3i(this.x - value, this.y - value, this.z - value);
} }
@CheckReturnValue @CheckReturnValue
public Vector3i less(final int xxx, final int yyy, final int zzz) { public Vector3i less(final int xxx, final int yyy, final int zzz) {
return new Vector3i(this.x - xxx, this.y - yyy, this.z - zzz); return new Vector3i(this.x - xxx, this.y - yyy, this.z - zzz);
@ -414,6 +420,16 @@ public record Vector3i(
*/ */
public static final Vector3i ZERO = new Vector3i(0, 0, 0); public static final Vector3i ZERO = new Vector3i(0, 0, 0);
public static final Vector3i ONE = new Vector3i(1, 1, 1); public static final Vector3i ONE = new Vector3i(1, 1, 1);
public static final Vector3i VALUE_2 = new Vector3i(2, 2, 2);
public static final Vector3i VALUE_4 = new Vector3i(4, 4, 4);
public static final Vector3i VALUE_8 = new Vector3i(8, 8, 8);
public static final Vector3i VALUE_16 = new Vector3i(16, 16, 16);
public static final Vector3i VALUE_32 = new Vector3i(32, 32, 32);
public static final Vector3i VALUE_64 = new Vector3i(64, 64, 64);
public static final Vector3i VALUE_128 = new Vector3i(128, 128, 128);
public static final Vector3i VALUE_256 = new Vector3i(256, 256, 256);
public static final Vector3i VALUE_512 = new Vector3i(512, 512, 512);
public static final Vector3i VALUE_1024 = new Vector3i(1024, 1024, 1024);
@Override @Override
public String toString() { public String toString() {

View File

@ -0,0 +1,9 @@
package org.atriasoft.etk.util;
public class Dynamic<T> {
public T value;
public Dynamic(final T value) {
this.value = value;
}
}

View File

@ -49,6 +49,15 @@ public class Pair<U, V> {
public String toString() { public String toString() {
return "(" + this.first + ", " + this.second + ")"; return "(" + this.first + ", " + this.second + ")";
} }
public Pair<U, V> withFirst(final U value) {
return new Pair<>(value, this.second);
}
public Pair<U, V> withSecond(final V value) {
return new Pair<>(this.first, value);
}
} }
// Program to implement Pair Class in Java // Program to implement Pair Class in Java