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
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 = 30;

//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
11 changes: 6 additions & 5 deletions CMPUT 250 W24 Lab 3/Assets/Scenes/SampleScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 3df35848a1b344bd5a1923d962ae8b19, type: 3}
m_Name:
m_EditorClassIdentifier:
speed: 3
speed: 30
X_Max: 5
Y_Max: 4
--- !u!1 &519420028
Expand Down Expand Up @@ -277,7 +277,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: 5, y: 5, z: 5}
m_Children: []
m_Father: {fileID: 421997421}
m_RootOrder: 0
Expand Down Expand Up @@ -321,12 +321,13 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 6e7069a7db07f489a87c0797b3ff2165, type: 3}
m_Sprite: {fileID: -7233061771267136272, guid: 1ec3884e97d764d309033f70d2b96f7d,
type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 5, y: 5}
m_Size: {x: 0.3, y: 0.3}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
Expand Down Expand Up @@ -566,7 +567,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: This is a bouncing ball
m_Text: Racon flying around
--- !u!222 &2098954804
CanvasRenderer:
m_ObjectHideFlags: 0
Expand Down
Binary file added CMPUT 250 W24 Lab 3/Assets/racon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
128 changes: 128 additions & 0 deletions CMPUT 250 W24 Lab 3/Assets/racon.png.meta

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

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.
Binary file not shown.
Binary file not shown.
45 changes: 23 additions & 22 deletions CMPUT 250 W24 Lab 3/Library/CurrentMaximizeLayout.dwlt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ MonoBehaviour:
m_MinSize: {x: 911, y: 421}
m_MaxSize: {x: 22006, y: 10021}
vertical: 0
controlID: -1
controlID: 78
--- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
Expand Down Expand Up @@ -61,7 +61,7 @@ MonoBehaviour:
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
m_TargetSize: {x: 960, y: 640}
m_TargetSize: {x: 1024, y: 768}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
Expand All @@ -70,16 +70,16 @@ MonoBehaviour:
m_VSyncEnabled: 0
m_Gizmos: 0
m_Stats: 0
m_SelectedSizes: 08000000000000000000000000000000000000000000000000000000000000000000000000000000
m_SelectedSizes: 06000000000000000000000000000000000000000000000000000000000000000000000000000000
m_ZoomArea:
m_HRangeLocked: 0
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
m_HBaseRangeMin: -240
m_HBaseRangeMax: 240
m_VBaseRangeMin: -160
m_VBaseRangeMax: 160
m_HBaseRangeMin: -256
m_HBaseRangeMax: 256
m_VBaseRangeMin: -192
m_VBaseRangeMax: 192
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
Expand All @@ -99,20 +99,20 @@ MonoBehaviour:
y: 21
width: 654
height: 299
m_Scale: {x: 0.934375, y: 0.934375}
m_Scale: {x: 0.7786458, y: 0.7786458}
m_Translation: {x: 327, y: 149.5}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -349.96655
y: -160
width: 699.9331
height: 320
x: -419.95987
y: -192
width: 839.91974
height: 384
m_MinimalGUI: 1
m_defaultScale: 0.934375
m_defaultScale: 0.7786458
m_LastWindowPixelSize: {x: 1308, y: 640}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
Expand Down Expand Up @@ -143,7 +143,7 @@ MonoBehaviour:
m_MinSize: {x: 201, y: 421}
m_MaxSize: {x: 4001, y: 8021}
vertical: 1
controlID: -1
controlID: 79
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
Expand All @@ -163,8 +163,8 @@ MonoBehaviour:
y: 0
width: 655
height: 359
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 5}
m_Panes:
- {fileID: 5}
Expand Down Expand Up @@ -368,7 +368,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: d8f7ffff44f9ffff62fbffff
m_ExpandedIDs: 1cfbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
Expand Down Expand Up @@ -411,8 +411,8 @@ MonoBehaviour:
y: 0
width: 232
height: 700
m_MinSize: {x: 232, y: 271}
m_MaxSize: {x: 10002, y: 10021}
m_MinSize: {x: 230, y: 250}
m_MaxSize: {x: 10000, y: 10000}
m_ActualView: {fileID: 10}
m_Panes:
- {fileID: 10}
Expand Down Expand Up @@ -461,14 +461,15 @@ MonoBehaviour:
m_StartGridSize: 64
m_LastFolders: []
m_LastFoldersGridSize: -1
m_LastProjectPath: /Users/guzdial/Downloads/CMPUT 250 W24 Lab 3
m_LastProjectPath: /Users/aaronchiu/Documents/CMPUT 250/CMPUT-250-F24-Lab-3/CMPUT
250 W24 Lab 3
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: da3b0000
m_LastClickedID: 15322
m_ExpandedIDs: ffffffff9a4d0000
m_ExpandedIDs: 0000000070390000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
Expand Down Expand Up @@ -496,7 +497,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: ffffffff9a4d0000
m_ExpandedIDs: ffffffff0000000070390000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
Expand Down
6 changes: 6 additions & 0 deletions CMPUT 250 W24 Lab 3/Library/EditorInstance.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"process_id" : 37589,
"version" : "2019.4.18f1",
"app_path" : "/Applications/Unity/Hub/Editor/2019.4.18f1/Unity.app",
"app_contents_path" : "/Applications/Unity/Hub/Editor/2019.4.18f1/Unity.app/Contents"
}
Binary file modified CMPUT 250 W24 Lab 3/Library/ScriptAssemblies/Assembly-CSharp.dll
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
08d8c0e334456f00.08d8c0e334456f00
08dd34e4add3b880.08dd34e4add3b880
Binary file modified CMPUT 250 W24 Lab 3/Library/ScriptAssemblies/PsdPlugin.dll
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.
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 modified CMPUT 250 W24 Lab 3/Library/ScriptAssemblies/Unity.Timeline.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified CMPUT 250 W24 Lab 3/Library/ScriptAssemblies/UnityEditor.UI.dll
Binary file not shown.
Binary file not shown.
Binary file modified CMPUT 250 W24 Lab 3/Library/ScriptAssemblies/UnityEngine.UI.dll
Binary file not shown.
Binary file modified CMPUT 250 W24 Lab 3/Library/ShaderCache/EditorEncounteredVariants
Binary file not shown.
Binary file modified CMPUT 250 W24 Lab 3/Library/SourceAssetDB
Binary file not shown.
Binary file modified CMPUT 250 W24 Lab 3/Library/SourceAssetDB-lock
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-2088,-1724,-1182],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-1252,14606,14634],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
Loading