mirror of
https://github.com/dragonpilot/dragonpilot.git
synced 2026-06-21 05:52:06 +08:00
small UI cleanup
This commit is contained in:
+2
-13
@@ -529,19 +529,8 @@ void ui_nvg_init(UIState *s) {
|
||||
|
||||
// init images
|
||||
std::vector<std::pair<const char *, const char *>> images = {
|
||||
{"wheel", "../assets/img_chffr_wheel.png"},
|
||||
{"trafficSign_turn", "../assets/img_trafficSign_turn.png"},
|
||||
{"driver_face", "../assets/img_driver_face.png"},
|
||||
{"button_settings", "../assets/images/button_settings.png"},
|
||||
{"button_home", "../assets/images/button_home.png"},
|
||||
{"battery", "../assets/images/battery.png"},
|
||||
{"battery_charging", "../assets/images/battery_charging.png"},
|
||||
{"network_0", "../assets/images/network_0.png"},
|
||||
{"network_1", "../assets/images/network_1.png"},
|
||||
{"network_2", "../assets/images/network_2.png"},
|
||||
{"network_3", "../assets/images/network_3.png"},
|
||||
{"network_4", "../assets/images/network_4.png"},
|
||||
{"network_5", "../assets/images/network_5.png"},
|
||||
{"wheel", "../assets/img_chffr_wheel.png"},
|
||||
{"driver_face", "../assets/img_driver_face.png"},
|
||||
};
|
||||
for (auto [name, file] : images) {
|
||||
s->images[name] = nvgCreateImage(s->vg, file, 1);
|
||||
|
||||
@@ -18,25 +18,17 @@ void OnroadWindow::initializeGL() {
|
||||
std::cout << "OpenGL renderer: " << glGetString(GL_RENDERER) << std::endl;
|
||||
std::cout << "OpenGL language version: " << glGetString(GL_SHADING_LANGUAGE_VERSION) << std::endl;
|
||||
|
||||
enabled = true;
|
||||
ui_nvg_init(&QUIState::ui_state);
|
||||
prev_draw_t = millis_since_boot();
|
||||
}
|
||||
|
||||
void OnroadWindow::setEnabled(bool on) {
|
||||
enabled = on;
|
||||
}
|
||||
|
||||
void OnroadWindow::update(const UIState &s) {
|
||||
// Connecting to visionIPC requires opengl to be current
|
||||
if (s.vipc_client->connected){
|
||||
makeCurrent();
|
||||
}
|
||||
|
||||
// TODO: will hide do this?
|
||||
if(enabled) {
|
||||
repaint();
|
||||
}
|
||||
repaint();
|
||||
}
|
||||
|
||||
void OnroadWindow::paintGL() {
|
||||
|
||||
@@ -20,10 +20,8 @@ protected:
|
||||
void initializeGL() override;
|
||||
|
||||
private:
|
||||
bool enabled;
|
||||
double prev_draw_t = 0;
|
||||
|
||||
public slots:
|
||||
void setEnabled(bool on);
|
||||
void update(const UIState &s);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user