Rename SIZE and SIZE_IN_BYTES to BYTES

integeruser · Nov 26, 2016 · 2991a98 · 2991a98
1 parent 9dbd36f
commit 2991a98
Show file tree

Hide file tree

Showing 32 changed files with 105 additions and 103 deletions.
diff --git a/src/integeruser/jglsdk/glimg/DdsLoader.java b/src/integeruser/jglsdk/glimg/DdsLoader.java
@@ -21,7 +21,7 @@ public static ImageSet loadFromFile(String ddsFilepath) throws IOException {
             throw new DdsFileMalformedException(ddsFilepath, "The Magic number is missing from the file.");
         }
 
-        if (ddsFile.length < DdsHeader.SIZE + 4) {
+        if (ddsFile.length < DdsHeader.BYTES + 4) {
             throw new DdsFileMalformedException(ddsFilepath, "The data is way too small to store actual information.");
         }
 
@@ -128,6 +128,8 @@ private static class DxgiFormat {
 
 
     private static class DdsPixelFormat {
+        static final int BYTES = Integer.BYTES * (8);
+
         int size;
         int flags;
         int fourCC;
@@ -149,7 +151,7 @@ private static class DdsPixelFormatFlags {
 
 
     private static class DdsHeader {
-        static final int SIZE = Integer.BYTES * (7 + 11 + 8 + 5);
+        static final int BYTES = Integer.BYTES * (7 + 11) + DdsPixelFormat.BYTES + Integer.BYTES * (5);
 
         int size;
         int flags;
@@ -242,7 +244,7 @@ private static int readDoubleWord(byte bytes[], int startIx) {
     private static Dds10Header getDds10Header(byte[] ddsFile, DdsHeader ddsHeader) {
         if (ddsHeader.ddsPixelFormat.fourCC == MagicNumbers.DDS10_FOUR_CC) {
             Dds10Header dds10Header = new Dds10Header();
-            int offsetToNewHeader = DdsHeader.SIZE + 4;
+            int offsetToNewHeader = DdsHeader.BYTES + 4;
 
             dds10Header.dxgiFormat = readDoubleWord(ddsFile, offsetToNewHeader);
             dds10Header.resourceDimension = readDoubleWord(ddsFile, offsetToNewHeader + 4);
@@ -317,7 +319,7 @@ private static ImageFormat.UncheckedImageFormat getFormat(DdsHeader ddsHeader, D
     }
 
     private static int getOffsetToData(DdsHeader ddsHeader) {
-        int byteOffset = DdsHeader.SIZE + 4;
+        int byteOffset = DdsHeader.BYTES + 4;
         if (ddsHeader.ddsPixelFormat.fourCC == MagicNumbers.DDS10_FOUR_CC) {
             byteOffset += Dds10Header.SIZE;
         }

diff --git a/src/integeruser/jgltut/Tutorial.java b/src/integeruser/jgltut/Tutorial.java
@@ -38,10 +38,10 @@ public abstract class Tutorial {
     protected FloatBuffer vec4Buffer = BufferUtils.createFloatBuffer(4);
     protected FloatBuffer mat3Buffer = BufferUtils.createFloatBuffer(9);
     protected FloatBuffer mat4Buffer = BufferUtils.createFloatBuffer(16);
-    protected ByteBuffer projectionBlockBuffer = BufferUtils.createByteBuffer(ProjectionBlock.SIZE_IN_BYTES);
-    protected ByteBuffer unprojectionBlockBuffer = BufferUtils.createByteBuffer(UnprojectionBlock.SIZE_IN_BYTES);
-    protected ByteBuffer lightBlockBuffer = BufferUtils.createByteBuffer(LightBlock.SIZE_IN_BYTES);
-    protected ByteBuffer materialBlockBuffer = BufferUtils.createByteBuffer(MaterialBlock.SIZE_IN_BYTES);
+    protected ByteBuffer projectionBlockBuffer = BufferUtils.createByteBuffer(ProjectionBlock.BYTES);
+    protected ByteBuffer unprojectionBlockBuffer = BufferUtils.createByteBuffer(UnprojectionBlock.BYTES);
+    protected ByteBuffer lightBlockBuffer = BufferUtils.createByteBuffer(LightBlock.BYTES);
+    protected ByteBuffer materialBlockBuffer = BufferUtils.createByteBuffer(MaterialBlock.BYTES);
 
     ////////////////////////////////
 

diff --git a/src/integeruser/jgltut/commons/LightBlock.java b/src/integeruser/jgltut/commons/LightBlock.java
@@ -10,7 +10,7 @@
  */
 public class LightBlock implements Bufferable {
     public static final int MAX_NUMBER_OF_LIGHTS = 5;
-    public static final int SIZE_IN_BYTES = Float.BYTES * (4 + 1 + 1 + 2) + PerLight.SIZE_IN_BYTES * MAX_NUMBER_OF_LIGHTS;
+    public static final int BYTES = Float.BYTES * (4 + 1 + 1 + 2) + PerLight.BYTES * MAX_NUMBER_OF_LIGHTS;
 
     public Vector4f ambientIntensity;
     public float lightAttenuation;

diff --git a/src/integeruser/jgltut/commons/MaterialBlock.java b/src/integeruser/jgltut/commons/MaterialBlock.java
@@ -9,7 +9,7 @@
  * Visit https://github.com/integeruser/jgltut for info and updates.
  */
 public class MaterialBlock implements Bufferable {
-    public static final int SIZE_IN_BYTES = Float.BYTES * (4 + 4 + 1 + 3);
+    public static final int BYTES = Float.BYTES * (4 + 4 + 1 + 3);
 
     public Vector4f diffuseColor;
     public Vector4f specularColor;

diff --git a/src/integeruser/jgltut/commons/PerLight.java b/src/integeruser/jgltut/commons/PerLight.java
@@ -9,7 +9,7 @@
  * Visit https://github.com/integeruser/jgltut for info and updates.
  */
 public class PerLight implements Bufferable {
-    public static final int SIZE_IN_BYTES = Float.BYTES * (4 + 4);
+    public static final int BYTES = Float.BYTES * (4 + 4);
 
     public Vector4f cameraSpaceLightPos;
     public Vector4f lightIntensity;

diff --git a/src/integeruser/jgltut/commons/ProjectionBlock.java b/src/integeruser/jgltut/commons/ProjectionBlock.java
@@ -9,7 +9,7 @@
  * Visit https://github.com/integeruser/jgltut for info and updates.
  */
 public class ProjectionBlock implements Bufferable {
-    public static final int SIZE_IN_BYTES = Float.BYTES * (16);
+    public static final int BYTES = Float.BYTES * (16);
 
     public Matrix4f cameraToClipMatrix;
 

diff --git a/src/integeruser/jgltut/commons/UnprojectionBlock.java b/src/integeruser/jgltut/commons/UnprojectionBlock.java
@@ -10,7 +10,7 @@
  * Visit https://github.com/integeruser/jgltut for info and updates.
  */
 public class UnprojectionBlock implements Bufferable {
-    public static final int SIZE_IN_BYTES = Float.BYTES * (16) + Integer.BYTES * (2);
+    public static final int BYTES = Float.BYTES * (16) + Integer.BYTES * (2);
 
     public Matrix4f clipToCameraMatrix;
     public Vector2i windowSize;

diff --git a/src/integeruser/jgltut/tut09/AmbientLighting.java b/src/integeruser/jgltut/tut09/AmbientLighting.java
@@ -66,10 +66,10 @@ protected void init() {
 
         projectionUniformBuffer = glGenBuffers();
         glBindBuffer(GL_UNIFORM_BUFFER, projectionUniformBuffer);
-        glBufferData(GL_UNIFORM_BUFFER, ProjectionBlock.SIZE_IN_BYTES, GL_DYNAMIC_DRAW);
+        glBufferData(GL_UNIFORM_BUFFER, ProjectionBlock.BYTES, GL_DYNAMIC_DRAW);
 
         // Bind the static buffers.
-        glBindBufferRange(GL_UNIFORM_BUFFER, projectionBlockIndex, projectionUniformBuffer, 0, ProjectionBlock.SIZE_IN_BYTES);
+        glBindBufferRange(GL_UNIFORM_BUFFER, projectionBlockIndex, projectionUniformBuffer, 0, ProjectionBlock.BYTES);
 
         glBindBuffer(GL_UNIFORM_BUFFER, 0);
 

diff --git a/src/integeruser/jgltut/tut09/BasicLighting.java b/src/integeruser/jgltut/tut09/BasicLighting.java
@@ -65,10 +65,10 @@ protected void init() {
 
         projectionUniformBuffer = glGenBuffers();
         glBindBuffer(GL_UNIFORM_BUFFER, projectionUniformBuffer);
-        glBufferData(GL_UNIFORM_BUFFER, ProjectionBlock.SIZE_IN_BYTES, GL_DYNAMIC_DRAW);
+        glBufferData(GL_UNIFORM_BUFFER, ProjectionBlock.BYTES, GL_DYNAMIC_DRAW);
 
         // Bind the static buffers.
-        glBindBufferRange(GL_UNIFORM_BUFFER, projectionBlockIndex, projectionUniformBuffer, 0, ProjectionBlock.SIZE_IN_BYTES);
+        glBindBufferRange(GL_UNIFORM_BUFFER, projectionBlockIndex, projectionUniformBuffer, 0, ProjectionBlock.BYTES);
 
         glBindBuffer(GL_UNIFORM_BUFFER, 0);
 

diff --git a/src/integeruser/jgltut/tut09/ScaleAndLighting.java b/src/integeruser/jgltut/tut09/ScaleAndLighting.java
@@ -66,10 +66,10 @@ protected void init() {
 
         projectionUniformBuffer = glGenBuffers();
         glBindBuffer(GL_UNIFORM_BUFFER, projectionUniformBuffer);
-        glBufferData(GL_UNIFORM_BUFFER, ProjectionBlock.SIZE_IN_BYTES, GL_DYNAMIC_DRAW);
+        glBufferData(GL_UNIFORM_BUFFER, ProjectionBlock.BYTES, GL_DYNAMIC_DRAW);
 
         // Bind the static buffers.
-        glBindBufferRange(GL_UNIFORM_BUFFER, projectionBlockIndex, projectionUniformBuffer, 0, ProjectionBlock.SIZE_IN_BYTES);
+        glBindBufferRange(GL_UNIFORM_BUFFER, projectionBlockIndex, projectionUniformBuffer, 0, ProjectionBlock.BYTES);
 
         glBindBuffer(GL_UNIFORM_BUFFER, 0);
 

diff --git a/src/integeruser/jgltut/tut10/FragmentAttenuation.java b/src/integeruser/jgltut/tut10/FragmentAttenuation.java
@@ -78,17 +78,17 @@ protected void init() {
 
         projectionUniformBuffer = glGenBuffers();
         glBindBuffer(GL_UNIFORM_BUFFER, projectionUniformBuffer);
-        glBufferData(GL_UNIFORM_BUFFER, ProjectionBlock.SIZE_IN_BYTES, GL_DYNAMIC_DRAW);
+        glBufferData(GL_UNIFORM_BUFFER, ProjectionBlock.BYTES, GL_DYNAMIC_DRAW);
 
         unprojectionUniformBuffer = glGenBuffers();
         glBindBuffer(GL_UNIFORM_BUFFER, unprojectionUniformBuffer);
-        GL15.glBufferData(GL_UNIFORM_BUFFER, UnprojectionBlock.SIZE_IN_BYTES, GL_DYNAMIC_DRAW);
+        GL15.glBufferData(GL_UNIFORM_BUFFER, UnprojectionBlock.BYTES, GL_DYNAMIC_DRAW);
 
         // Bind the static buffers.
-        glBindBufferRange(GL_UNIFORM_BUFFER, projectionBlockIndex, projectionUniformBuffer, 0, ProjectionBlock.SIZE_IN_BYTES);
+        glBindBufferRange(GL_UNIFORM_BUFFER, projectionBlockIndex, projectionUniformBuffer, 0, ProjectionBlock.BYTES);
 
         // Bind the static buffers.
-        glBindBufferRange(GL_UNIFORM_BUFFER, unprojectionBlockIndex, unprojectionUniformBuffer, 0, UnprojectionBlock.SIZE_IN_BYTES);
+        glBindBufferRange(GL_UNIFORM_BUFFER, unprojectionBlockIndex, unprojectionUniformBuffer, 0, UnprojectionBlock.BYTES);
 
         glBindBuffer(GL_UNIFORM_BUFFER, 0);
 

diff --git a/src/integeruser/jgltut/tut10/FragmentPointLighting.java b/src/integeruser/jgltut/tut10/FragmentPointLighting.java
@@ -72,10 +72,10 @@ protected void init() {
 
         projectionUniformBuffer = glGenBuffers();
         glBindBuffer(GL_UNIFORM_BUFFER, projectionUniformBuffer);
-        glBufferData(GL_UNIFORM_BUFFER, ProjectionBlock.SIZE_IN_BYTES, GL_DYNAMIC_DRAW);
+        glBufferData(GL_UNIFORM_BUFFER, ProjectionBlock.BYTES, GL_DYNAMIC_DRAW);
 
         // Bind the static buffers.
-        glBindBufferRange(GL_UNIFORM_BUFFER, projectionBlockIndex, projectionUniformBuffer, 0, ProjectionBlock.SIZE_IN_BYTES);
+        glBindBufferRange(GL_UNIFORM_BUFFER, projectionBlockIndex, projectionUniformBuffer, 0, ProjectionBlock.BYTES);
 
         glBindBuffer(GL_UNIFORM_BUFFER, 0);
 

diff --git a/src/integeruser/jgltut/tut10/VertexPointLighting.java b/src/integeruser/jgltut/tut10/VertexPointLighting.java
@@ -70,10 +70,10 @@ protected void init() {
 
         projectionUniformBuffer = glGenBuffers();
         glBindBuffer(GL_UNIFORM_BUFFER, projectionUniformBuffer);
-        glBufferData(GL_UNIFORM_BUFFER, ProjectionBlock.SIZE_IN_BYTES, GL_DYNAMIC_DRAW);
+        glBufferData(GL_UNIFORM_BUFFER, ProjectionBlock.BYTES, GL_DYNAMIC_DRAW);
 
         // Bind the static buffers.
-        glBindBufferRange(GL_UNIFORM_BUFFER, projectionBlockIndex, projectionUniformBuffer, 0, ProjectionBlock.SIZE_IN_BYTES);
+        glBindBufferRange(GL_UNIFORM_BUFFER, projectionBlockIndex, projectionUniformBuffer, 0, ProjectionBlock.BYTES);
 
         glBindBuffer(GL_UNIFORM_BUFFER, 0);
 

diff --git a/src/integeruser/jgltut/tut11/BlinnVsPhongLighting.java b/src/integeruser/jgltut/tut11/BlinnVsPhongLighting.java
@@ -79,10 +79,10 @@ protected void init() {
 
         projectionUniformBuffer = glGenBuffers();
         glBindBuffer(GL_UNIFORM_BUFFER, projectionUniformBuffer);
-        glBufferData(GL_UNIFORM_BUFFER, ProjectionBlock.SIZE_IN_BYTES, GL_DYNAMIC_DRAW);
+        glBufferData(GL_UNIFORM_BUFFER, ProjectionBlock.BYTES, GL_DYNAMIC_DRAW);
 
         // Bind the static buffers.
-        glBindBufferRange(GL_UNIFORM_BUFFER, projectionBlockIndex, projectionUniformBuffer, 0, ProjectionBlock.SIZE_IN_BYTES);
+        glBindBufferRange(GL_UNIFORM_BUFFER, projectionBlockIndex, projectionUniformBuffer, 0, ProjectionBlock.BYTES);
 
         glBindBuffer(GL_UNIFORM_BUFFER, 0);
 

diff --git a/src/integeruser/jgltut/tut11/GaussianSpecularLighting.java b/src/integeruser/jgltut/tut11/GaussianSpecularLighting.java
@@ -79,10 +79,10 @@ protected void init() {
 
         projectionUniformBuffer = glGenBuffers();
         glBindBuffer(GL_UNIFORM_BUFFER, projectionUniformBuffer);
-        glBufferData(GL_UNIFORM_BUFFER, ProjectionBlock.SIZE_IN_BYTES, GL_DYNAMIC_DRAW);
+        glBufferData(GL_UNIFORM_BUFFER, ProjectionBlock.BYTES, GL_DYNAMIC_DRAW);
 
         // Bind the static buffers.
-        glBindBufferRange(GL_UNIFORM_BUFFER, projectionBlockIndex, projectionUniformBuffer, 0, ProjectionBlock.SIZE_IN_BYTES);
+        glBindBufferRange(GL_UNIFORM_BUFFER, projectionBlockIndex, projectionUniformBuffer, 0, ProjectionBlock.BYTES);
 
         glBindBuffer(GL_UNIFORM_BUFFER, 0);
 

diff --git a/src/integeruser/jgltut/tut11/PhongLighting.java b/src/integeruser/jgltut/tut11/PhongLighting.java
@@ -79,10 +79,10 @@ protected void init() {
 
         projectionUniformBuffer = glGenBuffers();
         glBindBuffer(GL_UNIFORM_BUFFER, projectionUniformBuffer);
-        glBufferData(GL_UNIFORM_BUFFER, ProjectionBlock.SIZE_IN_BYTES, GL_DYNAMIC_DRAW);
+        glBufferData(GL_UNIFORM_BUFFER, ProjectionBlock.BYTES, GL_DYNAMIC_DRAW);
 
         // Bind the static buffers.
-        glBindBufferRange(GL_UNIFORM_BUFFER, projectionBlockIndex, projectionUniformBuffer, 0, ProjectionBlock.SIZE_IN_BYTES);
+        glBindBufferRange(GL_UNIFORM_BUFFER, projectionBlockIndex, projectionUniformBuffer, 0, ProjectionBlock.BYTES);
 
         glBindBuffer(GL_UNIFORM_BUFFER, 0);
 

diff --git a/src/integeruser/jgltut/tut12/GammaCorrection.java b/src/integeruser/jgltut/tut12/GammaCorrection.java
@@ -84,16 +84,16 @@ ProgramData getProgram(LightingProgramTypes lightingProgramType) {
         // Setup our Uniform Buffers
         lightUniformBuffer = glGenBuffers();
         glBindBuffer(GL_UNIFORM_BUFFER, lightUniformBuffer);
-        GL15.glBufferData(GL_UNIFORM_BUFFER, LightManager.LightBlockGamma.SIZE, GL_DYNAMIC_DRAW);
+        GL15.glBufferData(GL_UNIFORM_BUFFER, LightManager.LightBlockGamma.BYTES, GL_DYNAMIC_DRAW);
 
         projectionUniformBuffer = glGenBuffers();
         glBindBuffer(GL_UNIFORM_BUFFER, projectionUniformBuffer);
-        GL15.glBufferData(GL_UNIFORM_BUFFER, ProjectionBlock.SIZE_IN_BYTES, GL_DYNAMIC_DRAW);
+        GL15.glBufferData(GL_UNIFORM_BUFFER, ProjectionBlock.BYTES, GL_DYNAMIC_DRAW);
 
         // Bind the static buffers.
-        glBindBufferRange(GL_UNIFORM_BUFFER, lightBlockIndex, lightUniformBuffer, 0, LightManager.LightBlockGamma.SIZE);
+        glBindBufferRange(GL_UNIFORM_BUFFER, lightBlockIndex, lightUniformBuffer, 0, LightManager.LightBlockGamma.BYTES);
 
-        glBindBufferRange(GL_UNIFORM_BUFFER, projectionBlockIndex, projectionUniformBuffer, 0, ProjectionBlock.SIZE_IN_BYTES);
+        glBindBufferRange(GL_UNIFORM_BUFFER, projectionBlockIndex, projectionUniformBuffer, 0, ProjectionBlock.BYTES);
 
         glBindBuffer(GL_UNIFORM_BUFFER, 0);
 

diff --git a/src/integeruser/jgltut/tut12/HDRLighting.java b/src/integeruser/jgltut/tut12/HDRLighting.java
@@ -86,16 +86,16 @@ ProgramData getProgram(LightingProgramTypes lightingProgramType) {
         // Setup our Uniform Buffers
         lightUniformBuffer = glGenBuffers();
         glBindBuffer(GL_UNIFORM_BUFFER, lightUniformBuffer);
-        GL15.glBufferData(GL_UNIFORM_BUFFER, LightManager.LightBlockHDR.SIZE, GL_DYNAMIC_DRAW);
+        GL15.glBufferData(GL_UNIFORM_BUFFER, LightManager.LightBlockHDR.BYTES, GL_DYNAMIC_DRAW);
 
         projectionUniformBuffer = glGenBuffers();
         glBindBuffer(GL_UNIFORM_BUFFER, projectionUniformBuffer);
-        GL15.glBufferData(GL_UNIFORM_BUFFER, ProjectionBlock.SIZE_IN_BYTES, GL_DYNAMIC_DRAW);
+        GL15.glBufferData(GL_UNIFORM_BUFFER, ProjectionBlock.BYTES, GL_DYNAMIC_DRAW);
 
         // Bind the static buffers.
-        glBindBufferRange(GL_UNIFORM_BUFFER, lightBlockIndex, lightUniformBuffer, 0, LightManager.LightBlockHDR.SIZE);
+        glBindBufferRange(GL_UNIFORM_BUFFER, lightBlockIndex, lightUniformBuffer, 0, LightManager.LightBlockHDR.BYTES);
 
-        glBindBufferRange(GL_UNIFORM_BUFFER, projectionBlockIndex, projectionUniformBuffer, 0, ProjectionBlock.SIZE_IN_BYTES);
+        glBindBufferRange(GL_UNIFORM_BUFFER, projectionBlockIndex, projectionUniformBuffer, 0, ProjectionBlock.BYTES);
 
         glBindBuffer(GL_UNIFORM_BUFFER, 0);
 

diff --git a/src/integeruser/jgltut/tut12/LightManager.java b/src/integeruser/jgltut/tut12/LightManager.java
@@ -207,7 +207,7 @@ Vector4f getBackgroundColor() {
     private static final int NUMBER_OF_POINT_LIGHTS = NUMBER_OF_LIGHTS - 1;
 
     class LightBlockHDR implements Bufferable {
-        static final int SIZE = Float.BYTES * (4 + 1 + 1 + 2) + PerLight.SIZE_IN_BYTES * NUMBER_OF_LIGHTS;
+        static final int BYTES = Float.BYTES * (4 + 1 + 1 + 2) + PerLight.BYTES * NUMBER_OF_LIGHTS;
 
         Vector4f ambientIntensity;
         float lightAttenuation;
@@ -234,7 +234,7 @@ public ByteBuffer get(ByteBuffer buffer) {
     }
 
     class LightBlockGamma implements Bufferable {
-        static final int SIZE = Float.BYTES * (4 + 1 + 1 + 2) + PerLight.SIZE_IN_BYTES * NUMBER_OF_LIGHTS;
+        static final int BYTES = Float.BYTES * (4 + 1 + 1 + 1 + 1) + PerLight.BYTES * NUMBER_OF_LIGHTS;
 
         Vector4f ambientIntensity;
         float lightAttenuation;

diff --git a/src/integeruser/jgltut/tut12/Scene.java b/src/integeruser/jgltut/tut12/Scene.java
@@ -36,7 +36,7 @@ abstract class Scene {
         // Align the size of each MaterialBlock to the uniform buffer alignment.
         int uniformBufferAlignSize = glGetInteger(GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT);
 
-        sizeMaterialBlock = MaterialBlock.SIZE_IN_BYTES;
+        sizeMaterialBlock = MaterialBlock.BYTES;
         sizeMaterialBlock += uniformBufferAlignSize - (sizeMaterialBlock % uniformBufferAlignSize);
 
         int MATERIAL_COUNT = 6;
@@ -46,7 +46,7 @@ abstract class Scene {
         getMaterials(materials);
 
         ByteBuffer materialsBuffer = BufferUtils.createByteBuffer(sizeMaterialUniformBuffer);
-        final float[] padding = new float[(sizeMaterialBlock - MaterialBlock.SIZE_IN_BYTES) / (Float.SIZE / Byte.SIZE)];
+        final float[] padding = new float[(sizeMaterialBlock - MaterialBlock.BYTES) / (Float.SIZE / Byte.SIZE)];
 
         for (MaterialBlock materialBlock : materials) {
             materialBlock.get(materialsBuffer);
@@ -165,7 +165,7 @@ void draw(MatrixStackf modelMatrix, int materialBlockIndex, float alphaTetra) {
 
     void drawObject(Mesh mesh, ProgramData progData, int materialBlockIndex, int materialIndex, MatrixStackf modelMatrix) {
         glBindBufferRange(GL_UNIFORM_BUFFER, materialBlockIndex, materialUniformBuffer,
-                materialIndex * sizeMaterialBlock, MaterialBlock.SIZE_IN_BYTES);
+                materialIndex * sizeMaterialBlock, MaterialBlock.BYTES);
 
         Matrix3f normMatrix = new Matrix3f(modelMatrix);
         normMatrix.invert().transpose();
@@ -182,7 +182,7 @@ void drawObject(Mesh mesh, ProgramData progData, int materialBlockIndex, int mat
 
     void drawObject(Mesh mesh, String meshName, ProgramData progData, int materialBlockIndex, int materialIndex, MatrixStackf modelMatrix) {
         glBindBufferRange(GL_UNIFORM_BUFFER, materialBlockIndex, materialUniformBuffer,
-                materialIndex * sizeMaterialBlock, MaterialBlock.SIZE_IN_BYTES);
+                materialIndex * sizeMaterialBlock, MaterialBlock.BYTES);
 
         Matrix3f normMatrix = new Matrix3f(modelMatrix);
         normMatrix.invert().transpose();

diff --git a/src/integeruser/jgltut/tut12/SceneLighting.java b/src/integeruser/jgltut/tut12/SceneLighting.java
@@ -87,16 +87,16 @@ ProgramData getProgram(LightingProgramTypes lightingProgramType) {
         // Setup our Uniform Buffers
         lightUniformBuffer = glGenBuffers();
         glBindBuffer(GL_UNIFORM_BUFFER, lightUniformBuffer);
-        GL15.glBufferData(GL_UNIFORM_BUFFER, LightBlock.SIZE_IN_BYTES, GL_DYNAMIC_DRAW);
+        GL15.glBufferData(GL_UNIFORM_BUFFER, LightBlock.BYTES, GL_DYNAMIC_DRAW);
 
         projectionUniformBuffer = glGenBuffers();
         glBindBuffer(GL_UNIFORM_BUFFER, projectionUniformBuffer);
-        glBufferData(GL_UNIFORM_BUFFER, ProjectionBlock.SIZE_IN_BYTES, GL_DYNAMIC_DRAW);
+        glBufferData(GL_UNIFORM_BUFFER, ProjectionBlock.BYTES, GL_DYNAMIC_DRAW);
 
         // Bind the static buffers.
-        glBindBufferRange(GL_UNIFORM_BUFFER, lightBlockIndex, lightUniformBuffer, 0, LightBlock.SIZE_IN_BYTES);
+        glBindBufferRange(GL_UNIFORM_BUFFER, lightBlockIndex, lightUniformBuffer, 0, LightBlock.BYTES);
 
-        glBindBufferRange(GL_UNIFORM_BUFFER, projectionBlockIndex, projectionUniformBuffer, 0, ProjectionBlock.SIZE_IN_BYTES);
+        glBindBufferRange(GL_UNIFORM_BUFFER, projectionBlockIndex, projectionUniformBuffer, 0, ProjectionBlock.BYTES);
 
         glBindBuffer(GL_UNIFORM_BUFFER, 0);