Skip to content

Commit 3c6c596

Browse files
Fabio BarreseFabio Barrese
Fabio Barrese
authored and
Fabio Barrese
committed
new changes
1 parent 70f671b commit 3c6c596

15 files changed

+373
-20
lines changed

Diff for: .DS_Store

0 Bytes
Binary file not shown.

Diff for: Assets/Scenes/Asteroids.unity

+246-5
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,7 @@ Transform:
811811
m_PrefabInstance: {fileID: 0}
812812
m_PrefabAsset: {fileID: 0}
813813
m_GameObject: {fileID: 526989101}
814-
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
814+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
815815
m_LocalPosition: {x: 0, y: 0, z: 0}
816816
m_LocalScale: {x: 0.5, y: 0.5, z: 1}
817817
m_ConstrainProportionsScale: 0
@@ -887,6 +887,10 @@ MonoBehaviour:
887887
- Player
888888
- velocityY
889889
Count: 2
890+
- myStrings:
891+
- IntPair
892+
- rotationZ
893+
Count: 2
890894
_toMapProperties:
891895
- myStrings:
892896
- IntPair
@@ -912,10 +916,14 @@ MonoBehaviour:
912916
- Player
913917
- velocityY
914918
Count: 2
919+
- myStrings:
920+
- IntPair
921+
- rotationZ
922+
Count: 2
915923
_configurationName: playerSensor
916-
operationPerPropertyIndexes: 44a885c012185c6611185c6660104ad7fb84f1795a62cf6fd172ec6bd272ec6b
917-
operationPerPropertyOperations: 0000000000000000000000000000000000000000000000000000000000000000
918-
specificValuePerPropertyIndexes: 44a885c012185c6611185c6660104ad7fb84f1795a62cf6fd172ec6bd272ec6b
924+
operationPerPropertyIndexes: 44a885c012185c6611185c6660104ad7fb84f1795a62cf6fd172ec6bd272ec6b7a8ad369
925+
operationPerPropertyOperations: 000000000000000000000000000000000000000000000000000000000000000000000000
926+
specificValuePerPropertyIndexes: 44a885c012185c6611185c6660104ad7fb84f1795a62cf6fd172ec6bd272ec6b7a8ad369
919927
specificValuePerPropertyValues:
920928
-
921929
-
@@ -925,6 +933,7 @@ MonoBehaviour:
925933
-
926934
-
927935
-
936+
-
928937
--- !u!114 &526989108
929938
MonoBehaviour:
930939
m_ObjectHideFlags: 0
@@ -963,6 +972,7 @@ MonoBehaviour:
963972
m_EditorClassIdentifier:
964973
x: 0
965974
y: 0
975+
rotationZ: 0
966976
--- !u!1 &556392472
967977
GameObject:
968978
m_ObjectHideFlags: 0
@@ -6375,6 +6385,152 @@ CanvasRenderer:
63756385
m_PrefabAsset: {fileID: 0}
63766386
m_GameObject: {fileID: 1159035110}
63776387
m_CullTransparentMesh: 0
6388+
--- !u!1 &1183897539
6389+
GameObject:
6390+
m_ObjectHideFlags: 0
6391+
m_CorrespondingSourceObject: {fileID: 0}
6392+
m_PrefabInstance: {fileID: 0}
6393+
m_PrefabAsset: {fileID: 0}
6394+
serializedVersion: 6
6395+
m_Component:
6396+
- component: {fileID: 1183897541}
6397+
- component: {fileID: 1183897540}
6398+
- component: {fileID: 1183897542}
6399+
m_Layer: 0
6400+
m_Name: Line
6401+
m_TagString: Untagged
6402+
m_Icon: {fileID: 0}
6403+
m_NavMeshLayer: 0
6404+
m_StaticEditorFlags: 0
6405+
m_IsActive: 0
6406+
--- !u!120 &1183897540
6407+
LineRenderer:
6408+
m_ObjectHideFlags: 0
6409+
m_CorrespondingSourceObject: {fileID: 0}
6410+
m_PrefabInstance: {fileID: 0}
6411+
m_PrefabAsset: {fileID: 0}
6412+
m_GameObject: {fileID: 1183897539}
6413+
m_Enabled: 1
6414+
m_CastShadows: 1
6415+
m_ReceiveShadows: 1
6416+
m_DynamicOccludee: 1
6417+
m_StaticShadowCaster: 0
6418+
m_MotionVectors: 0
6419+
m_LightProbeUsage: 0
6420+
m_ReflectionProbeUsage: 0
6421+
m_RayTracingMode: 0
6422+
m_RayTraceProcedural: 0
6423+
m_RenderingLayerMask: 1
6424+
m_RendererPriority: 0
6425+
m_Materials:
6426+
- {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0}
6427+
m_StaticBatchInfo:
6428+
firstSubMesh: 0
6429+
subMeshCount: 0
6430+
m_StaticBatchRoot: {fileID: 0}
6431+
m_ProbeAnchor: {fileID: 0}
6432+
m_LightProbeVolumeOverride: {fileID: 0}
6433+
m_ScaleInLightmap: 1
6434+
m_ReceiveGI: 1
6435+
m_PreserveUVs: 0
6436+
m_IgnoreNormalsForChartDetection: 0
6437+
m_ImportantGI: 0
6438+
m_StitchLightmapSeams: 1
6439+
m_SelectedEditorRenderState: 3
6440+
m_MinimumChartSize: 4
6441+
m_AutoUVMaxDistance: 0.5
6442+
m_AutoUVMaxAngle: 89
6443+
m_LightmapParameters: {fileID: 0}
6444+
m_SortingLayerID: 0
6445+
m_SortingLayer: 0
6446+
m_SortingOrder: 0
6447+
m_Positions:
6448+
- {x: 0, y: 0, z: 0}
6449+
- {x: 0, y: 2, z: 0}
6450+
m_Parameters:
6451+
serializedVersion: 3
6452+
widthMultiplier: 0.1
6453+
widthCurve:
6454+
serializedVersion: 2
6455+
m_Curve:
6456+
- serializedVersion: 3
6457+
time: 0
6458+
value: 1
6459+
inSlope: 0
6460+
outSlope: 0
6461+
tangentMode: 0
6462+
weightedMode: 0
6463+
inWeight: 0.33333334
6464+
outWeight: 0.33333334
6465+
m_PreInfinity: 2
6466+
m_PostInfinity: 2
6467+
m_RotationOrder: 4
6468+
colorGradient:
6469+
serializedVersion: 2
6470+
key0: {r: 1, g: 0, b: 0.9186506, a: 1}
6471+
key1: {r: 1, g: 0, b: 0.9186506, a: 1}
6472+
key2: {r: 0, g: 0, b: 0, a: 0}
6473+
key3: {r: 0, g: 0, b: 0, a: 0}
6474+
key4: {r: 0, g: 0, b: 0, a: 0}
6475+
key5: {r: 0, g: 0, b: 0, a: 0}
6476+
key6: {r: 0, g: 0, b: 0, a: 0}
6477+
key7: {r: 0, g: 0, b: 0, a: 0}
6478+
ctime0: 0
6479+
ctime1: 65535
6480+
ctime2: 0
6481+
ctime3: 0
6482+
ctime4: 0
6483+
ctime5: 0
6484+
ctime6: 0
6485+
ctime7: 0
6486+
atime0: 0
6487+
atime1: 65535
6488+
atime2: 0
6489+
atime3: 0
6490+
atime4: 0
6491+
atime5: 0
6492+
atime6: 0
6493+
atime7: 0
6494+
m_Mode: 0
6495+
m_NumColorKeys: 2
6496+
m_NumAlphaKeys: 2
6497+
numCornerVertices: 0
6498+
numCapVertices: 0
6499+
alignment: 0
6500+
textureMode: 0
6501+
shadowBias: 0.5
6502+
generateLightingData: 0
6503+
m_UseWorldSpace: 0
6504+
m_Loop: 0
6505+
--- !u!4 &1183897541
6506+
Transform:
6507+
m_ObjectHideFlags: 0
6508+
m_CorrespondingSourceObject: {fileID: 0}
6509+
m_PrefabInstance: {fileID: 0}
6510+
m_PrefabAsset: {fileID: 0}
6511+
m_GameObject: {fileID: 1183897539}
6512+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
6513+
m_LocalPosition: {x: 0, y: 0, z: 0}
6514+
m_LocalScale: {x: 1, y: 1, z: 1}
6515+
m_ConstrainProportionsScale: 0
6516+
m_Children: []
6517+
m_Father: {fileID: 0}
6518+
m_RootOrder: 13
6519+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
6520+
--- !u!114 &1183897542
6521+
MonoBehaviour:
6522+
m_ObjectHideFlags: 0
6523+
m_CorrespondingSourceObject: {fileID: 0}
6524+
m_PrefabInstance: {fileID: 0}
6525+
m_PrefabAsset: {fileID: 0}
6526+
m_GameObject: {fileID: 1183897539}
6527+
m_Enabled: 1
6528+
m_EditorHideFlags: 0
6529+
m_Script: {fileID: 11500000, guid: 460dd5bae29de45ddaf6c4514b450ae0, type: 3}
6530+
m_Name:
6531+
m_EditorClassIdentifier:
6532+
player: {fileID: 0}
6533+
target: {fileID: 0}
63786534
--- !u!1 &1383206939
63796535
GameObject:
63806536
m_ObjectHideFlags: 0
@@ -6427,7 +6583,7 @@ SpriteRenderer:
64276583
m_PrefabInstance: {fileID: 0}
64286584
m_PrefabAsset: {fileID: 0}
64296585
m_GameObject: {fileID: 1383206939}
6430-
m_Enabled: 1
6586+
m_Enabled: 0
64316587
m_CastShadows: 0
64326588
m_ReceiveShadows: 0
64336589
m_DynamicOccludee: 1
@@ -6873,6 +7029,91 @@ RectTransform:
68737029
m_AnchoredPosition: {x: 0, y: 0}
68747030
m_SizeDelta: {x: 0, y: 0}
68757031
m_Pivot: {x: 0.5, y: 0.5}
7032+
--- !u!1 &2007993350
7033+
GameObject:
7034+
m_ObjectHideFlags: 0
7035+
m_CorrespondingSourceObject: {fileID: 0}
7036+
m_PrefabInstance: {fileID: 0}
7037+
m_PrefabAsset: {fileID: 0}
7038+
serializedVersion: 6
7039+
m_Component:
7040+
- component: {fileID: 2007993352}
7041+
- component: {fileID: 2007993351}
7042+
m_Layer: 0
7043+
m_Name: Circle
7044+
m_TagString: Untagged
7045+
m_Icon: {fileID: 0}
7046+
m_NavMeshLayer: 0
7047+
m_StaticEditorFlags: 0
7048+
m_IsActive: 0
7049+
--- !u!212 &2007993351
7050+
SpriteRenderer:
7051+
m_ObjectHideFlags: 0
7052+
m_CorrespondingSourceObject: {fileID: 0}
7053+
m_PrefabInstance: {fileID: 0}
7054+
m_PrefabAsset: {fileID: 0}
7055+
m_GameObject: {fileID: 2007993350}
7056+
m_Enabled: 1
7057+
m_CastShadows: 0
7058+
m_ReceiveShadows: 0
7059+
m_DynamicOccludee: 1
7060+
m_StaticShadowCaster: 0
7061+
m_MotionVectors: 1
7062+
m_LightProbeUsage: 1
7063+
m_ReflectionProbeUsage: 1
7064+
m_RayTracingMode: 0
7065+
m_RayTraceProcedural: 0
7066+
m_RenderingLayerMask: 1
7067+
m_RendererPriority: 0
7068+
m_Materials:
7069+
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
7070+
m_StaticBatchInfo:
7071+
firstSubMesh: 0
7072+
subMeshCount: 0
7073+
m_StaticBatchRoot: {fileID: 0}
7074+
m_ProbeAnchor: {fileID: 0}
7075+
m_LightProbeVolumeOverride: {fileID: 0}
7076+
m_ScaleInLightmap: 1
7077+
m_ReceiveGI: 1
7078+
m_PreserveUVs: 0
7079+
m_IgnoreNormalsForChartDetection: 0
7080+
m_ImportantGI: 0
7081+
m_StitchLightmapSeams: 1
7082+
m_SelectedEditorRenderState: 0
7083+
m_MinimumChartSize: 4
7084+
m_AutoUVMaxDistance: 0.5
7085+
m_AutoUVMaxAngle: 89
7086+
m_LightmapParameters: {fileID: 0}
7087+
m_SortingLayerID: 0
7088+
m_SortingLayer: 0
7089+
m_SortingOrder: 0
7090+
m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b,
7091+
type: 3}
7092+
m_Color: {r: 1, g: 1, b: 1, a: 1}
7093+
m_FlipX: 0
7094+
m_FlipY: 0
7095+
m_DrawMode: 0
7096+
m_Size: {x: 1, y: 1}
7097+
m_AdaptiveModeThreshold: 0.5
7098+
m_SpriteTileMode: 0
7099+
m_WasSpriteAssigned: 1
7100+
m_MaskInteraction: 0
7101+
m_SpriteSortPoint: 0
7102+
--- !u!4 &2007993352
7103+
Transform:
7104+
m_ObjectHideFlags: 0
7105+
m_CorrespondingSourceObject: {fileID: 0}
7106+
m_PrefabInstance: {fileID: 0}
7107+
m_PrefabAsset: {fileID: 0}
7108+
m_GameObject: {fileID: 2007993350}
7109+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
7110+
m_LocalPosition: {x: 2.78, y: 3.55, z: 0}
7111+
m_LocalScale: {x: 1, y: 1, z: 1}
7112+
m_ConstrainProportionsScale: 0
7113+
m_Children: []
7114+
m_Father: {fileID: 0}
7115+
m_RootOrder: 14
7116+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
68767117
--- !u!850595691 &2010325673
68777118
LightingSettings:
68787119
m_ObjectHideFlags: 0

