Skip to content
Merged
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
91a49ec
This is a very simple addition. It allows a person to set 3 variables…
bob0bob Nov 22, 2021
7bcba98
Merge branch 'master' of https://github.com/bob0bob/jmonkeyengine
bob0bob Nov 22, 2021
ce24716
formatting and comments changes.
bob0bob Nov 24, 2021
aef358f
jme3test.app.TestApplication hangs with LWJGL3 #1193
bob0bob Nov 24, 2021
1b0507e
Merge branch 'jMonkeyEngine:master' into master
bob0bob Nov 25, 2021
f0489b8
removing unwanted changes, since you can't do multiple pull requests …
bob0bob Nov 25, 2021
e5f608d
Merge branch 'master' of https://github.com/bob0bob/jmonkeyengine int…
bob0bob Nov 25, 2021
a5b0e37
formatting issues.
bob0bob Nov 25, 2021
26937ca
changed parameter naming to be more consistency with other items.
bob0bob Nov 25, 2021
3832d37
jme3test.app.TestApplication hangs with LWJGL3 #1193
bob0bob Nov 25, 2021
811493c
jme3test.app.TestApplication hangs with LWJGL3 #1193 (#3)
bob0bob Nov 25, 2021
db0d9ff
removing unwanted changes.
bob0bob Nov 25, 2021
5eb2690
AppSettings: enhance the new javadoc
stephengold Nov 30, 2021
72d008d
AppSettings: capitalize Window{X/Y}Position consistent w/other settings
stephengold Nov 30, 2021
f7c5ec7
LwjglWindow: convert tabs to spaces
stephengold Nov 30, 2021
4544d64
AppSettings: re-arrange @see tags in javadoc
stephengold Nov 30, 2021
0d28d62
Merge branch 'jMonkeyEngine:master' into master
bob0bob Dec 1, 2021
f600f23
Merge branch 'jMonkeyEngine:master' into master
bob0bob Dec 3, 2021
05a45a2
Merge branch 'jMonkeyEngine:master' into master
bob0bob Dec 4, 2021
6488773
Merge branch 'jMonkeyEngine:master' into master
bob0bob Dec 6, 2021
ef5d014
Merge branch 'jMonkeyEngine:master' into master
bob0bob Dec 14, 2021
aedf2e7
TestPostWater issue #1699
bob0bob Dec 14, 2021
aad89ca
Added a feature to leave dry filter on/off. Also put on the screen o…
bob0bob Dec 15, 2021
1f7de77
type preventing input to work correctly.
bob0bob Dec 15, 2021
cc0547b
more formattings changes.
bob0bob Jan 3, 2022
f5ab050
TestPostWater: standardize key names
stephengold Jan 3, 2022
5e1ea29
TestPostWater: correct key assignements that were swapped
stephengold Jan 3, 2022
3eee94f
TestPostWater: organize imports per the style guide
stephengold Jan 3, 2022
cae3fec
TestPostWater: whitespace
stephengold Jan 3, 2022
2d17803
TestPostWater: change useDryFilter logic so the 4 key has prompt effect
stephengold Jan 3, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 51 additions & 16 deletions jme3-examples/src/main/java/jme3test/water/TestPostWater.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@
import com.jme3.app.SimpleApplication;
import com.jme3.audio.AudioData.DataType;
import com.jme3.audio.AudioNode;
import com.jme3.audio.Filter;
import com.jme3.audio.LowPassFilter;
import com.jme3.font.BitmapText;
import com.jme3.input.KeyInput;
import com.jme3.input.controls.ActionListener;
import com.jme3.input.controls.KeyTrigger;
Expand Down Expand Up @@ -74,6 +76,8 @@ public class TestPostWater extends SimpleApplication {
private WaterFilter water;
private AudioNode waves;
final private LowPassFilter aboveWaterAudioFilter = new LowPassFilter(1, 1);
final private Filter underWaterAudioFilter = new LowPassFilter(0.5f, 0.1f);
private boolean useDryFilter = true;

public static void main(String[] args) {
TestPostWater app = new TestPostWater();
Expand Down Expand Up @@ -173,16 +177,18 @@ public void simpleInitApp() {
waves = new AudioNode(assetManager, "Sound/Environment/Ocean Waves.ogg",
DataType.Buffer);
waves.setLooping(true);
waves.setReverbEnabled(true);
if (uw) {
waves.setDryFilter(new LowPassFilter(0.5f, 0.1f));
} else {
waves.setDryFilter(aboveWaterAudioFilter);
}
updateAudio();
audioRenderer.playSource(waves);
//
viewPort.addProcessor(fpp);

setText(0, 50, "1 - Set Foam Texture to Foam.jpg");
setText(0, 80, "2 - Set Foam Texture to Foam2.jpg");
setText(0, 110, "3 - Set Foam Texture to Foam3.jpg");
setText(0, 140, "4 - Turn Dry Filter under water On/Off");
setText(0, 240, "PgUp - Larger Reflection Map");
setText(0, 270, "PgDn - Smaller Reflection Map");

inputManager.addListener(new ActionListener() {
@Override
public void onAction(String name, boolean isPressed, float tpf) {
Expand All @@ -205,12 +211,16 @@ public void onAction(String name, boolean isPressed, float tpf) {
water.setReflectionMapSize(Math.max(water.getReflectionMapSize() / 2, 32));
System.out.println("Reflection map size : " + water.getReflectionMapSize());
}
if (name.equals("dryFilter")) {
useDryFilter = !useDryFilter;
}
}
}
}, "foam1", "foam2", "foam3", "upRM", "downRM");
}, "foam1", "foam2", "foam3", "upRM", "downRM", "dryFilter");
inputManager.addMapping("foam1", new KeyTrigger(KeyInput.KEY_1));
inputManager.addMapping("foam2", new KeyTrigger(KeyInput.KEY_2));
inputManager.addMapping("foam3", new KeyTrigger(KeyInput.KEY_3));
inputManager.addMapping("dryFilter", new KeyTrigger(KeyInput.KEY_4));
inputManager.addMapping("upRM", new KeyTrigger(KeyInput.KEY_PGUP));
inputManager.addMapping("downRM", new KeyTrigger(KeyInput.KEY_PGDN));
}
Expand Down Expand Up @@ -275,17 +285,42 @@ public void simpleUpdate(float tpf) {
time += tpf;
waterHeight = (float) Math.cos(((time * 0.6f) % FastMath.TWO_PI)) * 1.5f;
water.setWaterHeight(initialWaterHeight + waterHeight);
if (water.isUnderWater() && !uw) {
uw = water.isUnderWater();
updateAudio();
}

protected void setText(int x, int y, String text) {
BitmapText txt2 = new BitmapText(guiFont, false);
txt2.setText(text);
txt2.setLocalTranslation(x, cam.getHeight() - y, 0);
txt2.setColor(ColorRGBA.Red);
guiNode.attachChild(txt2);
}

waves.setDryFilter(new LowPassFilter(0.5f, 0.1f));
uw = true;
/**
* Update the audio settings (dry filter and reverb)
* based on boolean fields ({@code uw} and {@code useDryFilter}).
*/
protected void updateAudio() {
Filter newDryFilter;
if (!useDryFilter) {
newDryFilter = null;
} else if (uw) {
newDryFilter = underWaterAudioFilter;
} else {
newDryFilter = aboveWaterAudioFilter;
}
Filter oldDryFilter = waves.getDryFilter();
if (oldDryFilter != newDryFilter) {
System.out.println("dry filter : " + newDryFilter);
waves.setDryFilter(newDryFilter);
}
if (!water.isUnderWater() && uw) {
uw = false;
//waves.setReverbEnabled(false);
waves.setDryFilter(new LowPassFilter(1, 1f));
//waves.setDryFilter(new LowPassFilter(1,1f));

boolean newReverbEnabled = !uw;
boolean oldReverbEnabled = waves.isReverbEnabled();
if (oldReverbEnabled != newReverbEnabled) {
System.out.println("reverb enabled : " + newReverbEnabled);
waves.setReverbEnabled(newReverbEnabled);
}
}
}
}