Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: Token VBL simplification #1435

Merged
merged 23 commits into from
Mar 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
31cdef2
Revert "Revert "Merge branch 'feature-token-vbl-simplification' of ht…
JamzTheMan Feb 7, 2020
c45ede2
Merge pull request #1252 from JamzTheMan/feature-token-vbl-simplifica…
Phergus Feb 7, 2020
0e847a0
Merge branch 'feature-token-vbl-simplification' of https://github.com…
JamzTheMan Feb 21, 2020
8ffdbba
WIP - Optimized TokenVBL
JamzTheMan Feb 22, 2020
76e2888
WIP - Optimized TokenVBL
JamzTheMan Feb 22, 2020
a4fe35f
Merge pull request #1307 from JamzTheMan/feature-token-vbl-simplifica…
Phergus Feb 22, 2020
bc11a61
Revert "Revert "Merge branch 'feature-token-vbl-simplification' of ht…
JamzTheMan Feb 7, 2020
4610cc0
WIP - Optimized TokenVBL
JamzTheMan Feb 22, 2020
a8b49a9
WIP - Optimized TokenVBL
JamzTheMan Feb 22, 2020
9a1ad05
WIP - Optimized TokenVBL
JamzTheMan Feb 23, 2020
2d09b9e
Merge branch 'feature-token-vbl-simplification' of https://github.com…
JamzTheMan Feb 23, 2020
5f53a08
WIP - Optimized TokenVBL
JamzTheMan Feb 23, 2020
d764854
WIP - Optimized TokenVBL
JamzTheMan Feb 23, 2020
aecfcb2
WIP - Optimized TokenVBL
JamzTheMan Feb 23, 2020
100bae2
Merge pull request #1315 from JamzTheMan/feature-token-vbl-simplifica…
JamzTheMan Feb 23, 2020
8beab05
WIP - Optimized TokenVBL
JamzTheMan Mar 20, 2020
09ebca5
WIP - Optimized TokenVBL
JamzTheMan Mar 20, 2020
f18b45b
WIP - Optimized TokenVBL
JamzTheMan Mar 22, 2020
8d24207
Redo fix from PR #1319
JamzTheMan Mar 30, 2020
6af5da4
Update tooltips for Token VBL controls
JamzTheMan Mar 30, 2020
4848c9a
Update VBL setTokenVBL with new auto generation options
JamzTheMan Mar 30, 2020
a011ab4
Merge develop
JamzTheMan Mar 30, 2020
107d0f4
#spotless
JamzTheMan Mar 30, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified build-resources/abeille-maptool-forms.jfpr
Binary file not shown.
282 changes: 227 additions & 55 deletions src/main/java/net/rptools/maptool/client/functions/VBL_Functions.java

Large diffs are not rendered by default.

934 changes: 525 additions & 409 deletions src/main/java/net/rptools/maptool/client/ui/token/EditTokenDialog.java

Large diffs are not rendered by default.

538 changes: 439 additions & 99 deletions src/main/java/net/rptools/maptool/client/ui/token/TokenVblPanel.java

Large diffs are not rendered by default.

378 changes: 256 additions & 122 deletions src/main/java/net/rptools/maptool/client/ui/zone/vbl/TokenVBL.java

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions src/main/java/net/rptools/maptool/model/Token.java
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ public int compare(Token o1, Token o2) {
private boolean isVisible = true;
private boolean visibleOnlyToOwner = false;

private int vblAlphaSensitivity = -1;
private int vblColorSensitivity = -1;
private int alwaysVisibleTolerance = 2; // Default for # of regions (out of 9) that must be seen
// before token is shown over FoW
private boolean isAlwaysVisible = false; // Controls whether a Token is shown over VBL
Expand Down Expand Up @@ -360,7 +360,7 @@ public Token(Token token) {
isVisible = token.isVisible;
visibleOnlyToOwner = token.visibleOnlyToOwner;

vblAlphaSensitivity = token.vblAlphaSensitivity;
vblColorSensitivity = token.vblColorSensitivity;
alwaysVisibleTolerance = token.alwaysVisibleTolerance;
isAlwaysVisible = token.isAlwaysVisible;
vbl = token.vbl;
Expand Down Expand Up @@ -1339,12 +1339,12 @@ public int getAlwaysVisibleTolerance() {
}
}

public void setAlphaSensitivity(int tolerance) {
vblAlphaSensitivity = tolerance;
public void setColorSensitivity(int tolerance) {
vblColorSensitivity = tolerance;
}

public int getAlphaSensitivity() {
return vblAlphaSensitivity;
public int getColorSensitivity() {
return vblColorSensitivity;
}

/**
Expand All @@ -1355,7 +1355,7 @@ public int getAlphaSensitivity() {
public void setVBL(Area vbl) {
this.vbl = vbl;
if (vbl == null) {
vblAlphaSensitivity = -1;
vblColorSensitivity = -1;
}
}

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,723 changes: 1,249 additions & 474 deletions src/main/resources/net/rptools/maptool/client/ui/forms/tokenPropertiesDialog.xml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,9 @@ EditTokenDialog.msg.speech.colID = ID
EditTokenDialog.msg.speech.colSpeechText = Speech Text
EditTokenDialog.msg.title = Edit Token
EditTokenDialog.msg.wrap = Wrap
EditTokenDialog.vbl.label.originalPointCount = Original Point Count
EditTokenDialog.vbl.label.optimizedPointCount = Optimized Point Count
EditTokenDialog.vbl.label.working = Working...

GridlessGrid.error.notLoaded = Could not load gridless grid footprints.

Expand Down