sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed FloatBuffer support as well as other

Browse Source 
buffers that are views of other buffers and
follow the same conventions.


git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9127 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
PSp..om 2012-02-01 22:59:36 +00:00
parent 33156837bf
commit 4edf262021
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
engine/src/core/com/jme3/util/BufferUtils.java
View File

@ -1165,9 +1165,21 @@ public final class BufferUtils {
Method cleanerMethod = toBeDestroyed.getClass().getMethod("cleaner"); Method cleanerMethod = toBeDestroyed.getClass().getMethod("cleaner");
cleanerMethod.setAccessible(true); cleanerMethod.setAccessible(true);
Object cleaner = cleanerMethod.invoke(toBeDestroyed); Object cleaner = cleanerMethod.invoke(toBeDestroyed);
Method cleanMethod = cleaner.getClass().getMethod("clean"); if (cleaner != null) {
cleanMethod.setAccessible(true); Method cleanMethod = cleaner.getClass().getMethod("clean");
cleanMethod.invoke(cleaner); cleanMethod.setAccessible(true);
cleanMethod.invoke(cleaner);
} else {
// Try the alternate approach of getting the viewed buffer
Method viewedBufferMethod = toBeDestroyed.getClass().getMethod("viewedBuffer");
viewedBufferMethod.setAccessible(true);
Object viewedBuffer = viewedBufferMethod.invoke(toBeDestroyed);
if (viewedBuffer != null) {
destroyDirectBuffer( (Buffer)viewedBuffer );
} else {
Logger.getLogger(BufferUtils.class.getName()).log(Level.SEVERE, "Buffer cannot be destroyed: {0}", toBeDestroyed);
}
}
} catch (IllegalAccessException ex) { } catch (IllegalAccessException ex) {
Logger.getLogger(BufferUtils.class.getName()).log(Level.SEVERE, "{0}", ex); Logger.getLogger(BufferUtils.class.getName()).log(Level.SEVERE, "{0}", ex);
} catch (IllegalArgumentException ex) { } catch (IllegalArgumentException ex) {

4
engine/src/test/jme3test/app/TestReleaseDirectMemory.java
View File

@ -39,6 +39,7 @@ import com.jme3.scene.Geometry;
import com.jme3.scene.shape.Box; import com.jme3.scene.shape.Box;
import com.jme3.util.BufferUtils; import com.jme3.util.BufferUtils;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.FloatBuffer;
public class TestReleaseDirectMemory extends SimpleApplication { public class TestReleaseDirectMemory extends SimpleApplication {
@ -61,6 +62,9 @@ public class TestReleaseDirectMemory extends SimpleApplication {
public void simpleUpdate(float tpf) { public void simpleUpdate(float tpf) {
ByteBuffer buf = BufferUtils.createByteBuffer(500000); ByteBuffer buf = BufferUtils.createByteBuffer(500000);
BufferUtils.destroyDirectBuffer(buf); BufferUtils.destroyDirectBuffer(buf);
FloatBuffer buf2 = BufferUtils.createFloatBuffer(500000);
BufferUtils.destroyDirectBuffer(buf2);
} }
} }