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

FMG 2.0: Codebase refactoring and modernization #842

Draft
wants to merge 195 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
195 commits
Select commit Hold shift + click to select a range
c4736cc
refactor: add vite
Jun 24, 2022
bc65e0e
refactor: start files migration nightmare
Jun 24, 2022
97f2b21
refactor(es modules): continue migration
Jun 25, 2022
030caec
refactor(es modules): continue migration
Jun 25, 2022
a929667
refactor(es modules): continue migration
Jun 25, 2022
eaa0046
refactor(es modules): continue migration
Jun 25, 2022
4a04a86
refactor(es modules): continue migration
Jun 25, 2022
922c6e2
refactor(es modules): continue migration
Jun 25, 2022
364f339
refactor(es modules): continue migration
Jun 25, 2022
b425a9d
refactor(es modules): migrate colorUtils
Jun 25, 2022
ad252b5
refactor(es modules): migrate numberUtils
Jun 25, 2022
f9aeadd
refactor(es modules): deploy setup
Jun 26, 2022
11df349
refactor(es modules): set up alias
Jun 26, 2022
12e1c9f
refactor(es modules): modulize utils
Jun 26, 2022
7ccebec
refactor(es modules): modulize utils
Jun 26, 2022
21fc303
refactor(es modules): modulize utils
Jun 26, 2022
b8ae515
refactor(es modules): modulize utils
Jun 26, 2022
4814bce
refactor(es modules): modulize utils
Jun 26, 2022
4feed39
refactor(es modules): temporary remove alias
Jun 26, 2022
0d05e1b
refactor(es modules): move all files to src, try vite 3.0
Jun 26, 2022
32d7db7
refactor(es modules): set src as TS base folder
Jun 26, 2022
aa214a7
refactor(es modules): remove gloval var lineGen
Jun 26, 2022
dea4960
refactor(es modules): restore old functions with TS
Jun 26, 2022
b360b42
refactor(es modules): add dist to gitignore
Jun 26, 2022
16f1906
refactor(es modules): add dist to gitignore
Jun 26, 2022
14a8a31
refactor(es modules): add dist to gitignore
Jun 26, 2022
63e9b9c
refactor(es modules): migrate a few more functions
Jun 27, 2022
865a981
refactor(es modules): migrate a few more functions
Jun 27, 2022
05564ef
refactor(es modules): modulize layers
Jun 27, 2022
7755d8b
refactor(es modules): split layers to modules
Jun 28, 2022
9206f46
refactor(es modules): set up aliases
Jun 28, 2022
2e4d142
refactor(es modules): dissolve general.js
Jun 29, 2022
f9f6017
refactor(es modules): heightmap config
Jun 29, 2022
6a7ec65
refactor(es modules): use polylabel module and update aleaPRNG as loc…
Jun 29, 2022
6ea6e52
refactor(es modules): replace PrioriryQueue with faster FlatQueue
Jul 1, 2022
eac3e62
chore: pick up recent master chnages
Jul 1, 2022
1abcec8
chore: install delaunator
Jul 3, 2022
51df2f9
chore: install rgbquant
Jul 3, 2022
e739698
chore: modularize main.js
Jul 3, 2022
c1b3a3b
refactor: more components
Jul 3, 2022
22903fc
v1.88.00
Jul 4, 2022
7c2c624
refactor: define globals
Jul 4, 2022
1847772
refactor: layers basic typization
Jul 5, 2022
98ae329
refactor: import d3
Jul 5, 2022
3018d94
refactor: fix ts errors
Jul 5, 2022
41180c5
refactor: first build
Jul 5, 2022
95baf27
refactor: code splitting strategy
Jul 5, 2022
da1cb4f
refactor: move assets
Jul 5, 2022
5e6f599
refactor: move assets
Jul 6, 2022
392cc24
refactor: compile service worker
Jul 6, 2022
9bd90e5
fix: clip by bbox
Jul 6, 2022
a107c58
chore: add dependencies visualizer
Jul 8, 2022
3470832
refactor: dynamically load modules
Jul 8, 2022
0c6eada
refactor: dynamically load modules
Jul 8, 2022
80bf0ef
fix: fill-box component
Jul 8, 2022
a97e7f4
refactor: replace fmg.modules with local vars
Jul 8, 2022
a15f601
refactor: migrate heightmap editor
Jul 9, 2022
0dd7468
refactor: hotkeys
Jul 9, 2022
3125366
refactor: ice editor dialog
Jul 9, 2022
3c850d8
refactor: population utils
Jul 9, 2022
ff97c92
refactor: map events
Jul 9, 2022
3184a29
refactor: interfaces
Jul 10, 2022
d1208b1
refactor: rankCells
Jul 10, 2022
6b2de4d
refactor: refactor greneration routine
Jul 10, 2022
d18636e
refactor: heightmap config
Jul 10, 2022
e59b536
refactor: grid generation
Jul 10, 2022
00d8d28
refactor: voronoi
Jul 11, 2022
c0f6ce0
refactor: generation script
Jul 12, 2022
87d8c10
refactor: generation script
Jul 12, 2022
f82fcba
refactor: markupPackFeatures
Jul 13, 2022
3410c48
refactor: detect feature vertex
Jul 14, 2022
1888b04
refactor: detect feature vertex
Azgaar Jul 15, 2022
4833a8a
refactor: draw coastline
Azgaar Jul 16, 2022
4e65616
refactor: river generation start
Azgaar Jul 18, 2022
cd86c61
refactor: river generation continue
Azgaar Jul 19, 2022
c1e7d6f
chore: update vite to 3.0.2
Azgaar Jul 20, 2022
3215b6f
refactor: rivers generation
Azgaar Jul 20, 2022
19d7f23
fix: skip coastline out points wip
Azgaar Jul 23, 2022
ffea4d1
test: cover sliceFragment
Azgaar Jul 23, 2022
cc3c06f
fix: drawCoastline - remove redundant off-canvas points
Azgaar Jul 23, 2022
4a15dc3
fix: drawCoastline - detect first vertex based on neibs first
Azgaar Jul 23, 2022
4b87424
refactor: lake group detection and features rendering
Azgaar Jul 23, 2022
b2f16c4
refactor: lake name generator
Azgaar Jul 23, 2022
3c6da65
refactor: addLakesInDeepDepressions
Azgaar Jul 24, 2022
fe4d4ea
refactor: openNearSeaLakes - remove as not required
Azgaar Jul 24, 2022
bb78d51
refactor: ckeanup
Azgaar Jul 24, 2022
21234dc
refactor: Biomes.define - partial
Azgaar Jul 24, 2022
1a57a8a
refactor(generation): rankCells
Azgaar Jul 24, 2022
fe20f66
refactor(generation): cultures start
Azgaar Jul 24, 2022
b03c894
refactor(generation): cultures continue
Azgaar Jul 24, 2022
34c98ed
refactor(generation): cultures continue
Azgaar Jul 26, 2022
fa2b873
refactor(generation): cultures continue
Azgaar Jul 26, 2022
6d70458
refactor(generation): cultures continue
Azgaar Jul 28, 2022
a832354
refactor(generation): cultures completion
Azgaar Jul 28, 2022
f692f8d
refactor(generation): drawCultures start
Azgaar Jul 28, 2022
7131a57
test: cultureSets to have executable sort functions
Azgaar Aug 1, 2022
6a3ef0f
chore: tests config
Azgaar Aug 1, 2022
cbe6da0
refactor: drawCultures
Azgaar Aug 1, 2022
e62d6ec
refactor: generate burgs
Azgaar Aug 3, 2022
c2fc067
refactor: generate states
Azgaar Aug 5, 2022
ff974a4
refactor: generate states cleanup
Azgaar Aug 5, 2022
aa6cefb
refactor: expand states
Azgaar Aug 5, 2022
7f57c9a
refactor: specify burgs
Azgaar Aug 6, 2022
8c741a5
refactor: specify burgs fixes
Azgaar Aug 6, 2022
910e782
refactor: routes start
Azgaar Aug 6, 2022
aff29d9
refactor: routes continue
Azgaar Aug 7, 2022
5c2d30c
refactor: main roads
Azgaar Aug 18, 2022
ec6285a
refactor: draw burgs and cells
Azgaar Aug 19, 2022
bc98757
refactor: fix burgId issue
Azgaar Aug 19, 2022
b0f081b
refactor: roads - Urquhart graph approach
Azgaar Aug 20, 2022
2c3cdad
refactor: draw burgs and labels separately
Azgaar Aug 20, 2022
1dd1853
refactor: roads generation - define by distance to make route less curvy
Azgaar Aug 20, 2022
fc3e3b8
refactor: roads generation - fix route segment detection
Azgaar Aug 20, 2022
e427050
refactor: roads generation - reduce curves on routes rendering
Azgaar Aug 20, 2022
2877f44
refactor: fix markup - ensure all cells have t defined
Azgaar Aug 21, 2022
4126222
refactor: sea routes generation
Azgaar Aug 21, 2022
bbf8871
refactor: route generation revalue
Azgaar Aug 22, 2022
03809e5
refactor: curve and shorten 2-points routes
Azgaar Aug 23, 2022
70e8296
refactor: religions start
Azgaar Aug 23, 2022
cce374d
refactor: generate organized religions
Azgaar Aug 24, 2022
17e9652
refactor: split to several files
Azgaar Aug 24, 2022
9011204
refactor(religions): define basic data
Azgaar Aug 25, 2022
0a77845
refactor(religions): spread folk religion
Azgaar Aug 26, 2022
707cdd7
refactor(religions): expand religions
Azgaar Aug 26, 2022
7a3a87e
refactor(religions): render religions
Azgaar Aug 28, 2022
538ad35
fix(burgs): don't put burgs on border cells
Azgaar Aug 28, 2022
8abf443
refactor: render covering layers
Azgaar Aug 29, 2022
5361565
refactor: render covering layers fix
Azgaar Aug 30, 2022
b9ff6a6
refactor: refactor religions expand
Azgaar Aug 31, 2022
3f6fca7
refactor: religions generation
Azgaar Sep 1, 2022
60e6934
Merge pull request #863 from Azgaar/vite-religions
Sep 1, 2022
2be3c68
refactor - stateForms start
Azgaar Sep 1, 2022
cffb0a8
refactor - define stateForms
Azgaar Sep 3, 2022
907e916
Merge pull request #865 from Azgaar/vite-stateForms
Sep 3, 2022
73431ec
refactor: generate relations
Azgaar Sep 4, 2022
136e71e
refactor: generate relations
Azgaar Sep 4, 2022
a2192fb
refactor: generate conflicts
Azgaar Sep 4, 2022
9b3a3f2
refactor: generate historical conflicts
Azgaar Sep 5, 2022
37826f1
Merge pull request #866 from Azgaar/vite-diplomacy
Sep 5, 2022
0d1b52e
refactor: don'r store events globally
Azgaar Sep 5, 2022
dd29a89
refactor: move files to folders
Azgaar Sep 5, 2022
2b61ac6
refactor: provinces start
Azgaar Sep 5, 2022
fe2f842
refactor: generateCoreProvinces
Azgaar Sep 6, 2022
a1e7727
refactor: expandProvinces
Azgaar Sep 6, 2022
859d205
refactor: generate wild provicnes start
Azgaar Sep 6, 2022
2c35122
refactor: generate wild provicnes continue
Azgaar Sep 7, 2022
4dc5648
refactor: generate provinces end
Azgaar Sep 8, 2022
b2ab699
refactor: render provinces
Azgaar Sep 10, 2022
ff5ef1c
refactor: add poles to state data
Azgaar Sep 10, 2022
e35cc2e
refactor: draw state labels start
Azgaar Sep 11, 2022
e07bf91
refactor: draw state labels start
Azgaar Sep 12, 2022
6954888
refactor: draw state labels - raycasting approach
Azgaar Sep 13, 2022
151c3d1
refactor: draw state labels - rendering
Azgaar Sep 14, 2022
aa74491
refactor: draw state labels - new rendering algo
Azgaar Sep 16, 2022
392325e
refactor: draw state labels - corrections
Azgaar Sep 16, 2022
b6acd8f
refactor: state labels - fix edit
Azgaar Sep 16, 2022
07a7441
cherry-pick 2bbff50b60c8bf6310c81221b3143a6205d3601e
Azgaar Sep 17, 2022
b8c0e0d
fix: remove scroll from the export dialog
Azgaar Sep 17, 2022
2bc008f
fix: 3d view - don't allow download obj for globe
Azgaar Sep 17, 2022
3b1d47f
feat(burgs): defineFeatures
Azgaar Sep 19, 2022
2035b12
Merge pull request #870 from Azgaar/vite-provinces
Sep 19, 2022
1ca3dd6
refactor: lake names
Azgaar Sep 19, 2022
f0c2a30
refactor: move some functions out of of pack generator
Azgaar Sep 19, 2022
a6d777a
Merge pull request #871 from Azgaar/vite-specifyRiversAndLakes
Sep 19, 2022
50edcb4
feat: draw borders
Azgaar Oct 1, 2022
bea278d
chore: remove duplicate alias
Azgaar Mar 5, 2023
8a817b5
fix: drawStateLabels - remove correct elements
Azgaar Aug 11, 2023
ab529a8
fix options year missing
StempunkDev Aug 25, 2024
1dc7354
fix dublicated value
StempunkDev Aug 25, 2024
743e9bb
update toggle to check for NoElements instead of i
StempunkDev Aug 25, 2024
3b6f834
utils import is now condensed into "/utils"
StempunkDev Aug 26, 2024
f90652b
jquery type imports
StempunkDev Aug 26, 2024
195a467
Burg Type now filtered properly in generations.ts
StempunkDev Aug 26, 2024
7519ed0
renderer type files for current js files
StempunkDev Aug 26, 2024
c3dd1d9
burg check added to unitUtils population conversion
StempunkDev Aug 26, 2024
cdb8d29
onhover resolved most types, few are temporary hacks marked with MARKER
StempunkDev Aug 26, 2024
509fc8c
province type enforced on province generation
StempunkDev Aug 26, 2024
09591a1
fix for ice-editor types
StempunkDev Aug 26, 2024
7300d2e
fix import in scripts/events for modules/legend
StempunkDev Aug 26, 2024
0e02e48
allow js imports temporarily
StempunkDev Aug 26, 2024
185740b
Revert "jquery type imports"
StempunkDev Aug 26, 2024
7ceeaa0
js files temporarly ignored for import, deleted leftover mapping
StempunkDev Aug 27, 2024
e4c8378
import js temporarily silenced
StempunkDev Aug 27, 2024
19117a7
religion in onhover to have a well definde default
StempunkDev Aug 27, 2024
324d926
render function does not need argument pack atm
StempunkDev Aug 27, 2024
70e7771
partial options typing
StempunkDev Aug 28, 2024
f753277
options available through button again
StempunkDev Aug 28, 2024
2dd6935
Delete src/modules/ui/cell-info.d.ts
StempunkDev Aug 28, 2024
50fe5ae
refactor: Update byId function for typed object returns (#1)
StempunkDev Sep 1, 2024
0216c04
moved listener for option back to option file
StempunkDev Sep 1, 2024
b66f4c6
update options file 80%
StempunkDev Sep 1, 2024
4f40663
options 90%
StempunkDev Sep 2, 2024
6c98341
move selects for 3d to 3d code
StempunkDev Sep 2, 2024
1644b05
clean up byId function
StempunkDev Sep 3, 2024
2ad1e75
Merge pull request #1121 from StempunkDev/vite
Azgaar Sep 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file added .DS_Store
Binary file not shown.
21 changes: 0 additions & 21 deletions .docker/default.conf

This file was deleted.

7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.bat
/node_modules
/dist
/coverage
.DS_Store
.vscode
.idea
.idea/Fantasy-Map-Generator.iml
11 changes: 0 additions & 11 deletions .vscode/launch.json

This file was deleted.

7 changes: 0 additions & 7 deletions Dockerfile

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Refer to the [project wiki](https://github.com/Azgaar/Fantasy-Map-Generator/wiki

Join our [Discord server](https://discordapp.com/invite/X7E84HU) and [Reddit community](https://www.reddit.com/r/FantasyMapGenerator) to share your creations, discuss the Generator, suggest ideas and get the most recent updates.

Contact me via [email](mailto:azgaar.fmg@yandex.by) if you have non-public suggestions. For bug reports please use [GitHub issues](https://github.com/Azgaar/Fantasy-Map-Generator/issues) or _#bugs_ channel on Discord. If you are facing performance issues, please read [the tips](https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Tips#performance-tips).
Contact me via [email](mailto:azgaar.fmg@yandex.com) if you have non-public suggestions. For bug reports please use [GitHub issues](https://github.com/Azgaar/Fantasy-Map-Generator/issues) or _#bugs_ channel on Discord. If you are facing performance issues, please read [the tips](https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Tips#performance-tips).

Electron desktop application is available in [releases](https://github.com/Azgaar/Fantasy-Map-Generator/releases). Download archive for your architecture, unzip and run.

Expand Down
9 changes: 0 additions & 9 deletions Readme.txt

This file was deleted.

74 changes: 0 additions & 74 deletions components/fill-box.js

This file was deleted.

166 changes: 0 additions & 166 deletions config/heightmap-templates.js

This file was deleted.

27 changes: 0 additions & 27 deletions config/precreated-heightmaps.js

This file was deleted.

17 changes: 17 additions & 0 deletions deploy.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/usr/bin/env sh

# abort on errors
set -e

npm run build

cd dist

git init
git checkout -b master
git add -A
git commit -m 'deploy'

git push -f [email protected]:Azgaar/Fantasy-Map-Generator.git main:gh-pages

cd -
Loading