Merge commit '7b9d94a1961d53ef13314eae3a547c665f5f584b'

deepnight · Jan 11, 2024 · 56bb917 · 56bb917
2 parents 8e70641 + 7b9d94a
commit 56bb917
Show file tree

Hide file tree

Showing 14 changed files with 53 additions and 17 deletions.
diff --git a/samples/_assets/sample.ldtk b/samples/_assets/sample.ldtk
@@ -5,12 +5,12 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.1",
+		"appVersion": "1.5.2",
 		"url": "https://ldtk.io"
 	},
 	"iid": "a8ea85a0-7820-11ed-b6fd-4507f1bd5fbf",
-	"jsonVersion": "1.5.1",
-	"appBuildId": 473601,
+	"jsonVersion": "1.5.2",
+	"appBuildId": 473607,
 	"nextUid": 59,
 	"identifierStyle": "Capitalize",
 	"toc": [{
@@ -192,6 +192,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 2357148,
 							"perlinScale": 0.2,
@@ -223,6 +224,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 6024002,
 							"perlinScale": 0.2,
@@ -267,6 +269,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 2975287,
 							"perlinScale": 0.2,
@@ -298,6 +301,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 847472,
 							"perlinScale": 0.2,
@@ -342,6 +346,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 3920188,
 							"perlinScale": 0.2,
@@ -373,6 +378,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 4007511,
 							"perlinScale": 0.2,
@@ -413,6 +419,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": true,
 							"perlinSeed": 2530931,
 							"perlinScale": 0.2,
@@ -444,6 +451,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 4359617,
 							"perlinScale": 0.2,
@@ -488,6 +496,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 8199321,
 							"perlinScale": 0.2,
@@ -519,6 +528,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 9065732,
 							"perlinScale": 0.2,
@@ -550,6 +560,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 4760070,
 							"perlinScale": 0.2,
@@ -581,6 +592,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 4633502,
 							"perlinScale": 0.2,
@@ -612,6 +624,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 6132148,
 							"perlinScale": 0.2,
@@ -643,6 +656,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": true,
 							"perlinSeed": 44676336,
 							"perlinScale": 0.38,
@@ -674,6 +688,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 259529,
 							"perlinScale": 0.2,
@@ -754,6 +769,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 5253545,
 							"perlinScale": 0.2,
@@ -785,6 +801,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 2597597,
 							"perlinScale": 0.2,
@@ -816,6 +833,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 5096226,
 							"perlinScale": 0.2,
@@ -847,6 +865,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 5534570,
 							"perlinScale": 0.2,
@@ -885,6 +904,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": true,
 							"perlinSeed": 3539893,
 							"perlinScale": 0.2,
@@ -916,6 +936,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 4280659,
 							"perlinScale": 0.2,

diff --git a/samples/_assets/sample/0000-West.ldtkl b/samples/_assets/sample/0000-West.ldtkl
@@ -5,7 +5,7 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.1",
+		"appVersion": "1.5.2",
 		"url": "https://ldtk.io"
 	},
 	"identifier": "West",

diff --git a/samples/_assets/sample/0001-East.ldtkl b/samples/_assets/sample/0001-East.ldtkl
@@ -5,7 +5,7 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.1",
+		"appVersion": "1.5.2",
 		"url": "https://ldtk.io"
 	},
 	"identifier": "East",

diff --git a/samples/_assets/sample/0002-Pit.ldtkl b/samples/_assets/sample/0002-Pit.ldtkl
@@ -5,7 +5,7 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.1",
+		"appVersion": "1.5.2",
 		"url": "https://ldtk.io"
 	},
 	"identifier": "Pit",

diff --git a/samples/_assets/sample/0003-Treasure_room.ldtkl b/samples/_assets/sample/0003-Treasure_room.ldtkl
@@ -5,7 +5,7 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.1",
+		"appVersion": "1.5.2",
 		"url": "https://ldtk.io"
 	},
 	"identifier": "Treasure_room",

diff --git a/samples/_assets/unitTest.ldtk b/samples/_assets/unitTest.ldtk
@@ -5,12 +5,12 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.1",
+		"appVersion": "1.5.2",
 		"url": "https://ldtk.io"
 	},
 	"iid": "a6731d00-7820-11ed-b6fd-8d5e0e3d5314",
