Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
176 commits
Select commit Hold shift + click to select a range
97a96ed
add jamz box2d experiments
thelsing Mar 29, 2021
0d3f281
integrate gdxtest
thelsing Apr 3, 2021
5fc30e7
integrate better
thelsing Apr 3, 2021
3a28ebf
integrate better
thelsing Apr 4, 2021
68b224f
defaultboard renders now.
thelsing Apr 4, 2021
af485ae
coupled pan&zoom
thelsing Apr 5, 2021
907c159
add renderZone and calles methods. Now only the method bodies are mis…
thelsing Apr 6, 2021
16b5ab4
center hudtext
thelsing Apr 6, 2021
db5e6c9
start with token rendering
thelsing Apr 6, 2021
be8e598
add gdx-vfx
thelsing Apr 7, 2021
9252f40
handle token rotation and topdown scaling + positioning
thelsing Apr 7, 2021
4c91491
start with grid
thelsing Apr 7, 2021
46ba590
sqaregrid done
thelsing Apr 8, 2021
aefed06
Isogrid + HorizontalGrid done. Vertical one has a wrong offset
thelsing Apr 8, 2021
cececd1
fix transparency and add fow via fb
thelsing Apr 8, 2021
0e86d4b
fog rendering works now.
thelsing Apr 9, 2021
40a314d
save
thelsing Apr 10, 2021
07cb7e5
boxedLabels
thelsing Apr 10, 2021
bd3ffe8
auras
thelsing Apr 10, 2021
1a72c6f
Merge remote-tracking branch 'upstream/develop' into gdx
thelsing Apr 10, 2021
f29e0f7
lights
thelsing Apr 10, 2021
8cf9987
labels
thelsing Apr 10, 2021
7655419
token clipping works
thelsing Apr 11, 2021
fe5563d
facing arrows
thelsing Apr 11, 2021
3c06380
fix fog alpha
thelsing Apr 12, 2021
14ec779
more work on token displaying
thelsing Apr 12, 2021
d6ea1ee
move all borders to one place; create atlas
thelsing Apr 13, 2021
b9594dd
add texture atlas and implement drawing of image borders
thelsing Apr 13, 2021
4262ee9
token labels work
thelsing Apr 14, 2021
c458703
clean up the used batches with the use of shaper
thelsing Apr 15, 2021
e449171
use tiledrawer for background
thelsing Apr 17, 2021
6a16116
bugfixes
thelsing Apr 17, 2021
0fee7d8
add default font and path rendering
thelsing Apr 18, 2021
488b0ad
add stubs for token overlays
thelsing Apr 19, 2021
2a01b94
rendererd CrossTokenOverlay
thelsing Apr 21, 2021
cb29c7b
rendered OTokenOverlay, ColorDotTokenOverlay, DiamondTokenOverlay and…
thelsing Apr 21, 2021
7f34e97
Merge remote-tracking branch 'upstream/develop' into gdx
thelsing Apr 21, 2021
d1ba713
rendered drawn FLow*TokenOverlays
thelsing Apr 22, 2021
de9fb75
remove unused texture loading code
thelsing Apr 22, 2021
d42dc75
added files to texture atlas
thelsing Apr 23, 2021
0ebf25a
Merge branch 'develop' into gdx
thelsing Apr 23, 2021
9e86849
pack token to atlas and change loading of assets.
thelsing Apr 24, 2021
d2b7fd6
render boolean *ImageTokenOverlays
thelsing Apr 24, 2021
427b1d5
render boolean *ImageBarOverlays
thelsing Apr 25, 2021
9c896ea
render DrawnBarTokenOverlay and TwoToneBarTokenOverlay
thelsing Apr 25, 2021
2d8c48e
implement rendering of movement
thelsing Apr 25, 2021
024b752
add big instanceof if-else for rendering of drawables
thelsing May 5, 2021
bafeeff
Merge branch 'develop' into gdx
thelsing May 9, 2021
3e5c0f7
add drawing of templates and shapes
thelsing May 16, 2021
39e7b20
enable AA and disable Effects for now
thelsing May 16, 2021
560e143
remove label
thelsing May 16, 2021
d6b5c23
fixed grids. Horizontal Hex grid is still wrong.
thelsing May 17, 2021
19e819f
better performance with background and fog drawing with textures
thelsing May 18, 2021
1564770
Merge remote-tracking branch 'upstream/develop' into gdx
thelsing May 19, 2021
1eab6e0
add rotation for selection border
thelsing May 19, 2021
0801c1e
add initial gif animation support
thelsing Jun 15, 2021
fd83cd6
switch to jogl-backend of libgdx
thelsing Aug 8, 2021
5a0b83d
save wip
thelsing Aug 10, 2021
7d55963
wip
thelsing Aug 12, 2021
5b52906
add and use alternative GifDecoder
thelsing Aug 12, 2021
4a28654
add and use alternative GifDecoder
thelsing Aug 12, 2021
318876b
switch main cam to PerspectiveCamera
thelsing Aug 16, 2021
b411ce7
fix switch between gdx and normal renderer and fullscreen
thelsing Aug 18, 2021
e341a6a
clean up
thelsing Aug 18, 2021
54f86a5
clean up
thelsing Aug 19, 2021
25c64e6
Merge branch 'develop' into gdx
thelsing Sep 7, 2021
9db0151
poc gdx-video
thelsing Sep 8, 2021
8afbf4f
update gitignore
thelsing Apr 4, 2022
80f7663
Merge remote-tracking branch 'upstream/develop' into gdx
thelsing Apr 4, 2022
fa57918
spotless
thelsing Apr 4, 2022
e3365a8
merge with dev
thelsing Apr 4, 2022
bd9de5b
add b2dlights test
thelsing Apr 7, 2022
02746ca
start cleaning GdxRenderer
thelsing Apr 29, 2022
fd40f4d
build
thelsing Apr 29, 2022
d2d33af
Merge remote-tracking branch 'upstream/develop' into feature-gdx
thelsing Jun 3, 2022
1c948ed
build
thelsing Jun 8, 2022
85e16b2
use github build for jogl
thelsing Jun 8, 2022
10cd47f
update gdx-backend-jogl
thelsing Jun 17, 2022
e385066
Merge remote-tracking branch 'upstream/develop' into feature-gdx
thelsing Jun 17, 2022
a2e8684
add jzy3d repo
thelsing Jun 17, 2022
76f68d6
add opens for jogl
thelsing Jun 17, 2022
7c8e063
reduce diffs
thelsing Jul 7, 2022
3f9699a
reduce diffs
thelsing Jul 7, 2022
1153555
more scaling stuff
thelsing Jul 7, 2022
a469f1d
more readresolve
thelsing Jul 7, 2022
f16c7e3
Merge branch 'feature-gdx-2' into feature-gdx
thelsing Jul 7, 2022
3b0220b
Merge branch 'develop' into feature-gdx
thelsing Jul 8, 2022
4f3211b
spotless
thelsing Jul 8, 2022
7ff5c18
Merge remote-tracking branch 'origin/feature-gdx' into feature-gdx
thelsing Jul 8, 2022
9a77d6e
Merge branch 'develop' into feature-gdx
Phergus Jul 9, 2022
cae6392
Merge remote-tracking branch 'upstream/develop' into feature-gdx
thelsing Jul 9, 2022
d422a45
remove ifs without braces
thelsing Jul 9, 2022
705cc0b
initialize dpiscale correctly
thelsing Jul 9, 2022
fe731d7
fix black screen during zoom
thelsing Jul 12, 2022
a0c50ef
Merge remote-tracking branch 'upstream/develop' into feature-gdx
thelsing Jul 12, 2022
2409f3a
fix hdpi scaling issues
thelsing Jul 12, 2022
37845e1
more hdpi scaling issues fixed
thelsing Jul 20, 2022
7e2afb8
Merge branch 'develop' into feature-gdx
thelsing Jul 20, 2022
abf7cae
fix failed test
thelsing Jul 20, 2022
4f0056f
Merge remote-tracking branch 'origin/feature-gdx' into feature-gdx
thelsing Jul 20, 2022
267aa3d
style
thelsing Jul 21, 2022
02e3cbc
Merge branch 'develop' into feature-gdx
thelsing Jul 21, 2022
5314056
Merge remote-tracking branch 'upstream/develop' into feature-gdx
thelsing Sep 24, 2022
9e34811
spotless
thelsing Sep 24, 2022
727da50
spotless
thelsing Oct 13, 2022
b7a8a6e
Merge remote-tracking branch 'upstream/develop' into feature-gdx
thelsing Nov 27, 2022
95fd92f
fix build
thelsing Dec 1, 2022
7f9cb85
Merge remote-tracking branch 'upstream/develop' into feature-gdx
thelsing Dec 27, 2022
642d460
spotless
thelsing Dec 27, 2022
0c1b787
update to develop
thelsing Dec 27, 2022
09ff6cb
Merge remote-tracking branch 'upstream/develop' into feature-gdx
thelsing Jan 6, 2023
c6d6046
.
thelsing Jan 6, 2023
dd058d9
Merge branch 'develop' into feature-gdx
Phergus Jan 12, 2023
fd0391e
.
thelsing Jan 12, 2023
30920c9
Merge remote-tracking branch 'origin/feature-gdx' into feature-gdx
thelsing Jan 12, 2023
e771329
Merge remote-tracking branch 'upstream/develop' into feature-gdx
thelsing Sep 20, 2023
f47d723
remove RepeatablePolygonSprite.java
thelsing Sep 22, 2023
1dab082
save wip
thelsing Sep 23, 2023
fb03713
drawing with textures works now.
thelsing Sep 24, 2023
bf5f114
embedding works correctly again.
thelsing Sep 25, 2023
8e3fddf
wip
thelsing Sep 29, 2023
96945cd
disable box2d for now
thelsing Sep 30, 2023
90b0b95
wip
thelsing Oct 6, 2023
dc320ea
lights work
thelsing Oct 7, 2023
ddd19ef
fog repaired
thelsing Oct 7, 2023
524a568
lumen overlay
thelsing Oct 8, 2023
adc89f4
.
thelsing Oct 9, 2023
84e6e8d
simplify lumen overlay rendering
thelsing Oct 9, 2023
9098f77
spotless
thelsing Oct 9, 2023
9dd9e5e
add playerdarkness, coordinates and lightbulboverlay.
thelsing Oct 9, 2023
0e75b96
add new triangulator.
thelsing Oct 11, 2023
90b88c9
AreaRenderer works now for complex Areas
thelsing Oct 12, 2023
0747691
build
thelsing Oct 14, 2023
eb798e5
build
thelsing Oct 14, 2023
c3b3a72
fix grid and coordinate errors
thelsing Oct 22, 2023
e294f7b
fix templates
thelsing Oct 23, 2023
a9946dc
no heartbeat on personal server
thelsing Oct 23, 2023
a11e02a
refactor to reuse triangulation of Areas
thelsing Nov 3, 2023
30e4337
refactor use of ZoneCache
thelsing Nov 4, 2023
49acfe4
refactor use of ZoneCache
thelsing Nov 4, 2023
b81e7b5
refactor use of ZoneCache
thelsing Nov 7, 2023
0dceaf2
Merge remote-tracking branch 'upstream/develop' into feature-gdx
thelsing Nov 7, 2023
7184b4f
fix artifacts when drawing path
thelsing Nov 7, 2023
19fac43
Merge remote-tracking branch 'upstream/develop' into feature-gdx
thelsing Nov 10, 2023
521dfb9
fix artifacts when drawing path
thelsing Nov 14, 2023
75ba041
fix build
thelsing Nov 14, 2023
b72fe95
fix fogArea
thelsing Nov 14, 2023
b8f673c
some box2dlight experiments
thelsing Nov 14, 2023
fe7b9a3
refactor drawing classes
thelsing Nov 15, 2023
0f8e216
Merge remote-tracking branch 'upstream/develop' into feature-gdx
thelsing Nov 16, 2023
6c0a095
Merge remote-tracking branch 'upstream/develop' into feature-gdx
thelsing Nov 17, 2023
3cccf97
fix build after merge
thelsing Nov 17, 2023
968bac8
Merge remote-tracking branch 'upstream/dependabot/gradle/develop/com.…
thelsing Nov 17, 2023
bda7757
fix build after merge
thelsing Nov 17, 2023
b2e4cbf
wip
thelsing Nov 19, 2023
2e72b3b
Merge remote-tracking branch 'upstream/develop' into feature-gdx
thelsing Nov 23, 2023
e10cdc2
Merge remote-tracking branch 'upstream/develop' into feature-gdx
thelsing Jan 13, 2024
8499c21
wip
thelsing Jan 15, 2024
04f2d86
Merge remote-tracking branch 'upstream/develop' into feature-gdx
thelsing May 31, 2024
66d12d0
fix build after merge
thelsing May 31, 2024
e1691b4
fix build after merge
thelsing Oct 2, 2024
780c080
Merge remote-tracking branch 'upstream/develop' into feature-gdx
thelsing Oct 2, 2024
b9c99a3
fix build after merge
thelsing Nov 22, 2024
3bd138e
Merge remote-tracking branch 'upstream/develop' into feature-gdx
thelsing Feb 24, 2025
fde1f10
fix build after merge
thelsing Feb 24, 2025
3a87ca4
fix trangulation and creation of areas
thelsing Feb 25, 2025
4e8e245
fix trangulation and creation of areas
thelsing Feb 26, 2025
1f9c756
clean up
thelsing Feb 27, 2025
7fec2a5
Merge remote-tracking branch 'upstream/develop' into feature-gdx
thelsing Feb 27, 2025
e60d926
Change image loading
thelsing Mar 1, 2025
2198897
spotless
thelsing Mar 1, 2025
d5c7fa1
fix hexgrid
thelsing Mar 2, 2025
29200ef
add maven repos for jogl and sonatype
thelsing Mar 2, 2025
9b20f3c
change font to NotoSansSymbols
thelsing Apr 7, 2025
5674d70
Merge remote-tracking branch 'upstream/develop' into feature-gdx
thelsing Apr 7, 2025
284c4da
spotless
thelsing Apr 7, 2025
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
17 changes: 15 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ def javaArgs = [
"-DMAPTOOL_DATADIR=.maptool-" + vendor.toLowerCase(), "-XX:+ShowCodeDetailsInExceptionMessages",
"--add-opens=java.desktop/java.awt=ALL-UNNAMED", "--add-opens=java.desktop/java.awt.geom=ALL-UNNAMED",
"--add-opens=java.desktop/sun.awt.geom=ALL-UNNAMED", "--add-opens=java.base/java.util=ALL-UNNAMED",
"--add-opens=javafx.web/javafx.scene.web=ALL-UNNAMED", "--add-opens=javafx.web/com.sun.webkit=ALL-UNNAMED", "--add-opens=javafx.web/com.sun.webkit.dom=ALL-UNNAMED",
"--add-opens=javafx.web/javafx.scene.web=ALL-UNNAMED", "--add-opens=javafx.web/com.sun.webkit=ALL-UNNAMED",
"--add-opens=javafx.web/com.sun.webkit.dom=ALL-UNNAMED","--add-opens=java.base/java.lang=ALL-UNNAMED",
"--add-opens=java.desktop/sun.awt=ALL-UNNAMED", "--add-opens=java.desktop/sun.java2d=ALL-UNNAMED",
"--add-opens=java.desktop/javax.swing=ALL-UNNAMED","--add-opens=java.desktop/sun.awt.shell=ALL-UNNAMED",
"--add-opens=java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED"]