Diff for: Assets/Scripts/AngleBetweenVectors.cs

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
using UnityEngine;
2+
3+
public class AngleBetweenVectors : MonoBehaviour
4+
{
5+
public Player player;
6+
public Asteroid target;
7+
private LineRenderer lr;
8+
// Start is called before the first frame update
9+
private void Awake()
10+
{
11+
lr = GetComponent<LineRenderer>();
12+
}
13+
void Start()
14+
{
15+
lr.SetPosition(0, player.transform.position);
16+
lr.SetPosition(1, player.transform.position);
17+
Vector2 AB = target.transform.position - player.transform.position;
18+
float angleInRadians = Mathf.Atan(AB.y/AB.x);
19+
float rotationZ = angleInRadians * Mathf.Rad2Deg;
20+
rotationZ -= 90;
21+
//if(asteroid.transform.position.x < player.transform.position.x
22+
//player.transform.rotation.z = 180 + rotationZ;
23+
//else
24+
//player.transform.rotation.z = rotation.
25+
Debug.Log(rotationZ);
26+
}
27+
28+
// Update is called once per frame
29+
void Update()
30+
{
31+
32+
}
33+
}

Diff for: Assets/Scripts/AngleBetweenVectors.cs.meta

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: Assets/Scripts/BulletPath.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ private void OnTriggerEnter2D(Collider2D collision)
88
{
99
if (collision.gameObject.CompareTag("Asteroid"))
1010
{
11-
myPlayer.turnDirection = 0f;
11+
myPlayer.rigidbody.angularVelocity = 0;
1212
myPlayer.isTimeToShoot = true;
1313
//myPlayer.Shoot();
1414
}

0 commit comments

Comments
 (0)