Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
138 commits
Select commit Hold shift + click to select a range
51d86d6
First versions of terrain import
seanth Feb 6, 2020
12aa4d7
Merge pull request #1 from seanth/terrain
ektheaker94 Feb 12, 2020
8111778
example change
ektheaker94 Feb 12, 2020
eb7e657
restructure image read-in
seanth Feb 12, 2020
679a4c2
working on solving increasing z values
seanth Feb 19, 2020
5cc67d4
Working terrain import
seanth Feb 27, 2020
a13da37
Fixed bug where a tiff pixel is tuple
seanth Sep 7, 2020
ec75bc1
read in tiff from file or folder
seanth Sep 7, 2020
7ac9e99
Merge branch 'master' into terrain
ektheaker94 Sep 11, 2020
6a78c5c
Merge pull request #6 from ektheaker94/terrain
ektheaker94 Sep 14, 2020
aa60d63
Merge pull request #3 from seanth/terrain
ektheaker94 Sep 14, 2020
d2c1fb2
Example code for reading the xlsx max min
seanth Sep 14, 2020
c0c6754
Merge branch 'terrain' of https://github.com/seanth/Vida into terrain
seanth Sep 14, 2020
9303cf4
Merge pull request #4 from seanth/terrain
ektheaker94 Sep 14, 2020
643f0fa
Update Vida.py
ektheaker94 Sep 21, 2020
1628527
Merge pull request #8 from ektheaker94/terrain
seanth Sep 23, 2020
ba82c1a
Better way of finding matched files, read xlsx
seanth Sep 23, 2020
a5bb4f7
Merge pull request #5 from seanth/terrain
ektheaker94 Sep 23, 2020
479add3
absmax&absminterr
ektheaker94 Sep 29, 2020
844c708
Merge pull request #9 from ektheaker94/terrain
seanth Oct 2, 2020
cf8414b
changed = to : so parses correctly
seanth Oct 2, 2020
f4c60c9
changed absMax to absMin
seanth Oct 2, 2020
06c82c9
changed tab indents to spaces
seanth Oct 2, 2020
73f13d1
need prefix '-' for arguments
seanth Oct 2, 2020
bde4f24
Fixed depreciated code warning
seanth Oct 2, 2020
5359002
global vars, commented out some code
seanth Oct 2, 2020
7896da3
Starting to add in water level code
seanth Oct 2, 2020
412a674
added in correct flag for if tiff is found
seanth Oct 2, 2020
ca86ab1
water layer prototype works
seanth Oct 2, 2020
4132370
updating some things related to elevation
seanth Mar 7, 2021
fbc3dfc
not needed
seanth Mar 7, 2021
8ed7e83
Species files additions/moves/changes
seanth Mar 7, 2021
85fc446
water elevation default
seanth Mar 7, 2021
7ed2ce2
Create debug-twoTree-elevationTests.csv
seanth Mar 7, 2021
a838c51
Update Vida World Preferences.yml
seanth Mar 7, 2021
92cec76
Update Vida.py
seanth Mar 7, 2021
4689f9d
Update list_utils.py
seanth Mar 7, 2021
659f5c1
Update vdxfGraphics.py
seanth Mar 7, 2021
c778a9a
Update vplantr.py
seanth Mar 7, 2021
920c817
Delete sdxf_utils.py
seanth Mar 7, 2021
058f261
Create requirements.txt
seanth Mar 7, 2021
e866c44
Completed rewrite of dxf generation
seanth Mar 7, 2021
4897e64
updated print statements to use ()
seanth Mar 7, 2021
99681d0
Print statements updated to ()
seanth Mar 7, 2021
32db516
Update requirements.txt
seanth Mar 29, 2021
76e823d
revising and moving some species around
seanth Mar 29, 2021
967ebb9
Create waterLevelExample.yaml
seanth Mar 29, 2021
3f49153
Including some new options for watterlogging
seanth Mar 29, 2021
0ddd6a1
Update colour_utils.py
seanth Mar 29, 2021
1a680e1
Update Vida.py
seanth Mar 29, 2021
7e99964
Update vdxfGraphics.py
seanth Mar 29, 2021
5a06189
Update vplantr.py
seanth Mar 29, 2021
b2b3bf8
Update vterrainImport.py
seanth Mar 29, 2021
c87b56b
Update vworldr.py
seanth Mar 29, 2021
3cc7864
Update miniVida2yml.py
seanth Apr 13, 2021
ad062d0
Update speciesTemplate.txt
seanth Apr 13, 2021
3150f1a
xls files for terrain project species
seanth Apr 13, 2021
55f6a27
Event files for use with terrain project
seanth Apr 13, 2021
4dab249
Species files for terrain project
seanth Apr 13, 2021
93afa86
Update Vida.py
seanth Apr 13, 2021
2c4e5cd
Update Default_species.yml
seanth Apr 13, 2021
bc1460b
Update vdxfGraphics.py
seanth Apr 13, 2021
6a5cc2d
Update vplantr.py
seanth Apr 13, 2021
2099860
Update vworldr.py
seanth Apr 13, 2021
63e1cb1
Delete waterLevelExample.yaml
seanth May 21, 2021
e283702
Merge pull request #6 from seanth/terrain
ektheaker94 May 26, 2021
dd35601
Update tamericana_sth3.yml
seanth May 26, 2021
b148ccc
Update miniVida2yml.py
seanth Jun 4, 2021
be1cf60
New stuff
seanth Jun 4, 2021
ec4a179
Update miniVida2yml.py
seanth Jun 4, 2021
4a0f316
Extended to read water logging tolerance
seanth Jun 4, 2021
c97e808
Merge pull request #7 from seanth/terrain
ektheaker94 Jun 4, 2021
404f4f9
File cleanup
seanth Jun 28, 2021
612c5b0
Bug fix: variable sized terrain
seanth Jun 28, 2021
3ce1da6
Merge pull request #8 from seanth/terrain
ektheaker94 Jun 29, 2021
5eab6e6
Adding ability to toggle on/off water logging/drought tol
seanth Jun 29, 2021
2df4ea1
Update vplantr.py
seanth Jun 29, 2021
fcacd0a
Work on drought tolerance
seanth Jun 29, 2021
c47bbc2
Merge pull request #9 from seanth/terrain
ektheaker94 Jun 29, 2021
c91e954
Species have water tol and drought tol values
seanth Jul 1, 2021
01fa0fc
Update Default_species.yml
seanth Jul 1, 2021
ecbdb60
Update Vida World Preferences.yml
seanth Jul 1, 2021
dc3a754
Drought tolerance and water logging tolerance implemented
seanth Jul 1, 2021
88c04db
Merge pull request #10 from seanth/terrain
ektheaker94 Jul 2, 2021
3969059
update for waterTol and droughtTol
seanth Jul 3, 2021
099ab6f
Dominant Species Tests
ektheaker94 Mar 18, 2022
0b506a4
Species File Updates
ektheaker94 Apr 4, 2022
ebb321c
Local Species updates
ektheaker94 Oct 21, 2022
6b08e14
Updates for python3
seanth Oct 24, 2022
1d2ad06
More python3 updates
seanth Oct 24, 2022
2188230
2 vs 3 way of dealing with dict keys
seanth Oct 24, 2022
69b2767
w vs wb
seanth Oct 24, 2022
3a244e5
Updates to license
seanth Oct 24, 2022
759d2db
More 2 vs 3 checks
seanth Oct 24, 2022
d0d361f
removed a bunch of debug prints
seanth Oct 24, 2022
e027919
Update requirements.txt
seanth Nov 6, 2022
164622a
Terrain species
seanth Nov 6, 2022
9391d90
Update vextract.py
seanth Nov 6, 2022
ffdce29
Fixes to importing placement files
seanth Nov 6, 2022
f66da37
New terrain species files
ektheaker94 Jan 5, 2023
cd7a96c
Update requirements.txt
seanth Mar 3, 2023
c5727a7
Renamed the chestnut project folder
seanth Mar 3, 2023
a4d2a94
Moved ponderosa pine stuff to disabled
seanth Mar 3, 2023
53dcd54
Student species moved to disabled
seanth Mar 3, 2023
9a45ee4
Update rastert_emidala1_TableToExcel.xlsx
seanth Mar 3, 2023
a82e84a
Update Vida.ini
seanth Mar 3, 2023
d0dbabe
Update vworldr.py
seanth Mar 3, 2023
e7ade6e
Update vterrainImport.py
seanth Mar 3, 2023
f3e2f43
Update vplantr.py
seanth Mar 3, 2023
b36c561
Update vdxfGraphics.py
seanth Mar 3, 2023
c494c83
Update Vida.py
seanth Mar 3, 2023
fe4fed6
Change to reading species in event files
seanth Mar 24, 2023
1687e8b
Example terrain files not in a dedicated folder
seanth Mar 24, 2023
61f8fd8
Placement files for testing an edge bug
seanth Mar 25, 2023
bd78da4
Terrain files going into folders
seanth Mar 25, 2023
453f40b
more terrain files into folders
seanth Mar 25, 2023
3955766
Changes to default ini values
seanth Mar 25, 2023
708efa7
Restructure to terrain import
seanth Mar 25, 2023
d190e32
I think this fixes the bug with seeds under the terrain.
seanth Mar 25, 2023
a24cfba
Merge branch 'terrain' into terrain
ektheaker94 Apr 2, 2023
623a6ba
Cleaning up terrain files
seanth May 25, 2023
fc2ad88
Create debug-edgePlacement-allEdges.csv
seanth May 25, 2023
e14ec45
Create waterLevelRisingSTH.yml
seanth May 25, 2023
328ac1e
value edit and removal of unused variables
seanth May 25, 2023
44171a5
Reset world size to default
seanth May 25, 2023
d3cd201
Fixed an spelling error
seanth May 25, 2023
f03edb8
Update vplantr.py
seanth May 25, 2023
c9727f7
Update vworldr.py
seanth May 25, 2023
85b541f
moving species around
seanth Jan 15, 2024
5b7cd33
Updating method to make dxf
seanth Jan 17, 2024
4e2970c
removed ezdxf test script
seanth Jan 17, 2024
90a2d22
Clean up of files
seanth Jan 17, 2024
f2fa217
Merge branch 'terrain' of https://github.com/seanth/Vida into terrain
seanth Jan 17, 2024
7fd70a7
Cleanup
seanth Jan 17, 2024
5980c30
replace solid with 3dface, prep for ezdxf
seanth Jan 17, 2024
61acb16
Update Vida.py
seanth Mar 20, 2025
5b785b2
Update vworldr.py
seanth Mar 20, 2025
d631f51
Merge branch 'isaacvida' into dekrüft
isaachenoweth Feb 6, 2026
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
0:
- Killzone:
- x: 0.0
y: 0.0
shape: square
size: 150
target: all
species: Abies_balsamea
- Killzone:
- x: 0.0
y: 0.0
shape: square
size: 150
target: all
species: A_rubrum
- Killzone:
- x: 0.0
y: 0.0
shape: square
size: 150
target: all
species: Betula_alleghaniensis
- Killzone:
- x: 0.0
y: 0.0
shape: square
size: 150
target: all
species: F_americana
- Killzone:
- x: 0.0
y: 0.0
shape: square
size: 150
target: all
species: T_americana
- Killzone:
- x: 0.0
y: 0.0
shape: square
size: 150
target: all
species: Ulmus_americana
500:
- Seed:
- species: betula_alleghaniensis.yml
placement: random
number: 100
- Seed:
- species: abies_balsamea.yml
placement: random
number: 100
- Seed:
- species: tamericana_sth3.yml
placement: random
number: 100
1500:
- Seed:
- species: famericana_sth3.yml
placement: random
number: 100
- Seed:
- species: arubrum_sth2.yml
placement: random
number: 100
- Seed:
- species: ulmus_americana.yml
placement: random
number: 100
37 changes: 37 additions & 0 deletions Event_Files/TerrainProject/WaterLevels/WaterLevelDamRemoval.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
2:
- Garden:
- waterLevel: 2.0
4:
- Garden:
- waterLevel: 2.0
6:
- Garden:
- waterLevel: 2.0
8:
- Garden:
- waterLevel: 12.0

