diff --git a/assets.h b/assets.h index 29828f7..91fea5c 100644 --- a/assets.h +++ b/assets.h @@ -6240,151 +6240,151 @@ uint16_t LCR_getNextImagePixel(void) static const int32_t LCR_carVertices[] = { - -700, -59, -504, -700, -540, -703, -700, -258, -421, -700, - 23, -703, -500, -493, -938, -700, -258, -985, -500, -258, - -1035, -700, -59, -902, -500, -23, -938, -289, -65, -897, - -289, -258, -977, -289, -452, -897, -289, -532, -703, -500, - -591, -703, -700, -458, -504, -500, -493, -468, -289, -452, - -509, -289, -258, -429, -500, -258, -371, -289, -65, -509, - -500, -23, -468, -500, 73, -703, -289, 15, -703, -700, - -458, -902, 698, -59, -902, 698, -540, -703, 698, -258, - -985, 698, 23, -703, 498, -493, -468, 698, -258, -421, - 498, -258, -371, 698, -59, -504, 498, -23, -468, 287, - -65, -509, 287, -258, -429, 287, -452, -509, 287, -532, - -703, 498, -591, -703, 698, -458, -902, 498, -493, -938, - 287, -452, -897, 287, -258, -977, 498, -258, -1035, 287, - -65, -897, 498, -23, -938, 498, 73, -703, 287, 15, - -703, 698, -458, -504, -357, -354, 227, -422, -87, 279, - -479, -118, -323, -201, 264, 202, -236, 233, -266, -234, - -279, 741, -254, -346, 315, 240, -279, 741, 278, -6, - 497, -245, -32, 706, 251, -32, 706, -212, -45, -585, - 207, 264, 202, -272, -6, 497, 242, 233, -266, -222, - -90, -763, 228, -90, -763, 238, -323, -811, -232, -323, - -811, -235, -406, -356, -384, -404, -257, 218, -45, -585, - 241, -406, -356, 260, -346, 315, 363, -354, 227, 390, - -404, -257, 485, -118, -323, 428, -87, 279, -700, -59, - 871, -700, -540, 671, -700, -258, 953, -700, 23, 671, - -500, -493, 436, -700, -258, 390, -500, -258, 339, -700, - -59, 472, -500, -23, 436, -289, -65, 478, -289, -258, - 397, -289, -452, 478, -289, -532, 671, -500, -591, 671, - -700, -458, 871, -500, -493, 906, -289, -452, 865, -289, - -258, 945, -500, -258, 1004, -289, -65, 865, -500, -23, - 906, -500, 73, 671, -289, 15, 671, -700, -458, 472, - 698, -59, 472, 698, -540, 671, 698, -258, 390, 698, - 23, 671, 498, -493, 906, 698, -258, 953, 498, -258, - 1004, 698, -59, 871, 498, -23, 906, 287, -65, 865, - 287, -258, 945, 287, -452, 865, 287, -532, 671, 498, - -591, 671, 698, -458, 472, 498, -493, 436, 287, -452, - 478, 287, -258, 397, 498, -258, 339, 287, -65, 478, - 498, -23, 436, 498, 73, 671, 287, 15, 671, 698, - -458, 871 + 698, 202, 472, 698, -278, 671, 698, 3, 390, 698, + 285, 671, 498, -231, 906, 698, 3, 953, 498, 3, + 1004, 698, 202, 871, 498, 238, 906, 287, 197, 865, + 287, 3, 945, 287, -190, 865, 287, -270, 671, 498, + -328, 671, 698, -196, 472, 498, -231, 436, 287, -190, + 478, 287, 3, 397, 498, 3, 339, 287, 197, 478, + 498, 238, 436, 498, 335, 671, 287, 277, 671, 698, + -196, 871, -700, 202, 871, -700, -278, 671, -700, 3, + 953, -700, 285, 671, -500, -231, 436, -700, 3, 390, + -500, 3, 339, -700, 202, 472, -500, 238, 436, -289, + 197, 478, -289, 3, 397, -289, -190, 478, -289, -270, + 671, -500, -328, 671, -700, -196, 871, -500, -231, 906, + -289, -190, 865, -289, 3, 945, -500, 3, 1004, -289, + 197, 865, -500, 238, 906, -500, 335, 671, -289, 277, + 671, -700, -196, 472, -357, -92, 227, -422, 174, 279, + -479, 143, -323, -201, 526, 202, -236, 495, -266, -234, + -17, 741, -254, -84, 315, 240, -17, 741, 278, 255, + 497, -245, 229, 706, 251, 229, 706, -212, 216, -585, + 207, 526, 202, -272, 255, 497, 242, 495, -266, -222, + 171, -763, 228, 171, -763, 238, -61, -811, -232, -61, + -811, -235, -144, -356, -384, -142, -257, 218, 216, -585, + 241, -144, -356, 260, -84, 315, 363, -92, 227, 390, + -142, -257, 485, 143, -323, 428, 174, 279, -700, 202, + -504, -700, -278, -703, -700, 3, -421, -700, 285, -703, + -500, -231, -938, -700, 3, -985, -500, 3, -1035, -700, + 202, -902, -500, 238, -938, -289, 197, -897, -289, 3, + -977, -289, -190, -897, -289, -270, -703, -500, -328, -703, + -700, -196, -504, -500, -231, -468, -289, -190, -509, -289, + 3, -429, -500, 3, -371, -289, 197, -509, -500, 238, + -468, -500, 335, -703, -289, 277, -703, -700, -196, -902, + 698, 202, -902, 698, -278, -703, 698, 3, -985, 698, + 285, -703, 498, -231, -468, 698, 3, -421, 498, 3, + -371, 698, 202, -504, 498, 238, -468, 287, 197, -509, + 287, 3, -429, 287, -190, -509, 287, -270, -703, 498, + -328, -703, 698, -196, -902, 498, -231, -938, 287, -190, + -897, 287, 3, -977, 498, 3, -1035, 287, 197, -897, + 498, 238, -938, 498, 335, -703, 287, 277, -703, 698, + -196, -504 }; static const uint16_t LCR_carTriangles[] = { - 100, 102, 101, 101, 103, 100, 104, 106, 105, 106, 108, 107, 106, - 110, 109, 106, 104, 111, 104, 113, 112, 101, 113, 104, 114, 115, - 113, 113, 115, 116, 115, 118, 117, 102, 118, 115, 118, 120, 119, - 100, 120, 118, 103, 121, 120, 103, 107, 108, 122, 121, 108, 121, - 122, 119, 101, 102, 114, 103, 101, 107, 107, 101, 105, 105, 101, - 123, 119, 122, 112, 119, 112, 117, 112, 116, 117, 122, 109, 112, - 109, 110, 112, 111, 112, 110, 104, 105, 123, 106, 107, 105, 106, - 109, 108, 106, 111, 110, 104, 112, 111, 101, 104, 123, 114, 113, - 101, 113, 116, 112, 115, 117, 116, 102, 115, 114, 118, 119, 117, - 100, 118, 102, 103, 120, 100, 103, 108, 121, 122, 108, 109, 121, - 119, 120, 76, 78, 77, 77, 79, 76, 80, 82, 81, 82, 84, - 83, 82, 86, 85, 82, 80, 87, 80, 89, 88, 77, 89, 80, - 90, 91, 89, 89, 91, 92, 91, 94, 93, 78, 94, 91, 94, - 96, 95, 76, 96, 94, 79, 97, 96, 79, 83, 84, 98, 97, - 84, 97, 98, 95, 77, 78, 90, 79, 77, 83, 83, 77, 81, - 81, 77, 99, 95, 98, 88, 95, 88, 93, 88, 92, 93, 98, - 85, 88, 85, 86, 88, 87, 88, 86, 80, 81, 99, 82, 83, - 81, 82, 85, 84, 82, 87, 86, 80, 88, 87, 77, 80, 99, - 90, 89, 77, 89, 92, 88, 91, 93, 92, 78, 91, 90, 94, - 95, 93, 76, 94, 78, 79, 96, 76, 79, 84, 97, 98, 84, - 85, 97, 95, 96, 48, 50, 49, 49, 52, 51, 53, 55, 54, - 56, 58, 57, 52, 50, 59, 56, 61, 60, 55, 53, 58, 51, - 61, 49, 60, 51, 62, 63, 64, 59, 63, 66, 65, 54, 61, - 53, 59, 50, 67, 50, 68, 67, 67, 68, 54, 63, 59, 66, - 67, 66, 59, 61, 54, 49, 49, 54, 48, 57, 53, 61, 59, - 69, 52, 70, 65, 66, 71, 70, 67, 48, 54, 68, 72, 74, - 73, 75, 62, 74, 54, 55, 71, 57, 61, 56, 62, 69, 74, - 51, 60, 61, 58, 53, 57, 60, 75, 56, 52, 62, 51, 64, - 69, 59, 65, 64, 63, 71, 55, 56, 69, 70, 74, 74, 70, - 73, 70, 71, 73, 64, 65, 69, 70, 69, 65, 56, 75, 71, - 75, 72, 71, 58, 56, 55, 62, 52, 69, 54, 71, 67, 70, - 66, 67, 72, 73, 71, 48, 68, 50, 49, 50, 52, 72, 75, - 74, 75, 60, 62, 0, 2, 1, 1, 3, 0, 4, 6, 5, - 6, 8, 7, 6, 10, 9, 6, 4, 11, 4, 13, 12, 1, - 13, 4, 14, 15, 13, 13, 15, 16, 15, 18, 17, 2, 18, - 15, 18, 20, 19, 0, 20, 18, 3, 21, 20, 3, 7, 8, - 22, 21, 8, 21, 22, 19, 1, 2, 14, 3, 1, 7, 7, - 1, 5, 5, 1, 23, 19, 22, 12, 19, 12, 17, 12, 16, - 17, 22, 9, 12, 9, 10, 12, 11, 12, 10, 4, 5, 23, - 6, 7, 5, 6, 9, 8, 6, 11, 10, 4, 12, 11, 1, - 4, 23, 14, 13, 1, 13, 16, 12, 15, 17, 16, 2, 15, - 14, 18, 19, 17, 0, 18, 2, 3, 20, 0, 3, 8, 21, - 22, 8, 9, 21, 19, 20, 24, 26, 25, 25, 27, 24, 28, - 30, 29, 30, 32, 31, 30, 34, 33, 30, 28, 35, 28, 37, - 36, 25, 37, 28, 38, 39, 37, 37, 39, 40, 39, 42, 41, - 26, 42, 39, 42, 44, 43, 24, 44, 42, 27, 45, 44, 27, - 31, 32, 46, 45, 32, 45, 46, 43, 25, 26, 38, 27, 25, - 31, 31, 25, 29, 29, 25, 47, 43, 46, 36, 43, 36, 41, - 36, 40, 41, 46, 33, 36, 33, 34, 36, 35, 36, 34, 28, - 29, 47, 30, 31, 29, 30, 33, 32, 30, 35, 34, 28, 36, - 35, 25, 28, 47, 38, 37, 25, 37, 40, 36, 39, 41, 40, - 26, 39, 38, 42, 43, 41, 24, 42, 26, 27, 44, 24, 27, - 32, 45, 46, 32, 33, 45, 43, 44 + 24, 26, 25, 25, 27, 24, 28, 30, 29, 30, 32, 31, 30, + 34, 33, 30, 28, 35, 28, 37, 36, 25, 37, 28, 38, 39, + 37, 37, 39, 40, 39, 42, 41, 26, 42, 39, 42, 44, 43, + 24, 44, 42, 27, 45, 44, 27, 31, 32, 46, 45, 32, 45, + 46, 43, 25, 26, 38, 27, 25, 31, 31, 25, 29, 29, 25, + 47, 43, 46, 36, 43, 36, 41, 36, 40, 41, 46, 33, 36, + 33, 34, 36, 35, 36, 34, 28, 29, 47, 30, 31, 29, 30, + 33, 32, 30, 35, 34, 28, 36, 35, 25, 28, 47, 38, 37, + 25, 37, 40, 36, 39, 41, 40, 26, 39, 38, 42, 43, 41, + 24, 42, 26, 27, 44, 24, 27, 32, 45, 46, 32, 33, 45, + 43, 44, 48, 50, 49, 49, 52, 51, 53, 55, 54, 56, 58, + 57, 52, 50, 59, 56, 61, 60, 55, 53, 58, 51, 61, 49, + 60, 51, 62, 63, 64, 59, 63, 66, 65, 54, 61, 53, 59, + 50, 67, 50, 68, 67, 67, 68, 54, 63, 59, 66, 67, 66, + 59, 61, 54, 49, 49, 54, 48, 57, 53, 61, 59, 69, 52, + 70, 65, 66, 71, 70, 67, 48, 54, 68, 72, 74, 73, 75, + 62, 74, 54, 55, 71, 57, 61, 56, 62, 69, 74, 51, 60, + 61, 58, 53, 57, 60, 75, 56, 52, 62, 51, 64, 69, 59, + 65, 64, 63, 71, 55, 56, 69, 70, 74, 74, 70, 73, 70, + 71, 73, 64, 65, 69, 70, 69, 65, 56, 75, 71, 75, 72, + 71, 58, 56, 55, 62, 52, 69, 54, 71, 67, 70, 66, 67, + 72, 73, 71, 48, 68, 50, 49, 50, 52, 72, 75, 74, 75, + 60, 62, 0, 2, 1, 1, 3, 0, 4, 6, 5, 6, 8, + 7, 6, 10, 9, 6, 4, 11, 4, 13, 12, 1, 13, 4, + 14, 15, 13, 13, 15, 16, 15, 18, 17, 2, 18, 15, 18, + 20, 19, 0, 20, 18, 3, 21, 20, 3, 7, 8, 22, 21, + 8, 21, 22, 19, 1, 2, 14, 3, 1, 7, 7, 1, 5, + 5, 1, 23, 19, 22, 12, 19, 12, 17, 12, 16, 17, 22, + 9, 12, 9, 10, 12, 11, 12, 10, 4, 5, 23, 6, 7, + 5, 6, 9, 8, 6, 11, 10, 4, 12, 11, 1, 4, 23, + 14, 13, 1, 13, 16, 12, 15, 17, 16, 2, 15, 14, 18, + 19, 17, 0, 18, 2, 3, 20, 0, 3, 8, 21, 22, 8, + 9, 21, 19, 20, 76, 78, 77, 77, 79, 76, 80, 82, 81, + 82, 84, 83, 82, 86, 85, 82, 80, 87, 80, 89, 88, 77, + 89, 80, 90, 91, 89, 89, 91, 92, 91, 94, 93, 78, 94, + 91, 94, 96, 95, 76, 96, 94, 79, 97, 96, 79, 83, 84, + 98, 97, 84, 97, 98, 95, 77, 78, 90, 79, 77, 83, 83, + 77, 81, 81, 77, 99, 95, 98, 88, 95, 88, 93, 88, 92, + 93, 98, 85, 88, 85, 86, 88, 87, 88, 86, 80, 81, 99, + 82, 83, 81, 82, 85, 84, 82, 87, 86, 80, 88, 87, 77, + 80, 99, 90, 89, 77, 89, 92, 88, 91, 93, 92, 78, 91, + 90, 94, 95, 93, 76, 94, 78, 79, 96, 76, 79, 84, 97, + 98, 84, 85, 97, 95, 96, 100, 102, 101, 101, 103, 100, 104, + 106, 105, 106, 108, 107, 106, 110, 109, 106, 104, 111, 104, 113, + 112, 101, 113, 104, 114, 115, 113, 113, 115, 116, 115, 118, 117, + 102, 118, 115, 118, 120, 119, 100, 120, 118, 103, 121, 120, 103, + 107, 108, 122, 121, 108, 121, 122, 119, 101, 102, 114, 103, 101, + 107, 107, 101, 105, 105, 101, 123, 119, 122, 112, 119, 112, 117, + 112, 116, 117, 122, 109, 112, 109, 110, 112, 111, 112, 110, 104, + 105, 123, 106, 107, 105, 106, 109, 108, 106, 111, 110, 104, 112, + 111, 101, 104, 123, 114, 113, 101, 113, 116, 112, 115, 117, 116, + 102, 115, 114, 118, 119, 117, 100, 118, 102, 103, 120, 100, 103, + 108, 121, 122, 108, 109, 121, 119, 120 }; static const uint16_t LCR_carUvs[] = { - 107, 278, 64, 377, 123, 319, 66, 260, 63, 219, - 125, 188, 63, 188, 125, 158, 63, 158, 4, 158, - 4, 188, 4, 219, 4, 251, 63, 251, 125, 251, - 125, 34, 63, 2, 63, 34, 4, 34, 4, 65, - 63, 65, 125, 65, 4, 96, 63, 96, 125, 96, - 125, 127, 63, 127, 4, 127, 105, 360, 24, 276, - 6, 317, 23, 359, 24, 276, 64, 377, 66, 260, - 6, 317, 23, 359, 107, 278, 124, 320, 106, 361, - 125, 219, 125, 2, 4, 2, 107, 278, 64, 377, - 123, 319, 66, 260, 63, 219, 125, 188, 63, 188, - 125, 158, 63, 158, 4, 158, 4, 188, 4, 219, - 4, 251, 63, 251, 125, 251, 125, 34, 63, 2, - 63, 34, 4, 34, 4, 65, 63, 65, 125, 65, - 4, 96, 63, 96, 125, 96, 125, 127, 63, 127, - 4, 127, 105, 360, 24, 276, 6, 317, 23, 359, - 24, 276, 64, 377, 66, 260, 6, 317, 23, 359, - 107, 278, 124, 320, 106, 361, 125, 219, 125, 2, - 4, 2, 254, 196, 249, 113, 374, 114, 252, 10, - 366, 10, 505, 241, 402, 237, 505, 345, 108, 392, - 62, 494, 62, 397, 449, 75, 205, 394, 108, 500, - 9, 399, 9, 492, 186, 96, 307, 387, 205, 497, - 437, 497, 398, 494, 437, 395, 502, 398, 502, 494, - 234, 194, 131, 171, 411, 199, 374, 193, 239, 239, - 263, 208, 490, 82, 505, 156, 135, 108, 307, 504, - 398, 397, 239, 347, 131, 240, 131, 346, 402, 349, - 381, 214, 255, 196, 374, 192, 373, 112, 249, 112, - 366, 9, 449, 75, 252, 9, 186, 95, 234, 194, - 130, 171, 412, 198, 263, 377, 490, 82, 505, 156, - 134, 108, 381, 372, 107, 278, 64, 377, 123, 319, - 66, 260, 63, 219, 125, 188, 63, 188, 125, 158, - 63, 158, 4, 158, 4, 188, 4, 219, 4, 251, - 63, 251, 125, 251, 125, 34, 63, 2, 63, 34, - 4, 34, 4, 65, 63, 65, 125, 65, 4, 96, - 63, 96, 125, 96, 125, 127, 63, 127, 4, 127, - 105, 360, 24, 276, 6, 317, 23, 359, 24, 276, - 64, 377, 66, 260, 6, 317, 23, 359, 107, 278, - 124, 320, 106, 361, 125, 219, 125, 2, 4, 2, - 107, 278, 64, 377, 123, 319, 66, 260, 63, 219, - 125, 188, 63, 188, 125, 158, 63, 158, 4, 158, - 4, 188, 4, 219, 4, 251, 63, 251, 125, 251, - 125, 34, 63, 2, 63, 34, 4, 34, 4, 65, - 63, 65, 125, 65, 4, 96, 63, 96, 125, 96, - 125, 127, 63, 127, 4, 127, 105, 360, 24, 276, - 6, 317, 23, 359, 24, 276, 64, 377, 66, 260, - 6, 317, 23, 359, 107, 278, 124, 320, 106, 361, - 125, 219, 125, 2, 4, 2 + 102, 283, 59, 382, 118, 324, 61, 265, 58, 224, + 119, 193, 58, 193, 119, 163, 58, 163, 0, 163, + 0, 193, 0, 224, 0, 256, 58, 256, 119, 256, + 119, 39, 58, 7, 58, 39, 0, 39, 0, 70, + 58, 70, 119, 70, 0, 101, 58, 101, 119, 101, + 119, 132, 58, 132, 0, 132, 100, 365, 19, 281, + 1, 322, 18, 364, 19, 281, 59, 382, 61, 265, + 1, 322, 18, 364, 102, 283, 118, 325, 101, 366, + 119, 224, 119, 7, 0, 7, 249, 201, 243, 118, + 369, 119, 247, 15, 361, 15, 500, 246, 397, 242, + 500, 350, 103, 397, 57, 499, 57, 402, 444, 80, + 200, 400, 103, 505, 3, 404, 3, 497, 181, 101, + 302, 393, 200, 502, 432, 502, 393, 500, 432, 400, + 497, 403, 497, 499, 229, 199, 126, 176, 406, 204, + 368, 198, 234, 244, 258, 213, 484, 88, 500, 161, + 130, 113, 302, 509, 393, 402, 234, 352, 126, 245, + 126, 351, 397, 354, 376, 219, 250, 201, 369, 198, + 368, 117, 244, 117, 361, 14, 444, 80, 247, 14, + 181, 101, 229, 199, 125, 176, 407, 203, 258, 383, + 485, 87, 500, 161, 129, 113, 376, 377, 102, 283, + 59, 382, 118, 324, 61, 265, 58, 224, 119, 193, + 58, 193, 119, 163, 58, 163, 0, 163, 0, 193, + 0, 224, 0, 256, 58, 256, 119, 256, 119, 39, + 58, 7, 58, 39, 0, 39, 0, 70, 58, 70, + 119, 70, 0, 101, 58, 101, 119, 101, 119, 132, + 58, 132, 0, 132, 100, 365, 19, 281, 1, 322, + 18, 364, 19, 281, 59, 382, 61, 265, 1, 322, + 18, 364, 102, 283, 118, 325, 101, 366, 119, 224, + 119, 7, 0, 7, 102, 283, 59, 382, 118, 324, + 61, 265, 58, 224, 119, 193, 58, 193, 119, 163, + 58, 163, 0, 163, 0, 193, 0, 224, 0, 256, + 58, 256, 119, 256, 119, 39, 58, 7, 58, 39, + 0, 39, 0, 70, 58, 70, 119, 70, 0, 101, + 58, 101, 119, 101, 119, 132, 58, 132, 0, 132, + 100, 365, 19, 281, 1, 322, 18, 364, 19, 281, + 59, 382, 61, 265, 1, 322, 18, 364, 102, 283, + 118, 325, 101, 366, 119, 224, 119, 7, 0, 7, + 102, 283, 59, 382, 118, 324, 61, 265, 58, 224, + 119, 193, 58, 193, 119, 163, 58, 163, 0, 163, + 0, 193, 0, 224, 0, 256, 58, 256, 119, 256, + 119, 39, 58, 7, 58, 39, 0, 39, 0, 70, + 58, 70, 119, 70, 0, 101, 58, 101, 119, 101, + 119, 132, 58, 132, 0, 132, 100, 365, 19, 281, + 1, 322, 18, 364, 19, 281, 59, 382, 61, 265, + 1, 322, 18, 364, 102, 283, 118, 325, 101, 366, + 119, 224, 119, 7, 0, 7 }; static const uint16_t LCR_carTriangleUvs[] = @@ -6399,29 +6399,29 @@ static const uint16_t LCR_carTriangleUvs[] = 9, 8, 6, 11, 10, 4, 12, 11, 14, 4, 40, 15, 16, 41, 16, 18, 42, 17, 19, 18, 21, 17, 15, 20, 22, 19, 24, 20, 21, 25, 23, 24, 25, 8, 26, 27, 8, 9, 26, - 22, 23, 43, 45, 44, 44, 46, 43, 47, 49, 48, 49, 51, - 50, 49, 53, 52, 49, 47, 54, 47, 56, 55, 57, 56, 47, - 58, 60, 59, 59, 60, 61, 60, 63, 62, 64, 63, 60, 63, - 66, 65, 67, 66, 63, 68, 69, 66, 68, 50, 51, 70, 69, - 51, 69, 70, 65, 44, 45, 71, 46, 44, 72, 72, 44, 73, - 73, 44, 74, 75, 77, 76, 75, 76, 78, 76, 79, 78, 77, - 80, 76, 80, 81, 76, 82, 76, 81, 47, 48, 83, 49, 50, - 48, 49, 52, 51, 49, 54, 53, 47, 55, 54, 57, 47, 83, - 58, 59, 84, 59, 61, 85, 60, 62, 61, 64, 60, 58, 63, - 65, 62, 67, 63, 64, 68, 66, 67, 68, 51, 69, 70, 51, - 52, 69, 65, 66, 86, 88, 87, 87, 90, 89, 91, 93, 92, - 94, 96, 95, 90, 88, 97, 94, 99, 98, 100, 101, 96, 89, - 102, 87, 98, 104, 103, 105, 107, 106, 105, 109, 108, 110, 102, - 111, 97, 88, 112, 88, 113, 112, 114, 115, 92, 116, 97, 117, - 112, 117, 97, 102, 110, 87, 87, 110, 86, 118, 111, 102, 106, - 120, 119, 121, 123, 122, 124, 121, 114, 125, 92, 115, 126, 128, - 127, 129, 130, 128, 92, 93, 124, 95, 99, 94, 130, 131, 128, - 104, 98, 99, 96, 101, 95, 132, 129, 133, 119, 103, 104, 107, - 120, 106, 108, 107, 105, 134, 135, 133, 131, 136, 128, 128, 136, - 127, 121, 124, 137, 138, 139, 131, 136, 131, 139, 133, 129, 134, - 129, 126, 134, 140, 133, 135, 103, 119, 120, 92, 124, 114, 121, - 122, 114, 141, 137, 124, 86, 113, 88, 87, 88, 90, 126, 129, - 128, 129, 132, 130, 142, 144, 143, 143, 145, 142, 146, 148, 147, + 22, 23, 43, 45, 44, 44, 47, 46, 48, 50, 49, 51, 53, + 52, 47, 45, 54, 51, 56, 55, 57, 58, 53, 46, 59, 44, + 55, 61, 60, 62, 64, 63, 62, 66, 65, 67, 59, 68, 54, + 45, 69, 45, 70, 69, 71, 72, 49, 73, 54, 74, 69, 74, + 54, 59, 67, 44, 44, 67, 43, 75, 68, 59, 63, 77, 76, + 78, 80, 79, 81, 78, 71, 82, 49, 72, 83, 85, 84, 86, + 87, 85, 49, 50, 81, 52, 56, 51, 87, 88, 85, 61, 55, + 56, 53, 58, 52, 89, 86, 90, 76, 60, 61, 64, 77, 63, + 65, 64, 62, 91, 92, 90, 88, 93, 85, 85, 93, 84, 78, + 81, 94, 95, 96, 88, 93, 88, 96, 90, 86, 91, 86, 83, + 91, 97, 90, 92, 60, 76, 77, 49, 81, 71, 78, 79, 71, + 98, 94, 81, 43, 70, 45, 44, 45, 47, 83, 86, 85, 86, + 89, 87, 99, 101, 100, 100, 102, 99, 103, 105, 104, 105, 107, + 106, 105, 109, 108, 105, 103, 110, 103, 112, 111, 113, 112, 103, + 114, 116, 115, 115, 116, 117, 116, 119, 118, 120, 119, 116, 119, + 122, 121, 123, 122, 119, 124, 125, 122, 124, 106, 107, 126, 125, + 107, 125, 126, 121, 100, 101, 127, 102, 100, 128, 128, 100, 129, + 129, 100, 130, 131, 133, 132, 131, 132, 134, 132, 135, 134, 133, + 136, 132, 136, 137, 132, 138, 132, 137, 103, 104, 139, 105, 106, + 104, 105, 108, 107, 105, 110, 109, 103, 111, 110, 113, 103, 139, + 114, 115, 140, 115, 117, 141, 116, 118, 117, 120, 116, 114, 119, + 121, 118, 123, 119, 120, 124, 122, 123, 124, 107, 125, 126, 107, + 108, 125, 121, 122, 142, 144, 143, 143, 145, 142, 146, 148, 147, 148, 150, 149, 148, 152, 151, 148, 146, 153, 146, 155, 154, 156, 155, 146, 157, 159, 158, 158, 159, 160, 159, 162, 161, 163, 162, 159, 162, 165, 164, 166, 165, 162, 167, 168, 165, 167, 149, 150, @@ -6446,14 +6446,15 @@ static const uint16_t LCR_carTriangleUvs[] = static const uint8_t LCR_carVertexTypes[] = { - 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, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 + 0, 0, 0, 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, 1, 1, 1, 1, 1 }; + #endif diff --git a/assets/car_model.obj b/assets/car_model.obj index 9959ce7..0536711 100644 --- a/assets/car_model.obj +++ b/assets/car_model.obj @@ -1,170 +1,130 @@ -v -1.367492 -0.116281 -0.985208 -v -1.367492 -1.055889 -1.374406 -v -1.367492 -0.505479 -0.823996 -v -1.367492 0.044930 -1.374406 -v -0.977042 -0.964281 -1.833208 -v -1.367492 -0.505479 -1.924816 -v -0.977042 -0.505479 -2.023249 -v -1.367492 -0.116281 -1.763604 -v -0.977042 -0.046678 -1.833208 -v -0.564692 -0.126959 -1.752926 -v -0.564692 -0.505479 -1.909715 -v -0.564692 -0.883999 -1.752926 -v -0.564692 -1.040788 -1.374406 -v -0.977042 -1.154322 -1.374406 -v -1.367492 -0.894678 -0.985208 -v -0.977042 -0.964281 -0.915605 -v -0.564692 -0.883999 -0.995886 -v -0.564692 -0.505479 -0.839098 -v -0.977042 -0.505479 -0.725563 -v -0.564692 -0.126959 -0.995886 -v -0.977042 -0.046678 -0.915605 -v -0.977042 0.143364 -1.374406 -v -0.564692 0.029829 -1.374406 -v -1.367492 -0.894678 -1.763604 -v 1.364076 -0.116281 -1.763604 -v 1.364076 -1.055889 -1.374406 -v 1.364076 -0.505479 -1.924816 -v 1.364076 0.044930 -1.374406 -v 0.973625 -0.964281 -0.915605 -v 1.364076 -0.505479 -0.823997 -v 0.973625 -0.505479 -0.725563 -v 1.364076 -0.116281 -0.985208 -v 0.973625 -0.046678 -0.915605 -v 0.561275 -0.126959 -0.995886 -v 0.561275 -0.505479 -0.839098 -v 0.561276 -0.883999 -0.995886 -v 0.561275 -1.040788 -1.374406 -v 0.973625 -1.154322 -1.374406 -v 1.364076 -0.894677 -1.763604 -v 0.973625 -0.964281 -1.833208 -v 0.561275 -0.883999 -1.752926 -v 0.561275 -0.505479 -1.909714 -v 0.973625 -0.505479 -2.023249 -v 0.561275 -0.126959 -1.752926 -v 0.973625 -0.046678 -1.833208 -v 0.973625 0.143364 -1.374406 -v 0.561275 0.029829 -1.374406 -v 1.364076 -0.894677 -0.985208 -v -0.698782 -0.692068 0.445154 -v -0.825614 -0.170539 0.546029 -v -0.937154 -0.230637 -0.632732 -v -0.394348 0.516439 0.396308 -v -0.462354 0.455623 -0.520713 -v -0.458878 -0.546660 1.448301 -v -0.497771 -0.677472 0.615712 -v 0.470584 -0.546660 1.448301 -v 0.544227 -0.012307 0.971953 -v -0.479206 -0.063923 1.380053 -v 0.490912 -0.063923 1.380053 -v -0.415357 -0.088228 -1.143432 -v 0.406054 0.516439 0.396308 -v -0.532521 -0.012307 0.971953 -v 0.474060 0.455623 -0.520713 -v -0.435391 -0.177301 -1.491592 -v 0.447097 -0.177301 -1.491592 -v 0.464895 -0.631620 -1.585934 -v -0.453189 -0.631620 -1.585934 -v -0.460862 -0.793575 -0.695679 -v -0.751407 -0.789115 -0.502939 -v 0.427063 -0.088228 -1.143432 -v 0.472567 -0.793575 -0.695679 -v 0.509476 -0.677472 0.615712 -v 0.710485 -0.692068 0.445154 -v 0.763109 -0.789115 -0.502939 -v 0.948860 -0.230637 -0.632732 -v 0.837320 -0.170539 0.546029 -v -1.367492 -0.116281 1.701463 -v -1.367492 -1.055889 1.312265 -v -1.367492 -0.505479 1.862674 -v -1.367492 0.044930 1.312265 -v -0.977041 -0.964281 0.853463 -v -1.367492 -0.505479 0.761855 -v -0.977041 -0.505479 0.663422 -v -1.367492 -0.116281 0.923066 -v -0.977041 -0.046678 0.853463 -v -0.564692 -0.126959 0.933745 -v -0.564691 -0.505479 0.776956 -v -0.564691 -0.883999 0.933745 -v -0.564691 -1.040787 1.312265 -v -0.977041 -1.154322 1.312265 -v -1.367492 -0.894677 1.701463 -v -0.977041 -0.964281 1.771066 -v -0.564691 -0.883999 1.690785 -v -0.564691 -0.505479 1.847573 -v -0.977041 -0.505479 1.961108 -v -0.564692 -0.126959 1.690785 -v -0.977041 -0.046678 1.771066 -v -0.977041 0.143364 1.312265 -v -0.564692 0.029829 1.312265 -v -1.367492 -0.894677 0.923066 -v 1.364076 -0.116281 0.923066 -v 1.364076 -1.055889 1.312265 -v 1.364076 -0.505479 0.761855 -v 1.364076 0.044930 1.312265 -v 0.973625 -0.964281 1.771066 -v 1.364076 -0.505479 1.862674 -v 0.973625 -0.505479 1.961108 -v 1.364076 -0.116281 1.701463 -v 0.973625 -0.046678 1.771066 -v 0.561275 -0.126959 1.690785 -v 0.561275 -0.505479 1.847573 -v 0.561276 -0.883999 1.690785 -v 0.561275 -1.040788 1.312265 -v 0.973625 -1.154322 1.312265 -v 1.364076 -0.894677 0.923066 -v 0.973625 -0.964281 0.853463 -v 0.561275 -0.883999 0.933745 -v 0.561275 -0.505479 0.776957 -v 0.973625 -0.505479 0.663422 -v 0.561275 -0.126959 0.933745 -v 0.973625 -0.046678 0.853463 -v 0.973625 0.143364 1.312265 -v 0.561275 0.029829 1.312265 -v 1.364076 -0.894677 1.701463 -vt 0.209947 0.456692 -vt 0.125567 0.263214 -vt 0.241901 0.375309 -vt 0.129805 0.491643 -vt 0.124436 0.570947 -vt 0.244305 0.631444 -vt 0.124436 0.631444 -vt 0.244305 0.690874 -vt 0.124436 0.690874 -vt 0.009233 0.690874 -vt 0.009233 0.631444 -vt 0.009233 0.570947 -vt 0.009233 0.508357 -vt 0.124436 0.508357 -vt 0.244305 0.508357 -vt 0.244305 0.932575 -vt 0.124436 0.995127 -vt 0.124436 0.932575 -vt 0.009233 0.932575 -vt 0.009233 0.871660 -vt 0.124436 0.871660 -vt 0.244305 0.871660 -vt 0.009233 0.811345 -vt 0.124436 0.811345 -vt 0.244305 0.811345 -vt 0.244305 0.751007 -vt 0.124436 0.751007 -vt 0.009233 0.751007 -vt 0.206950 0.295168 -vt 0.048423 0.459689 -vt 0.013471 0.379548 -vt 0.045426 0.298165 -vt 0.048585 0.459506 -vt 0.125867 0.262680 -vt 0.130113 0.491518 -vt 0.013572 0.379222 -vt 0.045583 0.297694 -vt 0.210398 0.456504 -vt 0.242409 0.374976 -vt 0.207395 0.294691 -vt 0.244305 0.570947 -vt 0.244305 0.995127 -vt 0.009233 0.995127 +# Blender v2.79 (sub 0) OBJ File: '' +# www.blender.org +mtllib car_model.mtl +v 1.364076 0.395480 0.923066 +v 1.364076 -0.544128 1.312265 +v 1.364076 0.006282 0.761855 +v 1.364076 0.556691 1.312265 +v 0.973625 -0.452520 1.771066 +v 1.364076 0.006282 1.862674 +v 0.973625 0.006282 1.961108 +v 1.364076 0.395480 1.701463 +v 0.973625 0.465083 1.771066 +v 0.561275 0.384802 1.690785 +v 0.561275 0.006282 1.847573 +v 0.561276 -0.372238 1.690785 +v 0.561275 -0.529027 1.312265 +v 0.973625 -0.642561 1.312265 +v 1.364076 -0.382916 0.923066 +v 0.973625 -0.452520 0.853463 +v 0.561275 -0.372238 0.933745 +v 0.561275 0.006282 0.776957 +v 0.973625 0.006282 0.663422 +v 0.561275 0.384802 0.933745 +v 0.973625 0.465083 0.853463 +v 0.973625 0.655125 1.312265 +v 0.561275 0.541590 1.312265 +v 1.364076 -0.382916 1.701463 +v -1.367492 0.395480 1.701463 +v -1.367492 -0.544128 1.312265 +v -1.367492 0.006282 1.862674 +v -1.367492 0.556691 1.312265 +v -0.977041 -0.452520 0.853463 +v -1.367492 0.006282 0.761855 +v -0.977041 0.006282 0.663422 +v -1.367492 0.395480 0.923066 +v -0.977041 0.465083 0.853463 +v -0.564692 0.384802 0.933745 +v -0.564691 0.006282 0.776956 +v -0.564691 -0.372238 0.933745 +v -0.564691 -0.529026 1.312265 +v -0.977041 -0.642561 1.312265 +v -1.367492 -0.382916 1.701463 +v -0.977041 -0.452520 1.771066 +v -0.564691 -0.372238 1.690785 +v -0.564691 0.006282 1.847573 +v -0.977041 0.006282 1.961108 +v -0.564692 0.384802 1.690785 +v -0.977041 0.465083 1.771066 +v -0.977041 0.655125 1.312265 +v -0.564692 0.541590 1.312265 +v -1.367492 -0.382916 0.923066 +v -0.698782 -0.180307 0.445154 +v -0.825614 0.341222 0.546029 +v -0.937154 0.281124 -0.632732 +v -0.394348 1.028200 0.396308 +v -0.462354 0.967384 -0.520713 +v -0.458878 -0.034899 1.448301 +v -0.497771 -0.165711 0.615712 +v 0.470584 -0.034899 1.448301 +v 0.544227 0.499454 0.971953 +v -0.479206 0.447838 1.380053 +v 0.490912 0.447838 1.380053 +v -0.415357 0.423533 -1.143432 +v 0.406054 1.028200 0.396308 +v -0.532521 0.499454 0.971953 +v 0.474060 0.967384 -0.520713 +v -0.435391 0.334460 -1.491592 +v 0.447097 0.334460 -1.491592 +v 0.464895 -0.119859 -1.585934 +v -0.453189 -0.119859 -1.585934 +v -0.460862 -0.281814 -0.695679 +v -0.751407 -0.277354 -0.502939 +v 0.427063 0.423533 -1.143432 +v 0.472567 -0.281814 -0.695679 +v 0.509476 -0.165711 0.615712 +v 0.710485 -0.180307 0.445154 +v 0.763109 -0.277354 -0.502939 +v 0.948860 0.281124 -0.632732 +v 0.837320 0.341222 0.546029 +v -1.367492 0.395480 -0.985208 +v -1.367492 -0.544128 -1.374406 +v -1.367492 0.006282 -0.823996 +v -1.367492 0.556691 -1.374406 +v -0.977042 -0.452520 -1.833208 +v -1.367492 0.006282 -1.924816 +v -0.977042 0.006282 -2.023249 +v -1.367492 0.395480 -1.763604 +v -0.977042 0.465083 -1.833208 +v -0.564692 0.384802 -1.752926 +v -0.564692 0.006282 -1.909715 +v -0.564692 -0.372238 -1.752926 +v -0.564692 -0.529027 -1.374406 +v -0.977042 -0.642561 -1.374406 +v -1.367492 -0.382917 -0.985208 +v -0.977042 -0.452520 -0.915605 +v -0.564692 -0.372238 -0.995886 +v -0.564692 0.006282 -0.839098 +v -0.977042 0.006282 -0.725563 +v -0.564692 0.384802 -0.995886 +v -0.977042 0.465083 -0.915605 +v -0.977042 0.655125 -1.374406 +v -0.564692 0.541590 -1.374406 +v -1.367492 -0.382917 -1.763604 +v 1.364076 0.395480 -1.763604 +v 1.364076 -0.544128 -1.374406 +v 1.364076 0.006282 -1.924816 +v 1.364076 0.556691 -1.374406 +v 0.973625 -0.452520 -0.915605 +v 1.364076 0.006282 -0.823997 +v 0.973625 0.006282 -0.725563 +v 1.364076 0.395480 -0.985208 +v 0.973625 0.465083 -0.915605 +v 0.561275 0.384802 -0.995886 +v 0.561275 0.006282 -0.839098 +v 0.561276 -0.372238 -0.995886 +v 0.561275 -0.529027 -1.374406 +v 0.973625 -0.642561 -1.374406 +v 1.364076 -0.382916 -1.763604 +v 0.973625 -0.452520 -1.833208 +v 0.561275 -0.372238 -1.752926 +v 0.561275 0.006282 -1.909714 +v 0.973625 0.006282 -2.023249 +v 0.561275 0.384802 -1.752926 +v 0.973625 0.465083 -1.833208 +v 0.973625 0.655125 -1.374406 +v 0.561275 0.541590 -1.374406 +v 1.364076 -0.382916 -0.985208 vt 0.209947 0.456692 vt 0.125567 0.263214 vt 0.241901 0.375309 @@ -350,236 +310,279 @@ vt 0.207395 0.294691 vt 0.244305 0.570947 vt 0.244305 0.995127 vt 0.009233 0.995127 -usemtl d -s 1 -f 101/1 102/2 103/3 -f 102/2 101/1 104/4 -f 105/5 106/6 107/7 -f 107/7 108/8 109/9 -f 107/7 110/10 111/11 -f 107/7 112/12 105/5 -f 105/5 113/13 114/14 -f 102/15 105/5 114/14 -f 115/16 114/17 116/18 -f 114/17 117/19 116/18 -f 116/18 118/20 119/21 -f 103/22 116/18 119/21 -f 119/21 120/23 121/24 -f 101/25 119/21 121/24 -f 104/26 121/24 122/27 -f 104/26 109/9 108/8 -f 123/28 109/9 122/27 -f 122/27 120/23 123/28 -f 102/2 115/29 103/3 -f 104/4 108/30 102/2 -f 108/30 106/31 102/2 -f 106/31 124/32 102/2 -f 120/33 113/34 123/35 -f 120/33 118/36 113/34 -f 113/34 118/36 117/37 -f 123/35 113/34 110/38 -f 110/38 113/34 111/39 -f 112/40 111/39 113/34 -f 105/5 124/41 106/6 -f 107/7 106/6 108/8 -f 107/7 109/9 110/10 -f 107/7 111/11 112/12 -f 105/5 112/12 113/13 -f 102/15 124/41 105/5 -f 115/16 102/42 114/17 -f 114/17 113/43 117/19 -f 116/18 117/19 118/20 -f 103/22 115/16 116/18 -f 119/21 118/20 120/23 -f 101/25 103/22 119/21 -f 104/26 101/25 121/24 -f 104/26 122/27 109/9 -f 123/28 110/10 109/9 -f 122/27 121/24 120/23 +vt 0.209947 0.456692 +vt 0.125567 0.263214 +vt 0.241901 0.375309 +vt 0.129805 0.491643 +vt 0.124436 0.570947 +vt 0.244305 0.631444 +vt 0.124436 0.631444 +vt 0.244305 0.690874 +vt 0.124436 0.690874 +vt 0.009233 0.690874 +vt 0.009233 0.631444 +vt 0.009233 0.570947 +vt 0.009233 0.508357 +vt 0.124436 0.508357 +vt 0.244305 0.508357 +vt 0.244305 0.932575 +vt 0.124436 0.995127 +vt 0.124436 0.932575 +vt 0.009233 0.932575 +vt 0.009233 0.871660 +vt 0.124436 0.871660 +vt 0.244305 0.871660 +vt 0.009233 0.811345 +vt 0.124436 0.811345 +vt 0.244305 0.811345 +vt 0.244305 0.751007 +vt 0.124436 0.751007 +vt 0.009233 0.751007 +vt 0.206950 0.295168 +vt 0.048423 0.459689 +vt 0.013471 0.379548 +vt 0.045426 0.298165 +vt 0.048585 0.459506 +vt 0.125867 0.262680 +vt 0.130113 0.491518 +vt 0.013572 0.379222 +vt 0.045583 0.297694 +vt 0.210398 0.456504 +vt 0.242409 0.374976 +vt 0.207395 0.294691 +vt 0.244305 0.570947 +vt 0.244305 0.995127 +vt 0.009233 0.995127 usemtl c -f 77/44 78/45 79/46 -f 78/45 77/44 80/47 -f 81/48 82/49 83/50 -f 83/50 84/51 85/52 -f 83/50 86/53 87/54 -f 83/50 88/55 81/48 -f 81/48 89/56 90/57 -f 78/58 81/48 90/57 -f 91/59 90/60 92/61 -f 90/60 93/62 92/61 -f 92/61 94/63 95/64 -f 79/65 92/61 95/64 -f 95/64 96/66 97/67 -f 77/68 95/64 97/67 -f 80/69 97/67 98/70 -f 80/69 85/52 84/51 -f 99/71 85/52 98/70 -f 98/70 96/66 99/71 -f 78/45 91/72 79/46 -f 80/47 84/73 78/45 -f 84/73 82/74 78/45 -f 82/74 100/75 78/45 -f 96/76 89/77 99/78 -f 96/76 94/79 89/77 -f 89/77 94/79 93/80 -f 99/78 89/77 86/81 -f 86/81 89/77 87/82 -f 88/83 87/82 89/77 -f 81/48 100/84 82/49 -f 83/50 82/49 84/51 -f 83/50 85/52 86/53 -f 83/50 87/54 88/55 -f 81/48 88/55 89/56 -f 78/58 100/84 81/48 -f 91/59 78/85 90/60 -f 90/60 89/86 93/62 -f 92/61 93/62 94/63 -f 79/65 91/59 92/61 -f 95/64 94/63 96/66 -f 77/68 79/65 95/64 -f 80/69 77/68 97/67 -f 80/69 98/70 85/52 -f 99/71 86/53 85/52 -f 98/70 97/67 96/66 +s 1 +f 25/1 26/2 27/3 +f 26/2 25/1 28/4 +f 29/5 30/6 31/7 +f 31/7 32/8 33/9 +f 31/7 34/10 35/11 +f 31/7 36/12 29/5 +f 29/5 37/13 38/14 +f 26/15 29/5 38/14 +f 39/16 38/17 40/18 +f 38/17 41/19 40/18 +f 40/18 42/20 43/21 +f 27/22 40/18 43/21 +f 43/21 44/23 45/24 +f 25/25 43/21 45/24 +f 28/26 45/24 46/27 +f 28/26 33/9 32/8 +f 47/28 33/9 46/27 +f 46/27 44/23 47/28 +f 26/2 39/29 27/3 +f 28/4 32/30 26/2 +f 32/30 30/31 26/2 +f 30/31 48/32 26/2 +f 44/33 37/34 47/35 +f 44/33 42/36 37/34 +f 37/34 42/36 41/37 +f 47/35 37/34 34/38 +f 34/38 37/34 35/39 +f 36/40 35/39 37/34 +f 29/5 48/41 30/6 +f 31/7 30/6 32/8 +f 31/7 33/9 34/10 +f 31/7 35/11 36/12 +f 29/5 36/12 37/13 +f 26/15 48/41 29/5 +f 39/16 26/42 38/17 +f 38/17 37/43 41/19 +f 40/18 41/19 42/20 +f 27/22 39/16 40/18 +f 43/21 42/20 44/23 +f 25/25 27/22 43/21 +f 28/26 25/25 45/24 +f 28/26 46/27 33/9 +f 47/28 34/10 33/9 +f 46/27 45/24 44/23 usemtl a -f 49/87 50/88 51/89 -f 50/88 52/90 53/91 -f 54/92 55/93 56/94 -f 57/95 58/96 59/97 -f 53/91 60/98 51/89 -f 57/95 61/99 62/100 -f 56/101 59/97 54/102 -f 52/90 50/88 62/103 -f 61/99 63/104 52/105 -f 64/106 60/107 65/108 -f 64/106 66/109 67/110 -f 55/111 54/112 62/103 -f 60/98 68/113 51/89 -f 51/89 68/113 69/114 -f 68/115 55/93 69/116 -f 64/117 67/118 60/98 -f 68/113 60/98 67/118 -f 62/103 50/88 55/111 -f 50/88 49/87 55/111 -f 58/119 62/103 54/112 -f 60/107 53/120 70/121 -f 71/122 67/123 66/124 -f 72/125 68/115 71/122 -f 49/126 69/116 55/93 -f 73/127 74/128 75/129 -f 76/130 75/129 63/131 -f 55/93 72/125 56/94 -f 58/96 57/95 62/100 -f 63/131 75/129 70/132 -f 52/105 62/100 61/99 -f 59/97 58/96 54/102 -f 61/133 57/134 76/130 -f 53/120 52/105 63/104 -f 65/108 60/107 70/121 -f 66/109 64/106 65/108 -f 72/135 57/134 56/136 -f 70/132 75/129 71/137 -f 75/129 74/128 71/137 -f 71/122 74/138 72/125 -f 65/139 70/132 66/140 -f 71/137 66/140 70/132 -f 57/134 72/135 76/130 -f 76/130 72/135 73/127 -f 59/141 56/136 57/134 -f 63/104 70/121 53/120 -f 55/93 68/115 72/125 -f 71/122 68/115 67/123 -f 73/142 72/125 74/138 -f 49/87 51/89 69/114 -f 50/88 53/91 51/89 -f 73/127 75/129 76/130 -f 76/130 63/131 61/133 +f 49/44 50/45 51/46 +f 50/45 52/47 53/48 +f 54/49 55/50 56/51 +f 57/52 58/53 59/54 +f 53/48 60/55 51/46 +f 57/52 61/56 62/57 +f 56/58 59/54 54/59 +f 52/47 50/45 62/60 +f 61/56 63/61 52/62 +f 64/63 60/64 65/65 +f 64/63 66/66 67/67 +f 55/68 54/69 62/60 +f 60/55 68/70 51/46 +f 51/46 68/70 69/71 +f 68/72 55/50 69/73 +f 64/74 67/75 60/55 +f 68/70 60/55 67/75 +f 62/60 50/45 55/68 +f 50/45 49/44 55/68 +f 58/76 62/60 54/69 +f 60/64 53/77 70/78 +f 71/79 67/80 66/81 +f 72/82 68/72 71/79 +f 49/83 69/73 55/50 +f 73/84 74/85 75/86 +f 76/87 75/86 63/88 +f 55/50 72/82 56/51 +f 58/53 57/52 62/57 +f 63/88 75/86 70/89 +f 52/62 62/57 61/56 +f 59/54 58/53 54/59 +f 61/90 57/91 76/87 +f 53/77 52/62 63/61 +f 65/65 60/64 70/78 +f 66/66 64/63 65/65 +f 72/92 57/91 56/93 +f 70/89 75/86 71/94 +f 75/86 74/85 71/94 +f 71/79 74/95 72/82 +f 65/96 70/89 66/97 +f 71/94 66/97 70/89 +f 57/91 72/92 76/87 +f 76/87 72/92 73/84 +f 59/98 56/93 57/91 +f 63/61 70/78 53/77 +f 55/50 68/72 72/82 +f 71/79 68/72 67/80 +f 73/99 72/82 74/95 +f 49/44 51/46 69/71 +f 50/45 53/48 51/46 +f 73/84 75/86 76/87 +f 76/87 63/88 61/90 +usemtl d +f 1/100 2/101 3/102 +f 2/101 1/100 4/103 +f 5/104 6/105 7/106 +f 7/106 8/107 9/108 +f 7/106 10/109 11/110 +f 7/106 12/111 5/104 +f 5/104 13/112 14/113 +f 2/114 5/104 14/113 +f 15/115 14/116 16/117 +f 14/116 17/118 16/117 +f 16/117 18/119 19/120 +f 3/121 16/117 19/120 +f 19/120 20/122 21/123 +f 1/124 19/120 21/123 +f 4/125 21/123 22/126 +f 4/125 9/108 8/107 +f 23/127 9/108 22/126 +f 22/126 20/122 23/127 +f 2/101 15/128 3/102 +f 4/103 8/129 2/101 +f 8/129 6/130 2/101 +f 6/130 24/131 2/101 +f 20/132 13/133 23/134 +f 20/132 18/135 13/133 +f 13/133 18/135 17/136 +f 23/134 13/133 10/137 +f 10/137 13/133 11/138 +f 12/139 11/138 13/133 +f 5/104 24/140 6/105 +f 7/106 6/105 8/107 +f 7/106 9/108 10/109 +f 7/106 11/110 12/111 +f 5/104 12/111 13/112 +f 2/114 24/140 5/104 +f 15/115 2/141 14/116 +f 14/116 13/142 17/118 +f 16/117 17/118 18/119 +f 3/121 15/115 16/117 +f 19/120 18/119 20/122 +f 1/124 3/121 19/120 +f 4/125 1/124 21/123 +f 4/125 22/126 9/108 +f 23/127 10/109 9/108 +f 22/126 21/123 20/122 usemtl b -f 1/143 2/144 3/145 -f 2/144 1/143 4/146 -f 5/147 6/148 7/149 -f 7/149 8/150 9/151 -f 7/149 10/152 11/153 -f 7/149 12/154 5/147 -f 5/147 13/155 14/156 -f 2/157 5/147 14/156 -f 15/158 14/159 16/160 -f 14/159 17/161 16/160 -f 16/160 18/162 19/163 -f 3/164 16/160 19/163 -f 19/163 20/165 21/166 -f 1/167 19/163 21/166 -f 4/168 21/166 22/169 -f 4/168 9/151 8/150 -f 23/170 9/151 22/169 -f 22/169 20/165 23/170 -f 2/144 15/171 3/145 -f 4/146 8/172 2/144 -f 8/172 6/173 2/144 -f 6/173 24/174 2/144 -f 20/175 13/176 23/177 -f 20/175 18/178 13/176 -f 13/176 18/178 17/179 -f 23/177 13/176 10/180 -f 10/180 13/176 11/181 -f 12/182 11/181 13/176 -f 5/147 24/183 6/148 -f 7/149 6/148 8/150 -f 7/149 9/151 10/152 -f 7/149 11/153 12/154 -f 5/147 12/154 13/155 -f 2/157 24/183 5/147 -f 15/158 2/184 14/159 -f 14/159 13/185 17/161 -f 16/160 17/161 18/162 -f 3/164 15/158 16/160 -f 19/163 18/162 20/165 -f 1/167 3/164 19/163 -f 4/168 1/167 21/166 -f 4/168 22/169 9/151 -f 23/170 10/152 9/151 -f 22/169 21/166 20/165 -f 25/186 26/187 27/188 -f 26/187 25/186 28/189 -f 29/190 30/191 31/192 -f 31/192 32/193 33/194 -f 31/192 34/195 35/196 -f 31/192 36/197 29/190 -f 29/190 37/198 38/199 -f 26/200 29/190 38/199 -f 39/201 38/202 40/203 -f 38/202 41/204 40/203 -f 40/203 42/205 43/206 -f 27/207 40/203 43/206 -f 43/206 44/208 45/209 -f 25/210 43/206 45/209 -f 28/211 45/209 46/212 -f 28/211 33/194 32/193 -f 47/213 33/194 46/212 -f 46/212 44/208 47/213 -f 26/187 39/214 27/188 -f 28/189 32/215 26/187 -f 32/215 30/216 26/187 -f 30/216 48/217 26/187 -f 44/218 37/219 47/220 -f 44/218 42/221 37/219 -f 37/219 42/221 41/222 -f 47/220 37/219 34/223 -f 34/223 37/219 35/224 -f 36/225 35/224 37/219 -f 29/190 48/226 30/191 -f 31/192 30/191 32/193 -f 31/192 33/194 34/195 -f 31/192 35/196 36/197 -f 29/190 36/197 37/198 -f 26/200 48/226 29/190 -f 39/201 26/227 38/202 -f 38/202 37/228 41/204 -f 40/203 41/204 42/205 -f 27/207 39/201 40/203 -f 43/206 42/205 44/208 -f 25/210 27/207 43/206 -f 28/211 25/210 45/209 -f 28/211 46/212 33/194 -f 47/213 34/195 33/194 -f 46/212 45/209 44/208 +f 77/143 78/144 79/145 +f 78/144 77/143 80/146 +f 81/147 82/148 83/149 +f 83/149 84/150 85/151 +f 83/149 86/152 87/153 +f 83/149 88/154 81/147 +f 81/147 89/155 90/156 +f 78/157 81/147 90/156 +f 91/158 90/159 92/160 +f 90/159 93/161 92/160 +f 92/160 94/162 95/163 +f 79/164 92/160 95/163 +f 95/163 96/165 97/166 +f 77/167 95/163 97/166 +f 80/168 97/166 98/169 +f 80/168 85/151 84/150 +f 99/170 85/151 98/169 +f 98/169 96/165 99/170 +f 78/144 91/171 79/145 +f 80/146 84/172 78/144 +f 84/172 82/173 78/144 +f 82/173 100/174 78/144 +f 96/175 89/176 99/177 +f 96/175 94/178 89/176 +f 89/176 94/178 93/179 +f 99/177 89/176 86/180 +f 86/180 89/176 87/181 +f 88/182 87/181 89/176 +f 81/147 100/183 82/148 +f 83/149 82/148 84/150 +f 83/149 85/151 86/152 +f 83/149 87/153 88/154 +f 81/147 88/154 89/155 +f 78/157 100/183 81/147 +f 91/158 78/184 90/159 +f 90/159 89/185 93/161 +f 92/160 93/161 94/162 +f 79/164 91/158 92/160 +f 95/163 94/162 96/165 +f 77/167 79/164 95/163 +f 80/168 77/167 97/166 +f 80/168 98/169 85/151 +f 99/170 86/152 85/151 +f 98/169 97/166 96/165 +f 101/186 102/187 103/188 +f 102/187 101/186 104/189 +f 105/190 106/191 107/192 +f 107/192 108/193 109/194 +f 107/192 110/195 111/196 +f 107/192 112/197 105/190 +f 105/190 113/198 114/199 +f 102/200 105/190 114/199 +f 115/201 114/202 116/203 +f 114/202 117/204 116/203 +f 116/203 118/205 119/206 +f 103/207 116/203 119/206 +f 119/206 120/208 121/209 +f 101/210 119/206 121/209 +f 104/211 121/209 122/212 +f 104/211 109/194 108/193 +f 123/213 109/194 122/212 +f 122/212 120/208 123/213 +f 102/187 115/214 103/188 +f 104/189 108/215 102/187 +f 108/215 106/216 102/187 +f 106/216 124/217 102/187 +f 120/218 113/219 123/220 +f 120/218 118/221 113/219 +f 113/219 118/221 117/222 +f 123/220 113/219 110/223 +f 110/223 113/219 111/224 +f 112/225 111/224 113/219 +f 105/190 124/226 106/191 +f 107/192 106/191 108/193 +f 107/192 109/194 110/195 +f 107/192 111/196 112/197 +f 105/190 112/197 113/198 +f 102/200 124/226 105/190 +f 115/201 102/227 114/202 +f 114/202 113/228 117/204 +f 116/203 117/204 118/205 +f 103/207 115/201 116/203 +f 119/206 118/205 120/208 +f 101/210 103/207 119/206 +f 104/211 101/210 121/209 +f 104/211 122/212 109/194 +f 123/213 110/195 109/194 +f 122/212 121/209 120/208 diff --git a/assets/encodeCarModel.c b/assets/encodeCarModel.c index 98c762a..14dd61f 100644 --- a/assets/encodeCarModel.c +++ b/assets/encodeCarModel.c @@ -14,6 +14,8 @@ #define UNIT 512 #define ARRAY_MAX 1024 +#define UV_OFFSET -0.01 + int vertices[ARRAY_MAX * 3]; int vertexTypes[ARRAY_MAX]; int vertexCount; @@ -112,6 +114,9 @@ int main(void) if (sscanf(line + 2,"%f %f",&a,&b) != 2) error(4); + a += UV_OFFSET; + b += UV_OFFSET; + uvs[2 * uvCount] = a * UNIT; uvs[2 * uvCount + 1] = (1 - b) * UNIT; diff --git a/constants.h b/constants.h index f086b5f..5b4ad80 100644 --- a/constants.h +++ b/constants.h @@ -22,7 +22,7 @@ #define LCR_MAP_SIZE_BLOCKS 64 /** Physics FPS, i.e. the number of physics ticks per second. */ -#define LCR_RACING_FPS 25 +#define LCR_RACING_FPS 30 #define LCR_RACING_TICK_MS (1000 / LCR_RACING_FPS) diff --git a/game.h b/game.h index 6eb7001..3ad4f74 100644 --- a/game.h +++ b/game.h @@ -257,7 +257,7 @@ LCR_GameUnit physicsInterpolationParam = LCR_GAME_UNIT - #if LCR_ANIMATE_CAR LCR_rendererSetWheelState(LCR_racingGetWheelRotation(), - LCR_racingGetWheelSteer()); + LCR_racingGetWheelSteer() * 2); #endif LCR_rendererDraw(); diff --git a/racing.h b/racing.h index af7d8b3..b6967b3 100644 --- a/racing.h +++ b/racing.h @@ -149,8 +149,10 @@ void LCR_racingInit(void) void LCR_racingGetCarTransform(LCR_GameUnit position[3], LCR_GameUnit rotation[3], LCR_GameUnit interpolationParam) { + TPE_Vec3 v; + #if LCR_SETTING_SMOOTH_ANIMATIONS - TPE_Vec3 v = TPE_vec3Plus( + v = TPE_vec3Plus( LCR_racing.carPositions[1], _LCR_TPE_vec3DividePlain( TPE_vec3TimesPlain( @@ -162,8 +164,6 @@ void LCR_racingGetCarTransform(LCR_GameUnit position[3], position[1] = v.y; position[2] = v.z; #else - TPE_Vec3 v; - position[0] = LCR_racing.carPositions[0].x; position[1] = LCR_racing.carPositions[0].y; position[2] = LCR_racing.carPositions[0].z; @@ -305,7 +305,7 @@ void LCR_racingStep(unsigned int input) TPE_Unit steer = (LCR_racing.wheelSteer * TPE_F) / LCR_GAME_UNIT; - + ja = TPE_vec3Normalized( TPE_vec3Plus(TPE_vec3Times(carForw,steer),carRight)); } @@ -347,20 +347,28 @@ void LCR_racingStep(unsigned int input) TPE_Vec3 tmpVec = LCR_racing.carPositions[0]; + LCR_racing.carPositions[0] = _LCR_TPE_vec3DividePlain( TPE_vec3TimesPlain( - LCR_racing.carBody.joints[4].position,LCR_GAME_UNIT), - LCR_PHYSICS_UNIT); + TPE_vec3Plus( + TPE_vec3Plus( + LCR_racing.carBody.joints[0].position, + LCR_racing.carBody.joints[1].position), + TPE_vec3Plus( + LCR_racing.carBody.joints[2].position, + LCR_racing.carBody.joints[3].position) + ),LCR_GAME_UNIT), + 4 * LCR_PHYSICS_UNIT); LCR_racing.carPositions[0] = TPE_vec3KeepWithinBox( LCR_racing.carPositions[1], LCR_racing.carPositions[0], TPE_vec3( - LCR_PHYSICS_UNIT / 50, // TODO: constant - LCR_PHYSICS_UNIT / 50, - LCR_PHYSICS_UNIT / 50 + LCR_PHYSICS_UNIT / 64, // TODO: constant + LCR_PHYSICS_UNIT / 64, + LCR_PHYSICS_UNIT / 64 ) ); diff --git a/renderer.h b/renderer.h index 171ffdd..5638271 100644 --- a/renderer.h +++ b/renderer.h @@ -7,7 +7,7 @@ #define S3L_RESOLUTION_X LCR_SETTING_RESOLUTION_X #define S3L_RESOLUTION_Y LCR_SETTING_RESOLUTION_Y -#define S3L_PIXEL_FUNCTION _LCR_pixelFuncc3D +#define S3L_PIXEL_FUNCTION _LCR_pixelFunc3D #define S3L_PERSPECTIVE_CORRECTION 2 #define S3L_NEAR_CROSS_STRATEGY 1 @@ -128,7 +128,7 @@ _LCR_smoothRotation(LCR_renderer.carModel->transform.rotation.z, */ } -void _LCR_pixelFuncc3D(S3L_PixelInfo *pixel) +void _LCR_pixelFunc3D(S3L_PixelInfo *pixel) { // once we get a new triangle, we precompute things for it: if (pixel->triangleID != LCR_renderer.previousTriID) diff --git a/settings.h b/settings.h index f4cc812..9a88fd1 100644 --- a/settings.h +++ b/settings.h @@ -102,7 +102,7 @@ #ifndef LCR_SETTING_CAMERA_HEIGHT /** Base height of the car follow camera, in 4ths of map block height. */ - #define LCR_SETTING_CAMERA_HEIGHT 4 + #define LCR_SETTING_CAMERA_HEIGHT 5 #endif #ifndef LCR_SETTING_CAMERA_HEIGHT_BAND @@ -113,7 +113,7 @@ #ifndef LCR_SETTING_CAMERA_DISTANCE /** Base horizontal distance of the car follow camera, in 4ths of map block width. */ - #define LCR_SETTING_CAMERA_DISTANCE 3 + #define LCR_SETTING_CAMERA_DISTANCE 4 #endif #ifndef LCR_SETTING_CAMERA_DISTANCE_BAND