Skip to content

Commit

Permalink
lumen overlay
Browse files Browse the repository at this point in the history
  • Loading branch information
@thelsing
thelsing committed Oct 8, 2023
1 parent ddd19ef commit 524a568
Show file tree
Hide file tree
Showing 4 changed files with 156 additions and 122 deletions.
19 changes: 17 additions & 2 deletions src/main/java/net/rptools/maptool/client/ui/zone/ZoneRenderer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import java.awt.font.TextLayout;
import java.awt.geom.*;
import java.awt.image.BufferedImage;
import java.io.File;
import java.text.NumberFormat;
import java.util.*;
import java.util.List;
Expand All @@ -38,6 +39,8 @@
import javax.annotation.Nullable;
import javax.imageio.ImageIO;
import javax.swing.*;

import net.didion.jwnl.data.Exc;
import net.rptools.lib.CodeTimer;
import net.rptools.lib.MD5Key;
import net.rptools.maptool.client.*;
Expand Down Expand Up @@ -1587,7 +1590,8 @@ private void renderLumensOverlay(
}

timer.start("renderLumensOverlay:drawLights:fillArea");
newG.setPaint(new Color(lightShade, lightShade, lightShade, lightOpacity));
var color = new Color(lightShade, lightShade, lightShade, lightOpacity);
newG.setPaint(color);
newG.fill(lumensLevel.lightArea());

newG.setPaint(new Color(0.f, 0.f, 0.f, 1.f));
Expand All @@ -1613,13 +1617,24 @@ private void renderLumensOverlay(

timer.stop("renderLumensOverlay:drawLumens");
newG.dispose();

timer.start("renderLumensOverlay:drawBuffer");
g.drawImage(lumensOverlay, null, 0, 0);
timer.stop("renderLumensOverlay:drawBuffer");
}
}

private void screenshot(String name, BufferedImage image) {
try {
File outputfile = new File("C:\\Users\\tkunze\\OneDrive\\Desktop\\" + name + "_j2d.png");
if(outputfile.exists())
return;

ImageIO.write(image, "png", outputfile);
} catch (Exception e) {
System.out.println(e.toString());
}
}