10:
- Garden:
- waterLevel: 10.0

12:
- Garden:
- waterLevel: 8.0

14:
- Garden:
- waterLevel: 6.0

16:
- Garden:
- waterLevel: 4.0

18:
- Garden:
- waterLevel: 4.0

20:
- Garden:
- waterLevel: 4.0

Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
2:
- Garden:
- waterLevel: 2.0
4:
- Garden:
- waterLevel: 4.0
6:
- Garden:
- waterLevel: 6.0
8:
- Garden:
- waterLevel: 4.0

10:
- Garden:
- waterLevel: 2.0

12:
- Garden:
- waterLevel: 4.0

14:
- Garden:
- waterLevel: 6.0

16:
- Garden:
- waterLevel: 4.0

18:
- Garden:
- waterLevel: 2.0

82 changes: 82 additions & 0 deletions Event_Files/WaterLevelFlood.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
0:
- Garden:
- waterLevel: 2.0
5:
- Garden:
- waterLevel: 4.0
10:
- Garden:
- waterLevel: 6.0
15:
- Garden:
- waterLevel: 8.0

20:
- Garden:
- waterLevel: 10.0

25:
- Garden:
- waterLevel: 8.0

30:
- Garden:
- waterLevel: 6.0

35:
- Garden:
- waterLevel: 4.0

