From 26711da67511098754000256ede12c16e87157ed Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Wed, 7 Jan 2009 23:13:18 -0600 Subject: [PATCH 1/9] L-system: Key gestures for strafing camera. Support for changing turtle values. --- extra/L-system/L-system.factor | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/extra/L-system/L-system.factor b/extra/L-system/L-system.factor index 9b8bdc1914..5bc7ce1db6 100644 --- a/extra/L-system/L-system.factor +++ b/extra/L-system/L-system.factor @@ -256,7 +256,9 @@ DEFER: default-L-parser-values ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! TUPLE: < gadget - camera display-list pedestal paused commands axiom rules string ; + camera display-list pedestal paused + turtle-values + commands axiom rules string ; ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -376,6 +378,7 @@ TUPLE: < gadget L-SYSTEM display-list>> GL_COMPILE glNewList turtle + L-SYSTEM turtle-values>> [ ] or call L-SYSTEM string>> L-SYSTEM axiom>> or L-SYSTEM commands>> interpret-string @@ -445,6 +448,11 @@ H{ { T{ key-down f f "q" } [ [ 5 roll-left ] with-camera ] } { T{ key-down f f "w" } [ [ 5 roll-right ] with-camera ] } + { T{ key-down f { A+ } "LEFT" } [ [ 1 strafe-left ] with-camera ] } + { T{ key-down f { A+ } "RIGHT" } [ [ 1 strafe-right ] with-camera ] } + { T{ key-down f { A+ } "UP" } [ [ 1 strafe-up ] with-camera ] } + { T{ key-down f { A+ } "DOWN" } [ [ 1 strafe-down ] with-camera ] } + { T{ key-down f f "r" } [ start-rotation-thread ] } { From 07da37ffc8cb0f3e354dd910407705aedf1b75f4 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Wed, 7 Jan 2009 23:14:32 -0600 Subject: [PATCH 2/9] L-system.models.abop-2: change default angle --- extra/L-system/models/abop-2/abop-2.factor | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/extra/L-system/models/abop-2/abop-2.factor b/extra/L-system/models/abop-2/abop-2.factor index 2ed8f64abe..1168780300 100644 --- a/extra/L-system/models/abop-2/abop-2.factor +++ b/extra/L-system/models/abop-2/abop-2.factor @@ -9,20 +9,23 @@ IN: L-system.models.abop-2 L-parser-dialect >>commands + [ 30 >>angle ] >>turtle-values + "c(12)FAL" >>axiom { - { "A" "F[&'(.7)!BL]>(137)[&'(.6)!BL]>(137)'(.9)!(.9)A" } - { "B" "F[-'(.7)!(.9)$CL]'(.9)!(.9)C" } - { "C" "F[+'(.7)!(.9)$BL]'(.9)!(.9)B" } + { "A" "F [&'(.7)!BL] >(137) [&'(.6)!BL] >(137) '(.9) !(.9) A" } + + { "B" "F [- '(.7) !(.9) $ C L] '(.9) !(.9) C" } + { "C" "F [+ '(.7) !(.9) $ B L] '(.9) !(.9) B" } { "L" "~c(8){+f(.1)-f(.1)-f(.1)+|+f(.1)-f(.1)-f(.1)}" } } >>rules ; + ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! : main ( -- ) [ L-system abop-2 "L-system" open-window ] with-ui ; MAIN: main - \ No newline at end of file From 7c3576c4bb81af720f2315014b069603fb77caa6 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Wed, 7 Jan 2009 23:15:04 -0600 Subject: [PATCH 3/9] L-system.models.abop-3: change default angle --- extra/L-system/models/abop-3/abop-3.factor | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extra/L-system/models/abop-3/abop-3.factor b/extra/L-system/models/abop-3/abop-3.factor index 49a63eb074..f594cafcd3 100644 --- a/extra/L-system/models/abop-3/abop-3.factor +++ b/extra/L-system/models/abop-3/abop-3.factor @@ -9,6 +9,8 @@ IN: L-system.models.abop-3 L-parser-dialect >>commands + [ 30 >>angle ] >>turtle-values + "c(12)FA" >>axiom { From a976830ff1836cdc1bf1dc7600561008ed3de7c3 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Wed, 7 Jan 2009 23:15:30 -0600 Subject: [PATCH 4/9] L-system.models.abop-4: change default angle --- extra/L-system/models/abop-4/abop-4.factor | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extra/L-system/models/abop-4/abop-4.factor b/extra/L-system/models/abop-4/abop-4.factor index 6b2688a478..71cf32d4d7 100644 --- a/extra/L-system/models/abop-4/abop-4.factor +++ b/extra/L-system/models/abop-4/abop-4.factor @@ -9,6 +9,8 @@ IN: L-system.models.abop-4 L-parser-dialect >>commands + [ 18 >>angle ] >>turtle-values + "c(12)&(20)N" >>axiom { From 87e49f19a3be49611854d675388f188ecfac03b5 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Wed, 7 Jan 2009 23:15:47 -0600 Subject: [PATCH 5/9] L-system.models.abop-5: change default angle --- extra/L-system/models/abop-5/abop-5.factor | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extra/L-system/models/abop-5/abop-5.factor b/extra/L-system/models/abop-5/abop-5.factor index abc346946a..5d6576f33a 100644 --- a/extra/L-system/models/abop-5/abop-5.factor +++ b/extra/L-system/models/abop-5/abop-5.factor @@ -9,6 +9,8 @@ IN: L-system.models.abop-5 L-parser-dialect >>commands + [ 5 >>angle ] >>turtle-values + "&(90)+(90)a" >>axiom { From fa73d98c288f25608832af9fce6c554935d46302 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Wed, 7 Jan 2009 23:16:09 -0600 Subject: [PATCH 6/9] Add L-system.models.abop-6 --- extra/L-system/models/abop-6/abop-6.factor | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 extra/L-system/models/abop-6/abop-6.factor diff --git a/extra/L-system/models/abop-6/abop-6.factor b/extra/L-system/models/abop-6/abop-6.factor new file mode 100644 index 0000000000..0639d53274 --- /dev/null +++ b/extra/L-system/models/abop-6/abop-6.factor @@ -0,0 +1,34 @@ + +USING: accessors ui L-system ; + +IN: L-system.models.abop-6 + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +: abop-6 ( -- ) + + L-parser-dialect >>commands + + [ 5 >>angle ] >>turtle-values + + ! "&(90)+(90)FFF[-(120)'(.6)x][-(60)'(.8)x][+(120)'(.6)x][+(60)'(.8)x]x" + "FFF[-(120)'(.6)x][-(60)'(.8)x][+(120)'(.6)x][+(60)'(.8)x]x" + >>axiom + + { + { "a" "F[cdx][cex]F!(.9)a" } + { "x" "a" } + + { "d" "+d" } + { "e" "-e" } + + { "F" "'(1.25)F'(.8)" } + } + >>rules ; + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +: main ( -- ) [ L-system abop-6 "L-system" open-window ] with-ui ; + +MAIN: main + \ No newline at end of file From 3a996c1afc7956c86ea782aa497d6870b57aa575 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Wed, 7 Jan 2009 23:16:34 -0600 Subject: [PATCH 7/9] Add L-system.models.abop-5-angular --- .../abop-5-angular/abop-5-angular.factor | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 extra/L-system/models/abop-5-angular/abop-5-angular.factor diff --git a/extra/L-system/models/abop-5-angular/abop-5-angular.factor b/extra/L-system/models/abop-5-angular/abop-5-angular.factor new file mode 100644 index 0000000000..29b1c72cbc --- /dev/null +++ b/extra/L-system/models/abop-5-angular/abop-5-angular.factor @@ -0,0 +1,33 @@ + +USING: accessors ui L-system ; + +IN: L-system.models.abop-5-angular + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +: abop-5-angular ( -- ) + + L-parser-dialect >>commands + + "&(90)+(90)a" >>axiom + + { + { "a" "F[+(45)l][-(45)l]^;ca" } + + { "l" "j" } + { "j" "h" } + { "h" "s" } + { "s" "d" } + { "d" "x" } + { "x" "a" } + + { "F" "'(1.17)F'(.855)" } + } + >>rules ; + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +: main ( -- ) [ L-system abop-5-angular "L-system" open-window ] with-ui ; + +MAIN: main + \ No newline at end of file From 09097ee2e676f509302b3afad0b5efef7a4a0470 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Wed, 7 Jan 2009 23:17:57 -0600 Subject: [PATCH 8/9] update.latest: Move back to using 'git' protocol instead of 'http' (factorcode.org git daemon seems stable again) --- extra/update/latest/latest.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/update/latest/latest.factor b/extra/update/latest/latest.factor index 98d264d227..77cd184cdb 100644 --- a/extra/update/latest/latest.factor +++ b/extra/update/latest/latest.factor @@ -7,7 +7,7 @@ IN: update.latest : git-pull-master ( -- ) image parent-directory [ - { "git" "pull" "http://factorcode.org/git/factor.git" "master" } + { "git" "pull" "git://factorcode.org/git/factor.git" "master" } run-command ] with-directory ; From 8c7e46283f04314568a60c26c2a68cfc0eb14f51 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Wed, 7 Jan 2009 23:23:32 -0600 Subject: [PATCH 9/9] L-system.models.abop-5: Adjust axiom (grow along Z) --- extra/L-system/models/abop-5/abop-5.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/L-system/models/abop-5/abop-5.factor b/extra/L-system/models/abop-5/abop-5.factor index 5d6576f33a..2e373f713c 100644 --- a/extra/L-system/models/abop-5/abop-5.factor +++ b/extra/L-system/models/abop-5/abop-5.factor @@ -11,7 +11,7 @@ IN: L-system.models.abop-5 [ 5 >>angle ] >>turtle-values - "&(90)+(90)a" >>axiom + "a" >>axiom { { "a" "F[+(45)l][-(45)l]^;ca" }