Refactor shader loading

src/Dodge/Item/Weapon/Launcher.hs

@@ -6,7 +6,6 @@ import Dodge.Default.Weapon
 import Dodge.Default.Shell
 import Dodge.SoundLogic.LoadSound
 import Dodge.WorldEvent.Explosion
-import Dodge.Picture.Layer
 import Dodge.Item.Data
 import Dodge.Item.Draw
 import Dodge.Item.Weapon.Shell
@@ -22,7 +21,7 @@ import Geometry.Vector3D
 import Picture
 import qualified IntMapHelp as IM
 import Padding
---import ShapePicture
+import ShapePicture
 import Shape
 
 import Data.Maybe
@@ -50,10 +49,10 @@ launcher = defaultGun
         ]
     , _wpSpread = 0.02
     , _wpRange = 20
-    , _itFloorPict = (,) emptySH $ onLayer FlItLayer launcherPic
+    , _itFloorPict = launcherPic
     , _itAimingSpeed = 0.2
     , _itAimingRange = 0.5
-    , _itEquipPict = pictureWeaponOnAim $ (,) emptySH launcherPic
+    , _itEquipPict = pictureWeaponOnAim launcherPic
     , _itHammer = NoHammer
     , _itEffect = NoItEffect
     , _wpAmmo = defaultShellAmmo 
@@ -65,8 +64,11 @@ launcher = defaultGun
     , _itAimStance = TwoHandTwist
     }
 
-launcherPic :: Picture
-launcherPic = color cyan $ polygon $ rectNESW 5 10 (-5) (-10)
+launcherPic :: SPic
+launcherPic = 
+    ( colorSH cyan $ upperPrismPoly 7 $ rectNESW 5 10 (-5) (-10)
+    , mempty
+    )
 
 basicAmPjMoves :: [PjParam]
 basicAmPjMoves =