-	"jsonVersion": "1.5.1",
-	"appBuildId": 473601,
+	"jsonVersion": "1.5.2",
+	"appBuildId": 473607,
 	"nextUid": 124,
 	"identifierStyle": "Free",
 	"toc": [ {
@@ -136,6 +136,7 @@
 							"pivotX": 0.5,
 							"pivotY": 0.5,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 9046842,
 							"perlinScale": 0.2,
@@ -167,6 +168,7 @@
 							"pivotX": 0.5,
 							"pivotY": 1,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 1562123,
 							"perlinScale": 0.2,
@@ -220,6 +222,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 9576609,
 							"perlinScale": 0.2,
@@ -251,6 +254,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 2918122,
 							"perlinScale": 0.2,
@@ -295,6 +299,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 2612059,
 							"perlinScale": 0.2,
@@ -326,6 +331,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 4227586,
 							"perlinScale": 0.2,
@@ -357,6 +363,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 123013,
 							"perlinScale": 0.2,
@@ -388,6 +395,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 4111779,
 							"perlinScale": 0.2,
@@ -426,6 +434,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 7005472,
 							"perlinScale": 0.2,
@@ -506,6 +515,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 4295232,
 							"perlinScale": 0.2,
@@ -537,6 +547,7 @@
 							"pivotX": 0,
 							"pivotY": 0,
 							"outOfBoundsValue": null,
+							"invalidated": false,
 							"perlinActive": false,
 							"perlinSeed": 2059932,
 							"perlinScale": 0.2,

diff --git a/samples/_assets/unitTest/Main_tests.ldtkl b/samples/_assets/unitTest/Main_tests.ldtkl
@@ -5,7 +5,7 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.1",
+		"appVersion": "1.5.2",
 		"url": "https://ldtk.io"
 	},
 	"identifier": "Main_tests",

diff --git a/samples/_assets/unitTest/Offset_tests.ldtkl b/samples/_assets/unitTest/Offset_tests.ldtkl
@@ -5,7 +5,7 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.1",
+		"appVersion": "1.5.2",
 		"url": "https://ldtk.io"
 	},
 	"identifier": "Offset_tests",

diff --git a/samples/_assets/unitTest/Target_level_ref.ldtkl b/samples/_assets/unitTest/Target_level_ref.ldtkl
@@ -5,7 +5,7 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.1",
+		"appVersion": "1.5.2",
 		"url": "https://ldtk.io"
 	},
 	"identifier": "Target_level_ref",

diff --git a/samples/_assets/unitTest/World1_Level_3.ldtkl b/samples/_assets/unitTest/World1_Level_3.ldtkl
@@ -5,7 +5,7 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.1",
+		"appVersion": "1.5.2",
 		"url": "https://ldtk.io"
 	},
 	"identifier": "World1_Level_3",

diff --git a/samples/_assets/unitTest/World2_Level_0.ldtkl b/samples/_assets/unitTest/World2_Level_0.ldtkl
@@ -5,7 +5,7 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.1",
+		"appVersion": "1.5.2",
 		"url": "https://ldtk.io"
 	},
 	"identifier": "World2_Level_0",

diff --git a/samples/_assets/unitTest/v1_4_0.ldtkl b/samples/_assets/unitTest/v1_4_0.ldtkl
@@ -5,7 +5,7 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.1",
+		"appVersion": "1.5.2",
 		"url": "https://ldtk.io"
 	},
 	"identifier": "v1_4_0",

diff --git a/samples/_assets/unitTest/v1_4_0_overlap.ldtkl b/samples/_assets/unitTest/v1_4_0_overlap.ldtkl
@@ -5,7 +5,7 @@
 		"doc": "https://ldtk.io/json",
 		"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
 		"appAuthor": "Sebastien 'deepnight' Benard",
-		"appVersion": "1.5.1",
+		"appVersion": "1.5.2",
 		"url": "https://ldtk.io"
 	},
 	"identifier": "v1_4_0_overlap",

diff --git a/src/ldtk/Json.hx b/src/ldtk/Json.hx
@@ -1050,6 +1050,10 @@ typedef AutoRuleDef = {
 	var perlinOctaves: Float;
 
 	var perlinSeed: Float;
+
+	/** If TRUE, then the rule should be re-evaluated by the editor at one point **/
+	@added("1.5.2")
+	var invalidated: Bool;
 };