diff --git a/.gitmodules b/.gitmodules index 2d52524..26b6a34 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "Data/External/JSONObject"] - path = Data/External/JSONObject - url = https://github.com/mtschoen/JSONObject +[submodule "Editor/External/JSONObject"] + path = Editor/External/JSONObject + url = https://github.com/mtschoen/JSONObject.git diff --git a/Data/nl.elmarjansen.geojsoncitybuilder.Data.asmdef b/Data/nl.elmarjansen.geojsoncitybuilder.Data.asmdef deleted file mode 100644 index b9668cb..0000000 --- a/Data/nl.elmarjansen.geojsoncitybuilder.Data.asmdef +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name": "nl.elmarjansen.geojsoncitybuilder.Data" -} diff --git a/Data/nl.elmarjansen.geojsoncitybuilder.Data.asmdef.meta b/Data/nl.elmarjansen.geojsoncitybuilder.Data.asmdef.meta deleted file mode 100644 index 90b1697..0000000 --- a/Data/nl.elmarjansen.geojsoncitybuilder.Data.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 3309e6465241f264eadb0960e9ffecde -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Editor/Builders/BlocksFromGeoJsonBuilder.cs b/Editor/Builders/BlocksFromGeoJsonBuilder.cs index ce4c09d..05f2124 100644 --- a/Editor/Builders/BlocksFromGeoJsonBuilder.cs +++ b/Editor/Builders/BlocksFromGeoJsonBuilder.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; +using GeoJsonCityBuilder.Data; using GeoJsonCityBuilder.Data.GeoJSON; using UnityEngine; using UnityEngine.ProBuilder; diff --git a/Editor/Builders/PrefabsFromGeoJsonBuilder.cs b/Editor/Builders/PrefabsFromGeoJsonBuilder.cs index f1af678..b8af7a3 100644 --- a/Editor/Builders/PrefabsFromGeoJsonBuilder.cs +++ b/Editor/Builders/PrefabsFromGeoJsonBuilder.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; +using GeoJsonCityBuilder.Data; using GeoJsonCityBuilder.Data.GeoJSON; using UnityEditor; using UnityEngine; diff --git a/Data/External.meta b/Editor/External.meta similarity index 77% rename from Data/External.meta rename to Editor/External.meta index ee09580..2e9c8b6 100644 --- a/Data/External.meta +++ b/Editor/External.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8d4a39ee1c4fab44982801c6b23bea46 +guid: 0d7af690fd725c642b93f3d72d17027b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Data/External/JSONObject b/Editor/External/JSONObject similarity index 100% rename from Data/External/JSONObject rename to Editor/External/JSONObject diff --git a/Data/External/JSONObject.meta b/Editor/External/JSONObject.meta similarity index 77% rename from Data/External/JSONObject.meta rename to Editor/External/JSONObject.meta index 056ac72..273da88 100644 --- a/Data/External/JSONObject.meta +++ b/Editor/External/JSONObject.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 215a75ab42c82d746bf5556254fcbe37 +guid: 4151be92c2c74b145abfb77448acacde folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Data/GeoJSON.meta b/Editor/GeoJSON.meta similarity index 77% rename from Data/GeoJSON.meta rename to Editor/GeoJSON.meta index e245574..7545376 100644 --- a/Data/GeoJSON.meta +++ b/Editor/GeoJSON.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ad793c04647cb8741bbc950fbcfd4c9b +guid: 032b31855ef2ca8428ca7255e5565e31 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Data/GeoJSON/Feature.cs b/Editor/GeoJSON/Feature.cs similarity index 100% rename from Data/GeoJSON/Feature.cs rename to Editor/GeoJSON/Feature.cs diff --git a/Data/GeoJSON/Feature.cs.meta b/Editor/GeoJSON/Feature.cs.meta similarity index 100% rename from Data/GeoJSON/Feature.cs.meta rename to Editor/GeoJSON/Feature.cs.meta diff --git a/Data/GeoJSON/FeatureCollection.cs b/Editor/GeoJSON/FeatureCollection.cs similarity index 100% rename from Data/GeoJSON/FeatureCollection.cs rename to Editor/GeoJSON/FeatureCollection.cs diff --git a/Data/GeoJSON/FeatureCollection.cs.meta b/Editor/GeoJSON/FeatureCollection.cs.meta similarity index 100% rename from Data/GeoJSON/FeatureCollection.cs.meta rename to Editor/GeoJSON/FeatureCollection.cs.meta diff --git a/Data/GeoJSON/GeoJSONObject.cs b/Editor/GeoJSON/GeoJSONObject.cs similarity index 100% rename from Data/GeoJSON/GeoJSONObject.cs rename to Editor/GeoJSON/GeoJSONObject.cs diff --git a/Data/GeoJSON/GeoJSONObject.cs.meta b/Editor/GeoJSON/GeoJSONObject.cs.meta similarity index 100% rename from Data/GeoJSON/GeoJSONObject.cs.meta rename to Editor/GeoJSON/GeoJSONObject.cs.meta diff --git a/Data/GeoJSON/Geometry.cs b/Editor/GeoJSON/Geometry.cs similarity index 100% rename from Data/GeoJSON/Geometry.cs rename to Editor/GeoJSON/Geometry.cs diff --git a/Data/GeoJSON/Geometry.cs.meta b/Editor/GeoJSON/Geometry.cs.meta similarity index 100% rename from Data/GeoJSON/Geometry.cs.meta rename to Editor/GeoJSON/Geometry.cs.meta diff --git a/Data/GeoJSON/MultiPolygonGeometry.cs b/Editor/GeoJSON/MultiPolygonGeometry.cs similarity index 100% rename from Data/GeoJSON/MultiPolygonGeometry.cs rename to Editor/GeoJSON/MultiPolygonGeometry.cs diff --git a/Data/GeoJSON/MultiPolygonGeometry.cs.meta b/Editor/GeoJSON/MultiPolygonGeometry.cs.meta similarity index 100% rename from Data/GeoJSON/MultiPolygonGeometry.cs.meta rename to Editor/GeoJSON/MultiPolygonGeometry.cs.meta diff --git a/Data/GeoJSON/PointGeometry.cs b/Editor/GeoJSON/PointGeometry.cs similarity index 100% rename from Data/GeoJSON/PointGeometry.cs rename to Editor/GeoJSON/PointGeometry.cs diff --git a/Data/GeoJSON/PointGeometry.cs.meta b/Editor/GeoJSON/PointGeometry.cs.meta similarity index 100% rename from Data/GeoJSON/PointGeometry.cs.meta rename to Editor/GeoJSON/PointGeometry.cs.meta diff --git a/Data/GeoJSON/PolygonGeometry.cs b/Editor/GeoJSON/PolygonGeometry.cs similarity index 100% rename from Data/GeoJSON/PolygonGeometry.cs rename to Editor/GeoJSON/PolygonGeometry.cs diff --git a/Data/GeoJSON/PolygonGeometry.cs.meta b/Editor/GeoJSON/PolygonGeometry.cs.meta similarity index 100% rename from Data/GeoJSON/PolygonGeometry.cs.meta rename to Editor/GeoJSON/PolygonGeometry.cs.meta diff --git a/Data/GeoJSON/Properties.cs b/Editor/GeoJSON/Properties.cs similarity index 100% rename from Data/GeoJSON/Properties.cs rename to Editor/GeoJSON/Properties.cs diff --git a/Data/GeoJSON/Properties.cs.meta b/Editor/GeoJSON/Properties.cs.meta similarity index 100% rename from Data/GeoJSON/Properties.cs.meta rename to Editor/GeoJSON/Properties.cs.meta diff --git a/Runtime/Components/BlocksFromGeoJson.cs b/Runtime/Components/BlocksFromGeoJson.cs index 0ad631b..801e1f7 100644 --- a/Runtime/Components/BlocksFromGeoJson.cs +++ b/Runtime/Components/BlocksFromGeoJson.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -using GeoJsonCityBuilder.Data.GeoJSON; +using GeoJsonCityBuilder.Data; using UnityEngine; using UnityEngine.ProBuilder; diff --git a/Runtime/Components/PositionOnWorldCoordinates.cs b/Runtime/Components/PositionOnWorldCoordinates.cs index 3d70ce2..025c8e6 100644 --- a/Runtime/Components/PositionOnWorldCoordinates.cs +++ b/Runtime/Components/PositionOnWorldCoordinates.cs @@ -1,6 +1,6 @@ using System.Collections; using System.Collections.Generic; -using GeoJsonCityBuilder.Data.GeoJSON; +using GeoJsonCityBuilder.Data; using UnityEngine; namespace GeoJsonCityBuilder diff --git a/Runtime/Components/PrefabsFromGeoJson.cs b/Runtime/Components/PrefabsFromGeoJson.cs index 215b867..132e3f6 100644 --- a/Runtime/Components/PrefabsFromGeoJson.cs +++ b/Runtime/Components/PrefabsFromGeoJson.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -using GeoJsonCityBuilder.Data.GeoJSON; +using GeoJsonCityBuilder.Data; using UnityEditor; using UnityEngine; using UnityEngine.ProBuilder; diff --git a/Data.meta b/Runtime/Data.meta similarity index 77% rename from Data.meta rename to Runtime/Data.meta index bd6c4ff..d80c505 100644 --- a/Data.meta +++ b/Runtime/Data.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 26ad629ae0abf224eb8b185e1282fc9f +guid: d8fc9e84c3cc2a34d9f91bfbb9bd619a folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Data/GeoJSON/Coordinate.cs b/Runtime/Data/Coordinate.cs similarity index 97% rename from Data/GeoJSON/Coordinate.cs rename to Runtime/Data/Coordinate.cs index 08ff905..88e1e54 100644 --- a/Data/GeoJSON/Coordinate.cs +++ b/Runtime/Data/Coordinate.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace GeoJsonCityBuilder.Data.GeoJSON { +namespace GeoJsonCityBuilder.Data { [Serializable] public class Coordinate { diff --git a/Data/GeoJSON/Coordinate.cs.meta b/Runtime/Data/Coordinate.cs.meta similarity index 83% rename from Data/GeoJSON/Coordinate.cs.meta rename to Runtime/Data/Coordinate.cs.meta index cffd30c..649d2ce 100644 --- a/Data/GeoJSON/Coordinate.cs.meta +++ b/Runtime/Data/Coordinate.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 95a69ea9edcb5a0409bf048f76051c98 +guid: d7605d83298adc348a09df0f7abbdf10 MonoImporter: externalObjects: {} serializedVersion: 2