-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
VectorEffects #2577
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+4,088
−0
Merged
VectorEffects #2577
Changes from 5 commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
a4dfa6c
Add files via upload
yaRnMcDonuts ba6672b
Add Example
yaRnMcDonuts 9bc33ac
Update VectorGroup.java
yaRnMcDonuts 4121447
Add FastNoiseLite.java
yaRnMcDonuts 5adc84a
Add NoiseVectorEffect.java
yaRnMcDonuts 5540726
Update VectorGroup.java
yaRnMcDonuts c42dfdc
refactor: make typesafe and immutable
riccardobl f7c5fd0
Add files via upload
yaRnMcDonuts dcf0f0d
Add files via upload
yaRnMcDonuts 40dd430
Update VectorEffectSimpleTest.java
yaRnMcDonuts ab4c1f8
Add files via upload
yaRnMcDonuts 7e93369
Add files via upload
yaRnMcDonuts 34f536f
Update NoiseVectorEffect.java
yaRnMcDonuts fba64fe
Update SequencedVectorEffect.java
yaRnMcDonuts 463d968
Update EaseVectorEffect.java
yaRnMcDonuts b0a095f
Update AbstractVectorEffect.java
yaRnMcDonuts 64f7082
Update Vector Effects based on Recent Reviews
yaRnMcDonuts 954bd7f
Update Examples
yaRnMcDonuts f82dbd6
Update Examples
yaRnMcDonuts b2760b0
Update VectorEffects based on recent reviews
yaRnMcDonuts e035c73
Update NoiseVectorEffectTest.java
yaRnMcDonuts File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
2,593 changes: 2,593 additions & 0 deletions
2,593
jme3-core/src/main/java/com/jme3/math/FastNoiseLite.java
Large diffs are not rendered by default.
Oops, something went wrong.
148 changes: 148 additions & 0 deletions
148
jme3-effects/src/main/java/com/jme3/vectoreffect/EaseVectorEffect.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| /* | ||
| * Copyright (c) 2009-2026 jMonkeyEngine | ||
| * All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are | ||
| * met: | ||
| * | ||
| * * Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * | ||
| * * Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in the | ||
| * documentation and/or other materials provided with the distribution. | ||
| * | ||
| * * Neither the name of 'jMonkeyEngine' nor the names of its contributors | ||
| * may be used to endorse or promote products derived from this software | ||
| * without specific prior written permission. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | ||
| * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR | ||
| * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | ||
| * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | ||
| * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | ||
| * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | ||
| * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING | ||
| * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
| * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| package com.jme3.vectoreffect; | ||
|
|
||
| import com.jme3.math.EaseFunction; | ||
| import com.jme3.math.Easing; | ||
| import com.jme3.math.Vector4f; | ||
|
|
||
| /** | ||
| * | ||
| * @author yaRnMcDonuts | ||
| */ | ||
| public final class EaseVectorEffect extends VectorEffect { | ||
|
|
||
| private VectorGroup targetVectors; | ||
| private VectorGroup startVectors; | ||
|
|
||
| private float duration = 0f; | ||
| private float easeTimer = 0f; | ||
| private float delay = 0f; | ||
| private float delayTimer = 0f; | ||
|
|
||
| private EaseFunction easeFunction = Easing.linear; | ||
|
|
||
| public EaseVectorEffect(Object vectorToModify) { | ||
| super(vectorToModify); | ||
| } | ||
|
|
||
| public EaseVectorEffect(Object vectorToModify, Object targetVector, float duration) { | ||
| this(vectorToModify); | ||
| setEaseToValueOverDuration(duration, targetVector); | ||
| } | ||
|
|
||
| public EaseVectorEffect(Object vectorToModify, Object targetVector, float duration, float delay) { | ||
| this(vectorToModify); | ||
| setEaseToValueOverDuration(duration, targetVector); | ||
| setDelayTime(delay); | ||
| } | ||
|
|
||
| public EaseVectorEffect(Object vectorToModify, Object targetVector, float duration, EaseFunction easeFunction) { | ||
| this(vectorToModify, targetVector, duration); | ||
| setEaseFunction(easeFunction); | ||
| } | ||
|
|
||
| public EaseVectorEffect(Object vectorToModify, Object targetVector, float duration, EaseFunction easeFunction, float delay) { | ||
| this(vectorToModify, targetVector, duration); | ||
| setEaseFunction(easeFunction); | ||
| setDelayTime(delay); | ||
| } | ||
|
|
||
| @Override | ||
| public void update(float tpf) { | ||
| super.update(tpf); | ||
|
|
||
| if (delayTimer <= delay) { | ||
| delayTimer += tpf; | ||
| return; | ||
| } | ||
|
|
||
|
|
||
| if (startVectors == null) { | ||
| startVectors = new VectorGroup(); | ||
|
|
||
| for(int v = 0; v < vectorsToModify.getSize(); v++){ | ||
| Vector4f startVector = vectorsToModify.getAsVector4(v).clone(); | ||
| startVectors.addVectorToGroup(startVector); | ||
| } | ||
| } | ||
|
|
||
| easeTimer += tpf; | ||
| float t = Math.min(easeTimer / duration, 1f); | ||
|
|
||
| float easedT = easeFunction.apply(t); | ||
|
|
||
| for(int v = 0; v < vectorsToModify.getSize(); v++){ | ||
|
|
||
| Vector4f targetVector = targetVectors.getAsVector4(v); | ||
| Vector4f startVector = startVectors.getAsVector4(v); | ||
| Vector4f difference = targetVector.subtract(startVector); | ||
|
|
||
| Vector4f currentValue = startVector.add(difference.mult(easedT)); | ||
| vectorsToModify.updateVectorObject(currentValue, v); | ||
| } | ||
|
|
||
| if (t >= 1f) { | ||
| super.setIsFinished(true); | ||
| } | ||
| } | ||
|
|
||
| public EaseVectorEffect setEaseToValueOverDuration(float dur, Object targetVector) { | ||
| if(targetVector instanceof VectorGroup){ | ||
| targetVectors = (VectorGroup) targetVector; | ||
| } | ||
| else{ | ||
| targetVectors = new VectorGroup(targetVector); | ||
| } | ||
|
|
||
| duration = dur; | ||
| startVectors = null; | ||
| return this; | ||
| } | ||
|
|
||
| public void setDelayTime(float delay) { | ||
| this.delay = delay; | ||
| } | ||
|
|
||
| public void setEaseFunction(EaseFunction func) { | ||
| this.easeFunction = func; | ||
| } | ||
|
|
||
| @Override | ||
| public void reset() { | ||
| delayTimer = 0; | ||
| easeTimer = 0; | ||
| startVectors = null; | ||
| super.reset(); | ||
| } | ||
| } |
113 changes: 113 additions & 0 deletions
113
jme3-effects/src/main/java/com/jme3/vectoreffect/NoiseVectorEffect.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| /* | ||
| * Copyright (c) 2009-2026 jMonkeyEngine | ||
| * All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are | ||
| * met: | ||
| * | ||
| * * Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * | ||
| * * Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in the | ||
| * documentation and/or other materials provided with the distribution. | ||
| * | ||
| * * Neither the name of 'jMonkeyEngine' nor the names of its contributors | ||
| * may be used to endorse or promote products derived from this software | ||
| * without specific prior written permission. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | ||
| * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR | ||
| * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | ||
| * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | ||
| * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | ||
| * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | ||
| * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING | ||
| * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
| * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
| package com.jme3.vectoreffect; | ||
|
|
||
| import com.jme3.math.Vector4f; | ||
| import com.jme3.math.FastNoiseLite; | ||
| import com.jme3.math.FastNoiseLite.NoiseType; | ||
|
|
||
| /** | ||
| * | ||
| * @author yaRnMcDonuts | ||
| */ | ||
| public class NoiseVectorEffect extends VectorEffect { | ||
|
|
||
| private FastNoiseLite noiseGenerator; | ||
|
|
||
| private VectorGroup noiseMagnitudes; | ||
| private VectorGroup originalVectorValues; | ||
|
|
||
| public float speed = 1; | ||
| private float timeAccrued = 0; | ||
|
|
||
| public NoiseVectorEffect(Object vectorObject, Object noiseMagnitude) { | ||
| this(vectorObject, noiseMagnitude, NoiseType.OpenSimplex2, 0.5f); | ||
| } | ||
|
|
||
| public NoiseVectorEffect(Object vectorObject, Object noiseMagnitude, NoiseType noiseType, float frequency) { | ||
| super(vectorObject); | ||
|
|
||
| if(noiseMagnitude instanceof VectorGroup){ | ||
| noiseMagnitudes = (VectorGroup) noiseMagnitude; | ||
| }else{ | ||
| noiseMagnitudes = new VectorGroup(noiseMagnitude); | ||
| } | ||
|
|
||
| noiseGenerator = new FastNoiseLite(); | ||
| noiseGenerator.SetFrequency(frequency); | ||
| noiseGenerator.SetNoiseType(noiseType); | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public void update(float tpf) { | ||
| super.update(tpf); | ||
|
|
||
| if(originalVectorValues == null){ | ||
| originalVectorValues = new VectorGroup(); | ||
| for(int v = 0; v < vectorsToModify.getSize(); v++){ | ||
| Vector4f startVector = vectorsToModify.getAsVector4(v).clone(); | ||
| originalVectorValues.addVectorToGroup(startVector); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| timeAccrued += tpf; | ||
|
|
||
| //to-do: add a togglable isUniform boolean that can be set false to allow each x/y/z/w component to be altered by a different noise value. | ||
|
|
||
| float noiseReturnVal = noiseGenerator.GetNoise(timeAccrued * speed, 12.671f + timeAccrued * speed * 0.92173f, 19.54f + timeAccrued * speed * 0.68913f); | ||
|
|
||
| for(int v = 0; v < vectorsToModify.getSize(); v++){ | ||
| int magnitudeIndex = Math.min(v, noiseMagnitudes.getSize() - 1); //allows multiple vectors to share the same magnitude if desired | ||
| Vector4f noiseVariation = noiseMagnitudes.getAsVector4(magnitudeIndex).mult(noiseReturnVal); | ||
|
|
||
| noiseVariation.addLocal(originalVectorValues.getAsVector4(v)); | ||
|
|
||
| vectorsToModify.updateVectorObject(noiseVariation, v); | ||
| } | ||
| } | ||
|
|
||
| public FastNoiseLite getNoiseGenerator() { | ||
| return noiseGenerator; | ||
| } | ||
|
|
||
| public void setSpeed(float speed) { | ||
| this.speed = speed; | ||
| } | ||
|
|
||
| @Override | ||
| public void reset() { | ||
| super.reset(); | ||
| originalVectorValues = null; | ||
| } | ||
| } | ||
95 changes: 95 additions & 0 deletions
95
jme3-effects/src/main/java/com/jme3/vectoreffect/SequencedVectorEffect.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,95 @@ | ||||||
| /* | ||||||
| * Copyright (c) 2009-2026 jMonkeyEngine | ||||||
| * All rights reserved. | ||||||
| * | ||||||
| * Redistribution and use in source and binary forms, with or without | ||||||
| * modification, are permitted provided that the following conditions are | ||||||
| * met: | ||||||
| * | ||||||
| * * Redistributions of source code must retain the above copyright | ||||||
| * notice, this list of conditions and the following disclaimer. | ||||||
| * | ||||||
| * * Redistributions in binary form must reproduce the above copyright | ||||||
| * notice, this list of conditions and the following disclaimer in the | ||||||
| * documentation and/or other materials provided with the distribution. | ||||||
| * | ||||||
| * * Neither the name of 'jMonkeyEngine' nor the names of its contributors | ||||||
| * may be used to endorse or promote products derived from this software | ||||||
| * without specific prior written permission. | ||||||
| * | ||||||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||||||
| * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | ||||||
| * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||||||
| * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR | ||||||
| * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | ||||||
| * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | ||||||
| * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | ||||||
| * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | ||||||
| * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING | ||||||
| * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||||||
| * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||||||
| */ | ||||||
|
|
||||||
| package com.jme3.vectoreffect; | ||||||
|
|
||||||
| import java.util.ArrayList; | ||||||
| import java.util.Collections; | ||||||
|
|
||||||
| /** | ||||||
| * | ||||||
| * @author yaRnMcDonuts | ||||||
| */ | ||||||
| public class SequencedVectorEffect extends VectorEffect { | ||||||
| private final ArrayList<VectorEffect> effects = new ArrayList<>(); | ||||||
| private int currentIndex = 0; | ||||||
| private boolean isRepeatingInfinitely = false; | ||||||
| private float numTimesToRepeat = -1; | ||||||
| private float currentCycle = 0; | ||||||
|
yaRnMcDonuts marked this conversation as resolved.
Outdated
|
||||||
|
|
||||||
| public void setLooping(boolean repeat) { this.isRepeatingInfinitely = repeat; } | ||||||
| public void setRepeatNumberOfTimes(float repititionCount){ this.numTimesToRepeat = repititionCount; } | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. To be consistent with changing
Suggested change
|
||||||
| public void addEffect(VectorEffect effect) { effects.add(effect); } | ||||||
|
|
||||||
| public SequencedVectorEffect(VectorEffect... effects) { | ||||||
| super(); | ||||||
| Collections.addAll(this.effects, effects); | ||||||
| } | ||||||
|
|
||||||
|
|
||||||
| @Override | ||||||
| public void update(float tpf) { | ||||||
| super.update(tpf); | ||||||
| if (effects.isEmpty()) { | ||||||
| setIsFinished(true); | ||||||
| return; | ||||||
| } | ||||||
|
|
||||||
| VectorEffect current = effects.get(currentIndex); | ||||||
| current.update(tpf); | ||||||
|
|
||||||
| if (current.isFinished()) { | ||||||
| currentIndex++; | ||||||
|
|
||||||
| if (currentIndex >= effects.size()) { | ||||||
| currentCycle++; | ||||||
| reset(); | ||||||
|
|
||||||
| if (!isRepeatingInfinitely && currentCycle >= numTimesToRepeat) { | ||||||
| setIsFinished(true); | ||||||
| currentCycle = 0; | ||||||
| } | ||||||
|
|
||||||
| } | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| @Override | ||||||
| public void reset() { | ||||||
| super.reset(); | ||||||
| isFinished = false; | ||||||
|
yaRnMcDonuts marked this conversation as resolved.
|
||||||
| currentIndex = 0; | ||||||
| for (VectorEffect e : effects) { | ||||||
| e.reset(); | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.