diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -2,4 +2,37 @@ Hylogen is a tiny language [embedded in Haskell](https://wiki.haskell.org/Embedded_domain_specific_language) for live-coding visuals. +## Setup +``` +cabal update +cabal install ghcid hylogen +``` +## Usage + +```haskell +-- ./Main.hs +module Main where + +import Hylogen + + +main = putStrLn . toGLSL $ Vec4 (a, a, a, 1) + where + a = cos(X uv * sin(time/ 10) * 10 + X mouse) + + sin(Y uv * sin(time / 10) * 10 + Y mouse) +``` + +#### run hylogen + +``` +hylogen Main.hs +``` + +#### play! +Go to [localhost:5678](http://localhost:5678) in your browser. + +Changes in `Main.hs` will now be propagated in realtime to your shader! + +## inspiration +- [The_Force](https://github.com/shawnlawson/The_Force). diff --git a/app/Main.hs b/app/Main.hs --- a/app/Main.hs +++ b/app/Main.hs @@ -2,18 +2,29 @@ {-# LANGUAGE ViewPatterns #-} {-# LANGUAGE LambdaCase #-} -import Data.Monoid + +import Paths_hylogen (getDataFileName) +import Control.Monad +import Control.Concurrent +import qualified Data.ByteString.Char8 as BS8 +import Data.ByteString (ByteString) +import Network (PortID(..), withSocketsDo, listenOn) +import Network.Socket (accept, sClose) +import Network.Socket.ByteString (sendAll) + +-- import Data.Monoid import qualified Data.Text as T import Network.WebSockets import System.Environment (getArgs) import System.FilePath import System.INotify import System.Process -import System.Random +-- import System.Random main :: IO () main = getArgs >>= \case - [pathToWatch] -> + [pathToWatch] -> do + _ <- forkIO $ serveIndex runServer "127.0.0.1" 8080 $ handleConnection pathToWatch _ -> error "Name a file to watch!" @@ -25,7 +36,7 @@ connection <- acceptRequest pending (sendTextData connection . T.pack) =<< getNewSource pathToWatch -- withINotify $ \inotify -> - addWatch inotify [Modify] dirToWatch $ \case + _ <- addWatch inotify [Modify] dirToWatch $ \case Modified False (Just f) | f == fileToWatch -> (sendTextData connection . T.pack) =<< getNewSource pathToWatch _ -> return () @@ -38,17 +49,17 @@ getNewSource :: FilePath -> IO String getNewSource pathToWatch = do -- TODO: more robust paths!: - c <- readFile pathToWatch - -- let (dirToWatch, fileToWatch) = splitFileName pathToWatch - -- c <- readProcess "runghc" [ - -- "-i"++dirToWatch - -- , pathToWatch - -- ] "" + -- c <- readFile pathToWatch + let (dirToWatch, fileToWatch) = splitFileName pathToWatch + c <- readProcess "runghc" [ + "-i"++dirToWatch + , pathToWatch + ] "" putStrLn c return c {- color <- randomRIO (0::Float, 1) - + return $ unlines [ "precision mediump float;" , "uniform float time;" @@ -61,3 +72,24 @@ , "}" ] -} + + +serveIndex :: IO () +serveIndex = withSocketsDo $ do + htmlString <- readFile =<< getDataFileName "app/index.html" + sock <- listenOn $ PortNumber 5678 + forever $ do + (conn, _) <- accept sock + _ <- forkIO $ do + sendAll conn $ wrapHtml $ BS8.pack htmlString + sClose conn + return () + +wrapHtml :: ByteString -> ByteString +wrapHtml bs = mconcat [ + "HTTP/1.0 200 OK\r\nContent-Length: " + , BS8.pack . show $ BS8.length bs + , "\r\n\r\n", bs, "\r\n" + ] + + diff --git a/app/index.html b/app/index.html new file mode 100644 --- /dev/null +++ b/app/index.html @@ -0,0 +1,264 @@ + + + + HYLOGEN + + + +
+
+
+ + Hylogen + +
+
+ + + + + diff --git a/hylogen.cabal b/hylogen.cabal --- a/hylogen.cabal +++ b/hylogen.cabal @@ -1,5 +1,5 @@ name: hylogen -version: 0.1.0.2 +version: 0.1.0.3 synopsis: a tiny EDSL for live-coding fragment shaders description: a tiny EDSL for live-coding fragment shaders homepage: https://github.com/sleexyz/hylogen @@ -9,6 +9,7 @@ category: Graphics build-type: Simple extra-source-files: README.md +data-files: app/index.html cabal-version: >=1.10 stability: experimental @@ -24,11 +25,13 @@ executable hylogen main-is: Main.hs build-depends: base - , websockets - , hinotify - , text + , bytestring , filepath - , random + , hinotify + , network , process + , random + , text + , websockets hs-source-dirs: app default-language: Haskell2010 diff --git a/src/Hylogen/Globals.hs b/src/Hylogen/Globals.hs --- a/src/Hylogen/Globals.hs +++ b/src/Hylogen/Globals.hs @@ -7,7 +7,7 @@ -- | Vec1: -pi = V1u "pi" +time :: Vec1 time = V1u "time" -- rand_ = V1uop "rand" @@ -20,6 +20,7 @@ -- | Vec2: +uv, mouse :: Vec2 uv = V2u "uv" mouse = V2u "mouse"