Skip to content

Commit b54d36f

Browse files
Copilotriccardobl
andauthored
Remove AWT dependencies from jme3-terrain ShaderUtils
- Remove mix(java.awt.Color, java.awt.Color, float) method (unused, AWT-dependent) - Remove getImageDataFromImage(BufferedImage) method (unused, AWT-dependent) - Remove all java.awt.* and related java.nio imports that were only used by those methods Agent-Logs-Url: https://github.com/jMonkeyEngine/jmonkeyengine/sessions/8296ad20-a298-49e4-aeb5-aae4f42c13fb Co-authored-by: riccardobl <4943530+riccardobl@users.noreply.github.com>
1 parent 31110b9 commit b54d36f

1 file changed

Lines changed: 0 additions & 37 deletions

File tree

jme3-terrain/src/main/java/com/jme3/terrain/noise/ShaderUtils.java

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,6 @@
2929
*/
3030
package com.jme3.terrain.noise;
3131

32-
import java.awt.Color;
33-
import java.awt.Graphics2D;
34-
import java.awt.image.BufferedImage;
35-
import java.awt.image.DataBuffer;
36-
import java.awt.image.DataBufferInt;
37-
import java.awt.image.WritableRaster;
38-
import java.nio.ByteBuffer;
39-
import java.nio.ByteOrder;
40-
4132
/**
4233
* Helper class containing useful functions explained in the book:
4334
* Texturing &amp; Modeling - A Procedural Approach
@@ -66,12 +57,6 @@ public static final float mix(final float a, final float b, final float f) {
6657
return (1 - f) * a + f * b;
6758
}
6859

69-
public static final Color mix(final Color a, final Color b, final float f) {
70-
return new Color((int) ShaderUtils.clamp(ShaderUtils.mix(a.getRed(), b.getRed(), f), 0, 255), (int) ShaderUtils.clamp(
71-
ShaderUtils.mix(a.getGreen(), b.getGreen(), f), 0, 255), (int) ShaderUtils.clamp(
72-
ShaderUtils.mix(a.getBlue(), b.getBlue(), f), 0, 255));
73-
}
74-
7560
public static final int mix(final int a, final int b, final float f) {
7661
return (int) ((1 - f) * a + f * b);
7762
}
@@ -257,28 +242,6 @@ public static final float length(final float[] v) {
257242
return (float) Math.sqrt(s);
258243
}
259244

260-
public static final ByteBuffer getImageDataFromImage(BufferedImage bufferedImage) {
261-
WritableRaster wr;
262-
DataBuffer db;
263-
264-
BufferedImage bi = new BufferedImage(128, 64, BufferedImage.TYPE_INT_ARGB);
265-
Graphics2D g = bi.createGraphics();
266-
g.drawImage(bufferedImage, null, null);
267-
bufferedImage = bi;
268-
wr = bi.getRaster();
269-
db = wr.getDataBuffer();
270-
271-
DataBufferInt dbi = (DataBufferInt) db;
272-
int[] data = dbi.getData();
273-
274-
ByteBuffer byteBuffer = ByteBuffer.allocateDirect(data.length * 4);
275-
byteBuffer.order(ByteOrder.LITTLE_ENDIAN);
276-
byteBuffer.asIntBuffer().put(data);
277-
byteBuffer.flip();
278-
279-
return byteBuffer;
280-
}
281-
282245
public static float frac(float f) {
283246
return f - ShaderUtils.floor(f);
284247
}

0 commit comments

Comments
 (0)