Skip to content

Commit f463287

Browse files
committed
Simplify drawFunctionOnLayer functions
1 parent b37bdac commit f463287

File tree

1 file changed

+4
-20
lines changed

1 file changed

+4
-20
lines changed

ttyd-tools/rel/source/draw.cpp

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -85,41 +85,25 @@ bool fontDrawMessageMtxHandleCommand(const char *command, const char *commandVal
8585
void drawFunctionOnDebugLayer(void (*func)())
8686
{
8787
ttyd::dispdrv::dispEntry(ttyd::dispdrv::CameraId::kDebug3d, 2, 0.f,
88-
[](ttyd::dispdrv::CameraId cameraId, void *user)
89-
{
90-
(void)cameraId;
91-
reinterpret_cast<void (*)()>(user)();
92-
}, reinterpret_cast<void *>(func));
88+
reinterpret_cast<ttyd::dispdrv::PFN_dispCallback>(func), nullptr);
9389
}
9490

9591
void drawFunctionOnDebugLayerWithOrder(void (*func)(), float order)
9692
{
9793
ttyd::dispdrv::dispEntry(ttyd::dispdrv::CameraId::kDebug3d, 2, order,
98-
[](ttyd::dispdrv::CameraId cameraId, void *user)
99-
{
100-
(void)cameraId;
101-
reinterpret_cast<void (*)()>(user)();
102-
}, reinterpret_cast<void *>(func));
94+
reinterpret_cast<ttyd::dispdrv::PFN_dispCallback>(func), nullptr);
10395
}
10496

10597
void drawFunctionOn2DLayer(void (*func)())
10698
{
10799
ttyd::dispdrv::dispEntry(ttyd::dispdrv::CameraId::k2d, 2, 0.f,
108-
[](ttyd::dispdrv::CameraId cameraId, void *user)
109-
{
110-
(void)cameraId;
111-
reinterpret_cast<void (*)()>(user)();
112-
}, reinterpret_cast<void *>(func));
100+
reinterpret_cast<ttyd::dispdrv::PFN_dispCallback>(func), nullptr);
113101
}
114102

115103
void drawFunctionOn2DLayerWithOrder(void (*func)(), float order)
116104
{
117105
ttyd::dispdrv::dispEntry(ttyd::dispdrv::CameraId::k2d, 2, order,
118-
[](ttyd::dispdrv::CameraId cameraId, void *user)
119-
{
120-
(void)cameraId;
121-
reinterpret_cast<void (*)()>(user)();
122-
}, reinterpret_cast<void *>(func));
106+
reinterpret_cast<ttyd::dispdrv::PFN_dispCallback>(func), nullptr);
123107
}
124108

125109
void drawMenuWindow()

0 commit comments

Comments
 (0)