Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions CMPUT 250 W24 Lab 3/Assets/Circle.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion CMPUT 250 W24 Lab 3/Assets/DVDLogo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
public class DVDLogo : MonoBehaviour
{
//Speed it moves at
public float speed = 3;
public float speed = 8;

//Bounds of the screen (could get these with camera bounds but we can do this since it's a fixed camera)
public float X_Max = 5, Y_Max = 4;
Expand Down
8 changes: 8 additions & 0 deletions CMPUT 250 W24 Lab 3/Assets/Images.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added CMPUT 250 W24 Lab 3/Assets/Images/SoccerBall.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
104 changes: 104 additions & 0 deletions CMPUT 250 W24 Lab 3/Assets/Images/SoccerBall.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 19 additions & 5 deletions CMPUT 250 W24 Lab 3/Assets/Scenes/SampleScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
speed: 3
X_Max: 5
Y_Max: 4
X_Max: 6
Y_Max: 4.5
--- !u!1 &519420028
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -261,6 +261,7 @@ GameObject:
m_Component:
- component: {fileID: 755472558}
- component: {fileID: 755472559}
- component: {fileID: 755472560}
m_Layer: 0
m_Name: Circle
m_TagString: Untagged
Expand All @@ -277,7 +278,7 @@ Transform:
m_GameObject: {fileID: 755472557}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.2, y: 0.2, z: 1}
m_LocalScale: {x: 0.1, y: 0.1, z: 1}
m_Children: []
m_Father: {fileID: 421997421}
m_RootOrder: 0
Expand Down Expand Up @@ -321,7 +322,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 6e7069a7db07f489a87c0797b3ff2165, type: 3}
m_Sprite: {fileID: 21300000, guid: da1144b79f050458bba05244a01fa802, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
Expand All @@ -332,6 +333,19 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!65 &755472560
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 755472557}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 0
serializedVersion: 2
m_Size: {x: 0.99, y: 0.96, z: 0.2}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &957195930
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -566,7 +580,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: This is a bouncing ball
m_Text: This is a soccer ball!
--- !u!222 &2098954804
CanvasRenderer:
m_ObjectHideFlags: 0
Expand Down
Binary file not shown.
Binary file modified CMPUT 250 W24 Lab 3/Library/ArtifactDB
Binary file not shown.
Binary file modified CMPUT 250 W24 Lab 3/Library/ArtifactDB-lock
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading