From 9805f71161b8dbdc0706e28195197596959e09ed Mon Sep 17 00:00:00 2001 From: Walter Bender Date: Wed, 06 Feb 2013 21:45:02 +0000 Subject: add 60 deg rotation to help with collision problem --- diff --git a/samples/math-prime-factors.ta b/samples/math-prime-factors.ta index 8b5e863..8f10025 100644 --- a/samples/math-prime-factors.ta +++ b/samples/math-prime-factors.ta @@ -1,7 +1,7 @@ -[[0, ["start", 2.0], 200, 180, [null, 361]], +[[0, ["start", 2.0], 120, 180, [null, 469]], [1, ["while", 0], 223, 532, [4, 5, 11, 151]], -[2, ["storein", 0], 254, 696, [261, 3, 268, 272]], -[3, ["string", "n"], 321, 696, [2, null]], +[2, ["storein", 0], 139, 714, [261, 3, 268, 272]], +[3, ["string", "n"], 206, 714, [2, null]], [4, ["vspace", 0], 223, 490, [149, 1]], [5, ["greater2", 0], 279, 498, [1, 6, 8, null]], [6, "box", 325, 498, [5, 7, null]], @@ -255,37 +255,37 @@ [252, ["division2", 0], 290, 994, [390, 283, 281]], [253, "sandwichclampcollapsed", 320, 634, [243, 372, null]], [254, "sandwichclampcollapsed", 180, 574, [239, 204, null]], -[255, ["while", 168], 236, 504, [265, 259, 261, null]], -[256, ["storein", 0], 236, 378, [285, 257, 258, 265]], -[257, ["string", "number"], 303, 378, [256, null]], -[258, ["number", 2], 303, 420, [256, null]], -[259, ["less2", 0], 292, 470, [255, 266, 260, null]], -[260, ["number", 101], 362, 512, [259, null]], -[261, "fillscreen2", 254, 570, [255, 262, 264, 263, 2]], -[262, ["number", 60], 335, 570, [261, null]], -[263, ["number", 100], 335, 654, [261, null]], -[264, "black", 335, 612, [261, null]], -[265, ["vspace", 0], 236, 462, [256, 255]], -[266, "box", 338, 470, [259, 267, null]], -[267, ["string", "number"], 392, 470, [266, null]], -[268, "box", 321, 738, [2, 269, null]], -[269, ["string", "number"], 375, 738, [268, null]], +[255, ["while", 168], 121, 522, [265, 259, 261, null]], +[256, ["storein", 0], 121, 396, [285, 257, 258, 265]], +[257, ["string", "number"], 188, 396, [256, null]], +[258, ["number", 2], 188, 438, [256, null]], +[259, ["less2", 0], 177, 488, [255, 266, 260, null]], +[260, ["number", 101], 247, 530, [259, null]], +[261, "fillscreen2", 139, 588, [255, 262, 264, 263, 2]], +[262, ["number", 60], 220, 588, [261, null]], +[263, ["number", 100], 220, 672, [261, null]], +[264, "black", 220, 630, [261, null]], +[265, ["vspace", 0], 121, 480, [256, 255]], +[266, "box", 223, 488, [259, 267, null]], +[267, ["string", "number"], 277, 488, [266, null]], +[268, "box", 206, 756, [2, 269, null]], +[269, ["string", "number"], 260, 756, [268, null]], [270, "hat", 240, 300, [null, 271, 286]], [271, ["string", "action"], 298, 312, [270, null]], -[272, "stack", 254, 780, [2, 273, 461]], -[273, ["string", "action"], 312, 780, [272, null]], -[274, "wait", 1016, 310, [463, 465, null]], -[275, ["storein", 0], 254, 864, [461, 276, 280, null]], -[276, ["string", "number"], 321, 864, [275, null]], -[277, ["number", 1], 375, 948, [280, null]], -[278, "box", 375, 906, [280, 279, null]], -[279, ["string", "number"], 429, 906, [278, null]], -[280, ["plus2", 0], 321, 906, [275, 278, 277]], +[272, "stack", 139, 798, [2, 273, 461]], +[273, ["string", "action"], 197, 798, [272, null]], +[274, "wait", 981, 286, [463, 465, null]], +[275, ["storein", 0], 139, 882, [461, 276, 280, null]], +[276, ["string", "number"], 206, 882, [275, null]], +[277, ["number", 1], 260, 966, [280, null]], +[278, "box", 260, 924, [280, 279, null]], +[279, ["string", "number"], 314, 924, [278, null]], +[280, ["plus2", 0], 206, 924, [275, 278, 277]], [281, "box", 368, 1036, [252, 282, null]], [282, ["string", "number"], 422, 1036, [281, null]], [283, "box", 344, 994, [252, 284, null]], [284, ["string", "radius"], 398, 994, [283, null]], -[285, ["forever", 273], 218, 344, [381, 256, null]], +[285, ["forever", 273], 103, 362, [381, 256, null]], [286, "sandwichclampcollapsed", 240, 354, [270, 91, null]], [287, "penup", 643, 328, [290, 298]], [288, "pendown", 643, 454, [298, 305]], @@ -355,15 +355,15 @@ [350, ["vspace", 0], 461, 704, [328, null]], [351, ["vspace", 0], 443, 866, [345, 73]], [352, "seth", 343, 424, [215, 358, 360]], -[353, ["number", 90], 455, 466, [358, null]], +[353, ["number", 60], 455, 466, [358, null]], [354, "heading", 455, 424, [358, null]], [355, "seth", 343, 634, [245, 359, null]], -[356, ["number", 90], 479, 676, [359, null]], +[356, ["number", 60], 479, 676, [359, null]], [357, "heading", 455, 634, [359, null]], [358, ["plus2", 0], 401, 424, [352, 354, 353]], [359, ["minus2", 0], 401, 634, [355, 357, 356]], [360, ["vspace", 0], 343, 466, [352, 241]], -[361, "sandwichclampcollapsed", 200, 226, [0, 409, null]], +[361, "sandwichclampcollapsed", 120, 268, [469, 409, null]], [362, ["storein", 20], 163, 708, [204, 367, 377, 165]], [363, ["string", "radius"], 284, 708, [367, null]], [364, "box", 370, 686, [372, 368, null]], @@ -383,8 +383,8 @@ [378, ["string", "radius"], 284, 790, [377, null]], [379, "seth", 643, 244, [318, 380, 290]], [380, ["number", 0], 701, 244, [379, null]], -[381, "setscale", 218, 302, [409, 382, 285]], -[382, ["number", 75], 295, 302, [381, null]], +[381, "setscale", 103, 320, [409, 382, 285]], +[382, ["number", 75], 180, 320, [381, null]], [383, "toppos", 755, 412, [384, null]], [384, ["minus2", 0], 701, 412, [298, 383, 299]], [385, "seth", 223, 868, [100, 386, 389]], @@ -411,14 +411,14 @@ [406, ["number", 100], 776, 686, [405, null]], [407, "setgray", 223, 1162, [293, 408, 137]], [408, ["number", 0], 296, 1162, [407, null]], -[409, "clean", 218, 260, [361, 381]], -[410, "mousey", 1394, 352, [414, null]], -[411, "height", 1448, 394, [412, null]], -[412, ["division2", 0], 1394, 394, [414, 411, 413]], -[413, ["number", 2], 1472, 436, [412, null]], -[414, ["plus2", 0], 1340, 352, [415, 410, 412]], -[415, ["division2", 0], 1262, 310, [467, 416, 414]], -[416, "height", 1316, 310, [415, null]], +[409, "clean", 103, 278, [361, 381]], +[410, "mousey", 1359, 328, [414, null]], +[411, "height", 1413, 370, [412, null]], +[412, ["division2", 0], 1359, 370, [414, 411, 413]], +[413, ["number", 2], 1437, 412, [412, null]], +[414, ["plus2", 0], 1305, 328, [415, 410, 412]], +[415, ["division2", 0], 1227, 286, [467, 416, 414]], +[416, "height", 1281, 286, [415, null]], [417, "toppos", 875, 428, [427, null]], [418, "bottompos", 875, 678, [438, null]], [419, "rightpos", 875, 346, [426, null]], @@ -463,11 +463,12 @@ [458, "sandwichclampcollapsed", 780, 294, [454, 428, null]], [459, "hat", 980, 180, [null, 460, 468]], [460, ["string", "pause"], 1038, 192, [459, null]], -[461, "stack", 254, 822, [272, 462, 275]], -[462, ["string", "pause"], 312, 822, [461, null]], -[463, ["repeat", 0], 998, 268, [468, 464, 274, null]], -[464, ["number", 10.0], 1056, 268, [463, null]], -[465, ["division2", 0], 1074, 310, [274, 467, 466]], -[466, ["number", 10.0], 1152, 352, [465, null]], -[467, ["identity2", 40], 1128, 310, [465, 415]], -[468, "sandwichclampcollapsed", 980, 234, [459, 463, null]]] +[461, "stack", 139, 840, [272, 462, 275]], +[462, ["string", "pause"], 197, 840, [461, null]], +[463, ["repeat", 0], 963, 244, [468, 464, 274, null]], +[464, ["number", 10], 1021, 244, [463, null]], +[465, ["division2", 0], 1039, 286, [274, 467, 466]], +[466, ["number", 10], 1117, 328, [465, null]], +[467, ["identity2", 40], 1093, 286, [465, 415]], +[468, "sandwichclampcollapsed", 980, 234, [459, 463, null]], +[469, "fullscreen", 120, 226, [0, 361]]] -- cgit v0.9.1