40:
- Garden:
- waterLevel: 2.0

45:
- Garden:
- waterLevel: 4.0
50:
- Garden:
- waterLevel: 6.0
55:
- Garden:
- waterLevel: 8.0

60:
- Garden:
- waterLevel: 10.0

65:
- Garden:
- waterLevel: 8.0

70:
- Garden:
- waterLevel: 6.0

75:
- Garden:
- waterLevel: 4.0

80:
- Garden:
- waterLevel: 2.0

75:
- Garden:
- waterLevel: 4.0

80:
- Garden:
- waterLevel: 2.0

85:
- Garden:
- waterLevel: 4.0

90:
- Garden:
- waterLevel: 2.0

95:
- Garden:
- waterLevel: 4.0
30 changes: 30 additions & 0 deletions Event_Files/waterLevelDropping.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
10:
- Garden:
- waterLevel: 9.0
20:
- Garden:
- waterLevel: 8.0
30:
- Garden:
- waterLevel: 7.0
40:
- Garden:
- waterLevel: 6.0
50:
- Garden:
- waterLevel: 5.0
60:
- Garden:
- waterLevel: 4.0
70:
- Garden:
- waterLevel: 3.0
80:
- Garden:
- waterLevel: 2.0
90:
- Garden:
- waterLevel: 1.0



