From bb66ef993fb759cfd9fd1a5a0fecdbd6e5e49506 Mon Sep 17 00:00:00 2001
From: Fen Dweller <chemicalcrux@gmail.com>
Date: Fri, 28 Feb 2020 12:36:25 -0500
Subject: [PATCH] Add a few fruits

---
 media/attribution.js                     | 12 +++++++++
 media/objects/fruits/banana-vertical.svg |  9 +++++++
 media/objects/fruits/banana.svg          |  9 +++++++
 media/objects/fruits/grape.svg           |  6 +++++
 media/objects/fruits/lemon.svg           | 10 +++++++
 media/objects/fruits/orange.svg          | 12 +++++++++
 presets/objects.js                       | 33 ++++++++++++++++++++++++
 7 files changed, 91 insertions(+)
 create mode 100644 media/objects/fruits/banana-vertical.svg
 create mode 100644 media/objects/fruits/banana.svg
 create mode 100644 media/objects/fruits/grape.svg
 create mode 100644 media/objects/fruits/lemon.svg
 create mode 100644 media/objects/fruits/orange.svg

diff --git a/media/attribution.js b/media/attribution.js
index c17aae49..27db6c35 100644
--- a/media/attribution.js
+++ b/media/attribution.js
@@ -2296,6 +2296,18 @@ const attributionData = {
                 "chemicalcrux"
             ]
         },
+        {
+            prefix: "./media/objects/fruits",
+            files: [
+                { name: "banana.svg", source: null },
+                { name: "banana-vertical.svg", source: null },
+                { name: "lemon.svg", source: null },
+                { name: "orange.svg", source: null },
+            ],
+            authors: [
+                "chemicalcrux"
+            ]
+        },
         {
             prefix: "./media/objects/",
             files: [
diff --git a/media/objects/fruits/banana-vertical.svg b/media/objects/fruits/banana-vertical.svg
new file mode 100644
index 00000000..ebd73428
--- /dev/null
+++ b/media/objects/fruits/banana-vertical.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 134.22 275.62" style="enable-background:new 0 0 134.22 275.62;" xml:space="preserve">
+<path d="M82.28,275.15c0,0-15.41-23.56-13.43-44.26s14.09-68.48,10.79-107.23c-3.3-38.75-10.79-54.83-20.7-67.16
+	S39.13,31.41,29,25.02S3.02,17.09,3.02,17.09S-1.61,9.83,0.59,4.76s9.22-2.42,9.22-2.42l4.43-0.69c0,0,7.93,5.31,14.09,4.21
+	s22.02-6.83,27.52-5.72s27.96,4.4,44.7,24.22S126.98,70.6,131.6,97.9s1.76,61.21,1.54,68.7s-12.77,62.09-15.63,72.88
+	c-2.86,10.79-12.11,31.71-28.18,35.67C84.82,276.2,82.28,275.15,82.28,275.15z"/>
+</svg>
diff --git a/media/objects/fruits/banana.svg b/media/objects/fruits/banana.svg
new file mode 100644
index 00000000..7f5c800d
--- /dev/null
+++ b/media/objects/fruits/banana.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 275.62 134.22" style="enable-background:new 0 0 275.62 134.22;" xml:space="preserve">
+<path d="M0.47,82.28c0,0,23.56-15.41,44.26-13.43s68.48,14.09,107.23,10.79c38.75-3.3,54.83-10.79,67.16-20.7S244.21,39.13,250.6,29
+	s7.93-25.98,7.93-25.98s7.27-4.62,12.33-2.42c5.06,2.2,2.42,9.22,2.42,9.22l0.69,4.43c0,0-5.31,7.93-4.21,14.09
+	s6.83,22.02,5.72,27.52s-4.4,27.96-24.22,44.7s-46.24,26.42-73.54,31.05s-61.21,1.76-68.7,1.54s-62.09-12.77-72.88-15.63
+	C25.35,114.65,4.43,105.4,0.47,89.33C-0.58,84.82,0.47,82.28,0.47,82.28z"/>
+</svg>
diff --git a/media/objects/fruits/grape.svg b/media/objects/fruits/grape.svg
new file mode 100644
index 00000000..f4085842
--- /dev/null
+++ b/media/objects/fruits/grape.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 34.13 46.68" style="enable-background:new 0 0 34.13 46.68;" xml:space="preserve">
+<ellipse cx="17.06" cy="23.34" rx="17.06" ry="23.34"/>
+</svg>
diff --git a/media/objects/fruits/lemon.svg b/media/objects/fruits/lemon.svg
new file mode 100644
index 00000000..bc678dfe
--- /dev/null
+++ b/media/objects/fruits/lemon.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 129.2 174.3" style="enable-background:new 0 0 129.2 174.3;" xml:space="preserve">
+<g>
+	<ellipse cx="64.6" cy="87.44" rx="64.6" ry="81.91"/>
+	<ellipse cx="64.6" cy="167.37" rx="6.52" ry="6.94"/>
+	<ellipse cx="64.6" cy="6.94" rx="13.56" ry="6.94"/>
+</g>
+</svg>
diff --git a/media/objects/fruits/orange.svg b/media/objects/fruits/orange.svg
new file mode 100644
index 00000000..b3a4b3f8
--- /dev/null
+++ b/media/objects/fruits/orange.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 155.46 161.16" style="enable-background:new 0 0 155.46 161.16;" xml:space="preserve">
+<g>
+	<ellipse cx="77.73" cy="90.36" rx="77.73" ry="70.8"/>
+	<g>
+		<path d="M85.72,32.68c-0.46,1.45-1.74,2.37-2.84,2.07c-1.11-0.3-1.63-1.96-1.17-3.43c3.41-9.51,5.66-19.47,8.38-29.19
+			c0.46-1.45,1.74-2.37,2.84-2.07c1.11,0.3,1.63,1.96,1.17,3.43C90.68,13,88.43,22.96,85.72,32.68z"/>
+	</g>
+</g>
+</svg>
diff --git a/presets/objects.js b/presets/objects.js
index 78ddd986..b3423794 100644
--- a/presets/objects.js
+++ b/presets/objects.js
@@ -335,6 +335,39 @@ function makeObjects() {
             }
         )
     });
+
+    results.push({
+        name: "Fruit",
+        constructor: () => makeObject(
+            "Fruit",
+            {
+                banana: {
+                    height: math.unit(3.5, "inches"),
+                    image: { source: "./media/objects/fruits/banana.svg" },
+                    name: "Banana",
+                    rename: true
+                },
+                bananaVertical: {
+                    height: math.unit(7, "inches"),
+                    image: { source: "./media/objects/fruits/banana-vertical.svg" },
+                    name: "Banana (Vertical)",
+                    rename: true
+                },
+                lemon: {
+                    height: math.unit(3.5, "inches"),
+                    image: { source: "./media/objects/fruits/lemon.svg" },
+                    name: "Lemon",
+                    rename: true
+                },
+                orange: {
+                    height: math.unit(2.8, "inches"),
+                    image: { source: "./media/objects/fruits/orange.svg" },
+                    name: "Orange",
+                    rename: true
+                },
+            }
+        )
+    });
     
     results.sort((b1, b2) => {
         e1 = b1.constructor();