tried to fix kissfft, failed misserably :D

diff --git a/extensions/gdx-audio/jni/com.badlogic.gdx.audio.analysis.AudioTools.cpp b/extensions/gdx-audio/jni/com.badlogic.gdx.audio.analysis.AudioTools.cpp
index f0b9929..119ba35 100644 (file)
--- a/extensions/gdx-audio/jni/com.badlogic.gdx.audio.analysis.AudioTools.cpp
+++ b/extensions/gdx-audio/jni/com.badlogic.gdx.audio.analysis.AudioTools.cpp
@@ -4,7 +4,7 @@ JNIEXPORT void JNICALL Java_com_badlogic_gdx_audio_analysis_AudioTools_convertTo
        float* target = (float*)env->GetDirectBufferAddress(obj_target);
 
 
-//@line:37
+//@line:42
 \r
                float inv = 1 / 32767.0f;\r
                for( int i = 0; i < numSamples; i++, source++, target++ )\r
@@ -25,7 +25,7 @@ JNIEXPORT void JNICALL Java_com_badlogic_gdx_audio_analysis_AudioTools_convertTo
        short* target = (short*)env->GetDirectBufferAddress(obj_target);
 
 
-//@line:57
+//@line:62
 \r
                for( int i = 0; i < numSamples; i++, source++, target++ )\r
                *target = (short)(*source * 32767);\r
@@ -38,7 +38,7 @@ JNIEXPORT void JNICALL Java_com_badlogic_gdx_audio_analysis_AudioTools_convertTo
        short* target = (short*)env->GetDirectBufferAddress(obj_target);
 
 
