justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Commit before work on beziergun

Browse Source
This commit is contained in:
justin
2021-03-14 12:05:27 +01:00
parent b0c8c10658
commit 5ce9b4487b
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Rendering.hs
+1 -1
View File
@@ -122,7 +122,7 @@ worldPictures w
testPic :: World -> [Picture] testPic :: World -> [Picture]
testPic w = --[blank] testPic w = --[blank]
[setLayer 1 $ onLayerL [99] $ bezierQuad white red 20 20 (00,00) (150,90) (200,200) ] [setLayer 1 $ onLayerL [99] $ bezierQuad white red 5 5 (00,00) (300,305) (50,000) ]
-- $ uncurry translate (mouseWorldPos w) -- $ uncurry translate (mouseWorldPos w)
src/Picture.hs
+9 -10
View File
@@ -83,18 +83,17 @@ bezierQuad cola colc ra rc a b c = BezierQuad 0 [-- ( (0,0) , cola, (0,0), (0,0)
where colb = mixColors 0.5 0.5 cola colc where colb = mixColors 0.5 0.5 cola colc
b2a | isLHS a b c = a -.- b b2a | isLHS a b c = a -.- b
| otherwise = b -.- a | otherwise = b -.- a
aRadVec = ra *.* (normalizeV $ vNormal b2a) aRadVec = 0.5 * ra *.* (normalizeV $ vNormal b2a)
aX = a -.- 0.5 *.* aRadVec aX = a -.- aRadVec
aIn = a +.+ 0.5 *.* aRadVec aIn = a +.+ aRadVec
b2c | isLHS a b c = b -.- c b2c | isLHS a b c = b -.- c
| otherwise = c -.- b | otherwise = c -.- b
cRadVec = rc *.* (normalizeV $ vNormal b2c) cRadVec = 0.5 * rc *.* (normalizeV $ vNormal b2c)
cX = c -.- 0.5 *.* cRadVec cX = c -.- cRadVec
cIn = c +.+ 0.5 *.* cRadVec cIn = c +.+ cRadVec
bX = (b -.- (0.5 *.* aRadVec) ) bRadVec = 0.25 * (ra + rc) *.* (normalizeV $ a +.+ b -.- 2 *.* c)
-.- (0.5 *.* cRadVec) bX = b +.+ bRadVec
bIn = b +.+ (0.5 *.* aRadVec) bIn = b -.- bRadVec
+.+ (0.5 *.* cRadVec)
fa = extrapolate aX cX bX fa = extrapolate aX cX bX
fc = extrapolate cX aX bX fc = extrapolate cX aX bX
fa' = extrapolate aIn cIn bIn fa' = extrapolate aIn cIn bIn