Skip to content

Commit ca34690

Browse files
authored
Merge pull request #2 from atalantus/v2.0
Refactored WFC-Algorithm
2 parents db5bc39 + 5a562b7 commit ca34690

File tree

16 files changed

+456
-766
lines changed

16 files changed

+456
-766
lines changed

Assets/Scenes/Main.unity

Lines changed: 86 additions & 129 deletions
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ RectTransform:
829829
- {fileID: 1059894513}
830830
- {fileID: 439048122}
831831
m_Father: {fileID: 0}
832-
m_RootOrder: 4
832+
m_RootOrder: 2
833833
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
834834
m_AnchorMin: {x: 0, y: 0}
835835
m_AnchorMax: {x: 0, y: 0}
@@ -848,7 +848,7 @@ MonoBehaviour:
848848
m_Script: {fileID: 11500000, guid: 14df4d3dd7079c84fa507a5daad9404d, type: 3}
849849
m_Name:
850850
m_EditorClassIdentifier:
851-
grid: {fileID: 1848369076}
851+
levelGenerator: {fileID: 1090563857}
852852
cameraController: {fileID: 963194229}
853853
widthText: {fileID: 1572440154}
854854
heightText: {fileID: 1439170201}
@@ -962,84 +962,6 @@ CanvasRenderer:
962962
m_PrefabAsset: {fileID: 0}
963963
m_GameObject: {fileID: 603545406}
964964
m_CullTransparentMesh: 0
965-
--- !u!1 &626460825
966-
GameObject:
967-
m_ObjectHideFlags: 0
968-
m_CorrespondingSourceObject: {fileID: 0}
969-
m_PrefabInstance: {fileID: 0}
970-
m_PrefabAsset: {fileID: 0}
971-
serializedVersion: 6
972-
m_Component:
973-
- component: {fileID: 626460826}
974-
- component: {fileID: 626460827}
975-
m_Layer: 0
976-
m_Name: Module Manager
977-
m_TagString: Untagged
978-
m_Icon: {fileID: 0}
979-
m_NavMeshLayer: 0
980-
m_StaticEditorFlags: 0
981-
m_IsActive: 1
982-
--- !u!4 &626460826
983-
Transform:
984-
m_ObjectHideFlags: 0
985-
m_CorrespondingSourceObject: {fileID: 0}
986-
m_PrefabInstance: {fileID: 0}
987-
m_PrefabAsset: {fileID: 0}
988-
m_GameObject: {fileID: 626460825}
989-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
990-
m_LocalPosition: {x: 0, y: 0, z: 0}
991-
m_LocalScale: {x: 1, y: 1, z: 1}
992-
m_Children: []
993-
m_Father: {fileID: 0}
994-
m_RootOrder: 2
995-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
996-
--- !u!114 &626460827
997-
MonoBehaviour:
998-
m_ObjectHideFlags: 0
999-
m_CorrespondingSourceObject: {fileID: 0}
1000-
m_PrefabInstance: {fileID: 0}
1001-
m_PrefabAsset: {fileID: 0}
1002-
m_GameObject: {fileID: 626460825}
1003-
m_Enabled: 1
1004-
m_EditorHideFlags: 0
1005-
m_Script: {fileID: 11500000, guid: e00bd4dc03b526443b05cb78bc7dd2e2, type: 3}
1006-
m_Name:
1007-
m_EditorClassIdentifier:
1008-
modules:
1009-
- {fileID: 11400000, guid: 9b12f41eabab67941a430f09b3443e01, type: 2}
1010-
- {fileID: 11400000, guid: 48f9aba4c810be6448d8f7a8592d4e19, type: 2}
1011-
- {fileID: 11400000, guid: ccd7f81dc004a004cb0c9623254c00bf, type: 2}
1012-
- {fileID: 11400000, guid: b6898c6fada98214f81096cb91a5ed72, type: 2}
1013-
- {fileID: 11400000, guid: 15a6e2c0294ba6545a5d7b4461989d40, type: 2}
1014-
- {fileID: 11400000, guid: 1eb8be357158af740bc8f7c1feb963c8, type: 2}
1015-
- {fileID: 11400000, guid: 7b03e37b1ae16044e90037f2cd32c3e4, type: 2}
1016-
- {fileID: 11400000, guid: 1d4277cc703376c42a44965162516aee, type: 2}
1017-
- {fileID: 11400000, guid: 693c1846c240da3479f6a9c8e66d61a1, type: 2}
1018-
- {fileID: 11400000, guid: a26709b40ca22014bb650e36eb05ea05, type: 2}
1019-
- {fileID: 11400000, guid: 2bdf9d9e96517154fb571696025d0370, type: 2}
1020-
- {fileID: 11400000, guid: 81ce795915529a545b30c384ccba5ceb, type: 2}
1021-
- {fileID: 11400000, guid: b36f24d57c5e3d0459552d943d1765c8, type: 2}
1022-
- {fileID: 11400000, guid: 4b1141662c0a1c14fb5d17286fc724cc, type: 2}
1023-
- {fileID: 11400000, guid: 162aab4dc6f8e114590b25d696387d27, type: 2}
1024-
- {fileID: 11400000, guid: f6e10291c7c42be4fa859f4dda9032fa, type: 2}
1025-
- {fileID: 11400000, guid: af7e24f3778270b4bb17292d47a7ff48, type: 2}
1026-
- {fileID: 11400000, guid: c119d21aeb170db40a40af78e0d1ee9b, type: 2}
1027-
- {fileID: 11400000, guid: f1d62dcc8713af64a8c797b88f218a32, type: 2}
1028-
- {fileID: 11400000, guid: 45c154cad0527c34aab437b73adb25eb, type: 2}
1029-
- {fileID: 11400000, guid: 39f34f7c1642e4f4a8bc7deb987ebd12, type: 2}
1030-
- {fileID: 11400000, guid: b476e2ff340aadf41a30afec96516fa9, type: 2}
1031-
- {fileID: 11400000, guid: 243ef413552d5284f91d21a5e3d8d0bb, type: 2}
1032-
- {fileID: 11400000, guid: 236ebda988720b14181261b33f966a0c, type: 2}
1033-
- {fileID: 11400000, guid: 590b2ee302546e54492d359111ad598f, type: 2}
1034-
- {fileID: 11400000, guid: bdc989d6bca29fb4da8e8649f6222d4e, type: 2}
1035-
- {fileID: 11400000, guid: 5e7f0227c699e9c479f48d31427821ed, type: 2}
1036-
- {fileID: 11400000, guid: d89a5b60e155bfd4cbb252614e830385, type: 2}
1037-
- {fileID: 11400000, guid: 090eef0eb4dfca34d83fca8729c74bc5, type: 2}
1038-
- {fileID: 11400000, guid: 056b613fc1f324044b61451f24fe028e, type: 2}
1039-
- {fileID: 11400000, guid: e672dca1089813d42a6a9fdfce546869, type: 2}
1040-
- {fileID: 11400000, guid: 35aee5ef0fb05a649a27001f04630bcf, type: 2}
1041-
- {fileID: 11400000, guid: fd316731eeaf78c43951e8a812fdabe9, type: 2}
1042-
- {fileID: 11400000, guid: e383116135fa996409399e738142279d, type: 2}
1043965
--- !u!1 &705507993
1044966
GameObject:
1045967
m_ObjectHideFlags: 0
@@ -1587,6 +1509,89 @@ CanvasRenderer:
15871509
m_PrefabAsset: {fileID: 0}
15881510
m_GameObject: {fileID: 1059894512}
15891511
m_CullTransparentMesh: 0
1512+
--- !u!1 &1090563856
1513+
GameObject:
1514+
m_ObjectHideFlags: 0
1515+
m_CorrespondingSourceObject: {fileID: 0}
1516+
m_PrefabInstance: {fileID: 0}
1517+
m_PrefabAsset: {fileID: 0}
1518+
serializedVersion: 6
1519+
m_Component:
1520+
- component: {fileID: 1090563858}
1521+
- component: {fileID: 1090563857}
1522+
m_Layer: 0
1523+
m_Name: Level Generator
1524+
m_TagString: Untagged
1525+
m_Icon: {fileID: 0}
1526+
m_NavMeshLayer: 0
1527+
m_StaticEditorFlags: 0
1528+
m_IsActive: 1
1529+
--- !u!114 &1090563857
1530+
MonoBehaviour:
1531+
m_ObjectHideFlags: 0
1532+
m_CorrespondingSourceObject: {fileID: 0}
1533+
m_PrefabInstance: {fileID: 0}
1534+
m_PrefabAsset: {fileID: 0}
1535+
m_GameObject: {fileID: 1090563856}
1536+
m_Enabled: 1
1537+
m_EditorHideFlags: 0
1538+
m_Script: {fileID: 11500000, guid: cfae39ce192249ffbfadc4460ba8d0ea, type: 3}
1539+
m_Name:
1540+
m_EditorClassIdentifier:
1541+
width: 4
1542+
height: 4
1543+
cellPrefab: {fileID: 8990666960892848915, guid: f8fe006e9c14f724a80bb10dbe43dfee,
1544+
type: 3}
1545+
modules:
1546+
- {fileID: 11400000, guid: ccd7f81dc004a004cb0c9623254c00bf, type: 2}
1547+
- {fileID: 11400000, guid: b6898c6fada98214f81096cb91a5ed72, type: 2}
1548+
- {fileID: 11400000, guid: 15a6e2c0294ba6545a5d7b4461989d40, type: 2}
1549+
- {fileID: 11400000, guid: 1eb8be357158af740bc8f7c1feb963c8, type: 2}
1550+
- {fileID: 11400000, guid: 7b03e37b1ae16044e90037f2cd32c3e4, type: 2}
1551+
- {fileID: 11400000, guid: 1d4277cc703376c42a44965162516aee, type: 2}
1552+
- {fileID: 11400000, guid: 693c1846c240da3479f6a9c8e66d61a1, type: 2}
1553+
- {fileID: 11400000, guid: a26709b40ca22014bb650e36eb05ea05, type: 2}
1554+
- {fileID: 11400000, guid: 2bdf9d9e96517154fb571696025d0370, type: 2}
1555+
- {fileID: 11400000, guid: 81ce795915529a545b30c384ccba5ceb, type: 2}
1556+
- {fileID: 11400000, guid: b36f24d57c5e3d0459552d943d1765c8, type: 2}
1557+
- {fileID: 11400000, guid: 4b1141662c0a1c14fb5d17286fc724cc, type: 2}
1558+
- {fileID: 11400000, guid: 162aab4dc6f8e114590b25d696387d27, type: 2}
1559+
- {fileID: 11400000, guid: f6e10291c7c42be4fa859f4dda9032fa, type: 2}
1560+
- {fileID: 11400000, guid: af7e24f3778270b4bb17292d47a7ff48, type: 2}
1561+
- {fileID: 11400000, guid: c119d21aeb170db40a40af78e0d1ee9b, type: 2}
1562+
- {fileID: 11400000, guid: 243ef413552d5284f91d21a5e3d8d0bb, type: 2}
1563+
- {fileID: 11400000, guid: 236ebda988720b14181261b33f966a0c, type: 2}
1564+
- {fileID: 11400000, guid: 590b2ee302546e54492d359111ad598f, type: 2}
1565+
- {fileID: 11400000, guid: bdc989d6bca29fb4da8e8649f6222d4e, type: 2}
1566+
- {fileID: 11400000, guid: f1d62dcc8713af64a8c797b88f218a32, type: 2}
1567+
- {fileID: 11400000, guid: 45c154cad0527c34aab437b73adb25eb, type: 2}
1568+
- {fileID: 11400000, guid: 39f34f7c1642e4f4a8bc7deb987ebd12, type: 2}
1569+
- {fileID: 11400000, guid: b476e2ff340aadf41a30afec96516fa9, type: 2}
1570+
- {fileID: 11400000, guid: 5e7f0227c699e9c479f48d31427821ed, type: 2}
1571+
- {fileID: 11400000, guid: d89a5b60e155bfd4cbb252614e830385, type: 2}
1572+
- {fileID: 11400000, guid: 090eef0eb4dfca34d83fca8729c74bc5, type: 2}
1573+
- {fileID: 11400000, guid: 056b613fc1f324044b61451f24fe028e, type: 2}
1574+
- {fileID: 11400000, guid: e672dca1089813d42a6a9fdfce546869, type: 2}
1575+
- {fileID: 11400000, guid: 35aee5ef0fb05a649a27001f04630bcf, type: 2}
1576+
- {fileID: 11400000, guid: fd316731eeaf78c43951e8a812fdabe9, type: 2}
1577+
- {fileID: 11400000, guid: e383116135fa996409399e738142279d, type: 2}
1578+
startModule: {fileID: 11400000, guid: 9b12f41eabab67941a430f09b3443e01, type: 2}
1579+
goalModule: {fileID: 11400000, guid: 48f9aba4c810be6448d8f7a8592d4e19, type: 2}
1580+
seed: -1
1581+
--- !u!4 &1090563858
1582+
Transform:
1583+
m_ObjectHideFlags: 0
1584+
m_CorrespondingSourceObject: {fileID: 0}
1585+
m_PrefabInstance: {fileID: 0}
1586+
m_PrefabAsset: {fileID: 0}
1587+
m_GameObject: {fileID: 1090563856}
1588+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1589+
m_LocalPosition: {x: 0, y: 0, z: 0}
1590+
m_LocalScale: {x: 1, y: 1, z: 1}
1591+
m_Children: []
1592+
m_Father: {fileID: 0}
1593+
m_RootOrder: 4
1594+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
15901595
--- !u!1 &1151151040
15911596
GameObject:
15921597
m_ObjectHideFlags: 0
@@ -1907,7 +1912,7 @@ Transform:
19071912
m_LocalScale: {x: 1, y: 1, z: 1}
19081913
m_Children: []
19091914
m_Father: {fileID: 0}
1910-
m_RootOrder: 5
1915+
m_RootOrder: 3
19111916
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
19121917
--- !u!1 &1439170199
19131918
GameObject:
@@ -2139,54 +2144,6 @@ RectTransform:
21392144
m_AnchoredPosition: {x: 0, y: 0}
21402145
m_SizeDelta: {x: -20, y: 0}
21412146
m_Pivot: {x: 0.5, y: 0.5}
2142-
--- !u!1 &1848369075
2143-
GameObject:
2144-
m_ObjectHideFlags: 0
2145-
m_CorrespondingSourceObject: {fileID: 0}
2146-
m_PrefabInstance: {fileID: 0}
2147-
m_PrefabAsset: {fileID: 0}
2148-
serializedVersion: 6
2149-
m_Component:
2150-
- component: {fileID: 1848369077}
2151-
- component: {fileID: 1848369076}
2152-
m_Layer: 0
2153-
m_Name: Grid
2154-
m_TagString: Untagged
2155-
m_Icon: {fileID: 0}
2156-
m_NavMeshLayer: 0
2157-
m_StaticEditorFlags: 0
2158-
m_IsActive: 1
2159-
--- !u!114 &1848369076
2160-
MonoBehaviour:
2161-
m_ObjectHideFlags: 0
2162-
m_CorrespondingSourceObject: {fileID: 0}
2163-
m_PrefabInstance: {fileID: 0}
2164-
m_PrefabAsset: {fileID: 0}
2165-
m_GameObject: {fileID: 1848369075}
2166-
m_Enabled: 1
2167-
m_EditorHideFlags: 0
2168-
m_Script: {fileID: 11500000, guid: d539eeb0ec51aa843a1c856970bc1e71, type: 3}
2169-
m_Name:
2170-
m_EditorClassIdentifier:
2171-
width: 4
2172-
height: 4
2173-
cellPrefab: {fileID: 8990666960892848915, guid: f8fe006e9c14f724a80bb10dbe43dfee,
2174-
type: 3}
2175-
seed: -1
2176-
--- !u!4 &1848369077
2177-
Transform:
2178-
m_ObjectHideFlags: 0
2179-
m_CorrespondingSourceObject: {fileID: 0}
2180-
m_PrefabInstance: {fileID: 0}
2181-
m_PrefabAsset: {fileID: 0}
2182-
m_GameObject: {fileID: 1848369075}
2183-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2184-
m_LocalPosition: {x: 0, y: 0, z: 0}
2185-
m_LocalScale: {x: 1, y: 1, z: 1}
2186-
m_Children: []
2187-
m_Father: {fileID: 0}
2188-
m_RootOrder: 3
2189-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
21902147
--- !u!1 &1952206893
21912148
GameObject:
21922149
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)