diff --git a/plugins/qtplug/CMakeLists.txt b/plugins/qtplug/CMakeLists.txt index 029cea769..651d9f0e4 100644 --- a/plugins/qtplug/CMakeLists.txt +++ b/plugins/qtplug/CMakeLists.txt @@ -12,7 +12,7 @@ if(QT4_FOUND AND OPENGL_FOUND AND OPENGL_GLU_FOUND) set ( qtplug_SRCS qtplug.cpp blankslade.cpp - #glwidget.cpp + glwidget.cpp ) SET ( qtplug_UI @@ -30,6 +30,8 @@ if(QT4_FOUND AND OPENGL_FOUND AND OPENGL_GLU_FOUND) QT4_WRAP_UI(qtplug_UI_h ${qtplug_UI}) qt4_automoc(${qtplug_SRCS}) DFHACK_PLUGIN(qtplug ${qtplug_SRCS} ${qtplug_RC_SRCS} ${qtplug_UI_h}) + # a small texture file + install(FILES terrain.png DESTINATION ${DFHACK_LIBRARY_DESTINATION}) target_link_libraries(qtplug ${OPENGL_LIBRARIES} ${QT_LIBRARIES} ) ELSE(QT_VERSION_MAJOR MATCHES 4 AND QT_VERSION_MINOR GREATER 6) MESSAGE(STATUS "Can't build the Qt plugin. Your Qt is too old.") diff --git a/plugins/qtplug/blankslade.cpp b/plugins/qtplug/blankslade.cpp index e9ccc1dc7..73c49b5b4 100644 --- a/plugins/qtplug/blankslade.cpp +++ b/plugins/qtplug/blankslade.cpp @@ -6,13 +6,13 @@ #include "blankslade.h" #include #include -//#include "glwidget.h" +#include "glwidget.h" blankslade::blankslade(QWidget *parent): QMainWindow(parent) { ui.setupUi(this); - //GLWidget * glw = new GLWidget(); - //ui.gridding->addWidget(glw); + GLWidget * glw = new GLWidget(); + ui.gridding->addWidget(glw); connect(ui.actionOpen,SIGNAL(triggered(bool)),this,SLOT(slotOpen(bool))); connect(ui.actionQuit,SIGNAL(triggered(bool)),this,SLOT(slotQuit(bool))); connect(ui.actionSave,SIGNAL(triggered(bool)),this,SLOT(slotSave(bool))); diff --git a/plugins/qtplug/glwidget.cpp b/plugins/qtplug/glwidget.cpp index d2d1f9412..1b614633c 100644 --- a/plugins/qtplug/glwidget.cpp +++ b/plugins/qtplug/glwidget.cpp @@ -9,6 +9,7 @@ #include #include #include +#include struct Vertex { @@ -193,7 +194,7 @@ void GLWidget::paintGL() mvp.rotate(d->rx,0,1,0); d->prog.setUniformValue(d->mvpUniform,mvp); - glActiveTexture(GL_TEXTURE0); + //glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, d->terrain); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); diff --git a/plugins/qtplug/terrain.png b/plugins/qtplug/terrain.png new file mode 100644 index 000000000..a7b791183 Binary files /dev/null and b/plugins/qtplug/terrain.png differ