Merge pull request #2 from Interrupt/texture-picker

Preserve textures when creating sectors / lines.

core/src/com/interrupt/doomtest/DoomTestEditor.java

@@ -96,6 +96,9 @@ public enum EditorModes { SECTOR, POINT, SPLIT };
 
     public static float GRID_SNAP = 2f;
 
+    Image texturePickerButton;
+    TextureRegion currentTexture;
+
 	@Override
 	public void create () {
         camera = new PerspectiveCamera(67, Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
@@ -142,7 +145,9 @@ public boolean touchDown(int screenX, int screenY, int pointer, int btn) {
         // Texture picker
         Array<TextureRegion> textures = loadTexturesFromAtlas("textures/textures.png");
         textures.add(new TextureRegion(Art.getTexture("textures/wall1.png")));
-        setupHud(textures);
+
+        currentTexture = textures.get(textures.size - 1);
+        setupHud(textures, currentTexture);
 	}
 
     public void refreshRenderer() {
@@ -406,6 +411,10 @@ else if(button == Input.Buttons.RIGHT) {
                     hoveredSector.match(pickedSector);
                     refreshRenderer();
                 }
+                else if(pickedLine != null && hoveredLine != null) {
+                    hoveredLine.match(pickedLine);
+                    refreshRenderer();
+                }
             }
         }
     }
@@ -457,7 +466,8 @@ public void finishSector() {
 
             if (parent != null) {
                 parent.addSubSector(current);
-                current.ceilHeight = parent.ceilHeight;
+                current.match(parent);
+                if(editHeight != null) current.floorHeight = editHeight;
 
                 // parent's sectors might now be contained by this new sector
                 editor.refreshSectorParents(current, parent);
@@ -471,20 +481,25 @@ public void finishSector() {
 
                 if (i > 0) {
                     Vector2 prev = points.get(i - 1);
-                    editor.addLine(current, prev, p);
+                    editor.addLine(current, prev, p, currentTexture);
                 }
             }
 
             // close the loop, if it isn't
             Vector2 startPoint = points.first();
             Vector2 lastPoint = points.get(points.size - 1);
             if (!lastPoint.equals(startPoint)) {
-                editor.addLine(current, lastPoint, startPoint);
+                editor.addLine(current, lastPoint, startPoint, currentTexture);
             }
 
-            if (parent == null)
+            if (parent == null) {
                 level.sectors.add(current);
 
+                // set texture
+                current.floorMaterial.set(TextureAttribute.createDiffuse(currentTexture));
+                current.ceilingMaterial.set(TextureAttribute.createDiffuse(currentTexture));
+            }
+
 
             // solid parents mean line solidity might change now
             if (parent != null && parent.isSolid) {
@@ -731,8 +746,8 @@ public void renderGrid() {
         lineRenderer.end();
     }
 
-    private void setupHud(final Array<TextureRegion> textures) {
-        Image texturePickerButton = new Image(new TextureRegionDrawable(textures.first()));
+    private void setupHud(final Array<TextureRegion> textures, TextureRegion current) {
+        texturePickerButton = new Image(new TextureRegionDrawable(current));
         texturePickerButton.setScaling(Scaling.stretch);
 
         Table wallPickerLayoutTable = new Table();
@@ -749,6 +764,7 @@ public void clicked(InputEvent event, float x, float y) {
                     @Override
                     public void result(Integer value, TextureRegion region) {
                         setTexture(region);
+                        texturePickerButton.setDrawable(new TextureRegionDrawable(region));
                     }
                 };
                 hudStage.addActor(picker);
@@ -761,6 +777,8 @@ public void result(Integer value, TextureRegion region) {
     }
 
     public void setTexture(TextureRegion texture) {
+        currentTexture = texture;
+
         if(pickedLine != null) {
             pickedLine.lowerMaterial.set(TextureAttribute.createDiffuse(texture));
         }

core/src/com/interrupt/doomtest/levels/Line.java

@@ -89,4 +89,8 @@ public Plane.PlaneSide getLowerWallSide() {
         }
         return Plane.PlaneSide.Front;
     }
+
+    public void match(Line other) {
+        lowerMaterial.set(other.lowerMaterial.get(TextureAttribute.Diffuse));
+    }
 }

core/src/com/interrupt/doomtest/levels/Sector.java

@@ -13,6 +13,8 @@
 import com.badlogic.gdx.utils.Array;
 import com.interrupt.doomtest.gfx.Art;
 
+import javax.xml.soap.Text;
+
 public class Sector {
     public Array<Vector2> points = new Array<Vector2>();
     public Sector parent = null;
@@ -225,5 +227,8 @@ public void removePoint(Vector2 vertex) {
     public void match(Sector other) {
         floorHeight = other.floorHeight;
         ceilHeight = other.ceilHeight;
+
+        floorMaterial.set((other.floorMaterial.get(TextureAttribute.Diffuse)));
+        ceilingMaterial.set((other.ceilingMaterial.get(TextureAttribute.Diffuse)));
     }
 }

core/src/com/interrupt/doomtest/levels/editor/Editor.java

@@ -1,6 +1,8 @@
 package com.interrupt.doomtest.levels.editor;
 
 import com.badlogic.gdx.graphics.Camera;
+import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import com.badlogic.gdx.graphics.g3d.attributes.TextureAttribute;
 import com.badlogic.gdx.math.Intersector;
 import com.badlogic.gdx.math.Plane;
 import com.badlogic.gdx.math.Vector2;
@@ -123,6 +125,8 @@ public void addPointToLine(Line l, Vector2 point) {
         l.end = point;
 
         Line newLine = new Line(point, oldEnd, l.solid, l.left, l.right);
+        newLine.match(l);
+
         level.lines.add(newLine);
 
         addNewPointToSector(new Line(l.start, oldEnd, l.solid, l.left, l.right), point, level.sectors);
@@ -211,7 +215,7 @@ public void addVertex(Vector2 vertex) {
         if(existing == null) level.vertices.add(vertex);
     }
 
-    public void addLine(Sector current, Vector2 start, Vector2 end) {
+    public void addLine(Sector current, Vector2 start, Vector2 end, TextureRegion texture) {
 
         // don't duplicate verts
         Vector2 existingStart = getExistingVertex(start);
@@ -230,6 +234,7 @@ public void addLine(Sector current, Vector2 start, Vector2 end) {
 
         if(existing == null) {
             level.lines.add(line);
+            line.lowerMaterial.set(TextureAttribute.createDiffuse(texture));
         }
         else {
             if(existing.left == current.parent) {