Skip to content

N
navmeshcomponents

爱小饭呀 / navmeshcomponents
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
N
navmeshcomponents

体验新版 GitCode，发现更多精彩内容 >>

提交 3b98e0bd 编写于 作者: J Jakob Hunsballe
浏览文件
操作

Update for new experimental build 

. NavMeshSurface supports baking and applying prefab instances.
. NavMeshLink and NavMeshSurface ignore scale.
. NavMeshLink has optional position & rotation when added.
. meta-files added: icons for components in inspector and project
windows.
. HelpURL for components.
. Coding style fixes.
上级 ce83e6ec
隐藏空白更改
内联 并排
Showing with 526 addition and 248 deletion
Assets/Gizmos/NavMeshLink Icon.png.meta 0 → 100644
浏览文件 @ 3b98e0bd
fileFormatVersion: 2
guid: 92f4afa3e25264f5b964937ccea49ff2
timeCreated: 1477656497
licenseType: Pro
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 4
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
Assets/Gizmos/NavMeshModifierVolume Icon.png.meta 0 → 100644
浏览文件 @ 3b98e0bd
fileFormatVersion: 2
guid: cc7b9475dbddf4f9088d327d6e10ab77
timeCreated: 1477656497
licenseType: Pro
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 4
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
Assets/Gizmos/NavMeshSurface Icon.png.meta 0 → 100644
浏览文件 @ 3b98e0bd
fileFormatVersion: 2
guid: e4f97225bcfb64760a1c81f460837f01
timeCreated: 1477656497
licenseType: Pro
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 4
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
Assets/NavMeshComponents/Editor/NavMeshLinkEditor.cs
浏览文件 @ 3b98e0bd
......@@ -4,7 +4,7 @@
namespace UnityEditor.AI
{
[CanEditMultipleObjects]
[CustomEditor (typeof (NavMeshLink))]
[CustomEditor(typeof(NavMeshLink))]
class NavMeshLinkEditor : Editor
{
SerializedProperty m_AgentTypeID;
......@@ -18,18 +18,18 @@ class NavMeshLinkEditor : Editor
static int s_SelectedID;
static int s_SelectedPoint = -1;
static Color s_HandleColor = new Color (255f, 167f, 39f, 210f) / 255;
static Color s_HandleColorDisabled = new Color (255f*0.75f, 167f*0.75f, 39f*0.75f, 100f) / 255;
static Color s_HandleColor = new Color(255f, 167f, 39f, 210f) / 255;
static Color s_HandleColorDisabled = new Color(255f * 0.75f, 167f * 0.75f, 39f * 0.75f, 100f) / 255;
void OnEnable ()
void OnEnable()
{
m_AgentTypeID = serializedObject.FindProperty ("m_AgentTypeID");
m_Area = serializedObject.FindProperty ("m_Area");
m_AutoUpdatePosition = serializedObject.FindProperty ("m_AutoUpdatePosition");
m_Bidirectional = serializedObject.FindProperty ("m_Bidirectional");
m_EndPoint = serializedObject.FindProperty ("m_EndPoint");
m_StartPoint = serializedObject.FindProperty ("m_StartPoint");
m_Width = serializedObject.FindProperty ("m_Width");
m_AgentTypeID = serializedObject.FindProperty("m_AgentTypeID");
m_Area = serializedObject.FindProperty("m_Area");
m_AutoUpdatePosition = serializedObject.FindProperty("m_AutoUpdatePosition");
m_Bidirectional = serializedObject.FindProperty("m_Bidirectional");
m_EndPoint = serializedObject.FindProperty("m_EndPoint");
m_StartPoint = serializedObject.FindProperty("m_StartPoint");
m_Width = serializedObject.FindProperty("m_Width");
s_SelectedID = 0;
s_SelectedPoint = -1;
......@@ -37,87 +37,92 @@ void OnEnable ()
NavMeshVisualizationSettings.showNavigation++;
}
void OnDisable ()
void OnDisable()
{
NavMeshVisualizationSettings.showNavigation--;
}
void AlignTransformToEndPoints (NavMeshLink navLink)
static Matrix4x4 UnscaledLocalToWorldMatrix(Transform t)
{
var transform = navLink.transform;
Vector3 worldStartPt = transform.TransformPoint (navLink.startPoint);
Vector3 worldEndPt = transform.TransformPoint (navLink.endPoint);
return Matrix4x4.TRS(t.position, t.rotation, Vector3.one);
}
Vector3 forward = worldEndPt - worldStartPt;
Vector3 up = transform.up;
void AlignTransformToEndPoints(NavMeshLink navLink)
{
var mat = UnscaledLocalToWorldMatrix(navLink.transform);
// Flatten
forward -= Vector3.Dot (up, forward) * up;
var worldStartPt = mat.MultiplyPoint(navLink.startPoint);
var worldEndPt = mat.MultiplyPoint(navLink.endPoint);
var forward = worldEndPt - worldStartPt;
var up = navLink.transform.up;
var rotation = new Quaternion ();
rotation.SetLookRotation (forward, up);
// Flatten
forward -= Vector3.Dot(up, forward) * up;
transform.rotation = rotation;
var transform = navLink.transform;
transform.rotation = Quaternion.LookRotation(forward, up);
transform.position = (worldEndPt + worldStartPt) * 0.5f;
transform.localScale = Vector3.one;
navLink.startPoint = transform.InverseTransformPoint (worldStartPt);
navLink.endPoint = transform.InverseTransformPoint (worldEndPt);
navLink.startPoint = transform.InverseTransformPoint(worldStartPt);
navLink.endPoint = transform.InverseTransformPoint(worldEndPt);
}
public override void OnInspectorGUI()
{
serializedObject.Update ();
NavMeshEditorHelpers.AgentTypePopup ("Agent Type", m_AgentTypeID);
EditorGUILayout.Space ();
EditorGUILayout.PropertyField (m_StartPoint);
EditorGUILayout.PropertyField (m_EndPoint);
EditorGUILayout.PropertyField (m_Width);
m_Width.floatValue = Mathf.Max (0.0f, m_Width.floatValue);
GUILayout.BeginHorizontal ();
GUILayout.Space (EditorGUIUtility.labelWidth);
if (GUILayout.Button ("Align Transform To Points"))
serializedObject.Update();
NavMeshEditorHelpers.AgentTypePopup("Agent Type", m_AgentTypeID);
EditorGUILayout.Space();
EditorGUILayout.PropertyField(m_StartPoint);
EditorGUILayout.PropertyField(m_EndPoint);
EditorGUILayout.PropertyField(m_Width);
m_Width.floatValue = Mathf.Max(0.0f, m_Width.floatValue);
GUILayout.BeginHorizontal();
GUILayout.Space(EditorGUIUtility.labelWidth);
if (GUILayout.Button("Align Transform To Points"))
{
foreach (NavMeshLink navLink in targets)
{
foreach (NavMeshLink navLink in targets)
{
Undo.RecordObject (navLink.transform, "Align Transform to End Points");
Undo.RecordObject (navLink, "Align Transform to End Points");
AlignTransformToEndPoints (navLink);
}
Undo.RecordObject(navLink.transform, "Align Transform to End Points");
Undo.RecordObject(navLink, "Align Transform to End Points");
AlignTransformToEndPoints(navLink);
}
GUILayout.EndHorizontal ();
EditorGUILayout.Space ();
}
GUILayout.EndHorizontal();
EditorGUILayout.Space();
EditorGUILayout.PropertyField (m_AutoUpdatePosition);
EditorGUILayout.PropertyField (m_Bidirectional);
EditorGUILayout.PropertyField(m_AutoUpdatePosition);
EditorGUILayout.PropertyField(m_Bidirectional);
NavMeshEditorHelpers.AreaPopup ("Area Type", m_Area);
NavMeshEditorHelpers.AreaPopup("Area Type", m_Area);
serializedObject.ApplyModifiedProperties ();
serializedObject.ApplyModifiedProperties();
EditorGUILayout.Space ();
EditorGUILayout.Space();
}
static Vector3 CalcLinkRight (NavMeshLink navLink)
static Vector3 CalcLinkRight(NavMeshLink navLink)
{
Vector3 dir = navLink.endPoint - navLink.startPoint;
return (new Vector3 (-dir.z, 0.0f, dir.x)).normalized;
var dir = navLink.endPoint - navLink.startPoint;
return (new Vector3(-dir.z, 0.0f, dir.x)).normalized;
}
static void DrawLink (NavMeshLink navLink)
static void DrawLink(NavMeshLink navLink)
{
Vector3 right = CalcLinkRight (navLink);
float rad = navLink.width * 0.5f;
var right = CalcLinkRight(navLink);
var rad = navLink.width * 0.5f;
Gizmos.DrawLine (navLink.startPoint - right * rad, navLink.startPoint + right * rad);
Gizmos.DrawLine (navLink.endPoint - right * rad, navLink.endPoint + right * rad);
Gizmos.DrawLine (navLink.startPoint - right * rad, navLink.endPoint - right * rad);
Gizmos.DrawLine (navLink.startPoint + right * rad, navLink.endPoint + right * rad);
Gizmos.DrawLine(navLink.startPoint - right * rad, navLink.startPoint + right * rad);
Gizmos.DrawLine(navLink.endPoint - right * rad, navLink.endPoint + right * rad);
Gizmos.DrawLine(navLink.startPoint - right * rad, navLink.endPoint - right * rad);
Gizmos.DrawLine(navLink.startPoint + right * rad, navLink.endPoint + right * rad);
}
[DrawGizmo (GizmoType.Selected | GizmoType.Active | GizmoType.Pickable)]
static void RenderBoxGizmo (NavMeshLink navLink, GizmoType gizmoType)
[DrawGizmo(GizmoType.Selected | GizmoType.Active | GizmoType.Pickable)]
static void RenderBoxGizmo(NavMeshLink navLink, GizmoType gizmoType)
{
if (!EditorApplication.isPlaying)
navLink.UpdateLink();
......@@ -129,19 +134,19 @@ static void RenderBoxGizmo (NavMeshLink navLink, GizmoType gizmoType)
var oldColor = Gizmos.color;
var oldMatrix = Gizmos.matrix;
Gizmos.matrix = navLink.transform.localToWorldMatrix;
Gizmos.matrix = UnscaledLocalToWorldMatrix(navLink.transform);
Gizmos.color = color;
DrawLink (navLink);
DrawLink(navLink);
Gizmos.matrix = oldMatrix;
Gizmos.color = oldColor;
Gizmos.DrawIcon (navLink.transform.position, "NavMeshLink Icon", true);
Gizmos.DrawIcon(navLink.transform.position, "NavMeshLink Icon", true);
}
[DrawGizmo (GizmoType.NotInSelectionHierarchy | GizmoType.Pickable)]
static void RenderBoxGizmoNotSelected (NavMeshLink navLink, GizmoType gizmoType)
[DrawGizmo(GizmoType.NotInSelectionHierarchy | GizmoType.Pickable)]
static void RenderBoxGizmoNotSelected(NavMeshLink navLink, GizmoType gizmoType)
{
if (NavMeshVisualizationSettings.showNavigation > 0)
{
......@@ -152,16 +157,16 @@ static void RenderBoxGizmoNotSelected (NavMeshLink navLink, GizmoType gizmoType)
var oldColor = Gizmos.color;
var oldMatrix = Gizmos.matrix;
Gizmos.matrix = navLink.transform.localToWorldMatrix;
Gizmos.matrix = UnscaledLocalToWorldMatrix(navLink.transform);
Gizmos.color = color;
DrawLink (navLink);
DrawLink(navLink);
Gizmos.matrix = oldMatrix;
Gizmos.color = oldColor;
}
Gizmos.DrawIcon (navLink.transform.position, "NavMeshLink Icon", true);
Gizmos.DrawIcon(navLink.transform.position, "NavMeshLink Icon", true);
}
public void OnSceneGUI()
......@@ -170,35 +175,37 @@ public void OnSceneGUI()
if (!navLink.enabled)
return;
Vector3 startPt = navLink.transform.TransformPoint (navLink.startPoint);
Vector3 endPt = navLink.transform.TransformPoint (navLink.endPoint);
Vector3 midPt = Vector3.Lerp (startPt, endPt, 0.35f);
float startSize = HandleUtility.GetHandleSize (startPt);
float endSize = HandleUtility.GetHandleSize (endPt);
float midSize = HandleUtility.GetHandleSize (midPt);
var mat = UnscaledLocalToWorldMatrix(navLink.transform);
var startPt = mat.MultiplyPoint(navLink.startPoint);
var endPt = mat.MultiplyPoint(navLink.endPoint);
var midPt = Vector3.Lerp(startPt, endPt, 0.35f);
var startSize = HandleUtility.GetHandleSize(startPt);
var endSize = HandleUtility.GetHandleSize(endPt);
var midSize = HandleUtility.GetHandleSize(midPt);
Quaternion zup = Quaternion.FromToRotation (Vector3.forward, Vector3.up);
Vector3 right = navLink.transform.TransformVector (CalcLinkRight (navLink));
var zup = Quaternion.FromToRotation(Vector3.forward, Vector3.up);
var right = mat.MultiplyVector(CalcLinkRight(navLink));
Color oldColor = Handles.color;
var oldColor = Handles.color;
Handles.color = s_HandleColor;
Vector3 pos;
if (navLink.GetInstanceID() == s_SelectedID && s_SelectedPoint == 0)
{
EditorGUI.BeginChangeCheck ();
Handles.CubeCap (0, startPt, zup, 0.1f * startSize);
pos = Handles.PositionHandle (startPt, navLink.transform.rotation);
if (EditorGUI.EndChangeCheck ())
EditorGUI.BeginChangeCheck();
Handles.CubeCap(0, startPt, zup, 0.1f * startSize);
pos = Handles.PositionHandle(startPt, navLink.transform.rotation);
if (EditorGUI.EndChangeCheck())
{
Undo.RecordObject (navLink, "Move link point");
navLink.startPoint = navLink.transform.InverseTransformPoint (pos);
Undo.RecordObject(navLink, "Move link point");
navLink.startPoint = mat.inverse.MultiplyPoint(pos);
}
}
else
{
if (Handles.Button (startPt, zup, 0.1f * startSize, 0.1f * startSize, Handles.CubeCap))
if (Handles.Button(startPt, zup, 0.1f * startSize, 0.1f * startSize, Handles.CubeCap))
{
s_SelectedPoint = 0;
s_SelectedID = navLink.GetInstanceID();
......@@ -207,52 +214,52 @@ public void OnSceneGUI()
if (navLink.GetInstanceID() == s_SelectedID && s_SelectedPoint == 1)
{
EditorGUI.BeginChangeCheck ();
Handles.CubeCap (0, endPt, zup, 0.1f * startSize);
pos = Handles.PositionHandle (endPt, navLink.transform.rotation);
if (EditorGUI.EndChangeCheck ())
EditorGUI.BeginChangeCheck();
Handles.CubeCap(0, endPt, zup, 0.1f * startSize);
pos = Handles.PositionHandle(endPt, navLink.transform.rotation);
if (EditorGUI.EndChangeCheck())
{
Undo.RecordObject (navLink, "Move link point");
navLink.endPoint = navLink.transform.InverseTransformPoint (pos);
Undo.RecordObject(navLink, "Move link point");
navLink.endPoint = mat.inverse.MultiplyPoint(pos);
}
}
else
{
if (Handles.Button (endPt, zup, 0.1f * endSize, 0.1f * endSize, Handles.CubeCap))
if (Handles.Button(endPt, zup, 0.1f * endSize, 0.1f * endSize, Handles.CubeCap))
{
s_SelectedPoint = 1;
s_SelectedID = navLink.GetInstanceID();
}
}
EditorGUI.BeginChangeCheck ();
pos = Handles.Slider (midPt + right * navLink.width*0.5f, right, midSize * 0.03f, Handles.DotCap, 0);
if (EditorGUI.EndChangeCheck ())
EditorGUI.BeginChangeCheck();
pos = Handles.Slider(midPt + right * navLink.width * 0.5f, right, midSize * 0.03f, Handles.DotCap, 0);
if (EditorGUI.EndChangeCheck())
{
Undo.RecordObject (navLink, "Adjust link width");
navLink.width = Mathf.Max (0.0f, Vector3.Dot (right, (pos - midPt)) * 2.0f);
Undo.RecordObject(navLink, "Adjust link width");
navLink.width = Mathf.Max(0.0f, Vector3.Dot(right, (pos - midPt)) * 2.0f);
}
EditorGUI.BeginChangeCheck ();
pos = Handles.Slider (midPt - right * navLink.width*0.5f, -right, midSize * 0.03f, Handles.DotCap, 0);
if (EditorGUI.EndChangeCheck ())
EditorGUI.BeginChangeCheck();
pos = Handles.Slider(midPt - right * navLink.width * 0.5f, -right, midSize * 0.03f, Handles.DotCap, 0);
if (EditorGUI.EndChangeCheck())
{
Undo.RecordObject (navLink, "Adjust link width");
navLink.width = Mathf.Max (0.0f, Vector3.Dot (-right, (pos - midPt)) * 2.0f);
Undo.RecordObject(navLink, "Adjust link width");
navLink.width = Mathf.Max(0.0f, Vector3.Dot(-right, (pos - midPt)) * 2.0f);
}
Handles.color = oldColor;
}
[MenuItem ("GameObject/AI/NavMesh Link", false, 2002)]
static public void CreateNavMeshLink (MenuCommand menuCommand)
[MenuItem("GameObject/AI/NavMesh Link", false, 2002)]
static public void CreateNavMeshLink(MenuCommand menuCommand)
{
var parent = menuCommand.context as GameObject;
GameObject go = NavMeshEditorHelpers.CreateAndSelectGameObject ("NavMesh Link", parent);
go.AddComponent<NavMeshLink> ();
GameObject go = NavMeshEditorHelpers.CreateAndSelectGameObject("NavMesh Link", parent);
go.AddComponent<NavMeshLink>();
var view = SceneView.lastActiveSceneView;
if (view != null)
view.MoveToView (go.transform);
view.MoveToView(go.transform);
}
}
}
Assets/NavMeshComponents/Editor/NavMeshLinkEditor.cs.meta 0 → 100644
浏览文件 @ 3b98e0bd
fileFormatVersion: 2
guid: ece1e865d1ad84587872fe8580ab5a20
timeCreated: 1477036743
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/NavMeshComponents/Editor/NavMeshModifierEditor.cs.meta 0 → 100644
浏览文件 @ 3b98e0bd
fileFormatVersion: 2
guid: 6fa04b4743e3947eba4d7b9e5832ea69
timeCreated: 1477036742
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/NavMeshComponents/Editor/NavMeshModifierVolumeEditor.cs
浏览文件 @ 3b98e0bd
......@@ -4,7 +4,7 @@
namespace UnityEditor.AI
{
[CanEditMultipleObjects]
[CustomEditor (typeof (NavMeshModifierVolume))]
[CustomEditor(typeof(NavMeshModifierVolume))]
class NavMeshModifierVolumeEditor : Editor
{
SerializedProperty m_AffectedAgents;
......@@ -12,45 +12,45 @@ class NavMeshModifierVolumeEditor : Editor
SerializedProperty m_Center;
SerializedProperty m_Size;
static Color s_HandleColor = new Color (187f, 138f, 240f, 210f) / 255;
static Color s_HandleColorDisabled = new Color (187f*0.75f, 138f*0.75f, 240f*0.75f, 100f) / 255;
static Color s_HandleColor = new Color(187f, 138f, 240f, 210f) / 255;
static Color s_HandleColorDisabled = new Color(187f * 0.75f, 138f * 0.75f, 240f * 0.75f, 100f) / 255;
void OnEnable ()
void OnEnable()
{
m_AffectedAgents = serializedObject.FindProperty ("m_AffectedAgents");
m_Area = serializedObject.FindProperty ("m_Area");
m_Center = serializedObject.FindProperty ("m_Center");
m_Size = serializedObject.FindProperty ("m_Size");
m_AffectedAgents = serializedObject.FindProperty("m_AffectedAgents");
m_Area = serializedObject.FindProperty("m_Area");
m_Center = serializedObject.FindProperty("m_Center");
m_Size = serializedObject.FindProperty("m_Size");
NavMeshVisualizationSettings.showNavigation++;
}
void OnDisable ()
void OnDisable()
{
NavMeshVisualizationSettings.showNavigation--;
}
public override void OnInspectorGUI()
{
serializedObject.Update ();
serializedObject.Update();
EditorGUILayout.PropertyField (m_Size);
EditorGUILayout.PropertyField (m_Center);
EditorGUILayout.PropertyField(m_Size);
EditorGUILayout.PropertyField(m_Center);
NavMeshEditorHelpers.AreaPopup ("Area Type", m_Area);
NavMeshEditorHelpers.AgentMaskPopup ("Affected Agents", m_AffectedAgents);
NavMeshEditorHelpers.AreaPopup("Area Type", m_Area);
NavMeshEditorHelpers.AgentMaskPopup("Affected Agents", m_AffectedAgents);
EditorGUILayout.Space();
serializedObject.ApplyModifiedProperties ();
serializedObject.ApplyModifiedProperties();
}
[DrawGizmo (GizmoType.Selected | GizmoType.Active)]
static void RenderBoxGizmo (NavMeshModifierVolume navModifier, GizmoType gizmoType)
[DrawGizmo(GizmoType.Selected | GizmoType.Active)]
static void RenderBoxGizmo(NavMeshModifierVolume navModifier, GizmoType gizmoType)
{
var color = s_HandleColor;
if (!navModifier.enabled)
color = s_HandleColorDisabled;
var colorTrans = new Color (color.r*0.75f, color.g*0.75f, color.b*0.75f, color.a*0.15f);
var colorTrans = new Color(color.r * 0.75f, color.g * 0.75f, color.b * 0.75f, color.a * 0.15f);
var oldColor = Gizmos.color;
var oldMatrix = Gizmos.matrix;
......@@ -58,19 +58,19 @@ static void RenderBoxGizmo (NavMeshModifierVolume navModifier, GizmoType gizmoTy
Gizmos.matrix = navModifier.transform.localToWorldMatrix;
Gizmos.color = colorTrans;
Gizmos.DrawCube (navModifier.center, navModifier.size);
Gizmos.DrawCube(navModifier.center, navModifier.size);
Gizmos.color = color;
Gizmos.DrawWireCube (navModifier.center, navModifier.size);
Gizmos.DrawWireCube(navModifier.center, navModifier.size);
Gizmos.matrix = oldMatrix;
Gizmos.color = oldColor;
Gizmos.DrawIcon (navModifier.transform.position, "NavMeshModifierVolume Icon", true);
Gizmos.DrawIcon(navModifier.transform.position, "NavMeshModifierVolume Icon", true);
}
[DrawGizmo (GizmoType.NotInSelectionHierarchy | GizmoType.Pickable)]
static void RenderBoxGizmoNotSelected (NavMeshModifierVolume navModifier, GizmoType gizmoType)
[DrawGizmo(GizmoType.NotInSelectionHierarchy | GizmoType.Pickable)]
static void RenderBoxGizmoNotSelected(NavMeshModifierVolume navModifier, GizmoType gizmoType)
{
if (NavMeshVisualizationSettings.showNavigation > 0)
{
......@@ -84,24 +84,24 @@ static void RenderBoxGizmoNotSelected (NavMeshModifierVolume navModifier, GizmoT
Gizmos.matrix = navModifier.transform.localToWorldMatrix;
Gizmos.color = color;
Gizmos.DrawWireCube (navModifier.center, navModifier.size);
Gizmos.DrawWireCube(navModifier.center, navModifier.size);
Gizmos.matrix = oldMatrix;
Gizmos.color = oldColor;
}
Gizmos.DrawIcon (navModifier.transform.position, "NavMeshModifierVolume Icon", true);
Gizmos.DrawIcon(navModifier.transform.position, "NavMeshModifierVolume Icon", true);
}
[MenuItem ("GameObject/AI/NavMesh Modifier Volume", false, 2001)]
static public void CreateNavMeshModifierVolume (MenuCommand menuCommand)
[MenuItem("GameObject/AI/NavMesh Modifier Volume", false, 2001)]
static public void CreateNavMeshModifierVolume(MenuCommand menuCommand)
{
var parent = menuCommand.context as GameObject;
var go = NavMeshEditorHelpers.CreateAndSelectGameObject ("NavMesh Modifier Volume", parent);
go.AddComponent<NavMeshModifierVolume> ();
var go = NavMeshEditorHelpers.CreateAndSelectGameObject("NavMesh Modifier Volume", parent);
go.AddComponent<NavMeshModifierVolume>();
var view = SceneView.lastActiveSceneView;
if (view != null)
view.MoveToView (go.transform);
view.MoveToView(go.transform);
}
}
}
Assets/NavMeshComponents/Editor/NavMeshModifierVolumeEditor.cs.meta 0 → 100644
浏览文件 @ 3b98e0bd
fileFormatVersion: 2
guid: c0f3bef2a67ae4e139538afec3e59b03
timeCreated: 1477036743
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/NavMeshComponents/Editor/NavMeshSurfaceEditor.cs
浏览文件 @ 3b98e0bd
......@@ -3,6 +3,7 @@
using UnityEditor.SceneManagement;
using UnityEngine.AI;
using UnityEngine;
using System.Linq;
namespace UnityEditor.AI
{
......@@ -68,10 +69,10 @@ void OnDisable()
NavMeshVisualizationSettings.showNavigation--;
}
static string GetAndEnsureTargetPath(NavMeshSurfaceEditor instance)
static string GetAndEnsureTargetPath(NavMeshSurface surface)
{
// Create directory for the asset if it does not exist yet.
var activeScenePath = EditorSceneManager.GetActiveScene().path;
var activeScenePath = surface.gameObject.scene.path;
var targetPath = "Assets";
if (!string.IsNullOrEmpty(activeScenePath))
......@@ -81,54 +82,14 @@ static string GetAndEnsureTargetPath(NavMeshSurfaceEditor instance)
return targetPath;
}
void SaveCombinedAsset()
void SaveNavMeshAsset(NavMeshSurface surface)
{
// Create an asset describing all surfaces.
var targetPath = GetAndEnsureTargetPath(this);
var combinedAssetData = new List<NavMeshData>();
var targetPath = GetAndEnsureTargetPath(surface);
// Collect valid navmesh data.
foreach (var s in NavMeshSurface.activeSurfaces)
{
if (s.bakedNavMeshData != null)
{
combinedAssetData.Add(s.bakedNavMeshData);
}
}
// Clear the legacy navmesh data reference on the scene
if (NavMeshEditorHelpers.CurrentNavMeshAssetFormat() == NavMeshEditorHelpers.NavMeshDataFormat.Single)
NavMeshBuilder.ClearAllNavMeshes();
// Store baked navmesh data in one asset.
var combinedAssetPath = Path.Combine(targetPath, "NavMesh.asset");
if (combinedAssetData.Count == 0)
{
AssetDatabase.DeleteAsset(combinedAssetPath);
}
else
{
if (!File.Exists(combinedAssetPath))
{
// NOTE: Creates empty dummy NavMeshData to represent the main asset,
// this is done in order to show all the built meshes equally in the list.
var dummy = new NavMeshData();
AssetDatabase.CreateAsset(dummy, combinedAssetPath);
}
// Only add the data that has not been added already.
// Call to NavMeshSurface.Clear () also deletes the data from the asset.
foreach (var data in combinedAssetData)
{
if (!AssetDatabase.Contains(data))
{
AssetDatabase.AddObjectToAsset(data, combinedAssetPath);
}
}
AssetDatabase.SaveAssets();
AssetDatabase.ImportAsset(combinedAssetPath);
}
var combinedAssetPath = Path.Combine(targetPath, "NavMesh-" + surface.name + ".asset");
combinedAssetPath = AssetDatabase.GenerateUniqueAssetPath(combinedAssetPath);
AssetDatabase.CreateAsset(surface.bakedNavMeshData, combinedAssetPath);
AssetDatabase.SaveAssets();
}
void BakeSurface(NavMeshSurface navSurface)
......@@ -136,7 +97,9 @@ void BakeSurface(NavMeshSurface navSurface)
var destroy = navSurface.bakedNavMeshData;
navSurface.Bake(s_DebugVisualization);
DestroyImmediate(destroy, true);
AssetDatabase.DeleteAsset(AssetDatabase.GetAssetPath(destroy));
SaveNavMeshAsset(navSurface);
ApplyIfPrefab(navSurface);
// Explicitly set the scene as dirty - otherwise the reference will be lost
EditorSceneManager.MarkSceneDirty(navSurface.gameObject.scene);
}
......@@ -148,21 +111,31 @@ void ClearSurface(NavMeshSurface navSurface)
navSurface.RemoveData();
if (destroy)
{
DestroyImmediate(destroy, true);
AssetDatabase.DeleteAsset(AssetDatabase.GetAssetPath(destroy));
ApplyIfPrefab(navSurface);
// Explicitly set the scene as dirty
EditorSceneManager.MarkSceneDirty(navSurface.gameObject.scene);
}
}
void ApplyIfPrefab(NavMeshSurface navSurface)
{
var prefabParent = PrefabUtility.GetPrefabParent(navSurface.gameObject);
if (prefabParent)
{
PrefabUtility.ReplacePrefab(navSurface.gameObject, prefabParent, ReplacePrefabOptions.ConnectToPrefab);
}
}
public override void OnInspectorGUI()
{
if (s_Styles == null)
s_Styles = new Styles();
var isPrefab = PrefabUtility.GetPrefabObject(target) != null;
if (isPrefab)
var targetsContainPrefab = targets.Any(x => PrefabUtility.GetPrefabType(x) == PrefabType.Prefab);
if (targetsContainPrefab)
{
EditorGUILayout.HelpBox("Prefabs are currently not supported", MessageType.Warning);
EditorGUILayout.HelpBox ("A Prefab instance is necessary for baking / clearing", MessageType.Warning);
return;
}
......@@ -330,17 +303,19 @@ public override void OnInspectorGUI()
using (new EditorGUI.DisabledScope(Application.isPlaying || m_AgentTypeID.intValue == -1))
{
var targetsContainPrefabInstance = targets.Any(x => PrefabUtility.GetPrefabType(x) == PrefabType.PrefabInstance);
if (targetsContainPrefabInstance)
{
EditorGUILayout.HelpBox ("Prefab changes are applied when baking / clearing", MessageType.Warning);
}
GUILayout.BeginHorizontal();
GUILayout.Space(EditorGUIUtility.labelWidth);
if (GUILayout.Button("Clear"))
{
if (NavMeshEditorHelpers.AllowToOverwriteExistingData(NavMeshEditorHelpers.NavMeshDataFormat.Nested))
{
foreach (NavMeshSurface s in targets)
ClearSurface(s);
SaveCombinedAsset();
SceneView.RepaintAll();
}
foreach (NavMeshSurface s in targets)
ClearSurface(s);
SceneView.RepaintAll();
}
var allTargetsActive = true;
......@@ -355,13 +330,9 @@ public override void OnInspectorGUI()
GUI.enabled = allTargetsActive;
if (GUILayout.Button("Bake"))
{
if (NavMeshEditorHelpers.AllowToOverwriteExistingData(NavMeshEditorHelpers.NavMeshDataFormat.Nested))
{
foreach (NavMeshSurface navSurface in targets)
BakeSurface(navSurface);
SaveCombinedAsset();
SceneView.RepaintAll();
}
foreach (NavMeshSurface navSurface in targets)
BakeSurface(navSurface);
SceneView.RepaintAll();
}
GUI.enabled = true;
GUILayout.EndHorizontal();
......
Assets/NavMeshComponents/Editor/NavMeshSurfaceEditor.cs.meta 0 → 100644
浏览文件 @ 3b98e0bd
fileFormatVersion: 2
guid: 1c32167dbf3314852b6006a288eb449b
timeCreated: 1476968447
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/NavMeshComponents/Scripts/NavMeshLink.cs
浏览文件 @ 3b98e0bd
......@@ -2,9 +2,10 @@
namespace UnityEngine.AI
{
[AddComponentMenu("Navigation/NavMeshLink", 33)]
[ExecuteInEditMode]
[DefaultExecutionOrder(-101)]
[AddComponentMenu("Navigation/NavMeshLink", 33)]
[HelpURL("https://github.com/Unity-Technologies/NavMeshComponents#further-documentation-draft")]
public class NavMeshLink : MonoBehaviour
{
[SerializeField]
......@@ -39,7 +40,6 @@ public class NavMeshLink : MonoBehaviour
Vector3 m_LastPosition = Vector3.zero;
Quaternion m_LastRotation = Quaternion.identity;
Vector3 m_LastScale = Vector3.one;
static readonly List<NavMeshLink> s_Tracked = new List<NavMeshLink>();
......@@ -108,28 +108,25 @@ void AddLink()
#endif
var link = new NavMeshLinkData();
link.startPosition = transform.TransformPoint(m_StartPoint);
link.endPosition = transform.TransformPoint(m_EndPoint);
link.startPosition = m_StartPoint;
link.endPosition = m_EndPoint;
link.width = m_Width;
link.upAxis = transform.up;
link.costModifier = -1.0f;
link.bidirectional = m_Bidirectional;
link.area = m_Area;
link.agentTypeID = m_AgentTypeID;
m_LinkInstance = NavMesh.AddLink(link);
m_LinkInstance = NavMesh.AddLink(link, transform.position, transform.rotation);
if (m_LinkInstance.valid)
m_LinkInstance.owner = this;
m_LastPosition = transform.position;
m_LastRotation = transform.rotation;
m_LastScale = transform.lossyScale;
}
bool HasTransformChanged()
{
if (m_LastPosition != transform.position) return true;
if (m_LastRotation != transform.rotation) return true;
if (m_LastScale != transform.lossyScale) return true;
return false;
}
......
Assets/NavMeshComponents/Scripts/NavMeshLink.cs.meta 0 → 100644
浏览文件 @ 3b98e0bd
fileFormatVersion: 2
guid: 6eeb5dc026fdf4b488bc7ae0138ab719
timeCreated: 1477924439
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {fileID: 2800000, guid: 92f4afa3e25264f5b964937ccea49ff2, type: 3}
userData:
assetBundleName:
assetBundleVariant:
Assets/NavMeshComponents/Scripts/NavMeshModifier.cs
浏览文件 @ 3b98e0bd
......@@ -2,8 +2,9 @@
namespace UnityEngine.AI
{
[AddComponentMenu ("Navigation/NavMeshModifier", 32)]
[ExecuteInEditMode]
[AddComponentMenu("Navigation/NavMeshModifier", 32)]
[HelpURL("https://github.com/Unity-Technologies/NavMeshComponents#further-documentation-draft")]
public class NavMeshModifier : MonoBehaviour
{
[SerializeField]
......
Assets/NavMeshComponents/Scripts/NavMeshModifier.cs.meta 0 → 100644
浏览文件 @ 3b98e0bd
fileFormatVersion: 2
guid: 1e3fdca004f2d45fe8abbed571a8abd5
timeCreated: 1477924411
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {fileID: 2800000, guid: cc7b9475dbddf4f9088d327d6e10ab77, type: 3}
userData:
assetBundleName:
assetBundleVariant:
Assets/NavMeshComponents/Scripts/NavMeshModifierVolume.cs
浏览文件 @ 3b98e0bd
......@@ -2,8 +2,9 @@
namespace UnityEngine.AI
{
[AddComponentMenu ("Navigation/NavMeshModifierVolume", 31)]
[ExecuteInEditMode]
[AddComponentMenu("Navigation/NavMeshModifierVolume", 31)]
[HelpURL("https://github.com/Unity-Technologies/NavMeshComponents#further-documentation-draft")]
public class NavMeshModifierVolume : MonoBehaviour
{
[SerializeField]
......
Assets/NavMeshComponents/Scripts/NavMeshModifierVolume.cs.meta 0 → 100644
浏览文件 @ 3b98e0bd
fileFormatVersion: 2
guid: 35e95dc5ff2b64380880dd7ac5922847
timeCreated: 1477924430
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {fileID: 2800000, guid: cc7b9475dbddf4f9088d327d6e10ab77, type: 3}
userData:
assetBundleName:
assetBundleVariant:
Assets/NavMeshComponents/Scripts/NavMeshSurface.cs
浏览文件 @ 3b98e0bd
......@@ -9,9 +9,10 @@ public enum CollectObjects
Children = 2,
}
[AddComponentMenu("Navigation/NavMeshSurface", 30)]
[ExecuteInEditMode]
[DefaultExecutionOrder(-102)]
[AddComponentMenu("Navigation/NavMeshSurface", 30)]
[HelpURL("https://github.com/Unity-Technologies/NavMeshComponents#further-documentation-draft")]
public class NavMeshSurface : MonoBehaviour
{
[SerializeField]
......@@ -73,12 +74,10 @@ public class NavMeshSurface : MonoBehaviour
NavMeshData m_BakedNavMeshData;
public NavMeshData bakedNavMeshData { get { return m_BakedNavMeshData; } set { m_BakedNavMeshData = value; } }
// Do not serialize.
NavMeshDataInstance m_NavMeshDataInstance = new NavMeshDataInstance();
// Do not serialize - runtime only state.
NavMeshDataInstance m_NavMeshDataInstance;
Vector3 m_LastPosition = Vector3.zero;
Quaternion m_LastRotation = Quaternion.identity;
Vector3 m_LastScale = Vector3.one;
static readonly List<NavMeshSurface> s_NavMeshSurfaces = new List<NavMeshSurface>();
......@@ -90,18 +89,6 @@ public static List<NavMeshSurface> activeSurfaces
void OnEnable()
{
Register(this);
// Workaround: Make sure we have unique navmesh data, if not, delete reference to the data.
// HasUniqueNavMeshData () assumes that the original copy got registered before us.
if (!HasUniqueNavMeshData())
{
if (m_BakedNavMeshData != null)
{
Debug.LogWarning("Duplicating NavMeshSurface does not duplicate the referenced navmesh data");
m_BakedNavMeshData = null;
}
}
AddData();
}
......@@ -124,12 +111,12 @@ public void AddData()
m_LastPosition = transform.position;
m_LastRotation = transform.rotation;
m_LastScale = transform.lossyScale;
}
public void RemoveData()
{
m_NavMeshDataInstance.Remove();
m_NavMeshDataInstance = new NavMeshDataInstance();
}
public NavMeshBuildSettings GetBuildSettings()
......@@ -201,17 +188,6 @@ static void UpdateActive()
s_NavMeshSurfaces[i].UpdateDataIfTransformChanged();
}
bool HasUniqueNavMeshData()
{
for (var i = 0; i < s_NavMeshSurfaces.Count; ++i)
{
var surface = s_NavMeshSurfaces[i];
if (surface != this && surface.m_BakedNavMeshData == m_BakedNavMeshData)
return false;
}
return true;
}
void AppendModifierVolumes(ref List<NavMeshBuildSource> sources)
{
// Modifiers
......@@ -354,7 +330,6 @@ bool HasTransformChanged()
{
if (m_LastPosition != transform.position) return true;
if (m_LastRotation != transform.rotation) return true;
if (m_LastScale != transform.lossyScale) return true;
return false;
}
......@@ -368,10 +343,36 @@ void UpdateDataIfTransformChanged()
}
#if UNITY_EDITOR
bool UnshareNavMeshAsset()
{
// Nothing to unshare
if (m_BakedNavMeshData == null)
return false;
// Prefabs can share asset reference
var prefab = UnityEditor.PrefabUtility.GetPrefabObject(this);
if (prefab != null)
return false;
// Don't allow referencing an asset that's assigned to another surface
for (var i = 0; i < s_NavMeshSurfaces.Count; ++i)
{
var surface = s_NavMeshSurfaces[i];
if (surface != this && surface.m_BakedNavMeshData == m_BakedNavMeshData)
return true;
}
// asset is not referenced by known surfaces
return false;
}
void OnValidate()
{
if (!s_NavMeshSurfaces.Contains(this))
return;
if (UnshareNavMeshAsset())
{
Debug.LogWarning("Duplicating NavMeshSurface does not duplicate the referenced navmesh data");
m_BakedNavMeshData = null;
}
var settings = NavMesh.GetSettingsByID(m_AgentTypeID);
if (settings.agentTypeID != -1)
......
Assets/NavMeshComponents/Scripts/NavMeshSurface.cs.meta 0 → 100644
浏览文件 @ 3b98e0bd
fileFormatVersion: 2
guid: 7a5ac11cc976e418e8d13136b07e1f52
timeCreated: 1477658803
licenseType: Pro
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {fileID: 2800000, guid: e4f97225bcfb64760a1c81f460837f01, type: 3}
userData:
assetBundleName:
assetBundleVariant:
README.md
浏览文件 @ 3b98e0bd
......@@ -21,7 +21,7 @@ https://docs.google.com/document/d/1g1KE59K7HQq25kAMxweRt5ePXkEMvgNnAU3zfX_R7m8
Download the feature build which is based on Unity 5.5
http://beta.unity3d.com/download/98b817aefff4/public_download.html
http://beta.unity3d.com/download/701843f9b69e/public_download.html
Clone or download this repository and open the project using the feature build.
Alternatively, you can copy the contents of `Assets/` to an existing project.
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或