From 9fe4592a7e7c3a454d14ec4fa76c22a24e339b49 Mon Sep 17 00:00:00 2001 From: Nils Thuerey Date: Thu, 5 Jan 2006 15:49:27 +0000 Subject: [PATCH] Three minor fixes: - removed debugging output from fluidsim export - directores with "+" are now valid for fluidsim data - simulation now always uses frame 1 to endframe, so changing start frame settings should work again --- intern/elbeem/intern/cfglexer.cpp | 657 +++++++++--------- .../blender/blenkernel/intern/DerivedMesh.c | 2 +- source/blender/src/fluidsim.c | 12 +- 3 files changed, 337 insertions(+), 334 deletions(-) diff --git a/intern/elbeem/intern/cfglexer.cpp b/intern/elbeem/intern/cfglexer.cpp index 472c6929451..0bc9d96b5b2 100644 --- a/intern/elbeem/intern/cfglexer.cpp +++ b/intern/elbeem/intern/cfglexer.cpp @@ -430,16 +430,16 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 1, 5, 6, 1, 1, 1, 1, 1, - 1, 7, 1, 1, 8, 9, 10, 11, 11, 11, - 11, 11, 11, 11, 11, 11, 11, 12, 13, 1, - 14, 1, 1, 1, 17, 18, 19, 20, 21, 22, - 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, - 33, 34, 35, 36, 37, 38, 39, 40, 41, 33, - 1, 15, 1, 1, 16, 1, 17, 18, 19, 20, + 1, 7, 8, 1, 9, 10, 11, 12, 12, 12, + 12, 12, 12, 12, 12, 12, 12, 13, 14, 1, + 15, 1, 1, 1, 18, 19, 20, 21, 22, 23, + 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, + 34, 35, 36, 37, 38, 39, 40, 41, 42, 34, + 1, 16, 1, 1, 17, 1, 18, 19, 20, 21, - 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, - 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, - 41, 33, 42, 1, 43, 1, 1, 1, 1, 1, + 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, + 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, + 42, 34, 43, 1, 44, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -456,103 +456,103 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[44] = +static yyconst flex_int32_t yy_meta[45] = { 0, - 1, 2, 3, 4, 1, 1, 1, 5, 6, 5, - 6, 5, 2, 1, 5, 6, 6, 6, 6, 6, + 1, 2, 3, 4, 1, 1, 1, 5, 5, 6, + 5, 6, 5, 2, 1, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 1, 1 + 6, 6, 1, 1 } ; -static yyconst flex_int16_t yy_base[576] = +static yyconst flex_int16_t yy_base[575] = { 0, - 0, 0, 43, 86, 128, 170, 704, 705, 60, 705, - 63, 0, 0, 43, 692, 53, 50, 47, 53, 78, - 47, 39, 87, 681, 43, 82, 54, 80, 117, 92, - 93, 112, 116, 669, 99, 123, 138, 149, 152, 0, - 141, 0, 695, 156, 101, 705, 157, 160, 163, 175, - 180, 694, 0, 687, 176, 686, 705, 0, 177, 660, - 677, 153, 662, 657, 673, 101, 651, 161, 46, 175, - 178, 670, 668, 660, 659, 649, 647, 186, 653, 645, - 651, 658, 649, 168, 645, 649, 648, 650, 653, 644, - 705, 652, 641, 174, 630, 192, 653, 131, 652, 633, + 0, 0, 44, 0, 87, 130, 713, 714, 95, 714, + 102, 0, 0, 84, 700, 96, 90, 85, 91, 92, + 86, 83, 122, 689, 82, 85, 101, 111, 133, 118, + 137, 128, 125, 677, 136, 124, 166, 167, 173, 0, + 174, 0, 704, 177, 173, 714, 181, 185, 188, 191, + 192, 703, 0, 695, 187, 694, 714, 0, 188, 668, + 685, 175, 670, 665, 681, 180, 659, 167, 178, 190, + 192, 678, 676, 668, 667, 657, 655, 200, 661, 653, + 659, 666, 657, 182, 653, 657, 656, 658, 661, 652, + 714, 660, 649, 191, 638, 205, 661, 199, 660, 641, - 198, 635, 628, 631, 629, 214, 219, 222, 226, 0, - 227, 0, 658, 657, 230, 0, 235, 705, 0, 636, - 635, 146, 634, 637, 623, 629, 625, 624, 705, 617, - 617, 620, 618, 612, 623, 619, 624, 705, 613, 609, - 622, 617, 600, 611, 604, 609, 616, 601, 611, 607, - 612, 598, 597, 609, 206, 600, 705, 603, 597, 596, - 584, 599, 587, 601, 587, 600, 588, 598, 598, 595, - 581, 578, 583, 591, 590, 589, 588, 572, 582, 238, - 568, 584, 570, 567, 585, 582, 575, 576, 578, 567, - 561, 559, 183, 577, 570, 562, 570, 553, 558, 567, + 208, 643, 636, 639, 637, 231, 235, 236, 240, 0, + 241, 0, 667, 666, 245, 0, 246, 714, 0, 644, + 643, 229, 642, 645, 631, 637, 633, 632, 714, 625, + 625, 628, 626, 620, 631, 627, 632, 714, 621, 617, + 630, 625, 608, 619, 612, 617, 624, 609, 619, 615, + 620, 606, 605, 617, 222, 608, 714, 611, 605, 604, + 592, 607, 595, 609, 595, 608, 596, 606, 606, 603, + 589, 586, 591, 599, 598, 597, 596, 580, 590, 252, + 576, 592, 578, 575, 593, 590, 583, 584, 586, 575, + 569, 567, 229, 585, 578, 570, 578, 561, 566, 575, - 216, 567, 705, 565, 555, 563, 549, 545, 545, 563, - 545, 561, 546, 705, 545, 554, 543, 705, 550, 549, - 548, 534, 535, 543, 550, 545, 537, 533, 526, 528, - 525, 531, 524, 529, 705, 705, 538, 535, 537, 533, - 523, 535, 534, 522, 513, 530, 513, 525, 705, 521, - 519, 705, 509, 508, 221, 520, 521, 504, 513, 705, - 506, 519, 507, 499, 512, 496, 495, 496, 705, 493, - 503, 486, 492, 497, 490, 503, 494, 705, 490, 495, - 502, 480, 498, 482, 478, 475, 485, 491, 705, 480, - 193, 493, 705, 469, 480, 705, 471, 477, 471, 479, + 227, 575, 714, 573, 563, 571, 557, 553, 553, 571, + 553, 569, 554, 714, 553, 562, 551, 714, 558, 557, + 556, 542, 543, 551, 558, 553, 545, 541, 534, 536, + 533, 539, 532, 537, 714, 714, 546, 543, 545, 541, + 531, 543, 542, 530, 521, 538, 521, 533, 714, 529, + 527, 714, 517, 516, 239, 528, 529, 512, 521, 714, + 514, 527, 515, 507, 520, 504, 503, 504, 714, 501, + 511, 494, 500, 505, 498, 511, 502, 714, 498, 503, + 510, 488, 506, 490, 486, 483, 493, 499, 714, 488, + 244, 501, 714, 477, 488, 714, 479, 485, 479, 487, - 705, 466, 471, 467, 483, 480, 705, 477, 476, 465, - 470, 478, 457, 471, 461, 470, 460, 470, 460, 458, - 451, 705, 462, 705, 466, 462, 705, 440, 444, 458, - 461, 447, 445, 456, 453, 448, 453, 435, 441, 452, - 705, 448, 221, 450, 426, 705, 444, 436, 442, 426, - 444, 424, 422, 441, 437, 227, 428, 417, 434, 413, - 435, 417, 705, 414, 428, 427, 418, 421, 705, 404, - 427, 415, 421, 418, 415, 411, 402, 705, 407, 411, - 400, 404, 416, 407, 414, 396, 408, 408, 391, 392, - 227, 705, 400, 219, 705, 389, 402, 392, 385, 389, + 714, 474, 479, 475, 491, 488, 714, 485, 484, 473, + 478, 486, 465, 479, 469, 478, 468, 478, 468, 466, + 459, 714, 470, 714, 474, 470, 714, 448, 452, 466, + 469, 455, 453, 464, 461, 456, 461, 443, 449, 460, + 714, 456, 249, 458, 434, 714, 452, 444, 450, 434, + 452, 432, 430, 449, 445, 245, 436, 425, 442, 421, + 443, 425, 714, 422, 436, 435, 426, 429, 714, 412, + 435, 423, 429, 426, 423, 419, 410, 714, 415, 419, + 408, 412, 424, 415, 422, 404, 416, 416, 399, 400, + 252, 714, 408, 238, 714, 397, 410, 400, 393, 397, - 385, 394, 231, 399, 395, 394, 393, 377, 387, 705, - 705, 705, 705, 379, 705, 391, 705, 377, 377, 388, - 705, 370, 705, 375, 380, 383, 365, 370, 368, 705, - 705, 374, 379, 376, 375, 361, 371, 705, 368, 705, - 357, 371, 354, 350, 354, 356, 369, 351, 355, 355, - 705, 354, 345, 361, 705, 358, 342, 347, 355, 341, - 351, 356, 351, 336, 340, 351, 332, 336, 336, 333, - 339, 339, 333, 705, 705, 327, 325, 342, 322, 325, - 335, 705, 705, 705, 321, 705, 705, 330, 318, 317, - 705, 705, 331, 310, 313, 705, 323, 322, 318, 326, + 393, 402, 246, 407, 403, 402, 401, 385, 395, 714, + 714, 714, 714, 387, 714, 399, 714, 385, 385, 396, + 714, 378, 714, 383, 388, 391, 373, 378, 376, 714, + 714, 382, 387, 384, 383, 369, 379, 714, 376, 714, + 365, 379, 362, 358, 362, 364, 377, 359, 363, 363, + 714, 362, 353, 369, 714, 366, 350, 355, 363, 349, + 359, 364, 359, 344, 348, 359, 340, 344, 344, 341, + 347, 347, 341, 714, 714, 335, 333, 350, 330, 333, + 343, 714, 714, 714, 329, 714, 714, 338, 326, 325, + 714, 714, 339, 318, 321, 714, 331, 330, 326, 334, - 308, 326, 306, 320, 705, 705, 320, 308, 705, 308, - 312, 705, 705, 705, 305, 705, 310, 317, 295, 705, - 311, 307, 300, 705, 705, 236, 299, 305, 309, 287, - 306, 289, 302, 705, 705, 299, 296, 296, 281, 274, - 267, 264, 263, 705, 705, 269, 258, 261, 705, 267, - 250, 705, 705, 245, 225, 222, 705, 212, 166, 705, - 705, 155, 705, 705, 705, 268, 274, 277, 283, 113, - 289, 295, 301, 307, 313 + 316, 334, 314, 328, 714, 714, 328, 316, 714, 316, + 320, 714, 714, 714, 313, 714, 318, 325, 303, 714, + 319, 315, 305, 714, 714, 261, 299, 300, 300, 278, + 297, 277, 290, 714, 714, 287, 280, 268, 256, 254, + 252, 252, 251, 714, 714, 256, 248, 231, 714, 228, + 197, 714, 714, 207, 167, 149, 714, 150, 106, 714, + 714, 101, 714, 714, 714, 294, 297, 303, 89, 309, + 315, 321, 327, 333 } ; -static yyconst flex_int16_t yy_def[576] = +static yyconst flex_int16_t yy_def[575] = { 0, - 565, 1, 566, 566, 567, 567, 565, 565, 565, 565, - 565, 568, 569, 565, 565, 565, 565, 565, 565, 565, + 565, 1, 565, 3, 566, 566, 565, 565, 565, 565, + 565, 567, 568, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, - 565, 565, 565, 565, 565, 565, 565, 565, 565, 570, - 565, 571, 572, 573, 571, 565, 571, 571, 565, 565, - 565, 568, 569, 565, 565, 565, 565, 574, 565, 565, + 565, 565, 565, 565, 565, 565, 565, 565, 565, 569, + 565, 570, 571, 572, 570, 565, 570, 570, 565, 565, + 565, 567, 568, 565, 565, 565, 565, 573, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, - 565, 565, 565, 565, 565, 565, 565, 565, 565, 570, - 565, 571, 572, 572, 573, 571, 575, 565, 574, 565, + 565, 565, 565, 565, 565, 565, 565, 565, 565, 569, + 565, 570, 571, 571, 572, 570, 574, 565, 573, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, - 565, 565, 565, 565, 565, 565, 565, 565, 565, 575, + 565, 565, 565, 565, 565, 565, 565, 565, 565, 574, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, @@ -596,175 +596,177 @@ static yyconst flex_int16_t yy_def[576] = 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 0, 565, 565, 565, 565, 565, - 565, 565, 565, 565, 565 + 565, 565, 565, 565 } ; -static yyconst flex_int16_t yy_nxt[749] = +static yyconst flex_int16_t yy_nxt[759] = { 0, - 8, 9, 10, 11, 12, 13, 8, 14, 15, 16, - 17, 8, 8, 8, 8, 8, 18, 19, 20, 21, - 22, 23, 24, 8, 25, 8, 8, 26, 27, 28, - 29, 30, 8, 31, 32, 33, 34, 35, 8, 8, - 8, 36, 37, 8, 38, 10, 39, 8, 13, 8, - 8, 54, 16, 55, 8, 8, 41, 8, 54, 57, - 59, 49, 58, 49, 49, 60, 49, 70, 72, 65, - 84, 71, 80, 132, 133, 61, 62, 81, 85, 73, - 66, 63, 64, 67, 36, 37, 8, 38, 10, 39, - 8, 13, 8, 8, 68, 16, 86, 8, 8, 41, + 8, 9, 10, 11, 12, 13, 8, 8, 14, 15, + 16, 17, 8, 8, 8, 8, 8, 18, 19, 20, + 21, 22, 23, 24, 8, 25, 8, 8, 26, 27, + 28, 29, 30, 8, 31, 32, 33, 34, 35, 8, + 8, 8, 36, 37, 8, 38, 10, 39, 8, 13, + 8, 8, 8, 40, 16, 40, 8, 8, 41, 8, + 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 36, 37, 9, 10, + 11, 43, 44, 54, 110, 55, 49, 45, 49, 54, - 8, 50, 51, 74, 50, 51, 82, 116, 69, 95, - 117, 75, 83, 96, 76, 93, 87, 77, 110, 104, - 78, 127, 94, 105, 106, 128, 106, 36, 37, 9, - 10, 11, 43, 44, 88, 97, 100, 45, 89, 107, - 46, 107, 111, 98, 111, 90, 91, 99, 92, 101, - 108, 169, 108, 108, 170, 108, 102, 53, 106, 53, - 106, 107, 109, 107, 49, 109, 49, 183, 53, 47, - 48, 9, 10, 11, 43, 44, 106, 122, 106, 45, - 184, 107, 46, 107, 54, 54, 55, 59, 123, 564, - 50, 51, 134, 50, 51, 130, 135, 131, 136, 137, + 46, 59, 57, 49, 60, 49, 58, 70, 65, 68, + 82, 71, 80, 72, 61, 62, 83, 81, 84, 66, + 63, 64, 67, 69, 73, 106, 85, 106, 86, 47, + 48, 9, 10, 11, 43, 44, 564, 50, 51, 74, + 45, 563, 93, 46, 50, 51, 100, 75, 87, 94, + 76, 88, 97, 77, 95, 89, 78, 104, 96, 101, + 98, 105, 90, 91, 99, 92, 102, 107, 108, 107, + 108, 562, 47, 48, 108, 111, 108, 111, 53, 116, + 53, 109, 106, 117, 106, 561, 107, 109, 107, 49, + 53, 49, 106, 107, 106, 107, 54, 54, 55, 59, - 563, 161, 144, 151, 50, 51, 145, 152, 162, 343, - 164, 47, 48, 165, 173, 106, 252, 106, 174, 253, - 107, 166, 107, 108, 344, 108, 167, 111, 111, 111, - 111, 53, 562, 53, 175, 109, 119, 215, 119, 119, - 388, 119, 53, 216, 261, 262, 435, 119, 309, 310, - 119, 401, 311, 438, 439, 537, 389, 561, 402, 447, - 560, 403, 436, 50, 51, 559, 448, 538, 40, 40, - 40, 40, 40, 40, 42, 42, 42, 42, 42, 42, - 52, 52, 52, 53, 53, 558, 53, 53, 53, 112, - 557, 556, 555, 112, 112, 113, 554, 553, 552, 113, + 122, 127, 130, 560, 131, 128, 132, 133, 134, 50, + 51, 123, 135, 136, 137, 50, 51, 144, 151, 161, + 169, 145, 152, 170, 164, 173, 162, 165, 559, 174, + 50, 51, 106, 558, 106, 166, 107, 108, 107, 108, + 167, 111, 111, 111, 111, 175, 53, 119, 53, 119, + 109, 183, 557, 119, 215, 119, 261, 262, 53, 119, + 216, 343, 556, 252, 184, 119, 253, 309, 310, 388, + 401, 311, 435, 438, 439, 447, 344, 402, 50, 51, + 403, 537, 448, 555, 554, 389, 553, 552, 436, 551, + 550, 549, 548, 538, 42, 42, 42, 42, 42, 42, - 113, 115, 115, 551, 115, 115, 115, 119, 119, 550, - 119, 119, 119, 180, 180, 549, 180, 180, 180, 548, - 547, 546, 545, 544, 543, 542, 541, 540, 539, 536, - 535, 534, 533, 532, 531, 530, 529, 528, 527, 526, - 525, 524, 523, 522, 521, 520, 519, 518, 517, 516, - 515, 514, 513, 512, 511, 510, 509, 508, 507, 506, - 505, 504, 503, 502, 501, 500, 499, 498, 497, 496, - 495, 494, 493, 492, 491, 490, 489, 488, 487, 486, - 485, 484, 483, 482, 481, 480, 479, 478, 477, 476, - 475, 474, 473, 472, 471, 470, 469, 468, 467, 466, + 52, 52, 52, 53, 53, 547, 53, 53, 53, 112, + 546, 545, 544, 112, 112, 113, 543, 542, 541, 113, + 113, 115, 115, 540, 115, 115, 115, 119, 119, 539, + 119, 119, 119, 180, 180, 536, 180, 180, 180, 535, + 534, 533, 532, 531, 530, 529, 528, 527, 526, 525, + 524, 523, 522, 521, 520, 519, 518, 517, 516, 515, + 514, 513, 512, 511, 510, 509, 508, 507, 506, 505, + 504, 503, 502, 501, 500, 499, 498, 497, 496, 495, + 494, 493, 492, 491, 490, 489, 488, 487, 486, 485, + 484, 483, 482, 481, 480, 479, 478, 477, 476, 475, - 465, 464, 463, 462, 461, 460, 459, 458, 457, 456, - 455, 454, 453, 452, 451, 450, 449, 446, 445, 444, - 443, 442, 441, 440, 437, 434, 433, 432, 431, 430, - 429, 428, 427, 426, 425, 424, 423, 422, 421, 420, - 419, 418, 417, 416, 415, 414, 413, 412, 411, 410, - 409, 408, 407, 406, 405, 404, 400, 399, 398, 397, - 396, 395, 394, 393, 392, 391, 390, 387, 386, 385, - 384, 383, 382, 381, 380, 379, 378, 377, 376, 375, - 374, 373, 372, 371, 370, 369, 368, 367, 366, 365, - 364, 363, 362, 361, 360, 359, 358, 357, 356, 355, + 474, 473, 472, 471, 470, 469, 468, 467, 466, 465, + 464, 463, 462, 461, 460, 459, 458, 457, 456, 455, + 454, 453, 452, 451, 450, 449, 446, 445, 444, 443, + 442, 441, 440, 437, 434, 433, 432, 431, 430, 429, + 428, 427, 426, 425, 424, 423, 422, 421, 420, 419, + 418, 417, 416, 415, 414, 413, 412, 411, 410, 409, + 408, 407, 406, 405, 404, 400, 399, 398, 397, 396, + 395, 394, 393, 392, 391, 390, 387, 386, 385, 384, + 383, 382, 381, 380, 379, 378, 377, 376, 375, 374, + 373, 372, 371, 370, 369, 368, 367, 366, 365, 364, - 354, 353, 352, 351, 350, 349, 348, 347, 346, 345, - 342, 341, 340, 339, 338, 337, 336, 335, 334, 333, - 332, 331, 330, 329, 328, 327, 326, 325, 324, 323, - 322, 321, 320, 319, 318, 317, 316, 315, 314, 313, - 312, 308, 307, 306, 305, 304, 303, 302, 301, 300, - 299, 298, 297, 296, 295, 294, 293, 292, 291, 290, - 289, 288, 287, 286, 285, 284, 283, 282, 281, 280, - 279, 278, 277, 276, 275, 274, 273, 272, 271, 270, - 269, 268, 267, 266, 265, 264, 263, 260, 259, 258, - 257, 256, 255, 254, 251, 250, 249, 248, 247, 246, + 363, 362, 361, 360, 359, 358, 357, 356, 355, 354, + 353, 352, 351, 350, 349, 348, 347, 346, 345, 342, + 341, 340, 339, 338, 337, 336, 335, 334, 333, 332, + 331, 330, 329, 328, 327, 326, 325, 324, 323, 322, + 321, 320, 319, 318, 317, 316, 315, 314, 313, 312, + 308, 307, 306, 305, 304, 303, 302, 301, 300, 299, + 298, 297, 296, 295, 294, 293, 292, 291, 290, 289, + 288, 287, 286, 285, 284, 283, 282, 281, 280, 279, + 278, 277, 276, 275, 274, 273, 272, 271, 270, 269, + 268, 267, 266, 265, 264, 263, 260, 259, 258, 257, - 245, 244, 243, 242, 241, 240, 239, 238, 237, 236, - 235, 234, 233, 232, 231, 230, 229, 228, 227, 226, - 225, 224, 223, 222, 221, 220, 219, 218, 217, 214, - 213, 212, 211, 210, 209, 208, 207, 206, 205, 204, - 203, 202, 201, 200, 199, 198, 197, 196, 195, 194, - 193, 192, 191, 190, 189, 188, 187, 186, 185, 182, - 181, 114, 114, 179, 178, 177, 176, 172, 171, 168, - 163, 160, 159, 158, 157, 156, 155, 154, 153, 150, - 149, 148, 147, 146, 143, 142, 141, 140, 139, 138, - 129, 126, 125, 124, 121, 120, 56, 56, 118, 114, + 256, 255, 254, 251, 250, 249, 248, 247, 246, 245, + 244, 243, 242, 241, 240, 239, 238, 237, 236, 235, + 234, 233, 232, 231, 230, 229, 228, 227, 226, 225, + 224, 223, 222, 221, 220, 219, 218, 217, 214, 213, + 212, 211, 210, 209, 208, 207, 206, 205, 204, 203, + 202, 201, 200, 199, 198, 197, 196, 195, 194, 193, + 192, 191, 190, 189, 188, 187, 186, 185, 182, 181, + 114, 114, 179, 178, 177, 176, 172, 171, 168, 163, + 160, 159, 158, 157, 156, 155, 154, 153, 150, 149, + 148, 147, 146, 143, 142, 141, 140, 139, 138, 129, - 103, 79, 56, 565, 7, 565, 565, 565, 565, 565, + 126, 125, 124, 121, 120, 56, 56, 118, 114, 103, + 79, 56, 565, 7, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565 } ; -static yyconst flex_int16_t yy_chk[749] = +static yyconst flex_int16_t yy_chk[759] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, - 3, 14, 3, 14, 3, 3, 3, 3, 17, 16, - 17, 9, 16, 9, 11, 18, 11, 21, 22, 19, - 27, 21, 25, 69, 69, 18, 18, 25, 27, 22, - 19, 18, 18, 19, 3, 3, 4, 4, 4, 4, - 4, 4, 4, 4, 20, 4, 28, 4, 4, 4, + 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 5, 5, + 5, 5, 5, 14, 569, 14, 9, 5, 9, 17, - 4, 9, 9, 23, 11, 11, 26, 45, 20, 31, - 45, 23, 26, 31, 23, 30, 28, 23, 570, 35, - 23, 66, 30, 35, 36, 66, 36, 4, 4, 5, - 5, 5, 5, 5, 29, 32, 33, 5, 29, 37, - 5, 37, 41, 32, 41, 29, 29, 32, 29, 33, - 38, 98, 38, 39, 98, 39, 33, 44, 47, 44, - 47, 48, 38, 48, 49, 39, 49, 122, 44, 5, - 5, 6, 6, 6, 6, 6, 50, 62, 50, 6, - 122, 51, 6, 51, 55, 59, 55, 59, 62, 562, - 38, 38, 70, 39, 39, 68, 70, 68, 71, 71, + 5, 17, 16, 11, 18, 11, 16, 21, 19, 20, + 26, 21, 25, 22, 18, 18, 26, 25, 27, 19, + 18, 18, 19, 20, 22, 36, 27, 36, 28, 5, + 5, 6, 6, 6, 6, 6, 562, 9, 9, 23, + 6, 559, 30, 6, 11, 11, 33, 23, 28, 30, + 23, 29, 32, 23, 31, 29, 23, 35, 31, 33, + 32, 35, 29, 29, 32, 29, 33, 37, 38, 37, + 38, 558, 6, 6, 39, 41, 39, 41, 44, 45, + 44, 38, 47, 45, 47, 556, 48, 39, 48, 49, + 44, 49, 50, 51, 50, 51, 55, 59, 55, 59, - 559, 94, 78, 84, 49, 49, 78, 84, 94, 291, - 96, 6, 6, 96, 101, 106, 193, 106, 101, 193, - 107, 96, 107, 108, 291, 108, 96, 109, 111, 109, - 111, 115, 558, 115, 101, 108, 117, 155, 117, 180, - 343, 180, 115, 155, 201, 201, 391, 117, 255, 255, - 180, 356, 255, 394, 394, 526, 343, 556, 356, 403, - 555, 356, 391, 108, 108, 554, 403, 526, 566, 566, - 566, 566, 566, 566, 567, 567, 567, 567, 567, 567, - 568, 568, 568, 569, 569, 551, 569, 569, 569, 571, - 550, 548, 547, 571, 571, 572, 546, 543, 542, 572, + 62, 66, 68, 555, 68, 66, 69, 69, 70, 38, + 38, 62, 70, 71, 71, 39, 39, 78, 84, 94, + 98, 78, 84, 98, 96, 101, 94, 96, 554, 101, + 49, 49, 106, 551, 106, 96, 107, 108, 107, 108, + 96, 109, 111, 109, 111, 101, 115, 117, 115, 117, + 108, 122, 550, 180, 155, 180, 201, 201, 115, 117, + 155, 291, 548, 193, 122, 180, 193, 255, 255, 343, + 356, 255, 391, 394, 394, 403, 291, 356, 108, 108, + 356, 526, 403, 547, 546, 343, 543, 542, 391, 541, + 540, 539, 538, 526, 566, 566, 566, 566, 566, 566, - 572, 573, 573, 541, 573, 573, 573, 574, 574, 540, - 574, 574, 574, 575, 575, 539, 575, 575, 575, 538, - 537, 536, 533, 532, 531, 530, 529, 528, 527, 523, - 522, 521, 519, 518, 517, 515, 511, 510, 508, 507, - 504, 503, 502, 501, 500, 499, 498, 497, 495, 494, - 493, 490, 489, 488, 485, 481, 480, 479, 478, 477, - 476, 473, 472, 471, 470, 469, 468, 467, 466, 465, - 464, 463, 462, 461, 460, 459, 458, 457, 456, 454, - 453, 452, 450, 449, 448, 447, 446, 445, 444, 443, - 442, 441, 439, 437, 436, 435, 434, 433, 432, 429, + 567, 567, 567, 568, 568, 537, 568, 568, 568, 570, + 536, 533, 532, 570, 570, 571, 531, 530, 529, 571, + 571, 572, 572, 528, 572, 572, 572, 573, 573, 527, + 573, 573, 573, 574, 574, 523, 574, 574, 574, 522, + 521, 519, 518, 517, 515, 511, 510, 508, 507, 504, + 503, 502, 501, 500, 499, 498, 497, 495, 494, 493, + 490, 489, 488, 485, 481, 480, 479, 478, 477, 476, + 473, 472, 471, 470, 469, 468, 467, 466, 465, 464, + 463, 462, 461, 460, 459, 458, 457, 456, 454, 453, + 452, 450, 449, 448, 447, 446, 445, 444, 443, 442, - 428, 427, 426, 425, 424, 422, 420, 419, 418, 416, - 414, 409, 408, 407, 406, 405, 404, 402, 401, 400, - 399, 398, 397, 396, 393, 390, 389, 388, 387, 386, - 385, 384, 383, 382, 381, 380, 379, 377, 376, 375, - 374, 373, 372, 371, 370, 368, 367, 366, 365, 364, - 362, 361, 360, 359, 358, 357, 355, 354, 353, 352, - 351, 350, 349, 348, 347, 345, 344, 342, 340, 339, - 338, 337, 336, 335, 334, 333, 332, 331, 330, 329, - 328, 326, 325, 323, 321, 320, 319, 318, 317, 316, - 315, 314, 313, 312, 311, 310, 309, 308, 306, 305, + 441, 439, 437, 436, 435, 434, 433, 432, 429, 428, + 427, 426, 425, 424, 422, 420, 419, 418, 416, 414, + 409, 408, 407, 406, 405, 404, 402, 401, 400, 399, + 398, 397, 396, 393, 390, 389, 388, 387, 386, 385, + 384, 383, 382, 381, 380, 379, 377, 376, 375, 374, + 373, 372, 371, 370, 368, 367, 366, 365, 364, 362, + 361, 360, 359, 358, 357, 355, 354, 353, 352, 351, + 350, 349, 348, 347, 345, 344, 342, 340, 339, 338, + 337, 336, 335, 334, 333, 332, 331, 330, 329, 328, + 326, 325, 323, 321, 320, 319, 318, 317, 316, 315, - 304, 303, 302, 300, 299, 298, 297, 295, 294, 292, - 290, 288, 287, 286, 285, 284, 283, 282, 281, 280, - 279, 277, 276, 275, 274, 273, 272, 271, 270, 268, - 267, 266, 265, 264, 263, 262, 261, 259, 258, 257, - 256, 254, 253, 251, 250, 248, 247, 246, 245, 244, - 243, 242, 241, 240, 239, 238, 237, 234, 233, 232, - 231, 230, 229, 228, 227, 226, 225, 224, 223, 222, - 221, 220, 219, 217, 216, 215, 213, 212, 211, 210, - 209, 208, 207, 206, 205, 204, 202, 200, 199, 198, - 197, 196, 195, 194, 192, 191, 190, 189, 188, 187, + 314, 313, 312, 311, 310, 309, 308, 306, 305, 304, + 303, 302, 300, 299, 298, 297, 295, 294, 292, 290, + 288, 287, 286, 285, 284, 283, 282, 281, 280, 279, + 277, 276, 275, 274, 273, 272, 271, 270, 268, 267, + 266, 265, 264, 263, 262, 261, 259, 258, 257, 256, + 254, 253, 251, 250, 248, 247, 246, 245, 244, 243, + 242, 241, 240, 239, 238, 237, 234, 233, 232, 231, + 230, 229, 228, 227, 226, 225, 224, 223, 222, 221, + 220, 219, 217, 216, 215, 213, 212, 211, 210, 209, + 208, 207, 206, 205, 204, 202, 200, 199, 198, 197, - 186, 185, 184, 183, 182, 181, 179, 178, 177, 176, - 175, 174, 173, 172, 171, 170, 169, 168, 167, 166, - 165, 164, 163, 162, 161, 160, 159, 158, 156, 154, - 153, 152, 151, 150, 149, 148, 147, 146, 145, 144, - 143, 142, 141, 140, 139, 137, 136, 135, 134, 133, - 132, 131, 130, 128, 127, 126, 125, 124, 123, 121, - 120, 114, 113, 105, 104, 103, 102, 100, 99, 97, - 95, 93, 92, 90, 89, 88, 87, 86, 85, 83, - 82, 81, 80, 79, 77, 76, 75, 74, 73, 72, - 67, 65, 64, 63, 61, 60, 56, 54, 52, 43, + 196, 195, 194, 192, 191, 190, 189, 188, 187, 186, + 185, 184, 183, 182, 181, 179, 178, 177, 176, 175, + 174, 173, 172, 171, 170, 169, 168, 167, 166, 165, + 164, 163, 162, 161, 160, 159, 158, 156, 154, 153, + 152, 151, 150, 149, 148, 147, 146, 145, 144, 143, + 142, 141, 140, 139, 137, 136, 135, 134, 133, 132, + 131, 130, 128, 127, 126, 125, 124, 123, 121, 120, + 114, 113, 105, 104, 103, 102, 100, 99, 97, 95, + 93, 92, 90, 89, 88, 87, 86, 85, 83, 82, + 81, 80, 79, 77, 76, 75, 74, 73, 72, 67, - 34, 24, 15, 7, 565, 565, 565, 565, 565, 565, + 65, 64, 63, 61, 60, 56, 54, 52, 43, 34, + 24, 15, 7, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, 565, @@ -800,10 +802,11 @@ char *yy_text; /* this header file is automatically generated by bison * and includes all token definitions, as well as yy_lval */ #if ELBEEM_BLENDER==1 +// for blender the headers have to be .h #include "cfgparser.h" -#else // ELBEEM_BLENDER==1 +#else #include "cfgparser.hpp" -#endif // ELBEEM_BLENDER==1 +#endif #include "utilities.h" #include @@ -825,7 +828,7 @@ extern "C" int yy_wrap (void ) { return 1; } * rules start */ /*----------------------------------------------------------------------------*/ -#line 829 "" +#line 832 "" #define INITIAL 0 #define ATTR 1 @@ -978,11 +981,11 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 54 "src/cfglexer.ll" +#line 55 "src/cfglexer.ll" -#line 986 "" +#line 989 "" if ( (yy_init) ) { @@ -1063,25 +1066,25 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 57 "src/cfglexer.ll" +#line 58 "src/cfglexer.ll" { return KW_PAROPEN; } YY_BREAK case 2: YY_RULE_SETUP -#line 58 "src/cfglexer.ll" +#line 59 "src/cfglexer.ll" { BEGIN(INITIAL); // '}' always closes scopes return KW_PARCLOSE; } YY_BREAK case 3: YY_RULE_SETUP -#line 61 "src/cfglexer.ll" +#line 62 "src/cfglexer.ll" { BEGIN(ATTRVALUE); return KW_EQUALS; } YY_BREAK case 4: YY_RULE_SETUP -#line 64 "src/cfglexer.ll" +#line 65 "src/cfglexer.ll" { /* attribute name = normal string */ strncpy( charBuffer, yy_text, CHAR_BUFFER_SIZE-2 ); yy_lval.charValue = charBuffer; @@ -1091,7 +1094,7 @@ YY_RULE_SETUP YY_BREAK case 5: YY_RULE_SETUP -#line 70 "src/cfglexer.ll" +#line 71 "src/cfglexer.ll" { /* quoted string! attribute name = normal string */ strncpy( charBuffer, yy_text, CHAR_BUFFER_SIZE-2 ); /* get rid of " " */ @@ -1102,7 +1105,7 @@ YY_RULE_SETUP YY_BREAK case 6: YY_RULE_SETUP -#line 77 "src/cfglexer.ll" +#line 78 "src/cfglexer.ll" { /* ends at newline or ';' */ strncpy( charBuffer, yy_text, CHAR_BUFFER_SIZE-2 ); yy_lval.charValue = charBuffer; @@ -1110,433 +1113,433 @@ YY_RULE_SETUP YY_BREAK case 7: YY_RULE_SETUP -#line 81 "src/cfglexer.ll" +#line 82 "src/cfglexer.ll" { /* return end token... */ BEGIN(ATTR); return KW_ATTREND; } YY_BREAK case 8: YY_RULE_SETUP -#line 86 "src/cfglexer.ll" +#line 87 "src/cfglexer.ll" { return KW_LBMSIM; } YY_BREAK case 9: YY_RULE_SETUP -#line 87 "src/cfglexer.ll" +#line 88 "src/cfglexer.ll" { return KW_COMPARELBM; } YY_BREAK case 10: YY_RULE_SETUP -#line 88 "src/cfglexer.ll" +#line 89 "src/cfglexer.ll" { return KW_DEBUGMODE; } YY_BREAK case 11: YY_RULE_SETUP -#line 89 "src/cfglexer.ll" +#line 90 "src/cfglexer.ll" { return KW_DEBUGLEVEL; } YY_BREAK case 12: YY_RULE_SETUP -#line 90 "src/cfglexer.ll" +#line 91 "src/cfglexer.ll" { return KW_RAYTRACING; } YY_BREAK case 13: YY_RULE_SETUP -#line 93 "src/cfglexer.ll" +#line 94 "src/cfglexer.ll" { return KW_RESOLUTION; } YY_BREAK case 14: YY_RULE_SETUP -#line 94 "src/cfglexer.ll" +#line 95 "src/cfglexer.ll" { return KW_ANTIALIAS; } YY_BREAK case 15: YY_RULE_SETUP -#line 95 "src/cfglexer.ll" +#line 96 "src/cfglexer.ll" { return KW_EYEPOINT; } YY_BREAK case 16: YY_RULE_SETUP -#line 96 "src/cfglexer.ll" +#line 97 "src/cfglexer.ll" { return KW_LOOKAT ; } YY_BREAK case 17: YY_RULE_SETUP -#line 97 "src/cfglexer.ll" +#line 98 "src/cfglexer.ll" { return KW_UPVEC ; } YY_BREAK case 18: YY_RULE_SETUP -#line 98 "src/cfglexer.ll" +#line 99 "src/cfglexer.ll" { return KW_FOVY; } YY_BREAK case 19: YY_RULE_SETUP -#line 99 "src/cfglexer.ll" +#line 100 "src/cfglexer.ll" { return KW_ASPECT ; } YY_BREAK case 20: YY_RULE_SETUP -#line 100 "src/cfglexer.ll" +#line 101 "src/cfglexer.ll" { return KW_AMBIENCE; } YY_BREAK case 21: YY_RULE_SETUP -#line 101 "src/cfglexer.ll" +#line 102 "src/cfglexer.ll" { return KW_BACKGROUND; } YY_BREAK case 22: YY_RULE_SETUP -#line 102 "src/cfglexer.ll" +#line 103 "src/cfglexer.ll" { return KW_ANISTART; } YY_BREAK case 23: YY_RULE_SETUP -#line 103 "src/cfglexer.ll" +#line 104 "src/cfglexer.ll" { return KW_ANIFRAMES; } YY_BREAK case 24: YY_RULE_SETUP -#line 104 "src/cfglexer.ll" +#line 105 "src/cfglexer.ll" { return KW_ANIFRAMETIME; } YY_BREAK case 25: YY_RULE_SETUP -#line 105 "src/cfglexer.ll" +#line 106 "src/cfglexer.ll" { return KW_FRAMESKIP; } YY_BREAK case 26: YY_RULE_SETUP -#line 106 "src/cfglexer.ll" +#line 107 "src/cfglexer.ll" { return KW_FILENAME; } YY_BREAK case 27: YY_RULE_SETUP -#line 107 "src/cfglexer.ll" +#line 108 "src/cfglexer.ll" { return KW_PMCAUSTICS; } YY_BREAK case 28: YY_RULE_SETUP -#line 108 "src/cfglexer.ll" +#line 109 "src/cfglexer.ll" { return KW_CAUSTICDIST; } YY_BREAK case 29: YY_RULE_SETUP -#line 109 "src/cfglexer.ll" +#line 110 "src/cfglexer.ll" { return KW_CAUSTICPHOT; } YY_BREAK case 30: YY_RULE_SETUP -#line 110 "src/cfglexer.ll" +#line 111 "src/cfglexer.ll" { return KW_SHADOWMAPBIAS; } YY_BREAK case 31: YY_RULE_SETUP -#line 111 "src/cfglexer.ll" +#line 112 "src/cfglexer.ll" { return KW_MAXRAYDEPTH; } YY_BREAK case 32: YY_RULE_SETUP -#line 112 "src/cfglexer.ll" +#line 113 "src/cfglexer.ll" { return KW_TREEMAXDEPTH; } YY_BREAK case 33: YY_RULE_SETUP -#line 113 "src/cfglexer.ll" +#line 114 "src/cfglexer.ll" { return KW_TREEMAXTRIANGLES; } YY_BREAK case 34: YY_RULE_SETUP -#line 114 "src/cfglexer.ll" +#line 115 "src/cfglexer.ll" { return KW_DEBUGPIXEL; } YY_BREAK case 35: YY_RULE_SETUP -#line 115 "src/cfglexer.ll" +#line 116 "src/cfglexer.ll" { return KW_TESTMODE; } YY_BREAK case 36: YY_RULE_SETUP -#line 116 "src/cfglexer.ll" +#line 117 "src/cfglexer.ll" { return KW_OPENGLATTR; } YY_BREAK case 37: YY_RULE_SETUP -#line 117 "src/cfglexer.ll" +#line 118 "src/cfglexer.ll" { return KW_BLENDERATTR; } YY_BREAK case 38: YY_RULE_SETUP -#line 119 "src/cfglexer.ll" +#line 120 "src/cfglexer.ll" { return KW_OBJATTR; /* assign attr to obj */ } YY_BREAK case 39: YY_RULE_SETUP -#line 120 "src/cfglexer.ll" +#line 121 "src/cfglexer.ll" { BEGIN(ATTR); return KW_ATTRIBUTE; /* global attr list */ } YY_BREAK case 40: YY_RULE_SETUP -#line 121 "src/cfglexer.ll" +#line 122 "src/cfglexer.ll" { BEGIN(ATTR); return KW_DEFINEATTR; /* obj defines new attrs */ } YY_BREAK case 41: YY_RULE_SETUP -#line 122 "src/cfglexer.ll" +#line 123 "src/cfglexer.ll" { BEGIN(ATTR); return KW_DEFINEATTR; } YY_BREAK case 42: YY_RULE_SETUP -#line 123 "src/cfglexer.ll" +#line 124 "src/cfglexer.ll" { BEGIN(ATTR); return KW_DEFINEATTR; } YY_BREAK case 43: YY_RULE_SETUP -#line 125 "src/cfglexer.ll" +#line 126 "src/cfglexer.ll" { return KW_GEOMETRY; } YY_BREAK case 44: YY_RULE_SETUP -#line 126 "src/cfglexer.ll" +#line 127 "src/cfglexer.ll" { return KW_TYPE; } YY_BREAK case 45: YY_RULE_SETUP -#line 127 "src/cfglexer.ll" +#line 128 "src/cfglexer.ll" { return KW_GEOTYPE_BOX; } YY_BREAK case 46: YY_RULE_SETUP -#line 128 "src/cfglexer.ll" +#line 129 "src/cfglexer.ll" { return KW_GEOTYPE_SPHERE; } YY_BREAK case 47: YY_RULE_SETUP -#line 129 "src/cfglexer.ll" +#line 130 "src/cfglexer.ll" { return KW_GEOTYPE_OBJMODEL; } YY_BREAK case 48: YY_RULE_SETUP -#line 130 "src/cfglexer.ll" +#line 131 "src/cfglexer.ll" { return KW_CASTSHADOWS; } YY_BREAK case 49: YY_RULE_SETUP -#line 131 "src/cfglexer.ll" +#line 132 "src/cfglexer.ll" { return KW_RECEIVESHADOWS ; } YY_BREAK case 50: YY_RULE_SETUP -#line 132 "src/cfglexer.ll" +#line 133 "src/cfglexer.ll" { return KW_VISIBLE; } YY_BREAK case 51: YY_RULE_SETUP -#line 133 "src/cfglexer.ll" +#line 134 "src/cfglexer.ll" { return KW_BOX_START; } YY_BREAK case 52: YY_RULE_SETUP -#line 134 "src/cfglexer.ll" +#line 135 "src/cfglexer.ll" { return KW_BOX_END; } YY_BREAK case 53: YY_RULE_SETUP -#line 135 "src/cfglexer.ll" +#line 136 "src/cfglexer.ll" { return KW_POLY ; } YY_BREAK case 54: YY_RULE_SETUP -#line 136 "src/cfglexer.ll" +#line 137 "src/cfglexer.ll" { return KW_POLY ; } YY_BREAK case 55: YY_RULE_SETUP -#line 137 "src/cfglexer.ll" +#line 138 "src/cfglexer.ll" { return KW_NUMVERTICES; } YY_BREAK case 56: YY_RULE_SETUP -#line 138 "src/cfglexer.ll" +#line 139 "src/cfglexer.ll" { return KW_VERTEX; } YY_BREAK case 57: YY_RULE_SETUP -#line 139 "src/cfglexer.ll" +#line 140 "src/cfglexer.ll" { return KW_NUMPOLYGONS; } YY_BREAK case 58: YY_RULE_SETUP -#line 140 "src/cfglexer.ll" +#line 141 "src/cfglexer.ll" { return KW_ISOSURF; } YY_BREAK case 59: YY_RULE_SETUP -#line 141 "src/cfglexer.ll" +#line 142 "src/cfglexer.ll" { return KW_FILEMODE; } YY_BREAK case 60: YY_RULE_SETUP -#line 142 "src/cfglexer.ll" +#line 143 "src/cfglexer.ll" { return KW_INVERT; } YY_BREAK case 61: YY_RULE_SETUP -#line 144 "src/cfglexer.ll" +#line 145 "src/cfglexer.ll" { return KW_MATERIAL; } YY_BREAK case 62: YY_RULE_SETUP -#line 145 "src/cfglexer.ll" +#line 146 "src/cfglexer.ll" { return KW_MATTYPE_PHONG; } YY_BREAK case 63: YY_RULE_SETUP -#line 146 "src/cfglexer.ll" +#line 147 "src/cfglexer.ll" { return KW_MATTYPE_BLINN; } YY_BREAK case 64: YY_RULE_SETUP -#line 147 "src/cfglexer.ll" +#line 148 "src/cfglexer.ll" { return KW_NAME; } YY_BREAK case 65: YY_RULE_SETUP -#line 148 "src/cfglexer.ll" +#line 149 "src/cfglexer.ll" { return KW_AMBIENT; } YY_BREAK case 66: YY_RULE_SETUP -#line 149 "src/cfglexer.ll" +#line 150 "src/cfglexer.ll" { return KW_DIFFUSE; } YY_BREAK case 67: YY_RULE_SETUP -#line 150 "src/cfglexer.ll" +#line 151 "src/cfglexer.ll" { return KW_SPECULAR; } YY_BREAK case 68: YY_RULE_SETUP -#line 151 "src/cfglexer.ll" +#line 152 "src/cfglexer.ll" { return KW_MIRROR; } YY_BREAK case 69: YY_RULE_SETUP -#line 152 "src/cfglexer.ll" +#line 153 "src/cfglexer.ll" { return KW_TRANSPARENCE; } YY_BREAK case 70: YY_RULE_SETUP -#line 153 "src/cfglexer.ll" +#line 154 "src/cfglexer.ll" { return KW_REFRACINDEX; } YY_BREAK case 71: YY_RULE_SETUP -#line 154 "src/cfglexer.ll" +#line 155 "src/cfglexer.ll" { return KW_TRANSADDITIVE; } YY_BREAK case 72: YY_RULE_SETUP -#line 155 "src/cfglexer.ll" +#line 156 "src/cfglexer.ll" { return KW_TRANSATTCOL; } YY_BREAK case 73: YY_RULE_SETUP -#line 156 "src/cfglexer.ll" +#line 157 "src/cfglexer.ll" { return KW_FRESNEL; } YY_BREAK case 74: YY_RULE_SETUP -#line 157 "src/cfglexer.ll" +#line 158 "src/cfglexer.ll" { return KW_FRESNEL; } YY_BREAK case 75: YY_RULE_SETUP -#line 159 "src/cfglexer.ll" +#line 160 "src/cfglexer.ll" { return KW_LIGHT; } YY_BREAK case 76: YY_RULE_SETUP -#line 160 "src/cfglexer.ll" +#line 161 "src/cfglexer.ll" { return KW_LIGHT_OMNI; } YY_BREAK case 77: YY_RULE_SETUP -#line 161 "src/cfglexer.ll" +#line 162 "src/cfglexer.ll" { return KW_ACTIVE; } YY_BREAK case 78: YY_RULE_SETUP -#line 162 "src/cfglexer.ll" +#line 163 "src/cfglexer.ll" { return KW_COLOUR; } YY_BREAK case 79: YY_RULE_SETUP -#line 163 "src/cfglexer.ll" +#line 164 "src/cfglexer.ll" { return KW_COLOUR; } YY_BREAK case 80: YY_RULE_SETUP -#line 164 "src/cfglexer.ll" +#line 165 "src/cfglexer.ll" { return KW_POSITION; } YY_BREAK case 81: YY_RULE_SETUP -#line 165 "src/cfglexer.ll" +#line 166 "src/cfglexer.ll" { return KW_CAUSTICPHOTONS; } YY_BREAK case 82: YY_RULE_SETUP -#line 166 "src/cfglexer.ll" +#line 167 "src/cfglexer.ll" { return KW_CAUSTICSTRENGTH; } YY_BREAK case 83: YY_RULE_SETUP -#line 167 "src/cfglexer.ll" +#line 168 "src/cfglexer.ll" { return KW_SHADOWMAP; } YY_BREAK case 84: YY_RULE_SETUP -#line 168 "src/cfglexer.ll" +#line 169 "src/cfglexer.ll" { return KW_CAUSTICSMAP; } YY_BREAK case 85: YY_RULE_SETUP -#line 170 "src/cfglexer.ll" +#line 171 "src/cfglexer.ll" { yy_lval.intValue = 1; return DT_INTEGER; } YY_BREAK case 86: YY_RULE_SETUP -#line 171 "src/cfglexer.ll" +#line 172 "src/cfglexer.ll" { yy_lval.intValue = 0; return DT_INTEGER; } YY_BREAK case 87: YY_RULE_SETUP -#line 172 "src/cfglexer.ll" +#line 173 "src/cfglexer.ll" { yy_lval.intValue = 1; return DT_INTEGER; } YY_BREAK case 88: YY_RULE_SETUP -#line 173 "src/cfglexer.ll" +#line 174 "src/cfglexer.ll" { yy_lval.intValue = 0; return DT_INTEGER; } YY_BREAK case 89: YY_RULE_SETUP -#line 176 "src/cfglexer.ll" +#line 177 "src/cfglexer.ll" { // integer number yy_lval.intValue = atoi( yy_text ); return DT_INTEGER; } YY_BREAK case 90: YY_RULE_SETUP -#line 180 "src/cfglexer.ll" +#line 181 "src/cfglexer.ll" { // floating point number yy_lval.floatValue = atof( yy_text ); return DT_FLOAT; } YY_BREAK case 91: YY_RULE_SETUP -#line 184 "src/cfglexer.ll" +#line 185 "src/cfglexer.ll" { /* normal character strings, now also for paths/filenames */ strncpy( charBuffer, yy_text, CHAR_BUFFER_SIZE-2 ); /* get rid of " " */ @@ -1547,17 +1550,17 @@ YY_RULE_SETUP YY_BREAK case 92: YY_RULE_SETUP -#line 192 "src/cfglexer.ll" +#line 193 "src/cfglexer.ll" { /* one line comment */ } YY_BREAK case 93: YY_RULE_SETUP -#line 193 "src/cfglexer.ll" +#line 194 "src/cfglexer.ll" { /* one line comment */ } YY_BREAK case 94: YY_RULE_SETUP -#line 194 "src/cfglexer.ll" +#line 195 "src/cfglexer.ll" { /* multiline comment */ register int c; for ( ; ; ) { @@ -1583,26 +1586,26 @@ YY_RULE_SETUP case 95: /* rule 95 can match eol */ YY_RULE_SETUP -#line 218 "src/cfglexer.ll" +#line 219 "src/cfglexer.ll" { // count line numbers lineCount++; } YY_BREAK case 96: YY_RULE_SETUP -#line 221 "src/cfglexer.ll" +#line 222 "src/cfglexer.ll" { /* do nothing by default... */ } YY_BREAK case 97: YY_RULE_SETUP -#line 223 "src/cfglexer.ll" +#line 224 "src/cfglexer.ll" { /*errorOut( "cfgLexer, Line "<" +#line 1609 "" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(ATTR): case YY_STATE_EOF(ATTRVALUE): @@ -2567,4 +2570,4 @@ void yy_free (void * ptr ) #undef YY_DECL_IS_OURS #undef YY_DECL #endif -#line 226 "src/cfglexer.ll" +#line 227 "src/cfglexer.ll" diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 89cd78fb37a..61db603d647 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -2268,7 +2268,7 @@ void loadFluidsimMesh(Object *srcob, int useRenderParams) float *bbStart = NULL, *bbSize = NULL; float lastBB[3]; int displaymode = 0; - int curFrame = G.scene->r.cfra - G.scene->r.sfra; /* start with 0 at start frame */ + int curFrame = G.scene->r.cfra - 1 /*G.scene->r.sfra*/; /* start with 0 at start frame */ char targetDir[FILE_MAXFILE+FILE_MAXDIR], targetFile[FILE_MAXFILE+FILE_MAXDIR]; char debugStrBuffer[256]; //snprintf(debugStrBuffer,256,"loadFluidsimMesh call (obid '%s', rp %d)\n", srcob->id.name, useRenderParams); // debug diff --git a/source/blender/src/fluidsim.c b/source/blender/src/fluidsim.c index cc9f240ef94..3044584cb31 100644 --- a/source/blender/src/fluidsim.c +++ b/source/blender/src/fluidsim.c @@ -276,7 +276,7 @@ void fluidsimBake(struct Object *ob) char targetFile[FILE_MAXDIR+FILE_MAXFILE]; // temp. store filename from targetDir for access int outStringsChanged = 0; // modified? copy back before baking int haveSomeFluid = 0; // check if any fluid objects are set - int noFrames = G.scene->r.efra - G.scene->r.sfra; + int noFrames = G.scene->r.efra - 1 /*G.scene->r.sfra*/; const char *strEnvName = "BLENDER_ELBEEMDEBUG"; // from blendercall.cpp @@ -400,7 +400,7 @@ void fluidsimBake(struct Object *ob) } // dump data for frame 0 - G.scene->r.cfra = G.scene->r.sfra; + G.scene->r.cfra = 1 /*G.scene->r.sfra*/; scene_update_for_newframe(G.scene, G.scene->lay); // start writing @@ -468,15 +468,15 @@ void fluidsimBake(struct Object *ob) int i; float tsum=0.0, shouldbe=0.0; fprintf(fileCfg, " CHANNEL p_aniframetime = "); - for(i=G.scene->r.sfra; ir.efra; i++) { + for(i=1 /*G.scene->r.sfra*/; ir.efra; i++) { float anit = (calc_ipo_time(fsDomain->ipo, i+1) - calc_ipo_time(fsDomain->ipo, i)) * aniFrameTime; if(anit<0.0) anit = 0.0; tsum += anit; } // make sure inaccurate integration doesnt modify end time - shouldbe = ((float)(G.scene->r.efra - G.scene->r.sfra)) *aniFrameTime; - for(i=G.scene->r.sfra; ir.efra; i++) { + shouldbe = ((float)(G.scene->r.efra - 1 /*G.scene->r.sfra*/)) *aniFrameTime; + for(i=1 /*G.scene->r.sfra*/; ir.efra; i++) { float anit = (calc_ipo_time(fsDomain->ipo, i+1) - calc_ipo_time(fsDomain->ipo, i)) * aniFrameTime; if(anit<0.0) anit = 0.0; @@ -771,7 +771,7 @@ void fluidsimBake(struct Object *ob) } for(i=0; i0) { - fprintf(stderr," CREATED '%s' deleting... \n", createdFiles[i]); + //fprintf(stderr," CREATED '%s' deleting... \n", createdFiles[i]); // debug BLI_delete(createdFiles[i], 0,0); } free(createdFiles[i]);