diff --git a/Assets/Prefab/Internal/3D/DesertTerrain.prefab b/Assets/Prefab/Internal/3D/DesertTerrain.prefab index 9718c65..5d9d749 100644 --- a/Assets/Prefab/Internal/3D/DesertTerrain.prefab +++ b/Assets/Prefab/Internal/3D/DesertTerrain.prefab @@ -112,50 +112,6 @@ TerrainCollider: m_Enabled: 1 m_TerrainData: {fileID: 15600000, guid: 341a9f816749cc94184a969203e0ca90, type: 2} m_EnableTreeColliders: 1 ---- !u!1 &2833149039642810054 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1599808776798555825} - - component: {fileID: 1454071697836266212} - m_Layer: 0 - m_Name: Wall1(Clone) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1599808776798555825 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2833149039642810054} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 981606792542339796} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &1454071697836266212 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2833149039642810054} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 4, y: 300, z: 4096} - m_Center: {x: 2048, y: 0, z: 0} --- !u!1 &4353899300367462599 GameObject: m_ObjectHideFlags: 0 @@ -216,50 +172,6 @@ Transform: m_Father: {fileID: 2723258013395397630} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &5420640108992326010 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2489854441578926941} - - component: {fileID: 4096909985466349748} - m_Layer: 0 - m_Name: Wall0(Clone) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2489854441578926941 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5420640108992326010} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 981606792542339796} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &4096909985466349748 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5420640108992326010} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 4096, y: 300, z: 4} - m_Center: {x: 0, y: 0, z: 2048} --- !u!1 &5836404662393964003 GameObject: m_ObjectHideFlags: 0 @@ -367,94 +279,6 @@ TerrainCollider: m_Enabled: 1 m_TerrainData: {fileID: 15600000, guid: 3b4e9c8ff063bed40908debc02da1b86, type: 2} m_EnableTreeColliders: 1 ---- !u!1 &6317993236501697552 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7351254070356589247} - - component: {fileID: 8799146068193239677} - m_Layer: 0 - m_Name: Wall3(Clone) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7351254070356589247 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6317993236501697552} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 981606792542339796} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &8799146068193239677 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6317993236501697552} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 4, y: 300, z: 4096} - m_Center: {x: -2048, y: 0, z: 0} ---- !u!1 &6381273438080327431 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1156076025300596754} - - component: {fileID: 4319190641482709151} - m_Layer: 0 - m_Name: Wall2(Clone) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1156076025300596754 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6381273438080327431} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 981606792542339796} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &4319190641482709151 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6381273438080327431} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 4096, y: 300, z: 4} - m_Center: {x: 0, y: 0, z: -2048} --- !u!1 &8110326164699059445 GameObject: m_ObjectHideFlags: 0 @@ -589,11 +413,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2048, y: 512, z: 2048} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 2489854441578926941} - - {fileID: 1599808776798555825} - - {fileID: 1156076025300596754} - - {fileID: 7351254070356589247} + m_Children: [] m_Father: {fileID: 8764433350868936292} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -611,6 +431,7 @@ MonoBehaviour: m_EditorClassIdentifier: depth: 4 height: 300 + inset: 100 map: 1 --- !u!1 &9000362401794272117 GameObject: diff --git a/Assets/Prefab/Internal/3D/HighlandsTerrain.prefab b/Assets/Prefab/Internal/3D/HighlandsTerrain.prefab index eeb41c6..552dabc 100644 --- a/Assets/Prefab/Internal/3D/HighlandsTerrain.prefab +++ b/Assets/Prefab/Internal/3D/HighlandsTerrain.prefab @@ -28,10 +28,10 @@ Transform: m_LocalPosition: {x: 2048, y: 547, z: 2048} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 8451738342599496825} - - {fileID: 622603301710714426} - - {fileID: 8163014746669670601} - - {fileID: 1559241028586918321} + - {fileID: 7061731525824112206} + - {fileID: 696923583187924781} + - {fileID: 6077939131250165542} + - {fileID: 2992696989258826107} m_Father: {fileID: 1850646933706671832} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -49,51 +49,8 @@ MonoBehaviour: m_EditorClassIdentifier: depth: 4 height: 700 + inset: 100 map: 0 ---- !u!1 &1358505770550601643 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8163014746669670601} - - component: {fileID: 6814129804410000242} - m_Layer: 0 - m_Name: Wall2(Clone) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8163014746669670601 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1358505770550601643} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 2360726726829903295} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &6814129804410000242 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1358505770550601643} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 4096, y: 700, z: 4} - m_Center: {x: 0, y: 0, z: -2048} --- !u!1 &1850646932820784178 GameObject: m_ObjectHideFlags: 0 @@ -433,7 +390,7 @@ TerrainCollider: m_Enabled: 1 m_TerrainData: {fileID: 15600000, guid: 7e5d25eca13653645a2c443204619558, type: 2} m_EnableTreeColliders: 1 ---- !u!1 &3733169463103170820 +--- !u!1 &2483588181238659114 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -441,43 +398,43 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 622603301710714426} - - component: {fileID: 4537157327926421470} + - component: {fileID: 7061731525824112206} + - component: {fileID: 7985137035243275723} m_Layer: 0 - m_Name: Wall1(Clone) + m_Name: Wall0(Clone) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &622603301710714426 +--- !u!4 &7061731525824112206 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3733169463103170820} + m_GameObject: {fileID: 2483588181238659114} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2360726726829903295} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &4537157327926421470 +--- !u!65 &7985137035243275723 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3733169463103170820} + m_GameObject: {fileID: 2483588181238659114} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 4, y: 700, z: 4096} - m_Center: {x: 2048, y: 0, z: 0} ---- !u!1 &8738312149566693036 + m_Size: {x: 3996, y: 700, z: 4} + m_Center: {x: 0, y: 0, z: 1998} +--- !u!1 &3460918565853520840 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -485,43 +442,43 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8451738342599496825} - - component: {fileID: 1255929447194561490} + - component: {fileID: 2992696989258826107} + - component: {fileID: 5230114758545309136} m_Layer: 0 - m_Name: Wall0(Clone) + m_Name: Wall3(Clone) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &8451738342599496825 +--- !u!4 &2992696989258826107 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8738312149566693036} + m_GameObject: {fileID: 3460918565853520840} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2360726726829903295} - m_RootOrder: 0 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &1255929447194561490 +--- !u!65 &5230114758545309136 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8738312149566693036} + m_GameObject: {fileID: 3460918565853520840} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 4096, y: 700, z: 4} - m_Center: {x: 0, y: 0, z: 2048} ---- !u!1 &8856493464294994269 + m_Size: {x: 4, y: 700, z: 3996} + m_Center: {x: -1998, y: 0, z: 0} +--- !u!1 &7422990848190229067 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -529,39 +486,83 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1559241028586918321} - - component: {fileID: 8240041719433265286} + - component: {fileID: 6077939131250165542} + - component: {fileID: 9074991184654904673} m_Layer: 0 - m_Name: Wall3(Clone) + m_Name: Wall2(Clone) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1559241028586918321 +--- !u!4 &6077939131250165542 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8856493464294994269} + m_GameObject: {fileID: 7422990848190229067} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2360726726829903295} - m_RootOrder: 3 + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &9074991184654904673 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7422990848190229067} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 3996, y: 700, z: 4} + m_Center: {x: 0, y: 0, z: -1998} +--- !u!1 &8423599525375796711 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 696923583187924781} + - component: {fileID: 3619906486387090744} + m_Layer: 0 + m_Name: Wall1(Clone) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &696923583187924781 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8423599525375796711} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2360726726829903295} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &8240041719433265286 +--- !u!65 &3619906486387090744 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8856493464294994269} + m_GameObject: {fileID: 8423599525375796711} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 4, y: 700, z: 4096} - m_Center: {x: -2048, y: 0, z: 0} + m_Size: {x: 4, y: 700, z: 3996} + m_Center: {x: 1998, y: 0, z: 0} diff --git a/Assets/Scripts/Utility/WorldWallBuilder.cs b/Assets/Scripts/Utility/WorldWallBuilder.cs index 86e70ab..5db0793 100644 --- a/Assets/Scripts/Utility/WorldWallBuilder.cs +++ b/Assets/Scripts/Utility/WorldWallBuilder.cs @@ -9,13 +9,15 @@ public class WorldWallBuilder : MonoBehaviour { public float depth; public float height; + public float inset; public MapEnum map; private Vector3 _size; - public void Awake() + public void Update() { _size = MapEnumWrapper.MapSizes[map]; + _size -= Vector3.one * inset; } public void BuildWalls() diff --git a/awconnection/awconnection.egg-info/PKG-INFO b/awconnection/awconnection.egg-info/PKG-INFO index d04fcd4..6644f00 100644 --- a/awconnection/awconnection.egg-info/PKG-INFO +++ b/awconnection/awconnection.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.2 Name: awconnection -Version: 0.3.2.post2 +Version: 0.3.3 Summary: An interface between Python and AutonoWar Home-page: https://github.com/griffinteller/awconnection Author: Griffin Teller diff --git a/awconnection/dist/awconnection-0.3.2.post2-py3-none-any.whl b/awconnection/dist/awconnection-0.3.2.post2-py3-none-any.whl deleted file mode 100644 index c4c4f5c..0000000 Binary files a/awconnection/dist/awconnection-0.3.2.post2-py3-none-any.whl and /dev/null differ diff --git a/awconnection/dist/awconnection-0.3.2.post2.tar.gz b/awconnection/dist/awconnection-0.3.2.post2.tar.gz deleted file mode 100644 index d074892..0000000 Binary files a/awconnection/dist/awconnection-0.3.2.post2.tar.gz and /dev/null differ diff --git a/awconnection/dist/awconnection-0.3.3-py3-none-any.whl b/awconnection/dist/awconnection-0.3.3-py3-none-any.whl new file mode 100644 index 0000000..6717127 Binary files /dev/null and b/awconnection/dist/awconnection-0.3.3-py3-none-any.whl differ diff --git a/awconnection/dist/awconnection-0.3.3.tar.gz b/awconnection/dist/awconnection-0.3.3.tar.gz new file mode 100644 index 0000000..da1183c Binary files /dev/null and b/awconnection/dist/awconnection-0.3.3.tar.gz differ diff --git a/awconnection/setup.py b/awconnection/setup.py index 9d3c0d2..f3d0dac 100644 --- a/awconnection/setup.py +++ b/awconnection/setup.py @@ -9,7 +9,7 @@ name='awconnection', license="MIT", description='An interface between Python and AutonoWar', - version='v0.3.2-2', + version='v0.3.3', long_description=README, url='https://github.com/griffinteller/awconnection', packages=setuptools.find_packages(),