-//@line:69
+//@line:74
 \r
                for( int i = 0; i < numSamples / 2; i++ )\r
                {\r
@@ -56,7 +56,7 @@ JNIEXPORT void JNICALL Java_com_badlogic_gdx_audio_analysis_AudioTools_convertTo
        float* target = (float*)env->GetDirectBufferAddress(obj_target);
 
 
-//@line:86
+//@line:91
 \r
                for( int i = 0; i < numSamples / 2; i++ )\r
                {\r
@@ -72,7 +72,7 @@ JNIEXPORT void JNICALL Java_com_badlogic_gdx_audio_analysis_AudioTools_convertTo
 static inline jfloat wrapped_Java_com_badlogic_gdx_audio_analysis_AudioTools_spectralFlux
 (JNIEnv* env, jclass clazz, jobject obj_spectrumA, jobject obj_spectrumB, jint numSamples, float* spectrumA, float* spectrumB) {
 
-//@line:103
+//@line:108
 \r
                float flux = 0;\r
                for( int i = 0; i < numSamples; i++ )\r

diff --git a/extensions/gdx-audio/jni/com.badlogic.gdx.audio.analysis.KissFFT.cpp b/extensions/gdx-audio/jni/com.badlogic.gdx.audio.analysis.KissFFT.cpp
index ad75165..f366df3 100644 (file)
--- a/extensions/gdx-audio/jni/com.badlogic.gdx.audio.analysis.KissFFT.cpp
+++ b/extensions/gdx-audio/jni/com.badlogic.gdx.audio.analysis.KissFFT.cpp
@@ -1,6 +1,6 @@
 #include <com.badlogic.gdx.audio.analysis.KissFFT.h>
 
-//@line:64
+//@line:58
 
        #include <kiss_fftr.h>
        #include <stdlib.h>
@@ -26,7 +26,7 @@
         JNIEXPORT jlong JNICALL Java_com_badlogic_gdx_audio_analysis_KissFFT_create(JNIEnv* env, jclass clazz, jint numSamples) {
 
 
-//@line:91
+//@line:85
 \r
                KissFFT* fft = new KissFFT();\r
                fft->config = kiss_fftr_alloc(numSamples,0,NULL,NULL);\r
@@ -40,7 +40,7 @@
 JNIEXPORT void JNICALL Java_com_badlogic_gdx_audio_analysis_KissFFT_destroy(JNIEnv* env, jclass clazz, jlong handle) {
 
 
-//@line:101
+//@line:95
 \r
                KissFFT* fft = (KissFFT*)handle;\r
                free(fft->config);\r
@@ -50,58 +50,58 @@ JNIEXPORT void JNICALL Java_com_badlogic_gdx_audio_analysis_KissFFT_destroy(JNIE
 
 }
 
-JNIEXPORT void JNICALL Java_com_badlogic_gdx_audio_analysis_KissFFT_spectrum(JNIEnv* env, jclass clazz, jlong handle, jobject obj_samples, jobject obj_spectrum) {
-       short* samples = (short*)env->GetDirectBufferAddress(obj_samples);
-       float* spectrum = (float*)env->GetDirectBufferAddress(obj_spectrum);
+JNIEXPORT void JNICALL Java_com_badlogic_gdx_audio_analysis_KissFFT_spectrum(JNIEnv* env, jclass clazz, jlong handle, jshortArray obj_samples, jfloatArray obj_spectrum) {
+       short* samples = (short*)env->GetPrimitiveArrayCritical(obj_samples, 0);
+       float* spectrum = (float*)env->GetPrimitiveArrayCritical(obj_spectrum, 0);
 
 
-//@line:114
+//@line:108
 \r
                KissFFT* fft = (KissFFT*)handle;\r
                kiss_fftr( fft->config, (kiss_fft_scalar*)samples, fft->spectrum );\r
        \r
                int len = fft->numSamples / 2 + 1;\r
-               float* out = (float*)spectrum;\r
-       \r
                for( int i = 0; i < len; i++ )\r
                {\r
                        float re = scale(fft->spectrum[i].r) * fft->numSamples;\r
                        float im = scale(fft->spectrum[i].i) * fft->numSamples;\r
        \r
                        if( i > 0 )\r
-                               out[i] = sqrtf(re*re + im*im) / (fft->numSamples / 2);\r
+                               spectrum[i] = sqrtf(re*re + im*im) / (fft->numSamples);\r
                        else\r
-                               out[i] = sqrtf(re*re + im*im) / (fft->numSamples);\r
+                               spectrum[i] = sqrtf(re*re + im*im) / (fft->numSamples);\r
                }\r
        
+       env->ReleasePrimitiveArrayCritical(obj_samples, samples, 0);
+       env->ReleasePrimitiveArrayCritical(obj_spectrum, spectrum, 0);
 
 }
 
-JNIEXPORT void JNICALL Java_com_badlogic_gdx_audio_analysis_KissFFT_getRealPart(JNIEnv* env, jclass clazz, jlong handle, jobject obj_real) {
-       short* real = (short*)env->GetDirectBufferAddress(obj_real);
+JNIEXPORT void JNICALL Java_com_badlogic_gdx_audio_analysis_KissFFT_getRealPart(JNIEnv* env, jclass clazz, jlong handle, jshortArray obj_real) {
+       short* real = (short*)env->GetPrimitiveArrayCritical(obj_real, 0);
 
 
-//@line:133
+//@line:125
 \r
                KissFFT* fft = (KissFFT*)handle;\r
-               short* out = (short*)real;\r
                for( int i = 0; i < fft->numSamples / 2; i++ )\r
-                       out[i] = fft->spectrum[i].r;\r
+                       real[i] = fft->spectrum[i].r;\r
        
+       env->ReleasePrimitiveArrayCritical(obj_real, real, 0);
 
 }
 
-JNIEXPORT void JNICALL Java_com_badlogic_gdx_audio_analysis_KissFFT_getImagPart(JNIEnv* env, jclass clazz, jlong handle, jobject obj_imag) {
-       short* imag = (short*)env->GetDirectBufferAddress(obj_imag);
+JNIEXPORT void JNICALL Java_com_badlogic_gdx_audio_analysis_KissFFT_getImagPart(JNIEnv* env, jclass clazz, jlong handle, jshortArray obj_imag) {
+       short* imag = (short*)env->GetPrimitiveArrayCritical(obj_imag, 0);
 
 
-//@line:140
+//@line:131
 \r
                KissFFT* fft = (KissFFT*)handle;\r
-               short* out = (short*)imag;\r
                for( int i = 0; i < fft->numSamples / 2; i++ )\r
-                       out[i] = fft->spectrum[i].i;\r
+                       imag[i] = fft->spectrum[i].i;\r
        
+       env->ReleasePrimitiveArrayCritical(obj_imag, imag, 0);
 
 }
 

diff --git a/extensions/gdx-audio/jni/com.badlogic.gdx.audio.analysis.KissFFT.h b/extensions/gdx-audio/jni/com.badlogic.gdx.audio.analysis.KissFFT.h
index 817bccb..5b84ec5 100644 (file)
--- a/extensions/gdx-audio/jni/com.badlogic.gdx.audio.analysis.KissFFT.h
+++ b/extensions/gdx-audio/jni/com.badlogic.gdx.audio.analysis.KissFFT.h
@@ -26,26 +26,26 @@ JNIEXPORT void JNICALL Java_com_badlogic_gdx_audio_analysis_KissFFT_destroy
 /*\r
  * Class:     com_badlogic_gdx_audio_analysis_KissFFT\r
  * Method:    spectrum\r
- * Signature: (JLjava/nio/ShortBuffer;Ljava/nio/FloatBuffer;)V\r
+ * Signature: (J[S[F)V\r
  */\r
 JNIEXPORT void JNICALL Java_com_badlogic_gdx_audio_analysis_KissFFT_spectrum\r
-  (JNIEnv *, jclass, jlong, jobject, jobject);\r
+  (JNIEnv *, jclass, jlong, jshortArray, jfloatArray);\r
 \r
 /*\r
  * Class:     com_badlogic_gdx_audio_analysis_KissFFT\r
  * Method:    getRealPart\r
- * Signature: (JLjava/nio/ShortBuffer;)V\r
+ * Signature: (J[S)V\r
  */\r
 JNIEXPORT void JNICALL Java_com_badlogic_gdx_audio_analysis_KissFFT_getRealPart\r
-  (JNIEnv *, jclass, jlong, jobject);\r
+  (JNIEnv *, jclass, jlong, jshortArray);\r
 \r
 /*\r
  * Class:     com_badlogic_gdx_audio_analysis_KissFFT\r
  * Method:    getImagPart\r
- * Signature: (JLjava/nio/ShortBuffer;)V\r
+ * Signature: (J[S)V\r
  */\r
 JNIEXPORT void JNICALL Java_com_badlogic_gdx_audio_analysis_KissFFT_getImagPart\r
-  (JNIEnv *, jclass, jlong, jobject);\r
+  (JNIEnv *, jclass, jlong, jshortArray);\r
 \r
 #ifdef __cplusplus\r
 }\r

diff --git a/extensions/gdx-audio/libs/gdx-audio-natives.jar b/extensions/gdx-audio/libs/gdx-audio-natives.jar
index 672cba4..3d7e7e3 100644 (file)
Binary files a/extensions/gdx-audio/libs/gdx-audio-natives.jar and b/extensions/gdx-audio/libs/gdx-audio-natives.jar differ

diff --git a/extensions/gdx-audio/libs/windows32/gdx-audio.dll b/extensions/gdx-audio/libs/windows32/gdx-audio.dll
index 8278b27..b8f7beb 100644 (file)
Binary files a/extensions/gdx-audio/libs/windows32/gdx-audio.dll and b/extensions/gdx-audio/libs/windows32/gdx-audio.dll differ

diff --git a/extensions/gdx-audio/src/com/badlogic/gdx/audio/AudioBuild.java b/extensions/gdx-audio/src/com/badlogic/gdx/audio/AudioBuild.java
index 019ff49..95bc6d9 100644 (file)
--- a/extensions/gdx-audio/src/com/badlogic/gdx/audio/AudioBuild.java
+++ b/extensions/gdx-audio/src/com/badlogic/gdx/audio/AudioBuild.java
@@ -88,7 +88,7 @@ public class AudioBuild {
                \r
                new AntScriptGenerator().generate(buildConfig, win32home, win32, win64, lin32, lin64, android);\r
                \r
-               BuildExecutor.executeAnt("jni/build-windows32home.xml", " -v");\r
+               BuildExecutor.executeAnt("jni/build-windows32home.xml", "clean postcompile -v");\r
                BuildExecutor.executeAnt("jni/build.xml", "pack-natives -v");\r
        }\r
 }\r

diff --git a/extensions/gdx-audio/src/com/badlogic/gdx/audio/analysis/AudioTools.java b/extensions/gdx-audio/src/com/badlogic/gdx/audio/analysis/AudioTools.java
index 1608715..d5a5cef 100644 (file)
--- a/extensions/gdx-audio/src/com/badlogic/gdx/audio/analysis/AudioTools.java
+++ b/extensions/gdx-audio/src/com/badlogic/gdx/audio/analysis/AudioTools.java
@@ -167,6 +167,27 @@ public class AudioTools {
        \r
        /**\r
         * Generates a mono PCM sample buffer for the given frequency and length in\r
+        * samples for use with {@link AudioMixer}.\r
+        * \r
+        * @param frequency\r
+        * @param numSamples\r
+        * @return PCM data for a sine wave\r
+        */\r
+       public static short[] generate(int samplingRate, int frequency, int numSamples) {\r
+               short[] samples = new short[numSamples];\r
+               float increment = (float) (2 * Math.PI) * frequency / (float)samplingRate;\r
+               float angle = 0;\r
+\r
+               for (int i = 0; i < numSamples; i++) {\r
+                       samples[i] = (short)(Math.sin(angle) * Short.MAX_VALUE);\r
+                       angle += increment;\r
+               }\r
+               \r
+               return samples;\r
+       }\r
+       \r
+       /**\r
+        * Generates a mono PCM sample buffer for the given frequency and length in\r
         * seconds for use with {@link AudioMixer}.\r
         * \r
         * @param frequency\r
@@ -175,15 +196,39 @@ public class AudioTools {
         */\r
        public static short[] generate(int samplingRate, int frequency, float length) {\r
                int numSamples = (int) (samplingRate * length);\r
-               short[] samples = new short[numSamples];\r
+               return generate(samplingRate, frequency, numSamples);\r
+       }\r
+       \r
+       /**\r
+        * Generates a mono PCM sample buffer for the given frequency and length in\r
+        * seconds for use with {@link AudioMixer}.\r
+        * \r
+        * @param frequency\r
+        * @param length\r
+        * @return\r
+        */\r
+       public static float[] generateFloat(int samplingRate, int frequency, int numSamples) {\r
+               float[] samples = new float[numSamples];\r
                float increment = (float) (2 * Math.PI) * frequency / (float)samplingRate;\r
                float angle = 0;\r
 \r
                for (int i = 0; i < numSamples; i++) {\r
-                       samples[i] = (short)(Math.sin(angle) * Short.MAX_VALUE);\r
+                       samples[i] = (float)Math.sin(angle);\r
                        angle += increment;\r
                }\r
-               \r
                return samples;\r
        }\r
+       \r
+       /**\r
+        * Generates a mono PCM sample buffer for the given frequency and length in\r
+        * seconds for use with {@link AudioMixer}.\r
+        * \r
+        * @param frequency\r
+        * @param length\r
+        * @return\r
+        */\r
+       public static float[] generateFloat(int samplingRate, int frequency, float length) {\r
+               int numSamples = (int) (samplingRate * length);\r
+               return generateFloat(samplingRate, frequency, numSamples);\r
+       }\r
 }\r

diff --git a/extensions/gdx-audio/src/com/badlogic/gdx/audio/analysis/FFT.java b/extensions/gdx-audio/src/com/badlogic/gdx/audio/analysis/FFT.java
index 334e893..5ed0389 100644 (file)
--- a/extensions/gdx-audio/src/com/badlogic/gdx/audio/analysis/FFT.java
+++ b/extensions/gdx-audio/src/com/badlogic/gdx/audio/analysis/FFT.java
@@ -210,10 +210,4 @@ public class FFT extends FourierTransform {
                        coslookup[i] = (float)Math.cos(-(float)Math.PI / i);\r
                }\r
        }\r
-\r
-// public static void main (String[] argv) {\r
-// FFT fft = new FFT(1024, 44100);\r
-// System.out.println(fft.getRealPart().length);\r
-// System.out.println(fft.getSpectrum().length);\r
-// }\r
 }\r

diff --git a/extensions/gdx-audio/src/com/badlogic/gdx/audio/analysis/KissFFT.java b/extensions/gdx-audio/src/com/badlogic/gdx/audio/analysis/KissFFT.java
index d8f03da..facb410 100644 (file)
--- a/extensions/gdx-audio/src/com/badlogic/gdx/audio/analysis/KissFFT.java
+++ b/extensions/gdx-audio/src/com/badlogic/gdx/audio/analysis/KissFFT.java
@@ -16,9 +16,6 @@
 \r
 package com.badlogic.gdx.audio.analysis;\r
 \r
-import java.nio.FloatBuffer;\r
-import java.nio.ShortBuffer;\r
-\r
 import com.badlogic.gdx.utils.Disposable;\r
 import com.badlogic.gdx.utils.SharedLibraryLoader;\r
 \r
@@ -41,7 +38,7 @@ public class KissFFT implements Disposable {
         * \r
         * @param samples the samples\r
         * @param spectrum the spectrum */\r
-       public void spectrum (ShortBuffer samples, FloatBuffer spectrum) {\r
+       public void spectrum (short[] samples, float[] spectrum) {\r
                spectrum(addr, samples, spectrum);\r
        }\r
 \r
@@ -50,11 +47,11 @@ public class KissFFT implements Disposable {
                destroy(addr);\r
        }\r
 \r
-       public void getRealPart (ShortBuffer real) {\r
+       public void getRealPart (short[] real) {\r
                getRealPart(addr, real);\r
        }\r
 \r
-       public void getImagPart (ShortBuffer imag) {\r
+       public void getImagPart (short[] imag) {\r
                getImagPart(addr, imag);\r
        }\r
        \r
@@ -108,36 +105,32 @@ public class KissFFT implements Disposable {
         * @param handle the handle to the kiss fft object\r
         * @param samples the samples in 16-bit signed PCM encoding\r
         * @param spectrum the spectrum */\r
-       private static native void spectrum (long handle, ShortBuffer samples, FloatBuffer spectrum); /*\r
+       private static native void spectrum (long handle, short[] samples, float[] spectrum); /*\r
                KissFFT* fft = (KissFFT*)handle;\r
                kiss_fftr( fft->config, (kiss_fft_scalar*)samples, fft->spectrum );\r
        \r
                int len = fft->numSamples / 2 + 1;\r
-               float* out = (float*)spectrum;\r
-       \r
                for( int i = 0; i < len; i++ )\r
                {\r
                        float re = scale(fft->spectrum[i].r) * fft->numSamples;\r
                        float im = scale(fft->spectrum[i].i) * fft->numSamples;\r
        \r
                        if( i > 0 )\r
-                               out[i] = sqrtf(re*re + im*im) / (fft->numSamples / 2);\r
+                               spectrum[i] = sqrtf(re*re + im*im) / (fft->numSamples);\r
                        else\r
-                               out[i] = sqrtf(re*re + im*im) / (fft->numSamples);\r
+                               spectrum[i] = sqrtf(re*re + im*im) / (fft->numSamples);\r
                }\r
        */\r
 \r
-       private static native void getRealPart (long handle, ShortBuffer real); /*\r
+       private static native void getRealPart (long handle, short[] real); /*\r
                KissFFT* fft = (KissFFT*)handle;\r
-               short* out = (short*)real;\r
                for( int i = 0; i < fft->numSamples / 2; i++ )\r
-                       out[i] = fft->spectrum[i].r;\r
+                       real[i] = fft->spectrum[i].r;\r
        */\r
 \r
-       private static native void getImagPart (long handle, ShortBuffer imag); /*\r
+       private static native void getImagPart (long handle, short[] imag); /*\r
                KissFFT* fft = (KissFFT*)handle;\r
-               short* out = (short*)imag;\r
                for( int i = 0; i < fft->numSamples / 2; i++ )\r
-                       out[i] = fft->spectrum[i].i;\r
+                       imag[i] = fft->spectrum[i].i;\r
        */\r
 }\r

diff --git a/gdx/src/com/badlogic/gdx/utils/SharedLibraryLoader.java b/gdx/src/com/badlogic/gdx/utils/SharedLibraryLoader.java
index 8c322de..1e1cc75 100644 (file)
--- a/gdx/src/com/badlogic/gdx/utils/SharedLibraryLoader.java
+++ b/gdx/src/com/badlogic/gdx/utils/SharedLibraryLoader.java
@@ -81,8 +81,6 @@ public class SharedLibraryLoader {
                        input.close();\r
                        output.close();\r
                } catch (IOException ex) {\r
-                       ex.printStackTrace();\r
-                       throw new RuntimeException(ex);\r
                }\r
                return nativeFile.exists() ? nativeFile.getAbsolutePath() : null;\r
        }\r

diff --git a/tests/gdx-tests-jogl/src/com/badlogic/gdx/tests/jogl/JoglDebugStarter.java b/tests/gdx-tests-jogl/src/com/badlogic/gdx/tests/jogl/JoglDebugStarter.java
index b1e8631..5e22f36 100644 (file)
--- a/tests/gdx-tests-jogl/src/com/badlogic/gdx/tests/jogl/JoglDebugStarter.java
+++ b/tests/gdx-tests-jogl/src/com/badlogic/gdx/tests/jogl/JoglDebugStarter.java
@@ -27,7 +27,7 @@ public class JoglDebugStarter {
                // this is only here for me to debug native code faster\r
                new SharedLibraryLoader("../../gdx/libs/gdx-natives.jar").load("gdx");\r
                \r
-               GdxTest test = new com.badlogic.gdx.tests.StbTrueTypeTest();\r
+               GdxTest test = new com.badlogic.gdx.tests.ImmediateModeRendererTest();\r
                JoglApplicationConfiguration config = new JoglApplicationConfiguration();\r
                config.useGL20 = test.needsGL20();\r
                new JoglApplication(test, config);\r

diff --git a/tests/gdx-tests-lwjgl/src/com/badlogic/gdx/tests/lwjgl/LwjglDebugStarter.java b/tests/gdx-tests-lwjgl/src/com/badlogic/gdx/tests/lwjgl/LwjglDebugStarter.java
index ec831a6..aa6dd53 100644 (file)
--- a/tests/gdx-tests-lwjgl/src/com/badlogic/gdx/tests/lwjgl/LwjglDebugStarter.java
+++ b/tests/gdx-tests-lwjgl/src/com/badlogic/gdx/tests/lwjgl/LwjglDebugStarter.java
@@ -18,6 +18,8 @@ package com.badlogic.gdx.tests.lwjgl;
 \r
 import com.badlogic.gdx.backends.lwjgl.LwjglApplication;\r
 import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;\r
+import com.badlogic.gdx.tests.ImmediateModeRendererTest;\r
+import com.badlogic.gdx.tests.ShapeRendererTest;\r
 import com.badlogic.gdx.tests.SoundTouchTest;\r
 import com.badlogic.gdx.tests.VorbisTest;\r
 import com.badlogic.gdx.tests.WavTest;\r
@@ -30,7 +32,7 @@ public class LwjglDebugStarter {
                new SharedLibraryLoader("../../gdx/libs/gdx-natives.jar").load("gdx");\r
                new SharedLibraryLoader("../../extensions/gdx-audio/libs/gdx-audio-natives.jar").load("gdx-audio");\r
                \r
-               GdxTest test = new WavTest();\r
+               GdxTest test = new ImmediateModeRendererTest();\r
                LwjglApplicationConfiguration config = new LwjglApplicationConfiguration();\r
                config.useGL20 = test.needsGL20();\r
                config.vSyncEnabled = true;\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/FFTTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/FFTTest.java
index af54454..ee3dd69 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/FFTTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/FFTTest.java
@@ -16,75 +16,42 @@
 \r
 package com.badlogic.gdx.tests;\r
 \r
+import java.nio.FloatBuffer;\r
+import java.nio.ShortBuffer;\r
+import java.util.Arrays;\r
 \r
+import com.badlogic.gdx.audio.AudioBuild;\r
+import com.badlogic.gdx.audio.analysis.AudioTools;\r
+import com.badlogic.gdx.audio.analysis.FFT;\r
+import com.badlogic.gdx.audio.analysis.KissFFT;\r
+import com.badlogic.gdx.utils.GdxNativesLoader;\r
+import com.badlogic.gdx.utils.SharedLibraryLoader;\r
+\r
+/**\r
+ * Simples test that makes sure the output of KissFFT and FFT are (mostly)\r
+ * equal.\r
+ * @author mzechner\r
+ *\r
+ */\r
 public class FFTTest {\r
-//     static int SAMPLES = 256;\r
-//\r
-//     public static void main (String[] argv) {\r
-//             GdxNativesLoader.load();\r
-//             float[] samples = new float[SAMPLES];\r
-//             ShortBuffer shortSamples = AudioTools.allocateShortBuffer(SAMPLES, 1);\r
-//\r
-//// createFlat( samples, shortSamples );\r
-//             createSine(samples, shortSamples);\r
-//             analyse(samples, shortSamples);\r
-//     }\r
-//\r
-//     private static void analyse (float samples[], ShortBuffer shortSamples) {\r
-//             FFT fft = new FFT(SAMPLES, 44100);\r
-//             KissFFT kfft = new KissFFT(SAMPLES);\r
-//             fft.forward(samples);\r
-//             float[] spectrum = fft.getSpectrum();\r
-//             FloatBuffer floatSpectrum = AudioTools.allocateFloatBuffer(SAMPLES / 2 + 1, 1);\r
-//\r
-//             System.out.println(Arrays.toString(spectrum));\r
-//\r
-//             System.out.print("[");\r
-//             kfft.spectrum(shortSamples, floatSpectrum);\r
-//             for (int i = 0; i < SAMPLES / 2 + 1; i++)\r
-//                     System.out.print(floatSpectrum.get(i) + ", ");\r
-//             System.out.println("]");\r
-//\r
-//             System.out.println(sum(samples) / SAMPLES);\r
-//// System.out.println( sum( spectrum ) );\r
-//// System.out.println( sum( floatSpectrum ));\r
-//             kfft.dispose();\r
-//     }\r
-//\r
-//     private static float sum (float samples[]) {\r
-//             float sum = 0;\r
-//             for (int i = 1; i < samples.length; i++)\r
-//                     sum += samples[i];\r
-//             return sum;\r
-//     }\r
-//\r
-//     private static float sum (FloatBuffer buffer) {\r
-//             float sum = 0;\r
-//             for (int i = 1; i < SAMPLES / 2 + 1; i++)\r
-//                     sum += buffer.get(i) * 2 / SAMPLES;\r
-//             return sum;\r
-//     }\r
-//\r
-//     private static void createFlat (float samples[], ShortBuffer shortSamples) {\r
-//             for (int i = 0; i < samples.length; i++) {\r
-//                     samples[i] = 1;\r
-//                     shortSamples.put(Short.MAX_VALUE);\r
-//             }\r
-//     }\r
-//\r
-//     private static void createSine (float samples[], ShortBuffer shortSamples) {\r
-//             final float frequency = 44100 / (SAMPLES / 2);\r
-//             float increment = (float)(2 * Math.PI) * frequency / 44100; // angular increment for each sample\r
-//             float angle = 0;\r
-//             final float frequency2 = 44100 / (SAMPLES / 2) * 4;\r
-//             float increment2 = (float)(2 * Math.PI) * frequency2 / 44100;\r
-//             float angle2 = 0;\r
-//\r
-//             for (int i = 0; i < samples.length; i++) {\r
-//                     samples[i] = Math.max(0, Math.min((float)Math.sin(angle) + (float)Math.sin(angle2), 1));\r
-//                     shortSamples.put((short)(Short.MAX_VALUE * samples[i]));\r
-//                     angle += increment;\r
-//                     angle2 += increment2;\r
-//             }\r
-//     }\r
+       static int SAMPLES = 1024;\r
+\r
+       public static void main (String[] argv) throws Exception {\r
+               new SharedLibraryLoader("../../extensions/gdx-audio/libs/gdx-audio-natives.jar").load("gdx-audio");\r
+               short[] samples = AudioTools.generate(44100, 440, SAMPLES);\r
+               float[] samplesFloat = AudioTools.generateFloat(44100, 440, SAMPLES);\r
+               \r
+               // Damien's FFT\r
+               FFT fft = new FFT(SAMPLES, 44100);\r
+               fft.forward(samplesFloat);\r
+               float[] spectrum = fft.getSpectrum();           \r
+               System.out.println(Arrays.toString(spectrum));\r
+\r
+               // KissFFT\r
+               spectrum = new float[SAMPLES / 2 + 1];\r
+               KissFFT kfft = new KissFFT(SAMPLES);\r
+               kfft.spectrum(samples, spectrum);\r
+               System.out.println(Arrays.toString(spectrum));\r
+               kfft.dispose();\r
+       }\r
 }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/ImmediateModeRendererTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/ImmediateModeRendererTest.java
index ac4a813..76f142c 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/ImmediateModeRendererTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/ImmediateModeRendererTest.java
@@ -18,12 +18,18 @@ package com.badlogic.gdx.tests;
 \r
 import com.badlogic.gdx.Gdx;\r
 import com.badlogic.gdx.graphics.GL10;\r
+import com.badlogic.gdx.graphics.GL20;\r
+import com.badlogic.gdx.graphics.GLCommon;\r
 import com.badlogic.gdx.graphics.Texture;\r
+import com.badlogic.gdx.graphics.glutils.ImmediateModeRenderer;\r
 import com.badlogic.gdx.graphics.glutils.ImmediateModeRenderer10;\r
+import com.badlogic.gdx.graphics.glutils.ImmediateModeRenderer20;\r
+import com.badlogic.gdx.math.Matrix4;\r
 import com.badlogic.gdx.tests.utils.GdxTest;\r
 \r
 public class ImmediateModeRendererTest extends GdxTest {\r
-       ImmediateModeRenderer10 renderer;\r
+       Matrix4 projMatrix = new Matrix4();\r
+       ImmediateModeRenderer renderer;\r
        Texture texture;\r
 \r
        @Override\r
@@ -33,10 +39,9 @@ public class ImmediateModeRendererTest extends GdxTest {
 \r
        @Override\r
        public void render () {\r
-               Gdx.graphics.getGL10().glViewport(0, 0, Gdx.graphics.getWidth(), Gdx.graphics.getHeight());\r
-               Gdx.graphics.getGL10().glEnable(GL10.GL_TEXTURE_2D);\r
+               Gdx.gl.glEnable(GL10.GL_TEXTURE_2D);\r
                texture.bind();\r
-               renderer.begin(GL10.GL_TRIANGLES);\r
+               renderer.begin(projMatrix, GL10.GL_TRIANGLES);\r
                renderer.texCoord(0, 0);\r
                renderer.color(1, 0, 0, 1);\r
                renderer.vertex(-0.5f, -0.5f, 0);\r
@@ -51,13 +56,16 @@ public class ImmediateModeRendererTest extends GdxTest {
 \r
        @Override\r
        public void create () {\r
-               renderer = new ImmediateModeRenderer10();\r
+               if(Gdx.graphics.isGL20Available()) \r
+                       renderer = new ImmediateModeRenderer20(false, true, 1);\r
+               else\r
+                       renderer = new ImmediateModeRenderer10();\r
                texture = new Texture(Gdx.files.internal("data/badlogic.jpg"));\r
        }\r
 \r
        @Override\r
        public boolean needsGL20 () {\r
-               return false;\r
+               return true;\r
        }\r
 \r
 }\r

diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/ShapeRendererTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/ShapeRendererTest.java
index 0db6137..b6ab5a1 100644 (file)
--- a/tests/gdx-tests/src/com/badlogic/gdx/tests/ShapeRendererTest.java
+++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/ShapeRendererTest.java
@@ -32,7 +32,7 @@ public class ShapeRendererTest extends GdxTest {
 \r
        @Override\r
        public boolean needsGL20 () {\r
-               return false;\r
+               return true;\r
        }\r
 \r
        ShapeRenderer renderer;\r