Skip to content

Test case collision #1568

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.

Sign up for GitHub

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

Closed
Mezage wants to merge 4 commits into from
Closed

Test case collision #1568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5001042
Fixed ArrayIndexOutOfBoundException when unit was greater than 16 in …
May 17, 2021
8bb6568
Fixed ArrayIndexOutOfBoundException when unit was greater than 16 in …
May 26, 2021
d5e2a50
Included test case to verify patch for issue #1537
May 27, 2021
494fc09
Delete jme3-core/src/test/java/com/jme3/bullet directory
Mezage May 27, 2021
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
3 changes: 2 additions & 1 deletion jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2413,7 +2413,8 @@ private void bindTextureAndUnit(int target, Image img, int unit) {
gl.glActiveTexture(GL.GL_TEXTURE0 + unit);
context.boundTextureUnit = unit;
}
if (context.boundTextures[unit]==null||context.boundTextures[unit].get() != img.getWeakRef().get()) {

if (context.boundTextures[unit] == null || context.boundTextures[unit].get() != img.getWeakRef().get()) {
gl.glBindTexture(target, img.getId());
context.boundTextures[unit] = img.getWeakRef();
statistics.onTextureUse(img, true);
Expand Down
28 changes: 28 additions & 0 deletions jme3-core/src/test/java/com/jme3/anim/AnimComposerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,15 @@
*/
package com.jme3.anim;

import com.jme3.anim.tween.action.Action;
import com.jme3.anim.tween.action.ClipAction;
import com.jme3.cinematic.Cinematic;
import com.jme3.cinematic.events.AnimEvent;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;

import java.awt.event.ActionEvent;

/**
* @author Remy Van Doosselaer
Expand Down Expand Up @@ -69,4 +76,25 @@ public void testGetAnimClipsNamesIsNotModifiable() {
composer.getAnimClipsNames().add("test");
}

/**
* Verify that issue#1537 was resolved : onStop() kills prior event on the same layer
*/
@Test
public void testGetLayerManagerReturnsRightEvent(){
AnimComposer composer = new AnimComposer();
composer.makeLayer("testLayer", null);

composer.addAnimClip(new AnimClip("testClip"));
AnimEvent ev1 = new AnimEvent(composer, "testClip", "testLayer");
AnimEvent ev2 = new AnimEvent(composer, "testClip", "testLayer");

ev1.onPlay();
Assert.assertEquals(composer.getLayerManager("testLayer"), ev1);
ev2.onPlay();
Assert.assertEquals(composer.getLayerManager("testLayer"), ev2);
ev1.onStop();
Assert.assertEquals(composer.getLayerManager("testLayer"), ev2);
ev2.onStop();
Assert.assertNull(composer.getLayerManager("testLayer"));
}
}