Index: ../trunk-jpl/src/android/helloworld/ISSM/.classpath =================================================================== --- ../trunk-jpl/src/android/helloworld/ISSM/.classpath (revision 13837) +++ ../trunk-jpl/src/android/helloworld/ISSM/.classpath (revision 13838) @@ -1,8 +0,0 @@ - - - - - - - - Index: ../trunk-jpl/src/android/helloworld/ISSM/project.properties =================================================================== --- ../trunk-jpl/src/android/helloworld/ISSM/project.properties (revision 13837) +++ ../trunk-jpl/src/android/helloworld/ISSM/project.properties (revision 13838) @@ -1,14 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-16 Index: ../trunk-jpl/src/android/helloworld/ISSM/.project =================================================================== --- ../trunk-jpl/src/android/helloworld/ISSM/.project (revision 13837) +++ ../trunk-jpl/src/android/helloworld/ISSM/.project (revision 13838) @@ -1,33 +0,0 @@ - - - ISSM - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - Index: ../trunk-jpl/src/android/helloworld/ISSM/proguard-project.txt =================================================================== --- ../trunk-jpl/src/android/helloworld/ISSM/proguard-project.txt (revision 13837) +++ ../trunk-jpl/src/android/helloworld/ISSM/proguard-project.txt (revision 13838) @@ -1,20 +0,0 @@ -# To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. -# -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} Index: ../trunk-jpl/src/android/helloworld/ISSM/AndroidManifest.xml =================================================================== --- ../trunk-jpl/src/android/helloworld/ISSM/AndroidManifest.xml (revision 13837) +++ ../trunk-jpl/src/android/helloworld/ISSM/AndroidManifest.xml (revision 13838) @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file Index: ../trunk-jpl/src/android/helloworld/ISSM/src/com/example/issm/MyGLRenderer.java =================================================================== --- ../trunk-jpl/src/android/helloworld/ISSM/src/com/example/issm/MyGLRenderer.java (revision 13837) +++ ../trunk-jpl/src/android/helloworld/ISSM/src/com/example/issm/MyGLRenderer.java (revision 13838) @@ -1,162 +0,0 @@ -/* - * Copyright (C) 2012 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.example.issm; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.FloatBuffer; - -import javax.microedition.khronos.egl.EGLConfig; -import javax.microedition.khronos.opengles.GL10; - -import android.opengl.GLES20; -import android.opengl.GLSurfaceView; - -public class MyGLRenderer implements GLSurfaceView.Renderer { - - private Triangle mTriangle; - - @Override - public void onSurfaceCreated(GL10 unused, EGLConfig config) { - - // Set the background frame color - GLES20.glClearColor(0.0f, 0.0f, 0.0f, 1.0f); - - mTriangle = new Triangle(); - } - - @Override - public void onDrawFrame(GL10 unused) { - - // Draw background color - GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT); - - // Draw triangle - mTriangle.draw(); - } - - @Override - public void onSurfaceChanged(GL10 unused, int width, int height) { - // Adjust the viewport based on geometry changes, - // such as screen rotation - GLES20.glViewport(0, 0, width, height); - } - - public static int loadShader(int type, String shaderCode){ - - // create a vertex shader type (GLES20.GL_VERTEX_SHADER) - // or a fragment shader type (GLES20.GL_FRAGMENT_SHADER) - int shader = GLES20.glCreateShader(type); - - // add the source code to the shader and compile it - GLES20.glShaderSource(shader, shaderCode); - GLES20.glCompileShader(shader); - - return shader; - } - -} - -class Triangle -{ - - private final String vertexShaderCode = - "attribute vec4 vPosition;" + - "void main() {" + - " gl_Position = vPosition;" + - "}"; - - private final String fragmentShaderCode = - "precision mediump float;" + - "uniform vec4 vColor;" + - "void main() {" + - " gl_FragColor = vColor;" + - "}"; - - private final FloatBuffer vertexBuffer; - private final int mProgram; - private int mPositionHandle; - private int mColorHandle; - - // number of coordinates per vertex in this array - static final int COORDS_PER_VERTEX = 3; - static float triangleCoords[] = { // in counterclockwise order: - 0.0f, 0.622008459f, 0.0f, // top - -0.5f, -0.311004243f, 0.0f, // bottom left - 0.5f, -0.311004243f, 0.0f // bottom right - }; - private final int vertexCount = triangleCoords.length / COORDS_PER_VERTEX; - private final int vertexStride = COORDS_PER_VERTEX * 4; // bytes per vertex - - // Set color with red, green, blue and alpha (opacity) values - float color[] = { 0.63671875f, 0.76953125f, 0.22265625f, 1.0f }; - - public Triangle() { - // initialize vertex byte buffer for shape coordinates - ByteBuffer bb = ByteBuffer.allocateDirect( - // (number of coordinate values * 4 bytes per float) - triangleCoords.length * 4); - // use the device hardware's native byte order - bb.order(ByteOrder.nativeOrder()); - - // create a floating point buffer from the ByteBuffer - vertexBuffer = bb.asFloatBuffer(); - // add the coordinates to the FloatBuffer - vertexBuffer.put(triangleCoords); - // set the buffer to read the first coordinate - vertexBuffer.position(0); - - // prepare shaders and OpenGL program - int vertexShader = MyGLRenderer.loadShader(GLES20.GL_VERTEX_SHADER, - vertexShaderCode); - int fragmentShader = MyGLRenderer.loadShader(GLES20.GL_FRAGMENT_SHADER, - fragmentShaderCode); - - mProgram = GLES20.glCreateProgram(); // create empty OpenGL Program - GLES20.glAttachShader(mProgram, vertexShader); // add the vertex shader to program - GLES20.glAttachShader(mProgram, fragmentShader); // add the fragment shader to program - GLES20.glLinkProgram(mProgram); // create OpenGL program executables - - } - - public void draw() { - // Add program to OpenGL environment - GLES20.glUseProgram(mProgram); - - // get handle to vertex shader's vPosition member - mPositionHandle = GLES20.glGetAttribLocation(mProgram, "vPosition"); - - // Enable a handle to the triangle vertices - GLES20.glEnableVertexAttribArray(mPositionHandle); - - // Prepare the triangle coordinate data - GLES20.glVertexAttribPointer(mPositionHandle, COORDS_PER_VERTEX, - GLES20.GL_FLOAT, false, - vertexStride, vertexBuffer); - - // get handle to fragment shader's vColor member - mColorHandle = GLES20.glGetUniformLocation(mProgram, "vColor"); - - // Set color for drawing the triangle - GLES20.glUniform4fv(mColorHandle, 1, color, 0); - - // Draw the triangle - GLES20.glDrawArrays(GLES20.GL_TRIANGLES, 0, vertexCount); - - // Disable vertex array - GLES20.glDisableVertexAttribArray(mPositionHandle); - } -} Index: ../trunk-jpl/src/android/helloworld/ISSM/src/com/example/issm/ISSM.java =================================================================== --- ../trunk-jpl/src/android/helloworld/ISSM/src/com/example/issm/ISSM.java (revision 13837) +++ ../trunk-jpl/src/android/helloworld/ISSM/src/com/example/issm/ISSM.java (revision 13838) @@ -1,97 +0,0 @@ -package com.example.issm; - -import android.app.Activity; -import android.content.Context; -import android.opengl.GLES20; -import android.opengl.GLSurfaceView; -import android.opengl.GLSurfaceView.Renderer; -import android.os.Bundle; -import android.util.AttributeSet; -import android.view.Menu; -import android.view.View; -import android.view.View.OnClickListener; -import android.widget.Button; -import android.widget.FrameLayout; -import android.widget.RelativeLayout; -import android.widget.SeekBar; -import android.widget.SeekBar.OnSeekBarChangeListener; -import android.widget.TextView; -import android.widget.Toast; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.FloatBuffer; -import java.nio.ShortBuffer; -import javax.microedition.khronos.egl.EGLConfig; -import javax.microedition.khronos.opengles.GL10; - -public class ISSM extends Activity implements OnSeekBarChangeListener -{ - private SeekBar bar; - private TextView txtStatus, txtValue; - private GLSurfaceView mGLView; - private FrameLayout frame; - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_issm); - - bar = (SeekBar)findViewById(R.id.seekBar); // make seekbar object - bar.setOnSeekBarChangeListener(this); // set seekbar listener - txtValue = (TextView)findViewById(R.id.value); - txtStatus = (TextView)findViewById(R.id.status); - - mGLView = new MyGLSurfaceView(this); - frame = (FrameLayout)findViewById(R.id.frame); - frame.addView(mGLView); - - } - - - @Override - public void onProgressChanged(SeekBar seekBar, int val, - boolean fromUser) - { - // change progress text label with current Seekbar value - txtValue.setText("Value: " + val); - txtStatus.setText("Status: changing"); - } - @Override - public void onStartTrackingTouch(SeekBar seekBar) - { - txtStatus.setText("Status: Starting to track touch"); - - } - @Override - public void onStopTrackingTouch(SeekBar seekBar) - { - seekBar.setSecondaryProgress(seekBar.getProgress()); // set the shade of the previous value. - txtStatus.setText("Status: Ended tracking touch"); - } - - @Override - protected void onPause() { - super.onPause(); - // The following call pauses the rendering thread. - // If your OpenGL application is memory intensive, - // you should consider de-allocating objects that - // consume significant memory here. - mGLView.onPause(); - } - - @Override - protected void onResume() { - super.onResume(); - // The following call resumes a paused rendering thread. - // If you de-allocated graphic objects for onPause() - // this is a good place to re-allocate them. - mGLView.onResume(); - } - - - @Override - public boolean onCreateOptionsMenu(Menu menu) - { - getMenuInflater().inflate(R.menu.activity_issm, menu); - return true; - } -} Index: ../trunk-jpl/src/android/helloworld/ISSM/src/com/example/issm/MyGLSurfaceView.java =================================================================== --- ../trunk-jpl/src/android/helloworld/ISSM/src/com/example/issm/MyGLSurfaceView.java (revision 13837) +++ ../trunk-jpl/src/android/helloworld/ISSM/src/com/example/issm/MyGLSurfaceView.java (revision 13838) @@ -1,21 +0,0 @@ -package com.example.issm; - -import android.content.Context; -import android.opengl.GLSurfaceView; - - -class MyGLSurfaceView extends GLSurfaceView { - - public MyGLSurfaceView(Context context) { - super(context); - - // Create an OpenGL ES 2.0 context. - setEGLContextClientVersion(2); - - // Set the Renderer for drawing on the GLSurfaceView - setRenderer(new MyGLRenderer()); - - // Render the view only when there is a change in the drawing data - setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY); - } -} \ No newline at end of file Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/ISSM.apk =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/AndroidManifest.xml =================================================================== --- ../trunk-jpl/src/android/helloworld/ISSM/bin/AndroidManifest.xml (revision 13837) +++ ../trunk-jpl/src/android/helloworld/ISSM/bin/AndroidManifest.xml (revision 13838) @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/resources.ap_ =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/res/drawable-hdpi/ic_launcher.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/res/drawable-hdpi/ic_action_search.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/res/drawable-ldpi/ic_launcher.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/res/drawable-mdpi/ic_launcher.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/res/drawable-mdpi/ic_action_search.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/res/drawable-xhdpi/ic_launcher.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/res/drawable-xhdpi/ic_action_search.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/jarlist.cache =================================================================== --- ../trunk-jpl/src/android/helloworld/ISSM/bin/jarlist.cache (revision 13837) +++ ../trunk-jpl/src/android/helloworld/ISSM/bin/jarlist.cache (revision 13838) @@ -1,3 +0,0 @@ -# cache for current jar dependecy. DO NOT EDIT. -# format is -# Encoding is UTF-8 Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/classes.dex =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/classes/com/example/issm/ISSM.class =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/classes/com/example/issm/MyGLSurfaceView.class =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/classes/com/example/issm/R$string.class =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/classes/com/example/issm/MyGLRenderer.class =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/classes/com/example/issm/R$attr.class =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/classes/com/example/issm/R.class =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/classes/com/example/issm/R$id.class =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/classes/com/example/issm/R$layout.class =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/classes/com/example/issm/BuildConfig.class =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/classes/com/example/issm/Triangle.class =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/classes/com/example/issm/R$style.class =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/classes/com/example/issm/R$drawable.class =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ../trunk-jpl/src/android/helloworld/ISSM/bin/classes/com/example/issm/R$menu.class =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ../trunk-jpl/src/android/helloworld/ISSM/gen/com/example/issm/R.java =================================================================== --- ../trunk-jpl/src/android/helloworld/ISSM/gen/com/example/issm/R.java (revision 13837) +++ ../trunk-jpl/src/android/helloworld/ISSM/gen/com/example/issm/R.java (revision 13838) @@ -1,39 +0,0 @@ -/* AUTO-GENERATED FILE. DO NOT MODIFY. - * - * This class was automatically generated by the - * aapt tool from the resource data it found. It - * should not be modified by hand. - */ - -package com.example.issm; - -public final class R { - public static final class attr { - } - public static final class drawable { - public static final int ic_action_search=0x7f020000; - public static final int ic_launcher=0x7f020001; - } - public static final class id { - public static final int frame=0x7f070004; - public static final int menu_settings=0x7f070005; - public static final int relativeLay=0x7f070000; - public static final int seekBar=0x7f070003; - public static final int status=0x7f070002; - public static final int value=0x7f070001; - } - public static final class layout { - public static final int activity_issm=0x7f030000; - } - public static final class menu { - public static final int activity_issm=0x7f060000; - } - public static final class string { - public static final int app_name=0x7f040000; - public static final int menu_settings=0x7f040001; - public static final int title_activity_issm=0x7f040002; - } - public static final class style { - public static final int AppTheme=0x7f050000; - } -} Index: ../trunk-jpl/src/android/helloworld/ISSM/gen/com/example/issm/BuildConfig.java =================================================================== --- ../trunk-jpl/src/android/helloworld/ISSM/gen/com/example/issm/BuildConfig.java (revision 13837) +++ ../trunk-jpl/src/android/helloworld/ISSM/gen/com/example/issm/BuildConfig.java (revision 13838) @@ -1,6 +0,0 @@ -/** Automatically generated file. DO NOT MODIFY */ -package com.example.issm; - -public final class BuildConfig { - public final static boolean DEBUG = true; -} \ No newline at end of file Index: ../trunk-jpl/src/android/helloworld/ISSM/libs/android-support-v4.jar =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: ../trunk-jpl/src/android/helloworld/ISSM/res/values/styles.xml =================================================================== --- ../trunk-jpl/src/android/helloworld/ISSM/res/values/styles.xml (revision 13837) +++ ../trunk-jpl/src/android/helloworld/ISSM/res/values/styles.xml (revision 13838) @@ -1,5 +0,0 @@ - - -