fixed SRM tilts.

Author: ELY3M

!files/2620001X.pdf

@@ -1,2 +1,45 @@
+
+http://tgftp.nws.noaa.gov/SL.us008001/DF.of/DC.radar/DS.141md/
+
+
+141
+Mesocyclone Detection
+
+
             case NexradHeader.L3PC_DIGITAL_MESOCYCLONE /*141*/:
-                return 10;
+                return 10;
+
+
+149
+Digital Mesocyclone 
+Detection
+149
+30
+Elevation Angle
+Degree
+-
+1.0 to + 45.0
+.1
+Digital Mesocyclone 
+Detection
+149
+51
+Compression Method 
+N/A
+0 or 1
+1
+Digital Mesocyclone 
+Detection
+149
+52
+Uncompressed Product 
+Data Size (MSW)
+Bytes
+120 to 300000
+1
+Digital Mesocyclone 
+Detection
+149
+53
+Uncompressed Product 
+Data Size (LSW)

!files/infos/meso.txt

@@ -17,6 +17,10 @@
 14. 8-bit SRM like in pykl3  
 15. fix up the ability to change products in the multi-pane radar. it seem wont change products for me
 16. android wear support. I own android wear watches and love them.  
+17. change the way the wX do radar pallettes - move the pallettes over to /wX/pal folder and have the app get palletes from there.  
+will keep them in raw and copy them from there to /wX/pal on first time start up and run file check.   
+right now, the app save custom pallettes to prefs I think.  
+
 
 
 #

!files/texture/WXGLRender.kt

