gluturtle 0.0.58 → 0.0.58.1

raw patch · 3 files changed

+7/−6 lines, 3 filesdep ~yjsvg

Dependency ranges changed: yjsvg

Files

• gluturtle.cabal +2/−2
• src/Graphics/UI/GLUT/Turtle/Input.hs +3/−2
• src/Graphics/UI/GLUT/Turtle/Move.hs +2/−2

@@ -2,7 +2,7 @@ cabal-version:	>= 1.6  name:		gluturtle-version:	0.0.58+version:	0.0.58.1 stability:	alpha author:		Yoshikuni Jujo <PAF01143@nifty.ne.jp> maintainer:	Yoshikuni Jujo <PAF01143@nifty.ne.jp>@@ -24,7 +24,7 @@   Hs-source-dirs:	src   Exposed-modules:	Graphics.UI.GLUT.Turtle   Build-depends:	base > 3 && < 5, yjtools >= 0.9.16, convertible >= 1.0.8,-    yjsvg >= 0.1.14, GLUT, stm+    yjsvg >= 0.1.18, GLUT, stm   Ghc-options:		-Wall   Other-modules:	Graphics.UI.GLUT.Turtle.Field, Graphics.UI.GLUT.Turtle.Input,     Graphics.UI.GLUT.Turtle.Move, Graphics.UI.GLUT.Turtle.State,

@@ -1,7 +1,7 @@ module Graphics.UI.GLUT.Turtle.Input(TurtleInput(..), turtleSeries) where  import Graphics.UI.GLUT.Turtle.State(TurtleState(..), initTurtleState, makeShape)-import Text.XML.YJSVG(SVG(..), Color(..), Position(..))+import Text.XML.YJSVG(SVG(..), Color(..), Position(..), Font(..), FontWeight(..))  -------------------------------------------------------------------------------- @@ -80,7 +80,8 @@ 	Just (Polyline (makeShape t (direction t) (position t)) fclr clr $ 		pensize t) nextTurtle t@TurtleState{pencolor = clr} (Write fnt sz str) = reset t `set`-	Just (Text (position t) sz clr fnt str)+--	Just (Text (position t) sz clr fnt str)+	Just (Text (position t) sz clr (Font fnt Normal) str) nextTurtle t (PutImage fp w h) = reset t `set` Just (Image (position t) w h fp) nextTurtle t (Undonum un) = (reset t){undonum = un} nextTurtle t Clear = (reset t){clear = True, drawed = [Fill (RGB 255 255 255)]}

@@ -50,7 +50,7 @@ 	fieldColor, drawLine, fillRectangle, fillPolygon, writeString, 	drawImage, undoField, drawCharacter, drawCharacterAndLine, 	consoleOutput, clearField)-import Text.XML.YJSVG(SVG(..), Position(..))+import Text.XML.YJSVG(SVG(..), Position(..), Font(..)) import qualified Text.XML.YJSVG as S(topleft)  import Control.Concurrent(threadDelay)@@ -91,7 +91,7 @@ drawSVG f (Rect pos w h 0 fc _) = fillRectangle f pos w h fc drawSVG f (Polyline ps fc lc lw) = fillPolygon f ps fc lc lw drawSVG f (Fill clr) = fieldColor f clr-drawSVG f (Text pos sz clr fnt str) = writeString f fnt sz clr pos str+drawSVG f (Text pos sz clr (Font fnt _) str) = writeString f fnt sz clr pos str drawSVG f (Image pos w h fp) = drawImage f fp pos w h drawSVG _ _ = error "not implemented"