xevion/Rebirth
1
0
Fork 0
mirror of https://github.com/Xevion/Rebirth.git synced 2025-12-07 13:16:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Planet Unit spawning code

Browse Source
This commit is contained in:
Xevion
2024-12-16 05:40:31 -06:00
parent e45adfe37f
commit cd56a6a3f7
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Assets/Planet.cs
View File

@@ -43,7 +43,6 @@ public class Planet : MonoBehaviour
void OnMouseDown() void OnMouseDown()
{ {
Debug.Log($"Clicked on {name}");
SpawnUnit(); SpawnUnit();
} }
@@ -51,7 +50,7 @@ public class Planet : MonoBehaviour
{ {
var radius = Size / 100f + distance; var radius = Size / 100f + distance;
var theta = angle * Mathf.Deg2Rad; var theta = angle * Mathf.Deg2Rad;
return new Vector2(Mathf.Cos(theta), Mathf.Sin(theta)) * radius; return (Vector2)transform.position + new Vector2(Mathf.Cos(theta), Mathf.Sin(theta)) * radius;
} }
public float GetUnitAngle(Unit unit) public float GetUnitAngle(Unit unit)
@@ -64,19 +63,19 @@ public class Planet : MonoBehaviour
{ {
var unitPrefab = Resources.Load<GameObject>("BaseUnit"); var unitPrefab = Resources.Load<GameObject>("BaseUnit");
var unitObject = Instantiate(unitPrefab); var unitObject = Instantiate(unitPrefab);
unitObject.transform.position = transform.position;
Debug.Log($"Spawned unit at {unitObject.transform.position} for planet {name}");
unitObject.transform.parent = transform;
var unit = unitObject.GetComponent<Unit>();
_units.Add(unit);
unitObject.name = "Unit " + _units.Count;
var unit = unitObject.GetComponent<Unit>();
unit.transform.SetParent(transform);
unit.transform.position = GetSurfacePosition(UnityEngine.Random.Range(0, 360), 0.3f);
_units.Add(unit);
unit.name = "Unit " + _units.Count;
_tree.SetCount(_tree.Count + 1); _tree.SetCount(_tree.Count + 1);
var index = _tree.Count - 1; var index = _tree.Count - 1;
unit.TreeIndex = index; unit.TreeIndex = index;
_tree.Points[index] = new Vector2(unitObject.transform.position.x, unitObject.transform.position.y); _tree.Points[index] = new Vector2(unit.transform.position.x, unit.transform.position.y);
_tree.Rebuild(); _tree.Rebuild();
} }

3
Assets/Unit.cs
View File

@@ -26,9 +26,6 @@ public class Unit : MonoBehaviour
}; };
RotationSpeed = Random.value > 0.5f ? 1 : -1 * Random.Range(0.8f, 1.2f) * 4f; RotationSpeed = Random.value > 0.5f ? 1 : -1 * Random.Range(0.8f, 1.2f) * 4f;
BobbingOffset = Random.Range(0, (float)(2 * Math.PI)); BobbingOffset = Random.Range(0, (float)(2 * Math.PI));
transform.position = planet.GetSurfacePosition(Random.Range(0, 360), 0.3f);
Debug.Log($"{name} belongs to {planet.name}");
} }
void Update() void Update()