Expand Down Expand Up @@ -116,7 +118,7 @@ spotless {
java {
target project.fileTree(project.projectDir) {
include 'src/**/*.java'
exclude '**/JTextAreaAppender.java'
exclude '**/JTextAreaAppender.java', '**/GifDecoder.java'
exclude 'src/main/java/net/rptools/maptool/client/ui/themes/Flat*ContrastIJTheme.java'
exclude 'src/main/java/net/rptools/maptool/client/ui/themes/Utils.java'
}
Expand Down Expand Up @@ -420,6 +422,17 @@ dependencies {
implementation(libs.rptools.maptool.addons)
implementation(libs.rptools.dice.roller)
implementation(libs.noiselib)

// libgdx
implementation 'com.github.thelsing:libgdx-jogl-backend:becdde406e'
implementation 'com.badlogicgames.gdx:gdx-backend-lwjgl:1.13.1'
implementation 'com.badlogicgames.gdx:gdx:1.13.1'
implementation 'com.badlogicgames.gdx:gdx-platform:1.13.1:natives-desktop'
implementation "space.earlygrey:shapedrawer:2.6.0"
implementation 'com.badlogicgames.gdx:gdx-freetype:1.13.1'
implementation 'com.badlogicgames.gdx:gdx-freetype-platform:1.13.1:natives-desktop'
implementation "com.badlogicgames.gdx-video:gdx-video:1.3.2-SNAPSHOT"
implementation "com.badlogicgames.gdx-video:gdx-video-lwjgl3:1.3.2-SNAPSHOT"
}

processResources {
Expand Down
6 changes: 4 additions & 2 deletions buildSrc/shared.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ repositories {
mavenCentral()
maven { url = 'https://maptool.craigs-stuff.net/repo/' }
maven { url = 'https://jitpack.io' }
maven { url "https://www.jetbrains.com/intellij-repository/releases" }
maven { url "https://cache-redirector.jetbrains.com/intellij-dependencies" }
maven { url = "https://www.jetbrains.com/intellij-repository/releases" }
maven { url = "https://cache-redirector.jetbrains.com/intellij-dependencies" }
maven { url = "https://oss.sonatype.org/content/repositories/snapshots" }
maven { url = "https://jogamp.org/deployment/maven" }
}

apply from: rootProject.file('buildSrc/java-version.gradle')
Expand Down
47 changes: 47 additions & 0 deletions maptool.tpproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name=maptool
filename=
output=src/main/resources/net/rptools/maptool/client

alias=true
alphaThreshold=0
debug=false
duplicatePadding=false
edgePadding=true
fast=false
filterMag=Nearest
filterMin=Nearest
ignoreBlankImages=true
maxHeight=2048
maxWidth=2048
minHeight=16
minWidth=16
paddingX=2
paddingY=2
pot=true
mof=false
rotation=false
stripWhitespaceX=false
stripWhitespaceY=false
wrapX=ClampToEdge
wrapY=ClampToEdge
premultiplyAlpha=false
grid=false
square=false
bleed=true
limitMemory=true
useIndexes=true
prettyPrint=false
legacyOutput=false

scaleFactors=[{suffix:"",factor:1,resampling:bicubic}]
inputFiles=[{path:src/main/resources/net/rptools/maptool/client/image/blueLabelbox.png,type:Input,regionName:null,ninepatch:{splits:[10,10,10,10],pads:[10,10,10,10]}},{path:src/main/resources/net/rptools/maptool/client/image/darkGreyLabelbox.png,type:Input,regionName:null,ninepatch:{splits:[10,10,10,10],pads:[10,10,10,10]}},{path:src/main/resources/net/rptools/maptool/client/image/grayLabelbox.png,type:Input,regionName:null,ninepatch:{splits:[10,10,10,10],pads:[10,10,10,10]}},{path:src/main/resources/net/rptools/maptool/client/image/border,type:Input,dirFilePrefix:border/,recursive:true,flattenPaths:false},{path:src/main/resources/net/rptools/maptool/client/image/stack.png,type:Input,regionName:null},{path:src/main/resources/net/rptools/maptool/client/image/whiteBorder.png,type:Input,regionName:null},{path:src/main/resources/net/rptools/maptool/client/image/hexBorder.png,type:Input,regionName:null},{path:src/main/resources/net/rptools/maptool/client/image/isoBorder.png,type:Input,regionName:null},{path:src/main/resources/net/rptools/maptool/client/image/redDot.png,type:Input,regionName:null},{path:src/main/resources/net/rptools/maptool/client/image/broken.png,type:Input,regionName:null},{path:src/main/resources/net/rptools/maptool/client/image/unknown.png,type:Input,regionName:null},{path:src/main/resources/net/rptools/maptool/client/image/block_move.png,type:Input,regionName:null},{path:src/main/resources/net/rptools/maptool/client/image/lightbulb.png,type:Input,regionName:null}]
keepInputFileExtensions=false


-PROJ-

version=4.12.0
fileTypeType=png
fileTypeData={encoding:RGBA8888}
previewBackgroundColor=ffffffff
projectSettings={inputFiles:{}}
Loading