Start to clean up Prop datatype
This commit is contained in:
+14
-14
@@ -26,8 +26,8 @@ debrisSPic db = translateSP (_dbPos db) . overPosSP (Q.rotate (_dbRot db)) $
|
||||
drawProp :: PropDraw -> Prop -> SPic
|
||||
drawProp = \case
|
||||
PropDrawSPic spic -> const spic
|
||||
PropDrawMovingShape pd' -> \pr -> drawMovingShape pr (drawProp pd' pr)
|
||||
PropDrawMovingShapeCol sh -> (`drawMovingShapeCol` sh)
|
||||
-- PropDrawMovingShape pd' -> \pr -> drawMovingShape pr (drawProp pd' pr)
|
||||
-- PropDrawMovingShapeCol sh -> (`drawMovingShapeCol` sh)
|
||||
PropDoubleLampCover h -> drawDoubleLampCover h
|
||||
PropVerticalLampCover h -> drawVerticalLampCover h
|
||||
PropLampCover h -> drawLampCover h
|
||||
@@ -78,19 +78,19 @@ drawVerticalLampCover h pr =
|
||||
$ rectNSWE 2 (-2) (-5) 5
|
||||
)
|
||||
|
||||
drawMovingShape :: Prop -> SPic -> SPic
|
||||
drawMovingShape pr =
|
||||
translateSPz (_prPosZ pr)
|
||||
. uncurryV translateSPxy (_prPos pr)
|
||||
. overPosSP (Q.rotate (_prQuat pr))
|
||||
--drawMovingShape :: Prop -> SPic -> SPic
|
||||
--drawMovingShape pr =
|
||||
-- translateSPz (_prPosZ pr)
|
||||
-- . uncurryV translateSPxy (_prPos pr)
|
||||
-- . overPosSP (Q.rotate (_prQuat pr))
|
||||
|
||||
drawMovingShapeCol :: Prop -> Shape -> SPic
|
||||
drawMovingShapeCol pr =
|
||||
noPic
|
||||
. translateSHz (_prPosZ pr)
|
||||
. uncurryV translateSHxy (_prPos pr)
|
||||
. overPosSH (Q.rotate (_prQuat pr))
|
||||
. colorSH (_prColor pr)
|
||||
--drawMovingShapeCol :: Prop -> Shape -> SPic
|
||||
--drawMovingShapeCol pr =
|
||||
-- noPic
|
||||
-- . translateSHz (_prPosZ pr)
|
||||
-- . uncurryV translateSHxy (_prPos pr)
|
||||
-- . overPosSH (Q.rotate (_prQuat pr))
|
||||
-- . colorSH (_prColor pr)
|
||||
|
||||
drawDoubleLampCover :: Float -> Prop -> SPic
|
||||
drawDoubleLampCover h pr =
|
||||
|
||||
Reference in New Issue
Block a user