From dad5943ff51a007d62301b4ab06b3994ed140d79 Mon Sep 17 00:00:00 2001 From: Joseph Ferano Date: Tue, 11 Jul 2023 14:34:04 +0700 Subject: [PATCH] Change robot keybindings, add build/deploy scripts --- .gitignore | 4 +++- Scene.elm | 6 +++--- build.sh | 10 ++++++++++ deploy.sh | 4 ++++ 4 files changed, 20 insertions(+), 4 deletions(-) create mode 100755 build.sh create mode 100755 deploy.sh diff --git a/.gitignore b/.gitignore index d59a35f..f643252 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,6 @@ elm-stuff/** !elm-stuff/packages/Zinggi/ !elm-stuff/packages/Zinggi/elm-obj-loader/ !elm-stuff/packages/Zinggi/elm-obj-loader/1.0.3/ -!elm-stuff/packages/Zinggi/elm-obj-loader/1.0.3/** \ No newline at end of file +!elm-stuff/packages/Zinggi/elm-obj-loader/1.0.3/** +/public/ +/project.todo diff --git a/Scene.elm b/Scene.elm index c79c2e9..2d12c91 100644 --- a/Scene.elm +++ b/Scene.elm @@ -134,13 +134,13 @@ updateRobot { robot , keys } dt = (keys.left, keys.down, keys.up, keys.right) (vec3 (sin rot) (sin rot) (cos rot)) robot.pos - 0.1 + 0.03 , rot = if keys.n then rr robot.rot else if keys.m then rl robot.rot else robot.rot , armRot = - let angle = if keys.y then rr robot.armRot else if keys.h then rl robot.armRot else robot.armRot + let angle = if keys.j then rr robot.armRot else if keys.h then rl robot.armRot else robot.armRot in clamp -0.5 2.5 angle , handRot = - let angle = if keys.u then rr robot.handRot else if keys.j then rl robot.handRot else robot.handRot + let angle = if keys.u then rr robot.handRot else if keys.y then rl robot.handRot else robot.handRot in clamp -1 1 angle} view: Model -> Html Msg diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..90784fb --- /dev/null +++ b/build.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +elm make Scene.elm +sed -i 's/Scene<\/title>/<title>3DFP<\/title>/g' index.html +mkdir -p ./public +mv index.html ./public/ +cp -r ./models ./public +cp -r ./textures/ ./public +cd public +zip -r ../3dfp.zip . diff --git a/deploy.sh b/deploy.sh new file mode 100755 index 0000000..aec5811 --- /dev/null +++ b/deploy.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +scp 3dfp.zip joe-vps:~ +ssh joe-vps 'unzip -o 3dfp.zip -d ~/websites/3d-fp/ && rm 3dfp.zip'