/**
* Combines a set of lights into an image that is then rendered into the zone.
*
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/rptools/maptool/client/ui/zone/gdx/AbstractDrawingDrawer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ protected void line(PolygonSpriteBatch batch, Pen pen, float x1, float y1, float
floats.add(x1, y1, x2, y2);
var path =
areaRenderer.path(
floats,
floats.toArray(),
pen.getThickness(),
pen.getSquareCap() ? AreaRenderer.JoinType.Pointy : AreaRenderer.JoinType.Round,
false);
Expand Down
79 changes: 55 additions & 24 deletions src/main/java/net/rptools/maptool/client/ui/zone/gdx/AreaRenderer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import java.awt.geom.PathIterator;
import java.util.ArrayList;
import java.util.List;

import com.badlogic.gdx.utils.IntArray;
import net.rptools.lib.gdx.Joiner;
import space.earlygrey.shapedrawer.DefaultSideEstimator;
import space.earlygrey.shapedrawer.ShapeDrawer;
Expand All @@ -45,6 +47,8 @@ public AreaRenderer(

private FloatArray tmpFloat = new FloatArray();

private IntArray segmentIndicies = new IntArray();

private Color color;

public void setColor(Color value) {
Expand Down Expand Up @@ -76,6 +80,12 @@ public void fillArea(PolygonSpriteBatch batch, Area area) {
if (area == null || area.isEmpty()) return;

pathToFloatArray(area.getPathIterator(null));
while (tmpFloat.get(0) == tmpFloat.get(tmpFloat.size - 2)
&& tmpFloat.get(1) == tmpFloat.get(tmpFloat.size - 1)) {
// make sure we don't have last and first point the same
tmpFloat.pop();
tmpFloat.pop();
}
paintVertices(batch, tmpFloat.toArray());
}

Expand All @@ -85,10 +95,29 @@ public void drawArea(PolygonSpriteBatch batch, Area area, boolean rounded, float
if (area == null || area.isEmpty()) return;

pathToFloatArray(area.getPathIterator(null));
var vertices = path(tmpFloat, thickness, rounded ? JoinType.Round : JoinType.Pointy, false);
float[] vertices = null;
var floats = tmpFloat.toArray();
if(segmentIndicies.size == 1) {
vertices = path(floats, thickness, rounded ? JoinType.Round : JoinType.Pointy, false);
paintVertices(batch, vertices);
} else {
var lastSegmentIndex = 0;
var color = this.color;
for(int i=0; i<segmentIndicies.size;i++) {
var idx = segmentIndicies.get(i);
var vertexCount = idx-lastSegmentIndex;
float[] array = new float[2*vertexCount];
System.arraycopy(floats, 2*lastSegmentIndex, array, 0, 2*vertexCount);
vertices = path(array, thickness, rounded ? JoinType.Round : JoinType.Pointy, false);
this.color = color;
paintVertices(batch, vertices);
lastSegmentIndex = idx + 1;
}
this.color = null;
}
// drawDebug(vertices);
// debug = true;
paintVertices(batch, vertices);

// debug = false;
}

Expand Down Expand Up @@ -136,9 +165,11 @@ protected void paintVertices(PolygonSpriteBatch batch, float[] vertices) {

public FloatArray pathToFloatArray(PathIterator it) {
tmpFloat.clear();
segmentIndicies.clear();

float moveToX = 0;
float moveToY = 0;
var index = 0;
for (; !it.isDone(); it.next()) {
int type = it.currentSegment(floatsFromArea);

Expand All @@ -149,17 +180,20 @@ public FloatArray pathToFloatArray(PathIterator it) {
moveToX = floatsFromArea[0];
moveToY = -floatsFromArea[1];
tmpFloat.add(floatsFromArea[0], -floatsFromArea[1]);

index+=1;
break;
case PathIterator.SEG_CLOSE:
// System.out.println("Close");
tmpFloat.add(moveToX, moveToY);
segmentIndicies.add(index);
index+=1;
break;
// return tmpFloat;
case PathIterator.SEG_LINETO:
// System.out.println("Line to: ( " + floatsFromArea[0] + ", " +
// floatsFromArea[1] + ")");
tmpFloat.add(floatsFromArea[0], -floatsFromArea[1]);
index+=1;
break;
case PathIterator.SEG_QUADTO:
// System.out.println("quadratic bezier with: ( " + floatsFromArea[0] +
Expand All @@ -178,6 +212,7 @@ public FloatArray pathToFloatArray(PathIterator it) {
tmpVector2,
tmpVector);
tmpFloat.add(tmpVectorOut.x, tmpVectorOut.y);
index+=1;
}
break;
case PathIterator.SEG_CUBICTO:
Expand All @@ -201,18 +236,14 @@ public FloatArray pathToFloatArray(PathIterator it) {
tmpVector3,
tmpVector);
tmpFloat.add(tmpVectorOut.x, tmpVectorOut.y);
index += 1;
}
break;
default:
System.out.println("Type: " + type);
}
}
if (tmpFloat.get(0) == tmpFloat.get(tmpFloat.size - 2)
&& tmpFloat.get(1) == tmpFloat.get(tmpFloat.size - 1)) {
// make sure we don't have last and first point the same
tmpFloat.pop();
tmpFloat.pop();
}

return tmpFloat;
}

Expand All @@ -233,15 +264,15 @@ enum JoinType {
Round
}

public float[] path(FloatArray path, float lineWidth, JoinType joinType, boolean open) {
public float[] path(float[] path, float lineWidth, JoinType joinType, boolean open) {
var outer = new ArrayList<Float>();
var inner = new ArrayList<Float>();

float halfWidth = lineWidth / 2f;

if (path.size == 2) {
var x = path.get(0);
var y = path.get(1);
if (path.length == 2) {
var x = path[0];
var y = path[1];
if (joinType == JoinType.Round) {
addArc(outer, x, y, halfWidth, 0, MathUtils.PI2 - 0.1f, false);
} else {
Expand All @@ -255,9 +286,9 @@ public float[] path(FloatArray path, float lineWidth, JoinType joinType, boolean
outer.add(y - halfWidth);
}

} else if (path.size == 4) {
A.set(path.get(0), path.get(1));
B.set(path.get(2), path.get(3));
} else if (path.length == 4) {
A.set(path[0], path[1]);
B.set(path[2], path[3]);
if (joinType == JoinType.Round) {
Joiner.prepareFlatEndpoint(B, A, D, E, halfWidth);
E0.set(D);
Expand Down Expand Up @@ -296,10 +327,10 @@ public float[] path(FloatArray path, float lineWidth, JoinType joinType, boolean
}

} else {
for (int i = 2; i < path.size - 2; i += 2) {
A.set(path.get(i - 2), path.get(i - 1));
B.set(path.get(i), path.get(i + 1));
C.set(path.get(i + 2), path.get(i + 3));
for (int i = 2; i < path.length - 2; i += 2) {
A.set(path[i - 2], path[i - 1]);
B.set(path[i], path[i + 1]);
C.set(path[i + 2], path[i + 3]);
if (i == 2) {
if (open) {
if (joinType == JoinType.Round) {
Expand All @@ -324,7 +355,7 @@ public float[] path(FloatArray path, float lineWidth, JoinType joinType, boolean
inner.add(E.y);
}
} else {
vec1.set(path.get(path.size - 2), path.get(path.size - 1));
vec1.set(path[path.length - 2], path[path.length - 1]);
if (joinType == JoinType.Pointy) {
Joiner.preparePointyJoin(vec1, A, B, D0, E0, halfWidth);
} else {
Expand Down Expand Up @@ -402,7 +433,7 @@ public float[] path(FloatArray path, float lineWidth, JoinType joinType, boolean
} else {
if (joinType == JoinType.Pointy) {
// draw last link on path
A.set(path.get(0), path.get(1));
A.set(path[0], path[1]);
Joiner.preparePointyJoin(B, C, A, D, E, halfWidth);
outer.add(D.x);
outer.add(D.y);
Expand All @@ -419,7 +450,7 @@ public float[] path(FloatArray path, float lineWidth, JoinType joinType, boolean
// draw last link on path
A.set(B);
B.set(C);
C.set(path.get(0), path.get(1));
C.set(path[0], path[1]);
var bendsLeft = Joiner.prepareSmoothJoin(A, B, C, D, E, halfWidth, false);
if (bendsLeft) {
vec1.set(E);
Expand Down Expand Up @@ -459,7 +490,7 @@ public float[] path(FloatArray path, float lineWidth, JoinType joinType, boolean

A.set(B);
B.set(C);
C.set(path.get(2), path.get(3));
C.set(path[2], path[3]);
bendsLeft = Joiner.prepareSmoothJoin(A, B, C, D, E, halfWidth, false);
if (bendsLeft) {
vec1.set(E);
Expand Down
Loading

0 comments on commit 524a568

Please sign in to comment.