Skip to content

Commit

Permalink
Add test build
Browse files Browse the repository at this point in the history
  • Loading branch information
kubilus1 committed Nov 25, 2022
1 parent 3d434a0 commit 46e1561
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 65 deletions.
1 change: 1 addition & 0 deletions .github/workflows/push-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
- na
- aus_pac
- eur
- test
zl:
type: string
default: 16
Expand Down
18 changes: 15 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SPLITSIZE=150
SPLITSIZE?=150

AUS_PAC_OVERLAYS=$(addprefix Ortho4XP/yOrtho4XP_Overlays/*/*/, $(shell cat aus_pacific_tile_list) )
AUS_PACS:=$(addprefix z_aus_pac_, $(shell ls aus_pacific_tile_list.* | awk -F. '{ print $$2 }') )
Expand All @@ -12,13 +12,19 @@ EURS:=$(addprefix z_eur_, $(shell ls eur_tile_list.* | awk -F. '{ print $$2 }')
EUR_OVERLAYS=$(addprefix Ortho4XP/yOrtho4XP_Overlays/*/*/, $(shell cat eur_tile_list) )
EUR_ZIPS=$(addsuffix .zip, $(EURS))

ZIPS=$(AUS_PAC_ZIPS) $(NA_ZIPS) $(EUR_ZIPS)
TESTS:=$(addprefix z_test_, $(shell ls test_tile_list.* | awk -F. '{ print $$2 }') )
TEST_OVERLAYS=$(addprefix Ortho4XP/yOrtho4XP_Overlays/*/*/, $(shell cat test_tile_list) )
TEST_ZIPS=$(addsuffix .zip, $(TESTS))


ZIPS=$(AUS_PAC_ZIPS) $(NA_ZIPS) $(EUR_ZIPS) $(TEST_ZIPS)

# Get the tiles listed in each list file
.SECONDEXPANSION:
AUS_PAC_TILES = $(addprefix Ortho4XP/Tiles/zOrtho4XP_, $(basename $(shell cat aus_pacific_tile_list.$* ) ) )
NA_TILES = $(addprefix Ortho4XP/Tiles/zOrtho4XP_, $(basename $(shell cat na_tile_list.$* ) ) )
EUR_TILES = $(addprefix Ortho4XP/Tiles/zOrtho4XP_, $(basename $(shell cat eur_tile_list.$* ) ) )
TEST_TILES = $(addprefix Ortho4XP/Tiles/zOrtho4XP_, $(basename $(shell cat test_tile_list.$* ) ) )

y_aus_pac: $(AUS_PAC_OVERLAYS)
mkdir -p $@
Expand All @@ -38,8 +44,14 @@ y_eur: $(EUR_OVERLAYS)
z_eur_%: eur_tile_list.% $${EUR_TILES}
echo "Going to do some $@"

y_test: $(TEST_OVERLAYS)
mkdir -p $@

z_test_%: test_tile_list.% $${TEST_TILES}
echo "Going to do some $@"


allzips: $(AUS_PAC_ZIPS) $(NA_ZIPS)
#allzips: $(AUS_PAC_ZIPS) $(NA_ZIPS)

#
# Ortho4XP setup
Expand Down
6 changes: 6 additions & 0 deletions aus_pac_info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"id": "aus_pac",
"name": "Australia Pacific Ortho Set",
"ortho_prefix": "z_aus_pac_",
"overlay_prefix": "y_aus_pac_overlays"
}
6 changes: 6 additions & 0 deletions na_info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"id": "na",
"name": "North America Ortho Set",
"ortho_prefix": "z_na_",
"overlay_prefix": "y_na_overlays"
}
62 changes: 0 additions & 62 deletions ortho4xp.diff
Original file line number Diff line number Diff line change
@@ -1,65 +1,3 @@
diff --git a/Ortho4XP.cfg b/Ortho4XP.cfg
index 3bd794c..606ad08 100644
--- a/Ortho4XP.cfg
+++ b/Ortho4XP.cfg
@@ -1,8 +1,8 @@
verbosity=1
-cleaning_level=1
+cleaning_level=3
overpass_server_choice=DE
-skip_downloads=False
-skip_converts=False
+skip_downloads=True
+skip_converts=True
max_convert_slots=4
check_tms_response=True
http_timeout=10.0
@@ -11,12 +11,15 @@ max_baddata_retries=5
ovl_exclude_pol=[0]
ovl_exclude_net=[]
custom_scenery_dir=
-custom_overlay_src=
+custom_overlay_src=/home/mkubilus/.steam/ubuntu12_32/steamapps/content/app_2126105/depot_2126105/Global Scenery/X-Plane 12 Global Scenery
+apt_smoothing_pix=8
road_level=1
road_banking_limit=0.5
+lane_width=5.0
max_levelled_segs=100000
+water_simplification=0.0
min_area=0.001
-max_area=200
+max_area=200.0
clean_bad_geometries=True
mesh_zl=19
curvature_tol=2.0
@@ -27,7 +30,6 @@ coast_curv_ext=0.5
limit_tris=0
hmin=0.0
min_angle=10.0
-apt_smoothing_pix=8
sea_smoothing_mode=zero
water_smoothing=10
iterate=0
@@ -35,10 +37,11 @@ mask_zl=14
masks_width=100
masking_mode=sand
use_masks_for_inland=False
+imprint_masks_to_dds=False
masks_use_DEM_too=False
masks_custom_extent=
-cover_airports_with_highres=False
-cover_extent=1.0
+cover_airports_with_highres=True
+cover_extent=0.5
cover_zl=18
ratio_water=0.25
overlay_lod=25000.0
@@ -47,4 +50,4 @@ add_low_res_sea_ovl=False
experimental_water=0
normal_map_strength=1.0
terrain_casts_shadows=True
-use_decal_on_terrain=False
+use_decal_on_terrain=True
diff --git a/src/O4_GUI_Utils.py b/src/O4_GUI_Utils.py
index a9de2da..c389a88 100755
--- a/src/O4_GUI_Utils.py
Expand Down

0 comments on commit 46e1561

Please sign in to comment.