Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-29 20:19:06 +00:00
Code Issues Releases Activity

Merge pull request #952 from CocoTheOwner/fix-image-math

Browse Source 
Fix image mapping math
This commit is contained in:
Brian Fopiano
2023-02-15 14:44:09 -08:00
committed by GitHub
parent 603168a147 8d715e2e4e
commit 8bb409df4e
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/volmit/iris/engine/object/IrisImageMap.java
View File

@@ -32,7 +32,7 @@ import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@Snippet("carving") @Snippet("image-map")
@Accessors(chain = true) @Accessors(chain = true)
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@@ -68,6 +68,7 @@ public class IrisImageMap {
IrisImage i = imageCache.aquire(() -> data.getImageLoader().load(image)); IrisImage i = imageCache.aquire(() -> data.getImageLoader().load(image));
if (i == null) { if (i == null) {
Iris.error("NULL IMAGE FOR " + image); Iris.error("NULL IMAGE FOR " + image);
return 0;
} }
return IrisInterpolation.getNoise(interpolationMethod, x, z, coordinateScale, (xx, zz) -> rawNoise(i, xx, zz)); return IrisInterpolation.getNoise(interpolationMethod, x, z, coordinateScale, (xx, zz) -> rawNoise(i, xx, zz));
@@ -76,11 +77,27 @@ public class IrisImageMap {
private double rawNoise(IrisImage i, double x, double z) { private double rawNoise(IrisImage i, double x, double z) {
x /= coordinateScale; x /= coordinateScale;
z /= coordinateScale; z /= coordinateScale;
x = isCentered() ? x + ((i.getWidth() / 2D) * coordinateScale) : x;
z = isCentered() ? z + ((i.getHeight() / 2D) * coordinateScale) : z; // X and Z are now scaled to the image
x = isTiled() ? x % i.getWidth() : x;
z = isTiled() ? z % i.getHeight() : z; // Add half the image width & height if centered
if (isCentered()) {
x += i.getWidth() / 2D;
z += i.getHeight() / 2D;
}
// If tiled modulo over width and height
if (isTiled()) {
x = x % i.getWidth();
x = x < 0 ? x + i.getWidth() : x; // Fix java's negative modulo shit
z = z % i.getHeight();
z = z < 0 ? z + i.getHeight() : z; // Fix java's negative modulo shit
}
// Retrieve value from image
double v = i.getValue(getChannel(), (int) x, (int) z); double v = i.getValue(getChannel(), (int) x, (int) z);
// Return value, or 1 - value if inverted (value is in double set [0, 1] so this will return [0, 1])
return isInverted() ? 1D - v : v; return isInverted() ? 1D - v : v;
} }
} }