Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 8 additions & 0 deletions jme3-android/src/main/java/com/jme3/app/AndroidHarness.java
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,7 @@ public void run() {
* @param dialog
* @param whichButton
*/
@Override
public void onClick(DialogInterface dialog, int whichButton) {
if (whichButton != -2) {
if (app != null) {
Expand Down Expand Up @@ -473,6 +474,7 @@ protected void initializeLogHandler() {
handler.setLevel(Level.ALL);
}

@Override
public void initialize() {
app.initialize();
if (handleExitHook) {
Expand All @@ -488,10 +490,12 @@ public void initialize() {
}
}

@Override
public void reshape(int width, int height) {
app.reshape(width, height);
}

@Override
public void update() {
app.update();
// call to remove the splash screen, if present.
Expand All @@ -503,10 +507,12 @@ public void update() {
}
}

@Override
public void requestClose(boolean esc) {
app.requestClose(esc);
}

@Override
public void destroy() {
if (app != null) {
app.destroy();
Expand All @@ -516,6 +522,7 @@ public void destroy() {
}
}

@Override
public void gainFocus() {
logger.fine("gainFocus");
if (view != null) {
Expand Down Expand Up @@ -547,6 +554,7 @@ public void gainFocus() {
}
}

@Override
public void loseFocus() {
logger.fine("loseFocus");
if (app != null) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2014 jMonkeyEngine
* Copyright (c) 2014-2020 jMonkeyEngine
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -82,6 +82,7 @@
public class DefaultAndroidProfiler implements AppProfiler {
private int androidApiLevel = Build.VERSION.SDK_INT;

@Override
public void appStep(AppStep appStep) {
if (androidApiLevel >= 18) {
switch(appStep) {
Expand Down Expand Up @@ -140,6 +141,7 @@ public void appSubStep(String... additionalInfo) {

}

@Override
public void vpStep(VpStep vpStep, ViewPort vp, RenderQueue.Bucket bucket) {
if (androidApiLevel >= 18) {
switch (vpStep) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2009-2019 jMonkeyEngine
* Copyright (c) 2009-2020 jMonkeyEngine
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -73,6 +73,7 @@ public class VideoRecorderAppState extends AbstractAppState {
private Application app;
private ExecutorService executor = Executors.newCachedThreadPool(new ThreadFactory() {

@Override
public Thread newThread(Runnable r) {
Thread th = new Thread(r);
th.setName("jME3 Video Processor");
Expand Down Expand Up @@ -239,6 +240,7 @@ public void addImage(Renderer renderer, FrameBuffer out) {
renderer.readFrameBufferWithFormat(out, item.buffer, Image.Format.BGRA8);
executor.submit(new Callable<Void>() {

@Override
public Void call() throws Exception {
if (fastMode) {
item.data = item.buffer.array();
Expand All @@ -260,6 +262,7 @@ public Void call() throws Exception {
}
}

@Override
public void initialize(RenderManager rm, ViewPort viewPort) {
logger.log(Level.INFO, "initialize in VideoProcessor");
this.camera = viewPort.getCamera();
Expand All @@ -275,13 +278,16 @@ public void initialize(RenderManager rm, ViewPort viewPort) {
}
}

@Override
public void reshape(ViewPort vp, int w, int h) {
}

@Override
public boolean isInitialized() {
return this.isInitilized;
}

@Override
public void preFrame(float tpf) {
if (null == writer) {
try {
Expand All @@ -292,14 +298,17 @@ public void preFrame(float tpf) {
}
}

@Override
public void postQueue(RenderQueue rq) {
}

@Override
public void postFrame(FrameBuffer out) {
numFrames++;
addImage(renderManager.getRenderer(), out);
}

@Override
public void cleanup() {
logger.log(Level.INFO, "cleanup in VideoProcessor");
logger.log(Level.INFO, "VideoProcessor numFrames: {0}", numFrames);
Expand Down Expand Up @@ -332,22 +341,27 @@ public IsoTimer(float framerate) {
this.ticks = 0;
}

@Override
public long getTime() {
return (long) (this.ticks * (1.0f / this.framerate) * 1000f);
}

@Override
public long getResolution() {
return 1000L;
}

@Override
public float getFrameRate() {
return this.framerate;
}

@Override
public float getTimePerFrame() {
return (float) (1.0f / this.framerate);
}

@Override
public void update() {
long time = System.currentTimeMillis();
long difference = time - lastTime;
Expand All @@ -364,6 +378,7 @@ public void update() {
this.ticks++;
}

@Override
public void reset() {
this.ticks = 0;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public class AndroidLocator implements AssetLocator {
public AndroidLocator() {
}

@Override
public void setRootPath(String rootPath) {
this.rootPath = rootPath;
}
Expand Down
20 changes: 20 additions & 0 deletions jme3-android/src/main/java/com/jme3/audio/android/AndroidAL.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,44 +10,64 @@ public final class AndroidAL implements AL {
public AndroidAL() {
}

@Override
public native String alGetString(int parameter);

@Override
public native int alGenSources();

@Override
public native int alGetError();

@Override
public native void alDeleteSources(int numSources, IntBuffer sources);

@Override
public native void alGenBuffers(int numBuffers, IntBuffer buffers);

@Override
public native void alDeleteBuffers(int numBuffers, IntBuffer buffers);

@Override
public native void alSourceStop(int source);

@Override
public native void alSourcei(int source, int param, int value);

@Override
public native void alBufferData(int buffer, int format, ByteBuffer data, int size, int frequency);

@Override
public native void alSourcePlay(int source);

@Override
public native void alSourcePause(int source);

@Override
public native void alSourcef(int source, int param, float value);

@Override
public native void alSource3f(int source, int param, float value1, float value2, float value3);

@Override
public native int alGetSourcei(int source, int param);

@Override
public native void alSourceUnqueueBuffers(int source, int numBuffers, IntBuffer buffers);

@Override
public native void alSourceQueueBuffers(int source, int numBuffers, IntBuffer buffers);

@Override
public native void alListener(int param, FloatBuffer data);

@Override
public native void alListenerf(int param, float value);

@Override
public native void alListener3f(int param, float value1, float value2, float value3);

@Override
public native void alSource3i(int source, int param, int value1, int value2, int value3);

}
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,27 @@ public final class AndroidALC implements ALC {
public AndroidALC() {
}

@Override
public native void createALC();

@Override
public native void destroyALC();

@Override
public native boolean isCreated();

@Override
public native String alcGetString(int parameter);

@Override
public native boolean alcIsExtensionPresent(String extension);

@Override
public native void alcGetInteger(int param, IntBuffer buffer, int size);

@Override
public native void alcDevicePauseSOFT();

@Override
public native void alcDeviceResumeSOFT();
}
11 changes: 11 additions & 0 deletions jme3-android/src/main/java/com/jme3/audio/android/AndroidEFX.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,36 @@ public class AndroidEFX implements EFX {
public AndroidEFX() {
}

@Override
public native void alGenAuxiliaryEffectSlots(int numSlots, IntBuffer buffers);

@Override
public native void alGenEffects(int numEffects, IntBuffer buffers);

@Override
public native void alEffecti(int effect, int param, int value);

@Override
public native void alAuxiliaryEffectSloti(int effectSlot, int param, int value);

@Override
public native void alDeleteEffects(int numEffects, IntBuffer buffers);

@Override
public native void alDeleteAuxiliaryEffectSlots(int numEffectSlots, IntBuffer buffers);

@Override
public native void alGenFilters(int numFilters, IntBuffer buffers);

@Override
public native void alFilteri(int filter, int param, int value);

@Override
public native void alFilterf(int filter, int param, float value);

@Override
public native void alDeleteFilters(int numFilters, IntBuffer buffers);

@Override
public native void alEffectf(int effect, int param, float value);
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ public long skip(long n) throws IOException {
throw new IOException("Not supported for audio streams");
}

@Override
public void setTime(float time) {
try {
file.seekTime(time);
Expand Down
Loading