CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

For FTDI800 compatibility, remove VERTEX_FORMAT dependency (#18982)

Browse Source
This commit is contained in:
Marcio T 2020-08-10 19:06:19 -06:00 committed by Scott Lahteine
parent b23da503fa
commit 3eafce4683
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bed_mesh_screen.cpp
View File

@ -88,7 +88,15 @@ void BedMeshScreen::drawMesh(int16_t x, int16_t y, int16_t w, int16_t h, ExtUI::
const float scale_z = ((val_max == val_min) ? 1 : 1/(val_max - val_min)) * autoscale_max; const float scale_z = ((val_max == val_min) ? 1 : 1/(val_max - val_min)) * autoscale_max;
// These equations determine the appearance of the grid on the screen. /**
* The 3D points go through a 3D graphics pipeline to determine the final 2D point on the screen.
* This is written out as a stack of macros that each apply an affine transformation to the point.
* At compile time, the compiler should be able to reduce these expressions.
*
* The last transformation in the chain (TRANSFORM_5) is initially set to a no-op so we can measure
* the dimensions of the grid, but is later replaced with a scaling transform that scales the grid
* to fit.
*/
#define TRANSFORM_5(X,Y,Z) (X), (Y) // No transform #define TRANSFORM_5(X,Y,Z) (X), (Y) // No transform
#define TRANSFORM_4(X,Y,Z) TRANSFORM_5((X)/(Z),(Y)/-(Z), 0) // Perspective #define TRANSFORM_4(X,Y,Z) TRANSFORM_5((X)/(Z),(Y)/-(Z), 0) // Perspective
@ -119,8 +127,12 @@ void BedMeshScreen::drawMesh(int16_t x, int16_t y, int16_t w, int16_t h, ExtUI::
const float center_x = x + w/2; const float center_x = x + w/2;
const float center_y = y + h/2; const float center_y = y + h/2;
// Now replace the last transformation in the chain with a scaling operation.
#undef TRANSFORM_5 #undef TRANSFORM_5
#define TRANSFORM_5(X,Y,Z) center_x + (X - grid_cx) * scale_x, center_y + (Y - grid_cy) * scale_y // Fit to bounds #define TRANSFORM_6(X,Y,Z) (X)*16, (Y)*16 // Scale to 1/16 pixel units
#define TRANSFORM_5(X,Y,Z) TRANSFORM_6( center_x + ((X) - grid_cx) * scale_x, \
center_y + ((Y) - grid_cy) * scale_y, 0) // Scale to bounds
// Draw the grid // Draw the grid
@ -128,7 +140,6 @@ void BedMeshScreen::drawMesh(int16_t x, int16_t y, int16_t w, int16_t h, ExtUI::
CommandProcessor cmd; CommandProcessor cmd;
cmd.cmd(SAVE_CONTEXT()) cmd.cmd(SAVE_CONTEXT())
.cmd(VERTEX_FORMAT(0))
.cmd(TAG_MASK(false)) .cmd(TAG_MASK(false))
.cmd(SAVE_CONTEXT()); .cmd(SAVE_CONTEXT());