Merge pull request #193 from storytold/obj-primitive-consolidation

primitives moved to objects, removed corresponding tab

app/pages/PageEnigma/comps/SidePanelTabs/itemTabs/ObjectsTab.tsx

@@ -10,6 +10,7 @@ import { ItemElements } from "~/pages/PageEnigma/comps/SidePanelTabs/itemTabs/It
 import { Button } from "~/components";
 import { faCirclePlus } from "@fortawesome/pro-solid-svg-icons";
 import { twMerge } from "tailwind-merge";
+import { shapeItems } from "~/pages/PageEnigma/store";
 
 interface Props {
   type: AssetType;
@@ -72,7 +73,7 @@ export const ObjectsTab = ({ type }: Props) => {
         </Button>
       </div>
       <div className="h-full w-full overflow-y-auto px-4">
-        <ItemElements items={items.value} assetFilter={assetFilter.value} />
+        <ItemElements items={[ ...type !== AssetType.CHARACTER ? shapeItems.value : [], ...items.value ]} assetFilter={assetFilter.value} />
       </div>
     </>
   );

app/pages/PageEnigma/comps/SidePanelTabs/tabList.tsx

@@ -24,12 +24,6 @@ export const tabList = [
     value: AssetType.OBJECT,
     component: <ObjectsTab type={AssetType.OBJECT} />,
   },
-  {
-    icon: "/resources/icons/shapes.png",
-    title: "Shapes",
-    value: AssetType.SHAPE,
-    component: <ShapeTab />,
-  },
   {
     icon: "/resources/icons/camera.png",
     title: "Camera",