From e90930881c6c409eaa954c99989ac5ead890e2f9 Mon Sep 17 00:00:00 2001 From: jaEimele24 <46973541+jaEimele24@users.noreply.github.com> Date: Wed, 30 Jan 2019 13:36:51 -0500 Subject: [PATCH 1/2] Update picture.py --- picture.py | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/picture.py b/picture.py index 6e2a3e23..cde9c13b 100644 --- a/picture.py +++ b/picture.py @@ -1,7 +1,7 @@ """ picture.py -Author: -Credit: +Author: James Eiler +Credit: Instruction and Tutorials From Mr Dennison Assignment: @@ -27,6 +27,33 @@ from ggame import App, Color, LineStyle, Sprite, RectangleAsset, CircleAsset, EllipseAsset, PolygonAsset # add your code here \/ \/ \/ +from ggame import App, Color, LineStyle, Sprite +from ggame import RectangleAsset, CircleAsset, EllipseAsset, PolygonAsset +app=App() +app.run() +red = Color(0xff0000, 1.0) +green = Color(0x00ff00, 1.0) +blue = Color(0x0000ff, 1.0) +black = Color(0x000000, 1.0) +linea = LineStyle(1, blue) +lineb = LineStyle(1, green) +linec = LineStyle(1, red) +rectangle1 = RectangleAsset(20, 80, linea, red) +circle1 = CircleAsset(20, lineb, green) +polygon1 = PolygonAsset([(10,20),(5,10),(3,2)], linec, blue) +Ellipse1 = EllipseAsset(10, 20, linea, red) +circle2 = CircleAsset(20, linec, blue) +Sprite(rectangle1, (250, 10)) +Sprite(polygon1, (50, 10)) +Sprite(Ellipse1, (50, 10)) +Sprite(circle1, (275, 375)) +Sprite(circle1, (300, 400)) +Sprite(rectangle1, (500, 10)) +Sprite(polygon1, (2, 3)) +Sprite(Ellipse1, (10, 13)) +Sprite(rectangle1, (250, 355)) +Sprite(circle2, (300, 350)) +Sprite(circle2, (325, 375)) # add your code here /\ /\ /\ From 5998c833deaf07c87d1eadbf11c697718605ce4e Mon Sep 17 00:00:00 2001 From: jaEimele24 <46973541+jaEimele24@users.noreply.github.com> Date: Thu, 31 Jan 2019 17:09:57 -0500 Subject: [PATCH 2/2] Update picture.py --- picture.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/picture.py b/picture.py index cde9c13b..5273630e 100644 --- a/picture.py +++ b/picture.py @@ -40,7 +40,7 @@ linec = LineStyle(1, red) rectangle1 = RectangleAsset(20, 80, linea, red) circle1 = CircleAsset(20, lineb, green) -polygon1 = PolygonAsset([(10,20),(5,10),(3,2)], linec, blue) +polygon1 = PolygonAsset([(100,200),(150,100),(3,2)], linec, blue) Ellipse1 = EllipseAsset(10, 20, linea, red) circle2 = CircleAsset(20, linec, blue) Sprite(rectangle1, (250, 10)) @@ -49,7 +49,7 @@ Sprite(circle1, (275, 375)) Sprite(circle1, (300, 400)) Sprite(rectangle1, (500, 10)) -Sprite(polygon1, (2, 3)) +Sprite(polygon1, (500, 300)) Sprite(Ellipse1, (10, 13)) Sprite(rectangle1, (250, 355)) Sprite(circle2, (300, 350))