@@ -47,6 +47,7 @@ val NEXRAD_PRODUCT_STRING: Map<String, String> = mapOf(
         "HI" to "DS.p59hi",
         "DVL" to "DS.134il",
         "EET" to "DS.135et",
+        "MDA" to "DS.141md",
         "TR0" to "DS.181r0",
         "TR1" to "DS.181r1",
         "TR2" to "DS.181r2",

TODOs.md

@@ -80,7 +80,8 @@ class StartupActivity : Activity(), ActivityCompat.OnRequestPermissionsResultCal
         storagepermissionManager.checkPermissions(singleton(Manifest.permission.WRITE_EXTERNAL_STORAGE), object : PermissionManager.PermissionRequestListener {
             override fun onPermissionGranted() {
                 Log.i(TAG, "Storage Permissions Granted")
-                checkfiles(R.drawable.headingbug, "headingbug.png")
+		checkfiles(R.drawable.headingbug, "headingbug.png")
+                checkfiles(R.drawable.star_cyan, "star_cyan.png")
                 checkfiles(R.drawable.location, "location.png")
             }
 

app/src/main/java/joshuatee/wx/GlobalDictionaries.kt

@@ -4,10 +4,14 @@ import android.opengl.GLES20
 
 // thanks! http://androidblog.reindustries.com/a-real-open-gl-es-2-0-2d-tutorial-part-1/
 
+//image textureing.....
+//http://androidblog.reindustries.com/a-real-opengl-es-2-0-2d-tutorial-part-2/
+
 internal object OpenGLShader {
 
     // Program variables
     var sp_SolidColor: Int = 0
+    var sp_Image: Int = 0
 
     /* SHADER Solid
      *
@@ -32,6 +36,32 @@ internal object OpenGLShader {
                     "  gl_FragColor = vec4(v_Color,1.0);" +
                     "}"
 
+
+    /* SHADER Image
+	 *
+	 * This shader is for rendering 2D images straight from a texture
+	 * No additional effects.
+	 *
+	 */
+	 const val vs_Image = "uniform mat4 uMVPMatrix;" +
+     "attribute vec4 vPosition;" +
+     "attribute vec2 a_texCoord;" +
+     "varying vec2 v_texCoord;" +
+     "void main() {" +
+     "  gl_Position = uMVPMatrix * vPosition;" +
+     "  v_texCoord = a_texCoord;" +
+     "}"
+
+	 const val fs_Image = (
+    "precision mediump float;" +
+    "varying vec2 v_texCoord;" +
+    "uniform sampler2D s_texture;" +
+    "void main() {" +
+    "  gl_FragColor = texture2D( s_texture, v_texCoord );" +
+    "}")
+
+
+
     fun loadShader(type: Int, shaderCode: String): Int {
 
         // create a vertex shader type (GLES20.GL_VERTEX_SHADER)
@@ -45,4 +75,5 @@ internal object OpenGLShader {
         // return the shader
         return shader
     }
+
 }

app/src/main/java/joshuatee/wx/StartupActivity.kt

@@ -32,6 +32,32 @@ internal object OpenGLShaderUniform {
                     "  gl_FragColor = v_Color;" +
                     "}"
 
+
+
+
+    /* SHADER Image
+ *
+ * This shader is for rendering 2D images straight from a texture
+ * No additional effects.
+ *
+ */
+    const val vs_Image = "uniform mat4 uMVPMatrix;" +
+            "attribute vec4 vPosition;" +
+            "attribute vec2 a_texCoord;" +
+            "varying vec2 v_texCoord;" +
+            "void main() {" +
+            "  gl_Position = uMVPMatrix * vPosition;" +
+            "  v_texCoord = a_texCoord;" +
+            "}"
+
+    const val fs_Image = (
+            "precision mediump float;" +
+                    "varying vec2 v_texCoord;" +
+                    "uniform sampler2D s_texture;" +
+                    "void main() {" +
+                    "  gl_FragColor = texture2D( s_texture, v_texCoord );" +
+                    "}")
+
     fun loadShader(type: Int, shaderCode: String): Int {
 
         // create a vertex shader type (GLES20.GL_VERTEX_SHADER)

app/src/main/java/joshuatee/wx/radar/OpenGLShader.kt

@@ -54,6 +54,8 @@ import android.graphics.Bitmap
 import android.opengl.GLES10
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
+import java.nio.FloatBuffer
+import java.nio.ShortBuffer
 import javax.microedition.khronos.opengles.GL10
 
 
@@ -80,10 +82,70 @@ object UtilityTexture {
         gl.glTexParameterf(GL10.GL_TEXTURE_2D, GL10.GL_TEXTURE_WRAP_S, GL10.GL_CLAMP_TO_EDGE.toFloat())
         gl.glTexParameterf(GL10.GL_TEXTURE_2D, GL10.GL_TEXTURE_WRAP_T, GL10.GL_CLAMP_TO_EDGE.toFloat())
         val bitmap = BitmapFactory.decodeFile(imagefile, options)
-        GLUtils.texImage2D(GL10.GL_TEXTURE_2D, 0, bitmap, 0)
+        if (bitmap != null) {
+            GLUtils.texImage2D(GL10.GL_TEXTURE_2D, 0, bitmap, 0)
+        } else {
+            Log.i(TAG, "bitmap is null")
+        }
         return textures[0]
     }
 
+    private val VERTEX_COORDINATES = floatArrayOf(-1.0f, +1.0f, 0.0f, +1.0f, +1.0f, 0.0f, -1.0f, -1.0f, 0.0f, +1.0f, -1.0f, 0.0f)
+
+    private val TEXTURE_COORDINATES = floatArrayOf(0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f)
+
+    private val TEXCOORD_BUFFER = ByteBuffer.allocateDirect(TEXTURE_COORDINATES.size * 4)
+            .order(ByteOrder.nativeOrder()).asFloatBuffer().put(TEXTURE_COORDINATES).rewind()
+    private val VERTEX_BUFFER = ByteBuffer.allocateDirect(VERTEX_COORDINATES.size * 4)
+            .order(ByteOrder.nativeOrder()).asFloatBuffer().put(VERTEX_COORDINATES).rewind()
+
+
+    fun drawimage(gl: GL10, texture: Int) {
+        gl.glActiveTexture(GL10.GL_TEXTURE0)
+        gl.glBindTexture(GL10.GL_TEXTURE_2D, texture)
+        gl.glVertexPointer(3, GL10.GL_FLOAT, 0, VERTEX_BUFFER)
+        gl.glTexCoordPointer(2, GL10.GL_FLOAT, 0, TEXCOORD_BUFFER)
+        gl.glDrawArrays(GL10.GL_TRIANGLE_STRIP, 0, 4)
+    }
+
+
+
+    fun SetupImage(imagefile: String): Bitmap {
+        var indices: ShortArray
+        var uvs: FloatArray
+        var uvBuffer: FloatBuffer
+        // Create our UV coordinates.
+        uvs = floatArrayOf(0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.0f)
+        // The texture buffer
+        val bb = ByteBuffer.allocateDirect(uvs.size * 4)
+        bb.order(ByteOrder.nativeOrder())
+        uvBuffer = bb.asFloatBuffer()
+        uvBuffer.put(uvs)
+        uvBuffer.position(0)
+        // Generate Textures, if more needed, alter these numbers.
+        val texturenames = IntArray(1)
+        GLES20.glGenTextures(1, texturenames, 0)
+        // Temporary create a bitmap
+        val options = BitmapFactory.Options()
+        options.inScaled = false
+        options.inPreferredConfig = Bitmap.Config.ARGB_8888
+        val bmp = BitmapFactory.decodeFile(imagefile, options)
+        // Bind texture to texturename
+        GLES20.glActiveTexture(GLES20.GL_TEXTURE0)
+        GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, texturenames[0])
+        // Set filtering
+        GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_MIN_FILTER, GLES20.GL_NEAREST)
+        GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_MAG_FILTER, GLES20.GL_NEAREST)
+        // Load the bitmap into the bound texture.
+        GLUtils.texImage2D(GLES20.GL_TEXTURE_2D, 0, bmp, 0)
+
+        // We are done using the bitmap so we should recycle it.
+        //bmp.recycle()
+        return bmp
+
+    }
+
+
 
 /*