Wed, 08 Feb 2017 17:07:19 +0200
Simplified GLRenderer::convert3dTo2d. The multiplication with the modelview matrix is not necessary, it's identity all the time... with that, I think the function makes much more sense now.
/* * LDForge: LDraw parts authoring CAD * Copyright (C) 2013 - 2017 Teemu Piippo * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once #include <QDialog> #include "../main.h" #include "../colors.h" class ColorSelector : public QDialog, public HierarchyElement { Q_OBJECT public: explicit ColorSelector (QWidget* parent, LDColor defaultvalue = LDColor::nullColor()); virtual ~ColorSelector(); static bool selectColor (QWidget* parent, LDColor& val, LDColor defval = LDColor::nullColor()); LDColor selection() const; private: class Ui_ColorSelUi& ui; QMap<int, QPushButton*> m_buttons; QMap<QPushButton*, int> m_buttonsReversed; bool m_firstResize; LDColor m_selection; void drawColorInfo(); void selectDirectColor (QColor col); private slots: void colorButtonClicked(); void chooseDirectColor(); void transparentCheckboxClicked(); };