Merge branch 'master' of https://github.com/lwjglgamedev/lwjglbook

Author: lwjglgamedev

chapter07/c07-p2/src/main/java/org/lwjglb/engine/graph/Mesh.java

@@ -28,7 +28,7 @@ public Mesh(float[] positions, float[] textCoords, int[] indices, Texture textur
         try {
             this.texture = texture;
             vertexCount = indices.length;
-            vboIdList = new ArrayList();
+            vboIdList = new ArrayList<>();
 
             vaoId = glGenVertexArrays();
             glBindVertexArray(vaoId);

chapter08/src/main/java/org/lwjglb/engine/graph/Mesh.java

@@ -28,7 +28,7 @@ public Mesh(float[] positions, float[] textCoords, int[] indices, Texture textur
         try {
             this.texture = texture;
             vertexCount = indices.length;
-            vboIdList = new ArrayList();
+            vboIdList = new ArrayList<>();
 
             vaoId = glGenVertexArrays();
             glBindVertexArray(vaoId);

chapter09/src/main/java/org/lwjglb/engine/graph/Mesh.java

@@ -34,7 +34,7 @@ public Mesh(float[] positions, float[] textCoords, float[] normals, int[] indice
         try {
             colour = DEFAULT_COLOUR;
             vertexCount = indices.length;
-            vboIdList = new ArrayList();
+            vboIdList = new ArrayList<>();
 
             vaoId = glGenVertexArrays();
             glBindVertexArray(vaoId);

chapter09/src/main/java/org/lwjglb/engine/graph/OBJLoader.java

@@ -57,7 +57,7 @@ public static Mesh loadMesh(String fileName) throws Exception {
     private static Mesh reorderLists(List<Vector3f> posList, List<Vector2f> textCoordList,
             List<Vector3f> normList, List<Face> facesList) {
 
-        List<Integer> indices = new ArrayList();
+        List<Integer> indices = new ArrayList<>();
         // Create position array in the order it has been declared
         float[] posArr = new float[posList.size() * 3];
         int i = 0;

chapter10/src/main/java/org/lwjglb/engine/graph/Mesh.java

@@ -28,7 +28,7 @@ public Mesh(float[] positions, float[] textCoords, float[] normals, int[] indice
         IntBuffer indicesBuffer = null;
         try {
             vertexCount = indices.length;
-            vboIdList = new ArrayList();
+            vboIdList = new ArrayList<>();
 
             vaoId = glGenVertexArrays();
             glBindVertexArray(vaoId);

chapter10/src/main/java/org/lwjglb/engine/graph/OBJLoader.java

@@ -57,7 +57,7 @@ public static Mesh loadMesh(String fileName) throws Exception {
     private static Mesh reorderLists(List<Vector3f> posList, List<Vector2f> textCoordList,
             List<Vector3f> normList, List<Face> facesList) {
 
-        List<Integer> indices = new ArrayList();
+        List<Integer> indices = new ArrayList<>();
         // Create position array in the order it has been declared
         float[] posArr = new float[posList.size() * 3];
         int i = 0;

chapter11/c11-p1/src/main/java/org/lwjglb/engine/graph/Mesh.java

@@ -28,7 +28,7 @@ public Mesh(float[] positions, float[] textCoords, float[] normals, int[] indice
         IntBuffer indicesBuffer = null;
         try {
             vertexCount = indices.length;
-            vboIdList = new ArrayList();
+            vboIdList = new ArrayList<>();
 
             vaoId = glGenVertexArrays();
             glBindVertexArray(vaoId);

chapter11/c11-p1/src/main/java/org/lwjglb/engine/graph/OBJLoader.java

@@ -57,7 +57,7 @@ public static Mesh loadMesh(String fileName) throws Exception {
     private static Mesh reorderLists(List<Vector3f> posList, List<Vector2f> textCoordList,
             List<Vector3f> normList, List<Face> facesList) {
 
-        List<Integer> indices = new ArrayList();
+        List<Integer> indices = new ArrayList<>();
         // Create position array in the order it has been declared
         float[] posArr = new float[posList.size() * 3];
         int i = 0;

chapter11/c11-p2/src/main/java/org/lwjglb/engine/graph/Mesh.java

@@ -28,7 +28,7 @@ public Mesh(float[] positions, float[] textCoords, float[] normals, int[] indice
         IntBuffer indicesBuffer = null;
         try {
             vertexCount = indices.length;
-            vboIdList = new ArrayList();
+            vboIdList = new ArrayList<>();
 
             vaoId = glGenVertexArrays();
             glBindVertexArray(vaoId);

chapter11/c11-p2/src/main/java/org/lwjglb/engine/graph/OBJLoader.java

@@ -57,7 +57,7 @@ public static Mesh loadMesh(String fileName) throws Exception {
     private static Mesh reorderLists(List<Vector3f> posList, List<Vector2f> textCoordList,
             List<Vector3f> normList, List<Face> facesList) {
 
-        List<Integer> indices = new ArrayList();
+        List<Integer> indices = new ArrayList<>();
         // Create position array in the order it has been declared
         float[] posArr = new float[posList.size() * 3];
         int i = 0;