Projects >> Terasology >>60357bf0721a47885f0d7ca8c1e045cda23db52e

Chunk
Conflicting content 
import com.google.common.collect.Maps;
import com.google.common.collect.Queues;
import com.google.common.collect.Sets;
<<<<<<< HEAD:engine/src/main/java/org/terasology/rendering/nui/internal/LwjglCanvas.java
import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.Display;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL20;
import org.lwjgl.opengl.Util;
=======
>>>>>>> 0ff4a9a60ef578c0f004b5bec9f5756771c78410:engine/src/main/java/org/terasology/rendering/nui/internal/CanvasImpl.java
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.terasology.asset.Assets;
Solution content 
import com.google.common.collect.Maps;
import com.google.common.collect.Queues;
import com.google.common.collect.Sets;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.terasology.asset.Assets;
File
CanvasImpl.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import java.util.Objects;
import java.util.Set;

<<<<<<< HEAD:engine/src/main/java/org/terasology/rendering/nui/internal/LwjglCanvas.java
import static org.lwjgl.opengl.GL11.GL_BLEND;
import static org.lwjgl.opengl.GL11.GL_DEPTH_TEST;
import static org.lwjgl.opengl.GL11.GL_CULL_FACE;
import static org.lwjgl.opengl.GL11.GL_VERTEX_ARRAY;
import static org.lwjgl.opengl.GL11.GL_COLOR_ARRAY;
import static org.lwjgl.opengl.GL11.GL_MODELVIEW;
import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA;
import static org.lwjgl.opengl.GL11.GL_PROJECTION;
import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA;
import static org.lwjgl.opengl.GL11.glBlendFunc;
import static org.lwjgl.opengl.GL11.glClear;
import static org.lwjgl.opengl.GL11.glDisable;
import static org.lwjgl.opengl.GL11.glDisableClientState;
import static org.lwjgl.opengl.GL11.glEnable;
import static org.lwjgl.opengl.GL11.glEnableClientState;
import static org.lwjgl.opengl.GL11.glLoadIdentity;
import static org.lwjgl.opengl.GL11.glLoadMatrix;
import static org.lwjgl.opengl.GL11.glMatrixMode;
import static org.lwjgl.opengl.GL11.glOrtho;
import static org.lwjgl.opengl.GL11.glPopMatrix;
import static org.lwjgl.opengl.GL11.glPushMatrix;
import static org.lwjgl.opengl.GL11.glScalef;
import static org.lwjgl.opengl.GL11.glTranslatef;
import static org.lwjgl.opengl.Util.checkGLError;

=======
>>>>>>> 0ff4a9a60ef578c0f004b5bec9f5756771c78410:engine/src/main/java/org/terasology/rendering/nui/internal/CanvasImpl.java
/**
 * @author Immortius
 */
Solution content 
import java.util.Objects;
import java.util.Set;

/**
 * @author Immortius
 */
File
CanvasImpl.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
    private Vector2i lastClickPosition = new Vector2i();

    private MouseInput lastClickButton;
<<<<<<< HEAD:engine/src/main/java/org/terasology/rendering/nui/internal/LwjglCanvas.java
    private Matrix4f modelView;
    private Line line = new Line();
=======
    private CanvasRenderer renderer;
>>>>>>> 0ff4a9a60ef578c0f004b5bec9f5756771c78410:engine/src/main/java/org/terasology/rendering/nui/internal/CanvasImpl.java

    public CanvasImpl(NUIManager nuiManager, Time time, CanvasRenderer renderer) {
        this.renderer = renderer;
Solution content 
    private MouseInput lastClickButton;
    private Vector2i lastClickPosition = new Vector2i();

    private CanvasRenderer renderer;
    private Line line = new Line();
    
    public CanvasImpl(NUIManager nuiManager, Time time, CanvasRenderer renderer) {
        this.renderer = renderer;
File
CanvasImpl.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation