Projects >> coregl >>105401d0d9e1b56da8c8c5013b3a615549034c05

Chunk
Conflicting content 
import org.lwjgl.util.vector.Matrix4f;

public class MatrixFactory {
<<<<<<< HEAD
  public static Matrix4f createOrtho(final float width, final float height) {
=======
  public static Matrix4f createProjection(final float width, final float height) {
>>>>>>> d7283ade91924c3ba7ac06923ea85ab72ffabdbe
    float left = 0;
    float right = width;
    float top = 0;
Solution content 
import org.lwjgl.util.vector.Matrix4f;

public class MatrixFactory {
  public static Matrix4f createOrtho(final float width, final float height) {
    float left = 0;
    float right = width;
    float top = 0;
File
MatrixFactory.java
Developer's decision
Version 1
Kind of conflict
Method signature
Chunk
Conflicting content 
    return projection;
  }

<<<<<<< HEAD
  public static Matrix4f createProjection(final float width, final float height) {
    float zFar = 10000;

    float left = 0;
    float right = width;
    float top = 0;
    float bottom = height;
    float zNear = 1;
    Matrix4f projection = new Matrix4f();
    projection.m00 = 2 * zNear / (right-left);
    projection.m20 = (right+left) / (right-left);
    projection.m11 = 2 * zNear / (top-bottom);
    projection.m21 = (top+bottom) / (top-bottom);
    projection.m22 = -(zFar + zNear) / (zFar-zNear);
    projection.m32 = - 2 * zFar * zNear / (zFar-zNear);
    projection.m23 = -1;
    return projection;
  }

=======
>>>>>>> d7283ade91924c3ba7ac06923ea85ab72ffabdbe
}
Solution content 
    return projection;
  }

  public static Matrix4f createProjection(final float width, final float height) {
    float left = 0;
    float right = width;
    float top = 0;
    float bottom = height;
    float zNear = 1;
    float zFar = 10000;

    Matrix4f projection = new Matrix4f();
    projection.m00 = 2 * zNear / (right-left);
    projection.m20 = (right+left) / (right-left);
    projection.m11 = 2 * zNear / (top-bottom);
    projection.m21 = (top+bottom) / (top-bottom);
    projection.m22 = -(zFar + zNear) / (zFar-zNear);
    projection.m32 = - 2 * zFar * zNear / (zFar-zNear);
    projection.m23 = -1;
    return projection;
  }
}
File
MatrixFactory.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Chunk
Conflicting content 
package de.lessvoid.coregl;


<<<<<<< HEAD
import static org.lwjgl.opengl.GL11.*;
import static org.lwjgl.opengl.GL15.GL_ARRAY_BUFFER;
import static org.lwjgl.opengl.GL15.*;
=======
import static org.lwjgl.opengl.GL15.GL_ARRAY_BUFFER;
import static org.lwjgl.opengl.GL15.GL_DYNAMIC_DRAW;
import static org.lwjgl.opengl.GL15.GL_STATIC_DRAW;
>>>>>>> d7283ade91924c3ba7ac06923ea85ab72ffabdbe
import static org.lwjgl.opengl.GL15.glBindBuffer;
import static org.lwjgl.opengl.GL15.glBufferData;
import static org.lwjgl.opengl.GL15.glDeleteBuffers;
Solution content 
package de.lessvoid.coregl;


import static org.lwjgl.opengl.GL15.GL_ARRAY_BUFFER;
import static org.lwjgl.opengl.GL15.GL_DYNAMIC_DRAW;
import static org.lwjgl.opengl.GL15.GL_STATIC_DRAW;
import static org.lwjgl.opengl.GL15.glBindBuffer;
import static org.lwjgl.opengl.GL15.glBufferData;
import static org.lwjgl.opengl.GL15.glDeleteBuffers;
File
VBO.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import static org.lwjgl.opengl.GL15.glBufferData;
import static org.lwjgl.opengl.GL15.glDeleteBuffers;
import static org.lwjgl.opengl.GL15.glGenBuffers;
<<<<<<< HEAD
import static org.lwjgl.opengl.GL20.glEnableVertexAttribArray;
import static org.lwjgl.opengl.GL20.glVertexAttribPointer;
=======
>>>>>>> d7283ade91924c3ba7ac06923ea85ab72ffabdbe

import java.nio.FloatBuffer;
Solution content 
import static org.lwjgl.opengl.GL15.glBufferData;
import static org.lwjgl.opengl.GL15.glDeleteBuffers;
import static org.lwjgl.opengl.GL15.glGenBuffers;

import java.nio.FloatBuffer;
File
VBO.java
Developer's decision
Version 2
Kind of conflict
Import