V1.1.9

1、添加了OpenGL测试类1

demo/OpenGLDemo/CMakeLists.txt

@@ -12,6 +12,7 @@ file(GLOB LOCAL_SRC
     ${CMAKE_CURRENT_SOURCE_DIR}/*.ui
     ${CMAKE_CURRENT_SOURCE_DIR}/GLWidget/*.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/GLShader/*.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/GLLearning/*.cpp
 
     ${CMAKE_SOURCE_DIR}/External/module/Logs/*.cpp
     ${CMAKE_SOURCE_DIR}/External/module/ThreadPool/*.cpp
@@ -44,6 +45,7 @@ target_include_directories(${this_exe} PRIVATE
 
     ${CMAKE_CURRENT_SOURCE_DIR}/GLWidget
     ${CMAKE_CURRENT_SOURCE_DIR}/GLShader
+    ${CMAKE_CURRENT_SOURCE_DIR}/GLLearning
     
     # ${CURL_INCLUDE_DIR}
     # ${FFMPEG_INCLUDE_DIR}

demo/OpenGLDemo/GLLearning/WidgetGL1.cpp

@@ -0,0 +1,29 @@
+#include "WidgetGL1.h"
+
+
+
+WidgetGL1::WidgetGL1(QWidget *parent)
+{
+
+}
+
+WidgetGL1::~WidgetGL1()
+{
+
+}
+
+
+void WidgetGL1::initializeGL()
+{
+
+}
+
+void WidgetGL1::resizeGL(int w, int h)
+{
+
+}
+
+void WidgetGL1::paintGL()
+{
+
+}

demo/OpenGLDemo/GLLearning/WidgetGL1.h

@@ -0,0 +1,27 @@
+#ifndef __WIDGETGL1_H__
+#define __WIDGETGL1_H__
+
+
+#include <QOpenGLWidget>
+#include <QOpenGLFunctions_3_3_Core>
+#include <GL/gl.h>
+
+
+
+class WidgetGL1 : public QOpenGLWidget
+{
+    Q_OBJECT
+public:
+    explicit WidgetGL1(QWidget *parent = nullptr);
+    ~WidgetGL1() override;
+protected:
+    void initializeGL() override;
+    void resizeGL(int w, int h) override;
+    void paintGL() override;
+};
+
+
+
+
+#endif // __WIDGETGL1_H__
+

demo/OpenGLDemo/widget.cpp

@@ -4,6 +4,10 @@
 #include <QTimer>
 #include "spdlog/spdlog.h"
 
+#include "PlayerGLWidget2.h"
+#include "WidgetGL1.h"
+
+
 
 Widget::Widget(QWidget *parent)
     : QWidget(parent)
@@ -11,23 +15,25 @@ Widget::Widget(QWidget *parent)
 {
     ui->setupUi(this);
 
-    m_playerGLWidget = new PlayerGLWidget(this);
-    m_playerGLWidget->setGeometry(0, 0, ui->widget_display->width(), ui->widget_display->height());
-    m_playerGLWidget->setStyleSheet(R"(border-radius:10px;)");
-
-    /* 设置背景颜色 */
-    this->setAutoFillBackground(true);
-    QPalette palette = m_playerGLWidget->palette();
-    palette.setColor(QPalette::Window, Qt::black); // 设置背景颜色为黑色
-    this->setPalette(palette);
-
-    QImage image = QImage(":/image/1.jpg");
-    connect(&m_timer, &QTimer::timeout, this, [=]() {
-        // SPDLOG_DEBUG("刷新一帧");
-        m_playerGLWidget->testShowYUV420Image(image); // 显示一张测试图片
-    });
-    m_timer.setSingleShot(false);
-    m_timer.start(10); // 60 FPS
+    // m_playerGLWidget = new PlayerGLWidget(this);
+    // m_playerGLWidget->setGeometry(0, 0, ui->widget_display->width(), ui->widget_display->height());
+    // m_playerGLWidget->setStyleSheet(R"(border-radius:10px;)");
+
+    // /* 设置背景颜色 */
+    // this->setAutoFillBackground(true);
+    // QPalette palette = m_playerGLWidget->palette();
+    // palette.setColor(QPalette::Window, Qt::black); // 设置背景颜色为黑色
+    // this->setPalette(palette);
+
+    // QImage image = QImage(":/image/1.jpg");
+    // connect(&m_timer, &QTimer::timeout, this, [=]() {
+    //     // SPDLOG_DEBUG("刷新一帧");
+    //     m_playerGLWidget->testShowYUV420Image(image); // 显示一张测试图片
+    // });
+    // m_timer.setSingleShot(false);
+    // m_timer.start(10); // 60 FPS
+
+    // auto gl1 = new WidgetGL1(ui->
     
 }