updated to api 33, update objects to 3.0 es

Author: JimSeker

opengl3ex1/.idea/gradle.xml

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "edu.cs4730.opengl3ex1"
         minSdkVersion 26
-        targetSdkVersion 32
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }

opengl3ex1/app/build.gradle

@@ -13,7 +13,7 @@
 import android.os.SystemClock;
 
 /**
- * This class implements our custom renderer. Note that the GL10 parameter passed in is unused for OpenGL ES 2.0
+ * This class implements our custom renderer. Note that the GL10 parameter passed in is unused for OpenGL ES 3.0
  * renderers -- the static class GLES20 is used instead.
  *
  *
@@ -163,13 +163,13 @@ public void onSurfaceCreated(GL10 glUnused, EGLConfig config)
 		Matrix.setLookAtM(mViewMatrix, 0, eyeX, eyeY, eyeZ, lookX, lookY, lookZ, upX, upY, upZ);
 
 		final String vertexShader =
-
-		 	"uniform mat4 u_MVPMatrix;      \n"		// A constant representing the combined model/view/projection matrix.
+			"#version 300 es                \n"    //set the version.
+		  +	"uniform mat4 u_MVPMatrix;      \n"		// A constant representing the combined model/view/projection matrix.
 
-		  + "attribute vec4 a_Position;     \n"		// Per-vertex position information we will pass in.
-		  + "attribute vec4 a_Color;        \n"		// Per-vertex color information we will pass in.			  
+		  + "in vec4 a_Position;            \n"		// Per-vertex position information we will pass in.
+		  + "in vec4 a_Color;               \n"		// Per-vertex color information we will pass in.
 
-		  + "varying vec4 v_Color;          \n"		// This will be passed into the fragment shader.
+		  + "out vec4 v_Color;              \n"		// This will be passed into the fragment shader.
 
 		  + "void main()                    \n"		// The entry point for our vertex shader.
 		  + "{                              \n"
@@ -180,11 +180,12 @@ public void onSurfaceCreated(GL10 glUnused, EGLConfig config)
 		  + "}                              \n";    // normalized screen coordinates.
 
 		final String fragmentShader =
-
-		  	"precision mediump float;       \n"		// Set the default precision to medium. We don't need as high of a
+			"#version 300 es                \n"    //set the version.
+		  +	"precision mediump float;       \n"		// Set the default precision to medium. We don't need as high of a
 													// precision in the fragment shader.				
-		  + "varying vec4 v_Color;          \n"		// This is the color from the vertex shader interpolated across the 
-		  											// triangle per fragment.			  
+		  + "in vec4 v_Color;               \n"		// This is the color from the vertex shader interpolated across the
+		  											// triangle per fragment.
+		  + "out vec4 gl_FragColor;         \n"
 		  + "void main()                    \n"		// The entry point for our fragment shader.
 		  + "{                              \n"
 		  + "   gl_FragColor = v_Color;     \n"		// Pass the color directly through the pipeline.		  

opengl3ex1/app/src/main/java/edu/cs4730/opengl3ex1/LessonOneRenderer.java

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:7.4.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

opengl3ex1/build.gradle

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

opengl3ex1/gradle/wrapper/gradle-wrapper.properties

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "edu.cs4730.opengl3ex2"
         minSdkVersion 26
-        targetSdkVersion 32
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }

opengl3ex2/.idea/gradle.xml

@@ -172,13 +172,13 @@ public void onSurfaceCreated(GL10 glUnused, EGLConfig config)
 		Matrix.setLookAtM(mViewMatrix, 0, eyeX, eyeY, eyeZ, lookX, lookY, lookZ, upX, upY, upZ);
 
 		final String vertexShader =
-
-		 	"uniform mat4 u_MVPMatrix;      \n"		// A constant representing the combined model/view/projection matrix.
+			"#version 300 es                \n"    //set the version.
+		  +	"uniform mat4 u_MVPMatrix;      \n"		// A constant representing the combined model/view/projection matrix.
 
-		  + "attribute vec4 a_Position;     \n"		// Per-vertex position information we will pass in.
-		  + "attribute vec4 a_Color;        \n"		// Per-vertex color information we will pass in.			  
+		  + "in vec4 a_Position;            \n"		// Per-vertex position information we will pass in.
+		  + "in vec4 a_Color;               \n"		// Per-vertex color information we will pass in.
 
-		  + "varying vec4 v_Color;          \n"		// This will be passed into the fragment shader.
+		  + "out vec4 v_Color;              \n"		// This will be passed into the fragment shader.
 
 		  + "void main()                    \n"		// The entry point for our vertex shader.
 		  + "{                              \n"
@@ -189,16 +189,17 @@ public void onSurfaceCreated(GL10 glUnused, EGLConfig config)
 		  + "}                              \n";    // normalized screen coordinates.
 
 		final String fragmentShader =
-
-		  	"precision mediump float;       \n"		// Set the default precision to medium. We don't need as high of a
-													// precision in the fragment shader.				
-		  + "varying vec4 v_Color;          \n"		// This is the color from the vertex shader interpolated across the 
-		  											// triangle per fragment.			  
+			"#version 300 es                \n"    //set the version.
+		  +	"precision mediump float;       \n"		// Set the default precision to medium. We don't need as high of a
+													// precision in the fragment shader.
+		  + "in vec4 v_Color;               \n"		// This is the color from the vertex shader interpolated across the
+		  											// triangle per fragment.
+		  + "out vec4 gl_FragColor;         \n"
 		  + "void main()                    \n"		// The entry point for our fragment shader.
 		  + "{                              \n"
-		  + "   gl_FragColor = v_Color;     \n"		// Pass the color directly through the pipeline.		  
-		  + "}                              \n";												
-		
+		  + "   gl_FragColor = v_Color;     \n"		// Pass the color directly through the pipeline.
+		  + "}                              \n";
+
 		// Load in the vertex shader.
 		int vertexShaderHandle = GLES30.glCreateShader(GLES30.GL_VERTEX_SHADER);
 

opengl3ex2/app/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:7.4.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

opengl3ex2/app/src/main/java/edu/cs4730/opengl3ex2/LessonOneRenderer.java

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip