Minor updates and corrections.

learnopengles · Jul 13, 2012 · 70f1d63 · 70f1d63
1 parent 43b9f17
commit 70f1d63
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/android/AndroidOpenGLESLessons/src/com/learnopengles/android/lesson4/LessonFourRenderer.java b/android/AndroidOpenGLESLessons/src/com/learnopengles/android/lesson4/LessonFourRenderer.java
@@ -385,8 +385,9 @@ public void onSurfaceCreated(GL10 glUnused, EGLConfig config)
 		// Enable depth testing
 		GLES20.glEnable(GLES20.GL_DEPTH_TEST);
 
+		// The below glEnable() call is a holdover from OpenGL ES 1, and is not needed in OpenGL ES 2.
 		// Enable texture mapping
-		GLES20.glEnable(GLES20.GL_TEXTURE_2D);
+		// GLES20.glEnable(GLES20.GL_TEXTURE_2D);
 
 		// Position the eye in front of the origin.
 		final float eyeX = 0.0f;

diff --git a/android/AndroidOpenGLESLessons/src/com/learnopengles/android/lesson6/LessonSixRenderer.java b/android/AndroidOpenGLESLessons/src/com/learnopengles/android/lesson6/LessonSixRenderer.java
@@ -391,8 +391,9 @@ public void onSurfaceCreated(GL10 glUnused, EGLConfig config)
 		// Enable depth testing
 		GLES20.glEnable(GLES20.GL_DEPTH_TEST);
 
+		// The below glEnable() call is a holdover from OpenGL ES 1, and is not needed in OpenGL ES 2.
 		// Enable texture mapping
-		GLES20.glEnable(GLES20.GL_TEXTURE_2D);
+		// GLES20.glEnable(GLES20.GL_TEXTURE_2D);
 
 		// Position the eye in front of the origin.
 		final float eyeX = 0.0f;

diff --git a/...oid/AndroidOpenGLESLessons/src/com/learnopengles/android/lesson8/LessonEightActivity.java b/...oid/AndroidOpenGLESLessons/src/com/learnopengles/android/lesson8/LessonEightActivity.java
@@ -6,11 +6,6 @@
 import android.content.pm.ConfigurationInfo;
 import android.os.Bundle;
 import android.util.DisplayMetrics;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-
-import com.learnopengles.android.R;
 
 public class LessonEightActivity extends Activity {	
 	private LessonEightGLSurfaceView glSurfaceView;

diff --git a/...ndroidOpenGLESLessons/src/com/learnopengles/android/lesson8/LessonEightGLSurfaceView.java b/...ndroidOpenGLESLessons/src/com/learnopengles/android/lesson8/LessonEightGLSurfaceView.java
@@ -7,7 +7,6 @@
 import android.widget.Toast;
 
 import com.learnopengles.android.R;
-import com.learnopengles.android.lesson8.ErrorHandler.ErrorType;
 
 public class LessonEightGLSurfaceView extends GLSurfaceView implements ErrorHandler
 {