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

* AndroidImageInfo now supports getting notification when the bitmap has been successfully uploaded to GL

Browse Source 
* AndroidAudioRenderer no longer prints silly debug messages

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9409 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
Sha..rd 2012-05-20 19:56:39 +00:00
parent 8b5f4cba36
commit 4be1d2be1e
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
engine/src/android/com/jme3/asset/AndroidImageInfo.java
View File

@ -7,6 +7,8 @@ import com.jme3.texture.Image;
import com.jme3.texture.Image.Format; import com.jme3.texture.Image.Format;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.logging.Level;
import java.util.logging.Logger;
/** /**
* <code>AndroidImageInfo</code> is set in a jME3 image via the {@link Image#setEfficentData(java.lang.Object) } * <code>AndroidImageInfo</code> is set in a jME3 image via the {@link Image#setEfficentData(java.lang.Object) }
@ -18,6 +20,8 @@ import java.io.InputStream;
*/ */
public class AndroidImageInfo { public class AndroidImageInfo {
private static final Logger logger = Logger.getLogger(AndroidImageInfo.class.getName());
protected AssetInfo assetInfo; protected AssetInfo assetInfo;
protected Bitmap bitmap; protected Bitmap bitmap;
protected Format format; protected Format format;
@ -40,7 +44,14 @@ public class AndroidImageInfo {
return bitmap; return bitmap;
} }
public void notifyBitmapUploaded() {
// Default function is to recycle the bitmap.
if (bitmap != null && !bitmap.isRecycled()) {
bitmap.recycle();
bitmap = null;
logger.log(Level.INFO, "Bitmap was deleted. ");
}
}
public Format getFormat(){ public Format getFormat(){
return format; return format;

4
engine/src/android/com/jme3/audio/android/AndroidAudioRenderer.java
View File

@ -88,8 +88,6 @@ public class AndroidAudioRenderer implements AudioRenderer,
@Override @Override
public void updateSourceParam(AudioNode src, AudioParam param) { public void updateSourceParam(AudioNode src, AudioParam param) {
// logger.log(Level.INFO, "updateSourceParam " + param);
if (audioDisabled) { if (audioDisabled) {
return; return;
} }
@ -195,7 +193,6 @@ public class AndroidAudioRenderer implements AudioRenderer,
@Override @Override
public void updateListenerParam(Listener listener, ListenerParam param) { public void updateListenerParam(Listener listener, ListenerParam param) {
// logger.log(Level.INFO, "updateListenerParam " + param);
if (audioDisabled) { if (audioDisabled) {
return; return;
} }
@ -203,7 +200,6 @@ public class AndroidAudioRenderer implements AudioRenderer,
switch (param) { switch (param) {
case Position: case Position:
listenerPosition.set(listener.getLocation()); listenerPosition.set(listener.getLocation());
break; break;
case Rotation: case Rotation:
Vector3f dir = listener.getDirection(); Vector3f dir = listener.getDirection();