GameCult/Aetheria
Watch
9
0
Fork
You've already forked Aetheria
 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Minimap + Input System

Browse source 
Minimap is back
Minimap zoom level button
Input System configured
This commit is contained in:
Reinier Vens 2020-12-02 16:42:09 +00:00
commit eef34a2de5
54 changed files with 6487 additions and 543 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Assets/Scripts/ActionGameManager.cs
View file

@ -7,6 +7,7 @@ using MessagePack;
using UniRx;
using UnityEngine;
using Unity.Mathematics;
using UnityEngine.InputSystem;
using static Unity.Mathematics.math;
using float2 = Unity.Mathematics.float2;
@ -16,10 +17,13 @@ public class ActionGameManager : MonoBehaviour
public SectorRenderer SectorRenderer;
public CinemachineVirtualCamera TopDownCamera;
public CinemachineVirtualCamera FollowCamera;
//public PlayerInput Input;
private DirectoryInfo _filePath;
private bool _editMode;
private float _time;
private AetheriaInput _input;
private int _zoomLevelIndex;
public DatabaseCache Cache { get; private set; }
public GameContext Context { get; private set; }
@ -49,6 +53,16 @@ public class ActionGameManager : MonoBehaviour
Zone = new Zone(Settings.PlanetSettings, zonePack);
SectorRenderer.LoadZone(Zone);
_input = new AetheriaInput();
_input.Player.Enable();
_zoomLevelIndex = Settings.DefaultMinimapZoom;
_input.Player.MinimapZoom.performed += context =>
{
_zoomLevelIndex = (_zoomLevelIndex + 1) % Settings.MinimapZoomLevels.Length;
SectorRenderer.MinimapDistance = Settings.MinimapZoomLevels[_zoomLevelIndex];
};
ConsoleController.AddCommand("editmode", _ => ToggleEditMode());
ConsoleController.AddCommand("savezone", args =>
{

1126
Assets/Scripts/AetheriaInput.cs Normal file
View file

File diff suppressed because it is too large Load diff

11
Assets/Scripts/AetheriaInput.cs.meta Normal file
View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: e1492a755d3edcf4eb6147bc8612f92e
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

788
Assets/Scripts/NIH/NaughtyAttributes/Scripts/Editor/Editors/InspectorEditor.cs
View file

@ -1,394 +1,394 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using UnityEditor;
using UnityEngine;
namespace NaughtyAttributes.Editor
{
[CanEditMultipleObjects]
[CustomEditor(typeof(UnityEngine.Object), true)]
public class InspectorEditor : UnityEditor.Editor
{
private SerializedProperty script;
private IEnumerable<FieldInfo> fields;
private HashSet<FieldInfo> groupedFields;
private Dictionary<string, List<FieldInfo>> groupedFieldsByGroupName;
private IEnumerable<FieldInfo> nonSerializedFields;
private IEnumerable<PropertyInfo> nativeProperties;
private IEnumerable<MethodInfo> methods;
private Dictionary<string, SerializedProperty> serializedPropertiesByFieldName;
private bool useDefaultInspector;
private void OnEnable()
{
this.script = this.serializedObject.FindProperty("m_Script");
// Cache serialized fields
this.fields = this.GetFields(f => this.serializedObject.FindProperty(f.Name) != null);
// If there are no NaughtyAttributes use default inspector
if (this.fields.All(f => f.GetCustomAttributes(typeof(NaughtyAttribute), true).Length == 0))
{
this.useDefaultInspector = true;
}
else
{
this.useDefaultInspector = false;
// Cache grouped fields
this.groupedFields = new HashSet<FieldInfo>(this.fields.Where(f => f.GetCustomAttributes(typeof(GroupAttribute), true).Length > 0));
// Cache grouped fields by group name
this.groupedFieldsByGroupName = new Dictionary<string, List<FieldInfo>>();
foreach (var groupedField in this.groupedFields)
{
string groupName = (groupedField.GetCustomAttributes(typeof(GroupAttribute), true)[0] as GroupAttribute).Name;
if (this.groupedFieldsByGroupName.ContainsKey(groupName))
{
this.groupedFieldsByGroupName[groupName].Add(groupedField);
}
else
{
this.groupedFieldsByGroupName[groupName] = new List<FieldInfo>()
{
groupedField
};
}
}
// Cache serialized properties by field name
this.serializedPropertiesByFieldName = new Dictionary<string, SerializedProperty>();
foreach (var field in this.fields)
{
this.serializedPropertiesByFieldName[field.Name] = this.serializedObject.FindProperty(field.Name);
}
}
// Cache non-serialized fields
this.nonSerializedFields = this.GetFields(
f => f.GetCustomAttributes(typeof(DrawerAttribute), true).Length > 0 && this.serializedObject.FindProperty(f.Name) == null);
// Cache the native properties
this.nativeProperties = this.GetProperties(
p => p.GetCustomAttributes(typeof(DrawerAttribute), true).Length > 0);
// Cache methods with DrawerAttribute
this.methods = this.GetMethods(m => m.GetCustomAttributes(typeof(DrawerAttribute), true).Length > 0);
}
private void OnDisable()
{
PropertyDrawerDatabase.ClearCache();
}
public override void OnInspectorGUI()
{
if (this.useDefaultInspector)
{
this.DrawDefaultInspector();
}
else
{
this.serializedObject.Update();
if (this.script != null)
{
GUI.enabled = false;
EditorGUILayout.PropertyField(this.script);
GUI.enabled = true;
}
// Draw fields
HashSet<string> drawnGroups = new HashSet<string>();
foreach (var field in this.fields)
{
if (this.groupedFields.Contains(field))
{
// Draw grouped fields
string groupName = (field.GetCustomAttributes(typeof(GroupAttribute), true)[0] as GroupAttribute).Name;
if (!drawnGroups.Contains(groupName))
{
drawnGroups.Add(groupName);
PropertyGrouper grouper = this.GetPropertyGrouperForField(field);
if (grouper != null)
{
grouper.BeginGroup(groupName);
this.ValidateAndDrawFields(this.groupedFieldsByGroupName[groupName]);
grouper.EndGroup();
}
else
{
this.ValidateAndDrawFields(this.groupedFieldsByGroupName[groupName]);
}
}
}
else
{
// Draw non-grouped field
this.ValidateAndDrawField(field);
}
}
this.serializedObject.ApplyModifiedProperties();
}
// Draw non-serialized fields
foreach (var field in this.nonSerializedFields)
{
DrawerAttribute drawerAttribute = (DrawerAttribute)field.GetCustomAttributes(typeof(DrawerAttribute), true)[0];
FieldDrawer drawer = FieldDrawerDatabase.GetDrawerForAttribute(drawerAttribute.GetType());
if (drawer != null)
{
drawer.DrawField(this.target, field);
}
}
// Draw native properties
foreach (var property in this.nativeProperties)
{
DrawerAttribute drawerAttribute = (DrawerAttribute)property.GetCustomAttributes(typeof(DrawerAttribute), true)[0];
NativePropertyDrawer drawer = NativePropertyDrawerDatabase.GetDrawerForAttribute(drawerAttribute.GetType());
if (drawer != null)
{
drawer.DrawNativeProperty(this.target, property);
}
}
// Draw methods
foreach (var method in this.methods)
{
DrawerAttribute drawerAttribute = (DrawerAttribute)method.GetCustomAttributes(typeof(DrawerAttribute), true)[0];
MethodDrawer methodDrawer = MethodDrawerDatabase.GetDrawerForAttribute(drawerAttribute.GetType());
if (methodDrawer != null)
{
methodDrawer.DrawMethod(this.target, method);
}
}
}
private void ValidateAndDrawFields(IEnumerable<FieldInfo> fields)
{
foreach (var field in fields)
{
this.ValidateAndDrawField(field);
}
}
private void ValidateAndDrawField(FieldInfo field)
{
this.ValidateField(field);
this.ApplyFieldMeta(field);
this.DrawField(field);
}
private void ValidateField(FieldInfo field)
{
ValidatorAttribute[] validatorAttributes = (ValidatorAttribute[])field.GetCustomAttributes(typeof(ValidatorAttribute), true);
foreach (var attribute in validatorAttributes)
{
PropertyValidator validator = PropertyValidatorDatabase.GetValidatorForAttribute(attribute.GetType());
if (validator != null)
{
validator.ValidateProperty(this.serializedPropertiesByFieldName[field.Name]);
}
}
}
private void DrawField(FieldInfo field)
{
// Check if the field has draw conditions
PropertyDrawCondition drawCondition = this.GetPropertyDrawConditionForField(field);
if (drawCondition != null)
{
bool canDrawProperty = drawCondition.CanDrawProperty(this.serializedPropertiesByFieldName[field.Name]);
if (!canDrawProperty)
{
return;
}
}
// Check if the field has HideInInspectorAttribute
HideInInspector[] hideInInspectorAttributes = (HideInInspector[])field.GetCustomAttributes(typeof(HideInInspector), true);
if (hideInInspectorAttributes.Length > 0)
{
return;
}
// Draw the field
EditorGUI.BeginChangeCheck();
PropertyDrawer drawer = this.GetPropertyDrawerForField(field);
if (drawer != null)
{
drawer.DrawProperty(this.serializedPropertiesByFieldName[field.Name]);
}
else
{
EditorGUILayout.PropertyField(this.serializedPropertiesByFieldName[field.Name], true);
}
if (EditorGUI.EndChangeCheck())
{
OnValueChangedAttribute[] onValueChangedAttributes = (OnValueChangedAttribute[])field.GetCustomAttributes(typeof(OnValueChangedAttribute), true);
foreach (var onValueChangedAttribute in onValueChangedAttributes)
{
PropertyMeta meta = PropertyMetaDatabase.GetMetaForAttribute(onValueChangedAttribute.GetType());
if (meta != null)
{
meta.ApplyPropertyMeta(this.serializedPropertiesByFieldName[field.Name], onValueChangedAttribute);
}
}
}
}
private void ApplyFieldMeta(FieldInfo field)
{
// Apply custom meta attributes
MetaAttribute[] metaAttributes = field
.GetCustomAttributes(typeof(MetaAttribute), true)
.Where(attr => attr.GetType() != typeof(OnValueChangedAttribute))
.Select(obj => obj as MetaAttribute)
.ToArray();
System.Array.Sort(metaAttributes, (x, y) =>
{
return x.Order - y.Order;
});
foreach (var metaAttribute in metaAttributes)
{
PropertyMeta meta = PropertyMetaDatabase.GetMetaForAttribute(metaAttribute.GetType());
if (meta != null)
{
meta.ApplyPropertyMeta(this.serializedPropertiesByFieldName[field.Name], metaAttribute);
}
}
}
private PropertyDrawer GetPropertyDrawerForField(FieldInfo field)
{
DrawerAttribute[] drawerAttributes = (DrawerAttribute[])field.GetCustomAttributes(typeof(DrawerAttribute), true);
if (drawerAttributes.Length > 0)
{
PropertyDrawer drawer = PropertyDrawerDatabase.GetDrawerForAttribute(drawerAttributes[0].GetType());
return drawer;
}
else
{
return null;
}
}
private PropertyGrouper GetPropertyGrouperForField(FieldInfo field)
{
GroupAttribute[] groupAttributes = (GroupAttribute[])field.GetCustomAttributes(typeof(GroupAttribute), true);
if (groupAttributes.Length > 0)
{
PropertyGrouper grouper = PropertyGrouperDatabase.GetGrouperForAttribute(groupAttributes[0].GetType());
return grouper;
}
else
{
return null;
}
}
private PropertyDrawCondition GetPropertyDrawConditionForField(FieldInfo field)
{
DrawConditionAttribute[] drawConditionAttributes = (DrawConditionAttribute[])field.GetCustomAttributes(typeof(DrawConditionAttribute), true);
if (drawConditionAttributes.Length > 0)
{
PropertyDrawCondition drawCondition = PropertyDrawConditionDatabase.GetDrawConditionForAttribute(drawConditionAttributes[0].GetType());
return drawCondition;
}
else
{
return null;
}
}
private List<FieldInfo> GetFields(Func<FieldInfo, bool> predicate)
{
List<Type> types = new List<Type>()
{
this.target.GetType()
};
while (types.Last().BaseType != null)
{
types.Add(types.Last().BaseType);
}
List<FieldInfo> fields = new List<FieldInfo>();
for (int i = types.Count - 1; i >= 0; i--)
{
IEnumerable<FieldInfo> fieldInfos = types[i]
.GetFields(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.DeclaredOnly)
.Where(predicate);
fields.AddRange(fieldInfos);
}
return fields;
}
private List<PropertyInfo> GetProperties(Func<PropertyInfo, bool> predicate)
{
List<Type> types = new List<Type>()
{
this.target.GetType()
};
while (types.Last().BaseType != null)
{
types.Add(types.Last().BaseType);
}
List<PropertyInfo> properties = new List<PropertyInfo>();
for (int i = types.Count - 1; i >= 0; i--)
{
IEnumerable<PropertyInfo> propertyInfos = types[i]
.GetProperties(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.DeclaredOnly)
.Where(predicate);
properties.AddRange(propertyInfos);
}
return properties;
}
private List<MethodInfo> GetMethods(Func<MethodInfo, bool> predicate)
{
List<Type> types = new List<Type>()
{
this.target.GetType()
};
while (types.Last().BaseType != null)
{
types.Add(types.Last().BaseType);
}
List<MethodInfo> methods = new List<MethodInfo>();
for (int i = types.Count - 1; i >= 0; i--)
{
IEnumerable<MethodInfo> methodInfos = types[i]
.GetMethods(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.DeclaredOnly)
.Where(predicate);
methods.AddRange(methodInfos);
}
return methods;
}
}
}
// using System;
// using System.Collections.Generic;
// using System.Linq;
// using System.Reflection;
// using UnityEditor;
// using UnityEngine;
//
// namespace NaughtyAttributes.Editor
// {
// [CanEditMultipleObjects]
// [CustomEditor(typeof(UnityEngine.Object), true)]
// public class InspectorEditor : UnityEditor.Editor
// {
// private SerializedProperty script;
//
// private IEnumerable<FieldInfo> fields;
// private HashSet<FieldInfo> groupedFields;
// private Dictionary<string, List<FieldInfo>> groupedFieldsByGroupName;
// private IEnumerable<FieldInfo> nonSerializedFields;
// private IEnumerable<PropertyInfo> nativeProperties;
// private IEnumerable<MethodInfo> methods;
//
// private Dictionary<string, SerializedProperty> serializedPropertiesByFieldName;
//
// private bool useDefaultInspector;
//
// private void OnEnable()
// {
// this.script = this.serializedObject.FindProperty("m_Script");
//
// // Cache serialized fields
// this.fields = this.GetFields(f => this.serializedObject.FindProperty(f.Name) != null);
//
// // If there are no NaughtyAttributes use default inspector
// if (this.fields.All(f => f.GetCustomAttributes(typeof(NaughtyAttribute), true).Length == 0))
// {
// this.useDefaultInspector = true;
// }
// else
// {
// this.useDefaultInspector = false;
//
// // Cache grouped fields
// this.groupedFields = new HashSet<FieldInfo>(this.fields.Where(f => f.GetCustomAttributes(typeof(GroupAttribute), true).Length > 0));
//
// // Cache grouped fields by group name
// this.groupedFieldsByGroupName = new Dictionary<string, List<FieldInfo>>();
// foreach (var groupedField in this.groupedFields)
// {
// string groupName = (groupedField.GetCustomAttributes(typeof(GroupAttribute), true)[0] as GroupAttribute).Name;
//
// if (this.groupedFieldsByGroupName.ContainsKey(groupName))
// {
// this.groupedFieldsByGroupName[groupName].Add(groupedField);
// }
// else
// {
// this.groupedFieldsByGroupName[groupName] = new List<FieldInfo>()
// {
// groupedField
// };
// }
// }
//
// // Cache serialized properties by field name
// this.serializedPropertiesByFieldName = new Dictionary<string, SerializedProperty>();
// foreach (var field in this.fields)
// {
// this.serializedPropertiesByFieldName[field.Name] = this.serializedObject.FindProperty(field.Name);
// }
// }
//
// // Cache non-serialized fields
// this.nonSerializedFields = this.GetFields(
// f => f.GetCustomAttributes(typeof(DrawerAttribute), true).Length > 0 && this.serializedObject.FindProperty(f.Name) == null);
//
// // Cache the native properties
// this.nativeProperties = this.GetProperties(
// p => p.GetCustomAttributes(typeof(DrawerAttribute), true).Length > 0);
//
// // Cache methods with DrawerAttribute
// this.methods = this.GetMethods(m => m.GetCustomAttributes(typeof(DrawerAttribute), true).Length > 0);
// }
//
// private void OnDisable()
// {
// PropertyDrawerDatabase.ClearCache();
// }
//
// public override void OnInspectorGUI()
// {
// if (this.useDefaultInspector)
// {
// this.DrawDefaultInspector();
// }
// else
// {
// this.serializedObject.Update();
//
// if (this.script != null)
// {
// GUI.enabled = false;
// EditorGUILayout.PropertyField(this.script);
// GUI.enabled = true;
// }
//
// // Draw fields
// HashSet<string> drawnGroups = new HashSet<string>();
// foreach (var field in this.fields)
// {
// if (this.groupedFields.Contains(field))
// {
// // Draw grouped fields
// string groupName = (field.GetCustomAttributes(typeof(GroupAttribute), true)[0] as GroupAttribute).Name;
// if (!drawnGroups.Contains(groupName))
// {
// drawnGroups.Add(groupName);
//
// PropertyGrouper grouper = this.GetPropertyGrouperForField(field);
// if (grouper != null)
// {
// grouper.BeginGroup(groupName);
//
// this.ValidateAndDrawFields(this.groupedFieldsByGroupName[groupName]);
//
// grouper.EndGroup();
// }
// else
// {
// this.ValidateAndDrawFields(this.groupedFieldsByGroupName[groupName]);
// }
// }
// }
// else
// {
// // Draw non-grouped field
// this.ValidateAndDrawField(field);
// }
// }
//
// this.serializedObject.ApplyModifiedProperties();
// }
//
// // Draw non-serialized fields
// foreach (var field in this.nonSerializedFields)
// {
// DrawerAttribute drawerAttribute = (DrawerAttribute)field.GetCustomAttributes(typeof(DrawerAttribute), true)[0];
// FieldDrawer drawer = FieldDrawerDatabase.GetDrawerForAttribute(drawerAttribute.GetType());
// if (drawer != null)
// {
// drawer.DrawField(this.target, field);
// }
// }
//
// // Draw native properties
// foreach (var property in this.nativeProperties)
// {
// DrawerAttribute drawerAttribute = (DrawerAttribute)property.GetCustomAttributes(typeof(DrawerAttribute), true)[0];
// NativePropertyDrawer drawer = NativePropertyDrawerDatabase.GetDrawerForAttribute(drawerAttribute.GetType());
// if (drawer != null)
// {
// drawer.DrawNativeProperty(this.target, property);
// }
// }
//
// // Draw methods
// foreach (var method in this.methods)
// {
// DrawerAttribute drawerAttribute = (DrawerAttribute)method.GetCustomAttributes(typeof(DrawerAttribute), true)[0];
// MethodDrawer methodDrawer = MethodDrawerDatabase.GetDrawerForAttribute(drawerAttribute.GetType());
// if (methodDrawer != null)
// {
// methodDrawer.DrawMethod(this.target, method);
// }
// }
// }
//
// private void ValidateAndDrawFields(IEnumerable<FieldInfo> fields)
// {
// foreach (var field in fields)
// {
// this.ValidateAndDrawField(field);
// }
// }
//
// private void ValidateAndDrawField(FieldInfo field)
// {
// this.ValidateField(field);
// this.ApplyFieldMeta(field);
// this.DrawField(field);
// }
//
// private void ValidateField(FieldInfo field)
// {
// ValidatorAttribute[] validatorAttributes = (ValidatorAttribute[])field.GetCustomAttributes(typeof(ValidatorAttribute), true);
//
// foreach (var attribute in validatorAttributes)
// {
// PropertyValidator validator = PropertyValidatorDatabase.GetValidatorForAttribute(attribute.GetType());
// if (validator != null)
// {
// validator.ValidateProperty(this.serializedPropertiesByFieldName[field.Name]);
// }
// }
// }
//
// private void DrawField(FieldInfo field)
// {
// // Check if the field has draw conditions
// PropertyDrawCondition drawCondition = this.GetPropertyDrawConditionForField(field);
// if (drawCondition != null)
// {
// bool canDrawProperty = drawCondition.CanDrawProperty(this.serializedPropertiesByFieldName[field.Name]);
// if (!canDrawProperty)
// {
// return;
// }
// }
//
// // Check if the field has HideInInspectorAttribute
// HideInInspector[] hideInInspectorAttributes = (HideInInspector[])field.GetCustomAttributes(typeof(HideInInspector), true);
// if (hideInInspectorAttributes.Length > 0)
// {
// return;
// }
//
// // Draw the field
// EditorGUI.BeginChangeCheck();
// PropertyDrawer drawer = this.GetPropertyDrawerForField(field);
// if (drawer != null)
// {
// drawer.DrawProperty(this.serializedPropertiesByFieldName[field.Name]);
// }
// else
// {
// EditorGUILayout.PropertyField(this.serializedPropertiesByFieldName[field.Name], true);
// }
//
// if (EditorGUI.EndChangeCheck())
// {
// OnValueChangedAttribute[] onValueChangedAttributes = (OnValueChangedAttribute[])field.GetCustomAttributes(typeof(OnValueChangedAttribute), true);
// foreach (var onValueChangedAttribute in onValueChangedAttributes)
// {
// PropertyMeta meta = PropertyMetaDatabase.GetMetaForAttribute(onValueChangedAttribute.GetType());
// if (meta != null)
// {
// meta.ApplyPropertyMeta(this.serializedPropertiesByFieldName[field.Name], onValueChangedAttribute);
// }
// }
// }
// }
//
// private void ApplyFieldMeta(FieldInfo field)
// {
// // Apply custom meta attributes
// MetaAttribute[] metaAttributes = field
// .GetCustomAttributes(typeof(MetaAttribute), true)
// .Where(attr => attr.GetType() != typeof(OnValueChangedAttribute))
// .Select(obj => obj as MetaAttribute)
// .ToArray();
//
// System.Array.Sort(metaAttributes, (x, y) =>
// {
// return x.Order - y.Order;
// });
//
// foreach (var metaAttribute in metaAttributes)
// {
// PropertyMeta meta = PropertyMetaDatabase.GetMetaForAttribute(metaAttribute.GetType());
// if (meta != null)
// {
// meta.ApplyPropertyMeta(this.serializedPropertiesByFieldName[field.Name], metaAttribute);
// }
// }
// }
//
// private PropertyDrawer GetPropertyDrawerForField(FieldInfo field)
// {
// DrawerAttribute[] drawerAttributes = (DrawerAttribute[])field.GetCustomAttributes(typeof(DrawerAttribute), true);
// if (drawerAttributes.Length > 0)
// {
// PropertyDrawer drawer = PropertyDrawerDatabase.GetDrawerForAttribute(drawerAttributes[0].GetType());
// return drawer;
// }
// else
// {
// return null;
// }
// }
//
// private PropertyGrouper GetPropertyGrouperForField(FieldInfo field)
// {
// GroupAttribute[] groupAttributes = (GroupAttribute[])field.GetCustomAttributes(typeof(GroupAttribute), true);
// if (groupAttributes.Length > 0)
// {
// PropertyGrouper grouper = PropertyGrouperDatabase.GetGrouperForAttribute(groupAttributes[0].GetType());
// return grouper;
// }
// else
// {
// return null;
// }
// }
//
// private PropertyDrawCondition GetPropertyDrawConditionForField(FieldInfo field)
// {
// DrawConditionAttribute[] drawConditionAttributes = (DrawConditionAttribute[])field.GetCustomAttributes(typeof(DrawConditionAttribute), true);
// if (drawConditionAttributes.Length > 0)
// {
// PropertyDrawCondition drawCondition = PropertyDrawConditionDatabase.GetDrawConditionForAttribute(drawConditionAttributes[0].GetType());
// return drawCondition;
// }
// else
// {
// return null;
// }
// }
//
// private List<FieldInfo> GetFields(Func<FieldInfo, bool> predicate)
// {
// List<Type> types = new List<Type>()
// {
// this.target.GetType()
// };
//
// while (types.Last().BaseType != null)
// {
// types.Add(types.Last().BaseType);
// }
//
// List<FieldInfo> fields = new List<FieldInfo>();
// for (int i = types.Count - 1; i >= 0; i--)
// {
// IEnumerable<FieldInfo> fieldInfos = types[i]
// .GetFields(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.DeclaredOnly)
// .Where(predicate);
//
// fields.AddRange(fieldInfos);
// }
//
// return fields;
// }
//
// private List<PropertyInfo> GetProperties(Func<PropertyInfo, bool> predicate)
// {
// List<Type> types = new List<Type>()
// {
// this.target.GetType()
// };
//
// while (types.Last().BaseType != null)
// {
// types.Add(types.Last().BaseType);
// }
//
// List<PropertyInfo> properties = new List<PropertyInfo>();
// for (int i = types.Count - 1; i >= 0; i--)
// {
// IEnumerable<PropertyInfo> propertyInfos = types[i]
// .GetProperties(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.DeclaredOnly)
// .Where(predicate);
//
// properties.AddRange(propertyInfos);
// }
//
// return properties;
// }
//
// private List<MethodInfo> GetMethods(Func<MethodInfo, bool> predicate)
// {
// List<Type> types = new List<Type>()
// {
// this.target.GetType()
// };
//
// while (types.Last().BaseType != null)
// {
// types.Add(types.Last().BaseType);
// }
//
// List<MethodInfo> methods = new List<MethodInfo>();
// for (int i = types.Count - 1; i >= 0; i--)
// {
// IEnumerable<MethodInfo> methodInfos = types[i]
// .GetMethods(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.DeclaredOnly)
// .Where(predicate);
//
// methods.AddRange(methodInfos);
// }
//
// return methods;
// }
// }
// }

5
Assets/Scripts/Sector Display/GameSettings.cs
View file

@ -9,7 +9,10 @@ public class GameSettings : ScriptableObject
public float DefaultZoneRadius;
public float DefaultZoneMass;
public float DefaultViewDistance;
public float DefaultMinimapDistance;
public float MinimapZoneGravityRange;
public float[] MinimapZoomLevels;
public int DefaultMinimapZoom;
public float IconSize;
public int AsteroidMeshCount = 5;
public PlanetSettings PlanetSettings;
public ZoneGenerationSettings ZoneSettings;

26
Assets/Scripts/Sector Display/SectorRenderer.cs
View file

@ -16,6 +16,7 @@ public class SectorRenderer : MonoBehaviour
public Transform SectorRoot;
public Transform SectorBrushes;
public MeshRenderer SectorBoundaryBrush;
public MeshRenderer MinimapGravityQuad;
public CinemachineVirtualCamera[] SceneCameras;
public Camera[] FogCameras;
public Camera[] MinimapCameras;
@ -28,7 +29,6 @@ public class SectorRenderer : MonoBehaviour
// public Material AsteroidMaterial;
[Header("Prefabs")]
public GameObject Belt;
public PlanetObject Planet;
public GasGiantObject GasGiant;
public SunObject Sun;
@ -41,6 +41,7 @@ public class SectorRenderer : MonoBehaviour
private Dictionary<Guid, InstancedMesh[]> _beltMeshes = new Dictionary<Guid, InstancedMesh[]>();
private Zone _zone;
private float _viewDistance;
private float _maxDepth;
public float Time { get; set; }
@ -53,7 +54,7 @@ public class SectorRenderer : MonoBehaviour
camera.orthographicSize = value;
foreach(var camera in SceneCameras)
camera.m_Lens.FarClipPlane = value * FarPlaneDistanceMultiplier;
FogMaterial.SetFloat("_DepthCeiling", value - FogFarFadeFraction * value);
FogMaterial.SetFloat("_DepthCeiling", value);
FogMaterial.SetFloat("_DepthBlend", FogFarFadeFraction * value);
}
}
@ -63,18 +64,22 @@ public class SectorRenderer : MonoBehaviour
set
{
foreach(var camera in MinimapCameras)
camera.orthographicSize = value * 2;
camera.orthographicSize = value;
MinimapGravityQuad.transform.localScale = value * 2 * Vector3.one;
foreach (var planet in _planets.Values)
planet.Icon.transform.localScale = Settings.IconSize / 256 * value * Vector3.one;
}
}
void Start()
{
ViewDistance = Settings.DefaultViewDistance;
MinimapDistance = Settings.DefaultMinimapDistance;
MinimapDistance = Settings.MinimapZoomLevels[Settings.DefaultMinimapZoom];
}
public void LoadZone(Zone zone)
{
_maxDepth = 0;
_zone = zone;
SectorBrushes.localScale = zone.Data.Radius * 2 * Vector3.one;
ClearZone();
@ -142,7 +147,11 @@ public class SectorRenderer : MonoBehaviour
var planetInstance = _zone.PlanetInstances[planetData.ID];
planetInstance.BodyRadius.Subscribe(f => planet.Body.transform.localScale = f * Vector3.one);
planetInstance.GravityWellRadius.Subscribe(f => planet.GravityWell.transform.localScale = f * Vector3.one);
planetInstance.GravityWellDepth.Subscribe(f => planet.GravityWell.material.SetFloat("_Depth", f));
planetInstance.GravityWellDepth.Subscribe(f =>
{
if (f > _maxDepth) _maxDepth = f;
planet.GravityWell.material.SetFloat("_Depth", f);
});
_planets.Add(planetData.ID, planet);
}
@ -186,8 +195,15 @@ public class SectorRenderer : MonoBehaviour
var fogPos = FogCameraParent.position;
SectorBoundaryBrush.material.SetFloat("_Power", Settings.PlanetSettings.ZoneDepthExponent);
SectorBoundaryBrush.material.SetFloat("_Depth", Settings.PlanetSettings.ZoneDepth + Settings.PlanetSettings.ZoneBoundaryFog);
var startDepth = Zone.PowerPulse(Settings.MinimapZoneGravityRange, Settings.PlanetSettings.ZoneDepthExponent) * Settings.PlanetSettings.ZoneDepth;
var depthRange = Settings.PlanetSettings.ZoneDepth - startDepth + _maxDepth;
MinimapGravityQuad.material.SetFloat("_StartDepth", startDepth);
MinimapGravityQuad.material.SetFloat("_DepthRange", depthRange);
FogMaterial.SetFloat("_GridOffset", Settings.PlanetSettings.ZoneBoundaryFog);
FogMaterial.SetVector("_GridTransform", new Vector4(fogPos.x,fogPos.z,_viewDistance*2));
var gravPos = MinimapGravityQuad.transform.position;
gravPos.y = -Settings.PlanetSettings.ZoneDepth - _maxDepth;
MinimapGravityQuad.transform.position = gravPos;
}
}

25
Assets/Scripts/UI/MinimapCameraTrack.cs Normal file
View file

@ -0,0 +1,25 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class MinimapCameraTrack : MonoBehaviour
{
public Transform Camera;
public bool Modulo;
public float Offset;
private RectTransform _rect;
void Start ()
{
_rect = GetComponent<RectTransform>();
}
void Update ()
{
var dir = Camera.forward.Flatland().normalized;
var deg = -Mathf.Atan2(dir.y, dir.x) * Mathf.Rad2Deg;
if (Modulo)
deg = Mathf.Repeat(deg + 15, 30) - 15;
_rect.rotation = Quaternion.Euler(0,0,deg+Offset);
}
}

11
Assets/Scripts/UI/MinimapCameraTrack.cs.meta Normal file
View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 7abd72c7a224abb43b58429a917aff25
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: