|
@@ -37,32 +37,34 @@
|
37
|
37
|
|
38
|
38
|
void reset();
|
39
|
39
|
|
40
|
|
- float get_x(int i) { return MESH_MIN_X + (MESH_X_DIST) * i; }
|
41
|
|
- float get_y(int i) { return MESH_MIN_Y + (MESH_Y_DIST) * i; }
|
42
|
|
- void set_z(int ix, int iy, float z) { z_values[iy][ix] = z; }
|
|
40
|
+ static FORCE_INLINE float get_x(int8_t i) { return MESH_MIN_X + (MESH_X_DIST) * i; }
|
|
41
|
+ static FORCE_INLINE float get_y(int8_t i) { return MESH_MIN_Y + (MESH_Y_DIST) * i; }
|
|
42
|
+ void set_z(int8_t ix, int8_t iy, float z) { z_values[iy][ix] = z; }
|
43
|
43
|
|
44
|
|
- inline void zigzag(int index, int &ix, int &iy) {
|
|
44
|
+ inline void zigzag(int8_t index, int8_t &ix, int8_t &iy) {
|
45
|
45
|
ix = index % (MESH_NUM_X_POINTS);
|
46
|
46
|
iy = index / (MESH_NUM_X_POINTS);
|
47
|
47
|
if (iy & 1) ix = (MESH_NUM_X_POINTS - 1) - ix; // Zig zag
|
48
|
48
|
}
|
49
|
49
|
|
50
|
|
- void set_zigzag_z(int index, float z) {
|
|
50
|
+ void set_zigzag_z(int8_t index, float z) {
|
51
|
51
|
int ix, iy;
|
52
|
52
|
zigzag(index, ix, iy);
|
53
|
53
|
set_z(ix, iy, z);
|
54
|
54
|
}
|
55
|
55
|
|
56
|
|
- int select_x_index(float x) {
|
57
|
|
- int i = 1;
|
58
|
|
- while (x > get_x(i) && i < MESH_NUM_X_POINTS - 1) i++;
|
59
|
|
- return i - 1;
|
|
56
|
+ int8_t select_x_index(float x) {
|
|
57
|
+ for (uint8_t i = MESH_NUM_X_POINTS; i--;)
|
|
58
|
+ if (fabs(x - get_x(i)) <= (MESH_X_DIST) / 2)
|
|
59
|
+ return i;
|
|
60
|
+ return -1;
|
60
|
61
|
}
|
61
|
62
|
|
62
|
|
- int select_y_index(float y) {
|
63
|
|
- int i = 1;
|
64
|
|
- while (y > get_y(i) && i < MESH_NUM_Y_POINTS - 1) i++;
|
65
|
|
- return i - 1;
|
|
63
|
+ int8_t select_y_index(float y) {
|
|
64
|
+ for (uint8_t i = MESH_NUM_Y_POINTS; i--;)
|
|
65
|
+ if (fabs(y - get_y(i)) <= (MESH_Y_DIST) / 2)
|
|
66
|
+ return i;
|
|
67
|
+ return -1;
|
66
|
68
|
}
|
67
|
69
|
|
68
|
70
|
float calc_z0(float a0, float a1, float z1, float a2, float z2) {
|
|
@@ -72,8 +74,9 @@
|
72
|
74
|
}
|
73
|
75
|
|
74
|
76
|
float get_z(float x0, float y0) {
|
75
|
|
- int x_index = select_x_index(x0);
|
76
|
|
- int y_index = select_y_index(y0);
|
|
77
|
+ int8_t x_index = select_x_index(x0);
|
|
78
|
+ int8_t y_index = select_y_index(y0);
|
|
79
|
+ if (x_index < 0 || y_index < 0) return z_offset;
|
77
|
80
|
float z1 = calc_z0(x0,
|
78
|
81
|
get_x(x_index), z_values[y_index][x_index],
|
79
|
82
|
get_x(x_index + 1), z_values[y_index][x_index + 1]);
|