diff --git a/README.org b/README.org index 24fbe60..b46d587 100644 --- a/README.org +++ b/README.org @@ -11,6 +11,10 @@ language. ** Showcase +[[file:./media/p2q5.gif]] +[[file:./media/p2q9.gif]] +[[file:./media/p3q5.gif]] + ** Keybindings You can increment/decrement P or Q using the keyboard to get different geometry; diff --git a/Torus.elm b/Torus.elm index afee236..a50f408 100644 --- a/Torus.elm +++ b/Torus.elm @@ -81,7 +81,24 @@ update msg model = view: Model -> Html Msg view model = - WebGL.toHtml + Html.div [] + [ Html.div [ style [ ("position", "absolute") + , ("top", "10px") + , ("left", "10px") + , ("background-color", "rgba(128, 128, 128, 1)") + , ("padding", "5px") + ] + ] + [ Html.text ("P: " ++ toString model.p) ] + , Html.div [ style [ ("position", "absolute") + , ("top", "10px") + , ("left", "40px") + , ("background-color", "rgba(128, 128, 128, 1)") + , ("padding", "5px") + ] + ] + [ Html.text ("Q: " ++ toString model.q) ] + , WebGL.toHtml [ width model.winSize.width , height model.winSize.height , style [ ( "display" , "block") , ( "background" , "black" ) ] ] @@ -101,13 +118,14 @@ view model = (Mat4.makeRotate (model.time * 0.9) (vec3 1 1 1 ) ) -- (Mat4.makeRotate (pi) (vec3 0.3 0.5 1 ) ) -- Mat4.identity - (colorToVec3 Color.green) + (colorToVec3 Color.red) -- (colorToVec3 Color.darkGrey) -- (colorToVec3 Color.white) (vec3 1 1 1) (vec3 1 1 1) (vec3 1 1 1) - 1.0) ] ) + 1.0) + ])] constructTorusMesh: Model -> Mesh Attributes constructTorusMesh model = diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..ed79e18 --- /dev/null +++ b/build.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +elm make Torus.elm +sed -i 's/Torus<\/title>/<title>PQ Torus Knot<\/title>/g' index.html +mkdir -p ./public +mv index.html ./public/ +cd public +zip -r ../pqtk.zip . diff --git a/deploy.sh b/deploy.sh new file mode 100755 index 0000000..3e89879 --- /dev/null +++ b/deploy.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +scp pqtk.zip joe-vps:~ +ssh joe-vps 'unzip -o pqtk.zip -d ~/websites/pqtk/ && rm pqtk.zip' diff --git a/media/p2q5.gif b/media/p2q5.gif new file mode 100644 index 0000000..9dba96b Binary files /dev/null and b/media/p2q5.gif differ diff --git a/media/p2q9.gif b/media/p2q9.gif new file mode 100644 index 0000000..0b26491 Binary files /dev/null and b/media/p2q9.gif differ diff --git a/media/p3q5.gif b/media/p3q5.gif new file mode 100644 index 0000000..f27550f Binary files /dev/null and b/media/p3q5.gif differ