From b308066d40c15a826d777b6862cd9d0606810fec Mon Sep 17 00:00:00 2001 From: Pierre Kraemer Date: Tue, 4 Dec 2012 15:31:44 +0100 Subject: [PATCH] SCHNApps: encore un petit souci d'affichage GL1 / GL2.. --- CMakeLists.txt | 1 + SCHNApps/CMakeLists.txt | 1 + SCHNApps/Debug/CMakeLists.txt | 7 +- .../Plugins/firstPlugin/include/firstPlugin.h | 33 ++------ .../Plugins/firstPlugin/src/firstPlugin.cpp | 76 ++++++------------- SCHNApps/Release/CMakeLists.txt | 9 ++- SCHNApps/include/camera.h | 5 ++ SCHNApps/include/mapHandler.h | 13 +++- SCHNApps/include/plugin.h | 15 +++- SCHNApps/include/system.h | 10 +-- SCHNApps/include/types.h | 3 + SCHNApps/include/view.h | 11 ++- SCHNApps/include/viewButtonArea.h | 15 ++-- SCHNApps/include/window.h | 22 +++--- SCHNApps/src/camera.cpp | 7 ++ SCHNApps/src/mapHandler.cpp | 12 ++- SCHNApps/src/plugin.cpp | 9 ++- SCHNApps/src/pluginDialog.cpp | 23 +++++- SCHNApps/src/view.cpp | 32 +++++--- SCHNApps/src/viewButtonArea.cpp | 38 +++++----- SCHNApps/src/window.cpp | 51 ++++++++++++- 21 files changed, 231 insertions(+), 162 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b1fdfdc2..691e7989e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -146,6 +146,7 @@ IF(WIN32) # set(CMAKE_CONFIGURATION_TYPES "Release Debug" CACHE STRING "Only Release or Debug" FORCE) ELSE(WIN32) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fPIC") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fPIC") add_subdirectory(Release) add_subdirectory(Debug) add_subdirectory(${CGoGN_ROOT_DIR}/Apps Apps) diff --git a/SCHNApps/CMakeLists.txt b/SCHNApps/CMakeLists.txt index 553309398..b50055a45 100644 --- a/SCHNApps/CMakeLists.txt +++ b/SCHNApps/CMakeLists.txt @@ -8,6 +8,7 @@ SET( QT_USE_QTDESIGNER TRUE ) SET( QT_USE_QTGUI TRUE ) SET( QT_USE_QTPLUGIN TRUE ) +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fPIC") #========CGoGN========# SET(CGoGN_ROOT_DIR ${CMAKE_SOURCE_DIR}/.. CACHE STRING "CGoGN root dir") diff --git a/SCHNApps/Debug/CMakeLists.txt b/SCHNApps/Debug/CMakeLists.txt index 76e148c2a..5f0cd6b4b 100644 --- a/SCHNApps/Debug/CMakeLists.txt +++ b/SCHNApps/Debug/CMakeLists.txt @@ -39,9 +39,12 @@ file( ) SET(SCHNApps_H_OBJECT_FILES - ${SCHNApps_ROOT_DIR}/include/window.h - ${SCHNApps_ROOT_DIR}/include/view.h + ${SCHNApps_ROOT_DIR}/include/camera.h + ${SCHNApps_ROOT_DIR}/include/mapHandler.h + ${SCHNApps_ROOT_DIR}/include/plugin.h ${SCHNApps_ROOT_DIR}/include/splitArea.h + ${SCHNApps_ROOT_DIR}/include/view.h + ${SCHNApps_ROOT_DIR}/include/window.h ${SCHNApps_ROOT_DIR}/include/viewButtonArea.h ${SCHNApps_ROOT_DIR}/include/viewSelector.h ${SCHNApps_ROOT_DIR}/include/cameraDialog.h diff --git a/SCHNApps/Plugins/firstPlugin/include/firstPlugin.h b/SCHNApps/Plugins/firstPlugin/include/firstPlugin.h index ca4e3bd50..fb53cc3de 100644 --- a/SCHNApps/Plugins/firstPlugin/include/firstPlugin.h +++ b/SCHNApps/Plugins/firstPlugin/include/firstPlugin.h @@ -6,7 +6,8 @@ /**---CGoGN includes **/ #include "Topology/generic/parameters.h" #include "Topology/map/embeddedMap2.h" -#include "Algo/Render/GL2/topoRender.h" +#include "Algo/Render/GL2/mapRender.h" +#include "Utils/Shaders/shaderFlat.h" /**---CGoGN includes **/ /**---Definitions specific to CGoGN ---*/ @@ -50,7 +51,6 @@ public: FirstPlugin() { setProvidesRendering(true); - glewInit(); } ~FirstPlugin() @@ -87,34 +87,11 @@ public: virtual void viewRemoved(View* view) {} protected: - /** Attributes that are specific to this plugin **/ MAP myMap; - - // attribute for vertices positions VertexAttribute position; - - // render (for the topo) - Algo::Render::GL2::TopoRender *m_render_topo; - - // just for more compact writing - inline Dart PHI1(Dart d) - { - return myMap.phi1(d); - } - inline Dart PHI_1(Dart d) - { - return myMap.phi_1(d); - } - inline Dart PHI2(Dart d) - { - return myMap.phi2(d); - } - template - Dart PHI(Dart d) - { - return myMap.phi(d); - } - /** Attributes that are specific to this plugin **/ + Algo::Render::GL2::MapRender* m_render ; + Utils::VBO* m_positionVBO ; + Utils::ShaderFlat* m_flatShader ; }; #endif // _FIRSTPLUGIN_H_ diff --git a/SCHNApps/Plugins/firstPlugin/src/firstPlugin.cpp b/SCHNApps/Plugins/firstPlugin/src/firstPlugin.cpp index 788765f95..0862e1e1f 100644 --- a/SCHNApps/Plugins/firstPlugin/src/firstPlugin.cpp +++ b/SCHNApps/Plugins/firstPlugin/src/firstPlugin.cpp @@ -1,78 +1,48 @@ #include "firstPlugin.h" #include "Algo/Geometry/boundingbox.h" +#include "Algo/Import/import.h" bool FirstPlugin::enable() { - // creation of 2 new faces: 1 triangle and 1 square - Dart d1 = myMap.newFace(3); - Dart d2 = myMap.newFace(4); + m_render = new Algo::Render::GL2::MapRender() ; + m_positionVBO = new Utils::VBO() ; + m_flatShader = new Utils::ShaderFlat() ; + m_flatShader->setAttributePosition(m_positionVBO) ; + m_flatShader->setAmbiant(Geom::Vec4f(0.2f, 0.2f, 0.2f, 0.1f)) ; + m_flatShader->setDiffuse(Geom::Vec4f(0.8f, 0.9f, 0.7f, 1.0f)) ; + m_flatShader->setExplode(1.0f) ; + CGoGN::Utils::GLSLShader::registerShader(NULL, m_flatShader) ; - // sew these faces along one of their edge - myMap.sewFaces(d1, d2); + std::vector attrNames ; + CGoGN::Algo::Import::importMesh(myMap, "/home/kraemer/Media/Data/surface/lowRes/duck_163.ply", attrNames); + position = myMap.getAttribute(attrNames[0]) ; - // creation of a new attribute on vertices of type 3D vector for position. - // a handler to this attribute is returned - position = myMap.addAttribute("position"); + m_render->initPrimitives(myMap, allDarts, CGoGN::Algo::Render::GL2::POINTS) ; + m_render->initPrimitives(myMap, allDarts, CGoGN::Algo::Render::GL2::LINES) ; + m_render->initPrimitives(myMap, allDarts, CGoGN::Algo::Render::GL2::TRIANGLES) ; - // affect position by moving in the map - position[d1] = VEC3(0, 0, 0); - position[PHI1(d1)] = VEC3(2, 0, 0); - position[PHI_1(d1)] = VEC3(1, 2, 0); - position[PHI<11>(d2)] = VEC3(0, -2, 0); - position[PHI_1(d2)] = VEC3(2, -2, 0); - - m_render_topo = new Algo::Render::GL2::TopoRender() ; - - SelectorDartNoBoundary nb(myMap); - m_render_topo->updateData(myMap, position, 0.9f, 0.9f, nb); + m_positionVBO->updateData(position) ; return true; } void FirstPlugin::disable() { - if (m_render_topo) - { - delete m_render_topo; - } } void FirstPlugin::redraw(View* view) { - m_render_topo->drawTopo(); - -// const float nbSteps = 200.0; -// glBegin(GL_QUAD_STRIP); -// for (float i = 0; i < nbSteps; ++i) -// { -// float ratio = i/nbSteps; -// float angle = 21.0*ratio; -// float c = cos(angle); -// float s = sin(angle); -// float r1 = 1.0 - 0.8f*ratio; -// float r2 = 0.8f - 0.8f*ratio; -// float alt = ratio - 0.5f; -// const float nor = 0.5f; -// const float up = sqrt(1.0-nor*nor); -// glColor3f(1.0-ratio, 0.2f , ratio); -// glNormal3f(nor*c, up, nor*s); -// glVertex3f(r1*c, alt, r1*s); -// glVertex3f(r2*c, alt+0.05f, r2*s); -// } -// glEnd(); + glPolygonMode(GL_FRONT_AND_BACK, GL_FILL) ; + glEnable(GL_LIGHTING) ; + m_render->draw(m_flatShader, Algo::Render::GL2::TRIANGLES) ; } void FirstPlugin::viewAdded(View* view) { - // bounding box of scene - Geom::BoundingBox bb = Algo::Geometry::computeBoundingBox(myMap, position); - - PFP::VEC3& min = bb.min(); - PFP::VEC3& max = bb.max(); - qglviewer::Vec minV(min[0], min[1], min[2]); - qglviewer::Vec maxV(max[0], max[1], max[2]); - - view->setSceneBoundingBox(minV, maxV); + CGoGN::Geom::BoundingBox bb = Algo::Geometry::computeBoundingBox(myMap, position) ; + qglviewer::Vec min(bb.min()[0], bb.min()[1], bb.min()[2]); + qglviewer::Vec max(bb.max()[0], bb.max()[1], bb.max()[2]); + view->setSceneBoundingBox(min, max); } /** diff --git a/SCHNApps/Release/CMakeLists.txt b/SCHNApps/Release/CMakeLists.txt index ad62755f3..c5c140fa7 100644 --- a/SCHNApps/Release/CMakeLists.txt +++ b/SCHNApps/Release/CMakeLists.txt @@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 2.8) SET(CMAKE_BUILD_TYPE Release) -ADD_DEFINITIONS(-fPIC) - IF(WIN32) link_directories( ${CGoGN_ROOT_DIR}/lib/Release ) ELSE (WIN32) @@ -41,9 +39,12 @@ file( ) SET(SCHNApps_H_OBJECT_FILES - ${SCHNApps_ROOT_DIR}/include/window.h - ${SCHNApps_ROOT_DIR}/include/view.h + ${SCHNApps_ROOT_DIR}/include/camera.h + ${SCHNApps_ROOT_DIR}/include/mapHandler.h + ${SCHNApps_ROOT_DIR}/include/plugin.h ${SCHNApps_ROOT_DIR}/include/splitArea.h + ${SCHNApps_ROOT_DIR}/include/view.h + ${SCHNApps_ROOT_DIR}/include/window.h ${SCHNApps_ROOT_DIR}/include/viewButtonArea.h ${SCHNApps_ROOT_DIR}/include/viewSelector.h ${SCHNApps_ROOT_DIR}/include/cameraDialog.h diff --git a/SCHNApps/include/camera.h b/SCHNApps/include/camera.h index 8c5eb410b..fedf8b2f0 100644 --- a/SCHNApps/include/camera.h +++ b/SCHNApps/include/camera.h @@ -8,6 +8,8 @@ class Window; class Camera : public qglviewer::Camera { + Q_OBJECT + public: static unsigned int cameraCount; @@ -79,6 +81,9 @@ protected: double m_drawPathScale; int m_snapCount; + +public slots: + void cb_viewRemoved(View* view); }; #endif diff --git a/SCHNApps/include/mapHandler.h b/SCHNApps/include/mapHandler.h index 53d5e1189..87a51c1d6 100644 --- a/SCHNApps/include/mapHandler.h +++ b/SCHNApps/include/mapHandler.h @@ -15,15 +15,20 @@ namespace CGoGN } } -class MapHandler +class MapHandler : public QObject { + Q_OBJECT + public: - MapHandler(const QString& name, CGoGN::GenericMap* map); + MapHandler(const QString& name, Window* window, CGoGN::GenericMap* map); ~MapHandler(); const QString& getName() { return m_name; } void setName(const QString& name) { m_name = name; } + Window* getWindow() { return m_window; } + void setWindow(Window* w) { m_window = w; } + CGoGN::GenericMap* getMap() { return m_map; } CGoGN::Utils::VBO* addVBO(const QString& name); @@ -45,11 +50,15 @@ public: protected: QString m_name; + Window* m_window; CGoGN::GenericMap* m_map; QList l_views; VBOHash h_vbo; + +public slots: + void cb_viewRemoved(View* view); }; #endif diff --git a/SCHNApps/include/plugin.h b/SCHNApps/include/plugin.h index 022ed5bbc..2c57c3b49 100644 --- a/SCHNApps/include/plugin.h +++ b/SCHNApps/include/plugin.h @@ -15,10 +15,9 @@ class Plugin : public QObject { -public: - enum { UNLIMITED_NUMBER_OF_MAPS = -1 }; - enum { UNLIMITED_NUMBER_OF_SCENES = -1 }; + Q_OBJECT +public: Plugin(); virtual ~Plugin(); @@ -35,7 +34,12 @@ public: void setWindow(Window* w) { m_window = w; } bool getProvidesRendering() { return b_providesRendering; } - void setProvidesRendering(bool b) { b_providesRendering = b; } + void setProvidesRendering(bool b) + { + b_providesRendering = b; + if(b_providesRendering) + glewInit(); + } virtual void redraw(View* view) = 0; @@ -92,6 +96,9 @@ protected: QList l_menuActions; QList l_toolbarActions; +public slots: + void cb_viewRemoved(View* view); + // QList l_dependencies; // QList l_dependantPlugins; diff --git a/SCHNApps/include/system.h b/SCHNApps/include/system.h index 1c5f2afad..51f711382 100644 --- a/SCHNApps/include/system.h +++ b/SCHNApps/include/system.h @@ -143,11 +143,11 @@ public: // static bool savePluginsInfo(Window *window, PluginHash *pluginHash, QStringList paths); //}; -typedef enum -{ - GLVIEWER_IN_DOCK, - SIMPLE_GLVIEWER -} QGLV_CREATE_SETTINGS; +//typedef enum +//{ +// GLVIEWER_IN_DOCK, +// SIMPLE_GLVIEWER +//} QGLV_CREATE_SETTINGS; extern QString app_path; diff --git a/SCHNApps/include/types.h b/SCHNApps/include/types.h index 89c3151d1..0031dbe84 100644 --- a/SCHNApps/include/types.h +++ b/SCHNApps/include/types.h @@ -8,6 +8,7 @@ class Window; class Plugin; class View; class Camera; +class Texture; class MapHandler; @@ -28,6 +29,8 @@ typedef QHash MapHash; typedef QHash VBOHash; typedef QHash ShaderHash; +typedef QHash TextureHash; + namespace Qt { extern int UserRoleType; diff --git a/SCHNApps/include/view.h b/SCHNApps/include/view.h index a2fbb9782..0b22d0098 100644 --- a/SCHNApps/include/view.h +++ b/SCHNApps/include/view.h @@ -105,15 +105,18 @@ protected: QString m_textInfo; + qglviewer::Vec bbmin; + qglviewer::Vec bbmax; + CameraViewDialog* m_cameraViewDialog; PluginsViewDialog* m_pluginsViewDialog; MapsViewDialog* m_mapsViewDialog; public slots: - void cb_cameraView(int x, int y); - void cb_pluginsView(int x, int y); - void cb_mapsView(int x, int y); - void cb_closeView(int x, int y); + void cb_cameraView(int x, int y, int globalX, int globalY); + void cb_pluginsView(int x, int y, int globalX, int globalY); + void cb_mapsView(int x, int y, int globalX, int globalY); + void cb_closeView(int x, int y, int globalX, int globalY); //signals: // void currentCameraChanged(Camera* camera); diff --git a/SCHNApps/include/viewButtonArea.h b/SCHNApps/include/viewButtonArea.h index eab958bf7..0c022ee9f 100644 --- a/SCHNApps/include/viewButtonArea.h +++ b/SCHNApps/include/viewButtonArea.h @@ -10,6 +10,7 @@ #include class View; +class Texture; class ViewButton : public QObject { @@ -19,20 +20,18 @@ public: ViewButton(const QString& image, View* view); ~ViewButton(); - QSize getSize() { return m_GLimg.size(); } + QSize getSize(); - void click(int x, int y); + void click(int x, int y, int globalX, int globalY); void drawAt(int x, int y); protected: + QString m_img; View* m_view; - - QSize m_size; - QImage m_GLimg; - int m_texID; + Texture* m_tex; signals: - void clicked(int x, int y); + void clicked(int x, int y, int globalX, int globalY); }; class ViewButtonArea : public QObject @@ -49,7 +48,7 @@ public: void removeButton(ViewButton* button); bool isClicked(int x, int y); - void clickButton(int x, int y); + void clickButton(int x, int y, int globalX, int globalY); const QRect& getForm() { return m_form; } diff --git a/SCHNApps/include/window.h b/SCHNApps/include/window.h index d17f36730..66e69dd91 100644 --- a/SCHNApps/include/window.h +++ b/SCHNApps/include/window.h @@ -9,6 +9,7 @@ class SplitArea; class PluginDialog; class CameraDialog; +class Texture; class Window : public QMainWindow, Ui::Window { @@ -238,17 +239,12 @@ public: QList getMapsList() { return h_maps.values(); } const MapHash& getMapsHash() { return h_maps; } -// template -// T* getReferencedMap(QString map_name){ -// MapHash::iterator it; -// if((it=h_map.find(map_name))!=h_map.end()){ -// return ((T*)(*it)); -// } -// else{ -// System::Error::code= System::Error::MAP_UNREFERENCED_f(map_name); -// return NULL; -// } -// } + /********************************************************* + * MANAGE TEXTURES + *********************************************************/ + + Texture* getTexture(const QString& image); + void releaseTexture(const QString& image); protected: bool m_initialization; @@ -266,6 +262,8 @@ protected: CameraHash h_cameras; MapHash h_maps; + TextureHash h_textures; + PluginDialog* m_pluginDialog; CameraDialog* m_cameraDialog; @@ -330,7 +328,7 @@ signals: void viewAdded(View* view); void viewRemoved(View* view); - void mapAdded(MapHandler* camera); + void mapAdded(MapHandler* map); void mapRemoved(MapHandler* map); void pluginAdded(Plugin* plugin); diff --git a/SCHNApps/src/camera.cpp b/SCHNApps/src/camera.cpp index 495d4d21a..29a1c5754 100644 --- a/SCHNApps/src/camera.cpp +++ b/SCHNApps/src/camera.cpp @@ -15,6 +15,8 @@ Camera::Camera(const QString& name, Window* window) : { ++cameraCount; this->setZClippingCoefficient(100); + +// connect(m_window, SIGNAL(viewRemoved(View*)), this, SLOT(cb_viewRemoved(View*))); } Camera::~Camera() @@ -63,3 +65,8 @@ void Camera::saveSnapshot(QString snapPathName) view->saveSnapshot(snapPathName + view->getName() + '_' + QString::number(m_snapCount) + ".jpg", true); ++m_snapCount; } + +void Camera::cb_viewRemoved(View* view) +{ + unlinkView(view); +} diff --git a/SCHNApps/src/mapHandler.cpp b/SCHNApps/src/mapHandler.cpp index c3379fa76..8f7549097 100644 --- a/SCHNApps/src/mapHandler.cpp +++ b/SCHNApps/src/mapHandler.cpp @@ -4,10 +4,13 @@ #include "Topology/generic/genericmap.h" #include "Utils/vbo.h" -MapHandler::MapHandler(const QString& name, CGoGN::GenericMap *map) : +MapHandler::MapHandler(const QString& name, Window* window, CGoGN::GenericMap *map) : m_name(name), + m_window(window), m_map(map) -{} +{ +// connect(m_window, SIGNAL(viewRemoved(View*)), this, SLOT(cb_viewRemoved(View*))); +} MapHandler::~MapHandler() { @@ -98,3 +101,8 @@ void MapHandler::unlinkView(View* view) view->updateGL(); } } + +void MapHandler::cb_viewRemoved(View* view) +{ + unlinkView(view); +} diff --git a/SCHNApps/src/plugin.cpp b/SCHNApps/src/plugin.cpp index 46db5d284..f63609920 100644 --- a/SCHNApps/src/plugin.cpp +++ b/SCHNApps/src/plugin.cpp @@ -3,7 +3,9 @@ Plugin::Plugin() : m_window(NULL), b_providesRendering(false) -{} +{ +// connect(m_window, SIGNAL(viewRemoved(View*)), this, SLOT(cb_viewRemoved(View*))); +} Plugin::~Plugin() { @@ -114,3 +116,8 @@ void Plugin::removeToolbarAction(QAction* action) if(l_toolbarActions.removeOne(action)) m_window->removeToolbarAction(action); } + +void Plugin::cb_viewRemoved(View* view) +{ + unlinkView(view); +} diff --git a/SCHNApps/src/pluginDialog.cpp b/SCHNApps/src/pluginDialog.cpp index af653a894..5929ad58d 100644 --- a/SCHNApps/src/pluginDialog.cpp +++ b/SCHNApps/src/pluginDialog.cpp @@ -15,6 +15,7 @@ #include "system.h" #include "window.h" +#include "plugin.h" PluginDialog::PluginDialog(Window* window) : m_window(window), @@ -155,7 +156,7 @@ void PluginDialog::cb_addPlugins() QStringList files = QFileDialog::getOpenFileNames( this, "Select one or more plugins", - System::app_path, + System::app_path + QString("/../Plugins/"), "Plugins (lib*.so lib*.dylib)" ); @@ -189,7 +190,7 @@ void PluginDialog::cb_addPluginsDirectory() QString dir = QFileDialog::getExistingDirectory( this, tr("Select a directory"), - System::app_path, + System::app_path + QString("/../Plugins/"), QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks ); @@ -345,11 +346,25 @@ void PluginDialog::cb_togglePlugin(QTreeWidgetItem *item, int column) init = true; item->setCheckState(0, Qt::Unchecked); init = false; - return; } } else if (item->checkState(0) == Qt::Unchecked) - m_window->unloadPlugin(pluginName); + { + Plugin* p = m_window->getPlugin(pluginName); + + if(!p->getLinkedViews().empty()) + { + QMessageBox::warning(this, tr("Warning"), "Plugin is currently used"); + init = true; + item->setCheckState(0, Qt::Checked); + init = false; + return; + } + else + { + m_window->unloadPlugin(pluginName); + } + } } } diff --git a/SCHNApps/src/view.cpp b/SCHNApps/src/view.cpp index 49b20f8f4..29a87248f 100644 --- a/SCHNApps/src/view.cpp +++ b/SCHNApps/src/view.cpp @@ -43,10 +43,16 @@ View::~View() this->setCamera(c); foreach(Plugin* plugin, l_plugins) + { + plugin->unlinkView(this); unlinkPlugin(plugin); + } foreach(MapHandler* map, l_maps) + { + map->unlinkView(this); unlinkMap(map); + } delete m_buttonArea; } @@ -58,19 +64,19 @@ void View::init() m_cameraButton = new ViewButton(":icons/icons/camera_32.png", this); m_buttonArea->addButton(m_cameraButton); - connect(m_cameraButton, SIGNAL(clicked(int, int)), this, SLOT(cb_cameraView(int, int))); + connect(m_cameraButton, SIGNAL(clicked(int, int, int, int)), this, SLOT(cb_cameraView(int, int, int, int))); m_pluginsButton = new ViewButton(":icons/icons/plugins_32.png", this); m_buttonArea->addButton(m_pluginsButton); - connect(m_pluginsButton, SIGNAL(clicked(int, int)), this, SLOT(cb_pluginsView(int, int))); + connect(m_pluginsButton, SIGNAL(clicked(int, int, int, int)), this, SLOT(cb_pluginsView(int, int, int, int))); m_mapsButton = new ViewButton(":icons/icons/maps_32.png", this); m_buttonArea->addButton(m_mapsButton); - connect(m_mapsButton, SIGNAL(clicked(int, int)), this, SLOT(cb_mapsView(int, int))); + connect(m_mapsButton, SIGNAL(clicked(int, int, int, int)), this, SLOT(cb_mapsView(int, int, int, int))); m_closeButton = new ViewButton(":icons/icons/close_32.png", this); m_buttonArea->addButton(m_closeButton); - connect(m_closeButton, SIGNAL(clicked(int, int)), this, SLOT(cb_closeView(int, int))); + connect(m_closeButton, SIGNAL(clicked(int, int, int, int)), this, SLOT(cb_closeView(int, int, int, int))); qglviewer::Camera* c = this->camera(); this->setCamera(m_currentCamera); @@ -83,8 +89,6 @@ void View::init() void View::preDraw() { - QGLViewer::preDraw(); - glm::mat4 mm = getCurrentModelViewMatrix(); glm::mat4 pm = getCurrentProjectionMatrix(); for(std::set< std::pair >::iterator it = CGoGN::Utils::GLSLShader::m_registeredShaders.begin(); @@ -93,6 +97,8 @@ void View::preDraw() { it->second->updateMatrices(pm, mm); } + + QGLViewer::preDraw(); } void View::draw() @@ -150,7 +156,7 @@ void View::keyReleaseEvent(QKeyEvent *event) void View::mousePressEvent(QMouseEvent* event) { if(m_buttonArea->isClicked(event->x(), event->y())) - m_buttonArea->clickButton(event->x(), event->y()); + m_buttonArea->clickButton(event->x(), event->y(), event->globalX(), event->globalY()); else { foreach(Plugin* plugin, l_plugins) @@ -303,23 +309,25 @@ void View::setCurrentProjectionMatrix(const glm::mat4& pm) this->camera()->setFromProjectionMatrix(gl_pm); } -void View::cb_cameraView(int x, int y) +void View::cb_cameraView(int x, int y, int globalX, int globalY) { -// m_cameraViewDialog->setGeometry(x, y, 150, 300); + m_cameraViewDialog->move(globalX, globalY); m_cameraViewDialog->show(); } -void View::cb_pluginsView(int x, int y) +void View::cb_pluginsView(int x, int y, int globalX, int globalY) { + m_pluginsViewDialog->move(globalX, globalY); m_pluginsViewDialog->show(); } -void View::cb_mapsView(int x, int y) +void View::cb_mapsView(int x, int y, int globalX, int globalY) { + m_mapsViewDialog->move(globalX, globalY); m_mapsViewDialog->show(); } -void View::cb_closeView(int x, int y) +void View::cb_closeView(int x, int y, int globalX, int globalY) { m_window->removeView(m_name); } diff --git a/SCHNApps/src/viewButtonArea.cpp b/SCHNApps/src/viewButtonArea.cpp index 474315698..975a6741e 100644 --- a/SCHNApps/src/viewButtonArea.cpp +++ b/SCHNApps/src/viewButtonArea.cpp @@ -1,44 +1,48 @@ #include "viewButtonArea.h" +#include "window.h" +#include "view.h" +#include "texture.h" #include "camera.h" #include ViewButton::ViewButton(const QString& image, View* view) : + m_img(image), m_view(view) { - m_GLimg.load(image); - if(!m_GLimg.isNull()) - { - m_size = m_GLimg.size(); - m_GLimg = QGLWidget::convertToGLFormat(m_GLimg); - m_texID = m_view->bindTexture(m_GLimg, GL_TEXTURE_2D, GL_RGBA); - } + m_tex = m_view->getWindow()->getTexture(m_img); } ViewButton::~ViewButton() { - m_view->deleteTexture(m_texID); + m_view->getWindow()->releaseTexture(m_img); +} + +QSize ViewButton::getSize() +{ + return m_tex->size; } -void ViewButton::click(int x, int y) +void ViewButton::click(int x, int y, int globalX, int globalY) { - emit clicked(x, y); + emit clicked(x, y, globalX, globalY); } void ViewButton::drawAt(int x, int y) { - glBindTexture(GL_TEXTURE_2D, m_texID); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 32, 32, 0, GL_RGBA, GL_UNSIGNED_BYTE, m_GLimg.bits()); + int w = m_tex->size.width(); + int h = m_tex->size.height(); + glBindTexture(GL_TEXTURE_2D, m_tex->texID); glBegin (GL_QUADS); glTexCoord2i(0, 1); glVertex2i(x, y); glTexCoord2i(0, 0); - glVertex2i(x, y + m_size.height()); + glVertex2i(x, y + h); glTexCoord2i(1, 0); - glVertex2i(x + m_size.width(), y + m_size.height()); + glVertex2i(x + w, y + h); glTexCoord2i(1, 1); - glVertex2i(x + m_size.width(), y); + glVertex2i(x + w, y); glEnd(); } @@ -86,7 +90,7 @@ bool ViewButtonArea::isClicked(int x, int y) return m_form.contains(x, y); } -void ViewButtonArea::clickButton(int x, int y) +void ViewButtonArea::clickButton(int x, int y, int globalX, int globalY) { QPoint p = m_form.topLeft(); p.setY(p.y() + 3); @@ -94,7 +98,7 @@ void ViewButtonArea::clickButton(int x, int y) { if(QRect(p, b->getSize()).contains(x, y)) { - b->click(x, y); + b->click(x, y, globalX, globalY); return; } p.setX(p.x() + 3 + b->getSize().width()); diff --git a/SCHNApps/src/window.cpp b/SCHNApps/src/window.cpp index 37663034a..df1bd64b5 100644 --- a/SCHNApps/src/window.cpp +++ b/SCHNApps/src/window.cpp @@ -10,6 +10,7 @@ #include "plugin.h" #include "view.h" +#include "texture.h" #include "splitArea.h" #include "viewSelector.h" @@ -417,7 +418,6 @@ Plugin* Window::loadPlugin(QString pluginFilePath) return NULL; } - // QT's plugin loader class QPluginLoader loader(pluginFilePath); // if the loader loads a plugin instance @@ -435,8 +435,8 @@ Plugin* Window::loadPlugin(QString pluginFilePath) { // if it succeeded we reference this plugin h_plugins.insert(pluginName, plugin); - statusbar->showMessage(pluginName + QString(" successfully loaded."), 2000); + statusbar->showMessage(pluginName + QString(" successfully loaded."), 2000); emit(pluginAdded(plugin)); // method success @@ -467,12 +467,14 @@ void Window::unloadPlugin(const QString& pluginName) plugin->disable(); h_plugins.remove(pluginName); + QPluginLoader loader(plugin->getFilePath()); + loader.unload(); + + statusbar->showMessage(pluginName + QString(" successfully unloaded."), 2000); emit(pluginRemoved(plugin)); // delete plugin delete plugin; - - statusbar->showMessage(pluginName + QString(" successfully unloaded."), 2000); } } @@ -550,6 +552,47 @@ MapHandler* Window::getMap(const QString& name) } } +/********************************************************* + * MANAGE TEXTURES + *********************************************************/ + +Texture* Window::getTexture(const QString& image) +{ + if(h_textures.contains(image)) + { + Texture* t = h_textures[image]; + t->ref++; + return t; + } + else + { + Texture* t = NULL; + QImage img(image); + if(!img.isNull()) + { + GLuint texID = m_firstView->bindTexture(img); + t = new Texture(texID, img.size(), 1); + h_textures.insert(image, t); + } + return t; + } +} + +void Window::releaseTexture(const QString& image) +{ + if(h_textures.contains(image)) + { + Texture* t = h_textures[image]; + t->ref--; + if(t->ref == 0) + { + m_firstView->deleteTexture(h_textures[image]->texID); + h_textures.remove(image); + delete t; + } + } +} + -- GitLab