Browse Source

Abstände bei der Planetengenerierung

master
laurids 2 years ago
parent
commit
3f4ae4e1ba
3 changed files with 397 additions and 399 deletions
  1. +1
    -1
      Assets/GWConquest/Prefabs/Planet.prefab
  2. +365
    -365
      Assets/GWConquest/Scenes/GalaxyMap.unity
  3. +31
    -33
      Assets/GWConquest/Scripts/PlanetConnection.cs

+ 1
- 1
Assets/GWConquest/Prefabs/Planet.prefab View File

@ -547,7 +547,7 @@ Transform:
m_GameObject: {fileID: 6717268396553122152} m_GameObject: {fileID: 6717268396553122152}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.001, y: 0.001, z: 0.001}
m_Children: m_Children:
- {fileID: 4253974885826492724} - {fileID: 4253974885826492724}
- {fileID: 8866216275828915038} - {fileID: 8866216275828915038}


+ 365
- 365
Assets/GWConquest/Scenes/GalaxyMap.unity
File diff suppressed because it is too large
View File


+ 31
- 33
Assets/GWConquest/Scripts/PlanetConnection.cs View File

@ -120,54 +120,52 @@ namespace GWConquest
private void Update() private void Update()
{ {
if (planet1 != null && planet2 != null
if (Application.isPlaying && !IsPreConnection && planet1 != null && planet2 != null
&& Util.IsPointOnScreen(planet1.transform.position) && Util.IsPointOnScreen(planet2.transform.position)) && Util.IsPointOnScreen(planet1.transform.position) && Util.IsPointOnScreen(planet2.transform.position))
{ {
UpdatePositions(); UpdatePositions();
if (Application.isPlaying && !IsPreConnection)
{
Camera cam = Camera.main;
float distance;
Camera cam = Camera.main;
float distance;
if (cam.orthographic)
{
distance = cam.orthographicSize;
}
else
{
distance = Vector3.Distance(transform.position, cam.transform.position);
}
if (cam.orthographic)
{
distance = cam.orthographicSize;
}
else
{
distance = Vector3.Distance(transform.position, cam.transform.position);
}
float scale = distance * 1000f / cam.pixelHeight;
lineRenderer.widthMultiplier = ConstantWidth * scale;
float scale = distance * 1000f / cam.pixelHeight;
lineRenderer.widthMultiplier = ConstantWidth * scale;
var delta = QuadSpeed * Time.deltaTime;
for (int i = Quads.Count - 1; i >= 0; i--)
var delta = QuadSpeed * Time.deltaTime;
for (int i = Quads.Count - 1; i >= 0; i--)
{
var quad = Quads[i];
quad.transform.position = Vector3.MoveTowards(quad.transform.position, quad.target, delta);
quad.transform.localScale = Vector3.one * ConstantQuadScale * scale;
if (Vector3.SqrMagnitude(quad.transform.position - quad.target) <= 0.1)
{ {
var quad = Quads[i];
quad.transform.position = Vector3.MoveTowards(quad.transform.position, quad.target, delta);
quad.transform.localScale = Vector3.one * ConstantQuadScale * scale;
if (Vector3.SqrMagnitude(quad.transform.position - quad.target) <= 0.1)
{
Destroy(quad.transform.gameObject);
Quads.RemoveAt(i);
}
Destroy(quad.transform.gameObject);
Quads.RemoveAt(i);
} }
} }
} }
#if UNITY_EDITOR #if UNITY_EDITOR
if (!Application.isPlaying && IsPreConnection)
if (!Application.isPlaying)
{ {
var lineRenderer = GetComponent<LineRenderer>();
lineRenderer.startColor = Util.UpdateColorRGB(lineRenderer.startColor, Color.green);
lineRenderer.endColor = Util.UpdateColorRGB(lineRenderer.endColor, Color.green);
UpdatePositions();
if(IsPreConnection)
{
var lineRenderer = GetComponent<LineRenderer>();
lineRenderer.startColor = Util.UpdateColorRGB(lineRenderer.startColor, Color.green);
lineRenderer.endColor = Util.UpdateColorRGB(lineRenderer.endColor, Color.green);
}
} }
#endif #endif
} }


Loading…
Cancel
Save