16 changes: 16 additions & 0 deletions Event_Files/waterLevelExample.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
2:
- Garden:
- waterLevel: 2.0
4:
- Garden:
- waterLevel: 4.0
6:
- Garden:
- waterLevel: 6.0
8:
- Garden:
- waterLevel: 8.0
10:
- Garden:
- waterLevel: 10.0

30 changes: 30 additions & 0 deletions Event_Files/waterLevelRising.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
10:
- Garden:
- waterLevel: 1.0
20:
- Garden:
- waterLevel: 2.0
30:
- Garden:
- waterLevel: 3.0
40:
- Garden:
- waterLevel: 4.0
50:
- Garden:
- waterLevel: 5.0
60:
- Garden:
- waterLevel: 6.0
70:
- Garden:
- waterLevel: 7.0
80:
- Garden:
- waterLevel: 8.0
90:
- Garden:
- waterLevel: 9.0



32 changes: 32 additions & 0 deletions Event_Files/waterLevelRisingSTH.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
25:
- Garden:
- waterLevel: 1.0
30:
- Garden:
- waterLevel: 5.0
35:
- Garden:
- waterLevel: 10.0
40:
- Garden:
- waterLevel: 15.0
45:
- Garden:
- waterLevel: 20.0
50:
- Garden:
- waterLevel: 25.0
55:
- Garden:
- waterLevel: 30.0
60:
- Garden:
- waterLevel: 35.0
65:
- Garden:
- waterLevel: 40.0
70:
- Garden:
- waterLevel: 45.0


4 changes: 0 additions & 4 deletions Placement_Files/JustForShow.csv

This file was deleted.

1 change: 0 additions & 1 deletion Placement_Files/Re-plantMiddle50x50.csv

This file was deleted.

Loading