Sat, 28 Jan 2017 17:20:16 +0200
Removed the dangerous C-array constructor from the matrix - no need for it anyway since the matrix already is an array of doubles.
/* * LDForge: LDraw parts authoring CAD * Copyright (C) 2013 - 2016 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/>. */ #include <QPainter> #include <QMouseEvent> #include "drawMode.h" #include "../ldObject.h" #include "../glRenderer.h" DrawMode::DrawMode (GLRenderer* renderer) : Super (renderer) {} EditModeType DrawMode::type() const { return EditModeType::Draw; } void DrawMode::render (QPainter& painter) const { QVector<Vertex> poly; for (Vertex const& vert : m_drawedVerts) poly << vert; // Draw the cursor vertex as the last one in the list. if (countof(poly) < 4) poly << getCursorVertex(); renderPolygon (painter, poly, true, true); } bool DrawMode::preAddVertex (Vertex const& pos) { // If we picked an already-existing vertex, stop drawing for (Vertex& vert : m_drawedVerts) { if (vert == pos) { if (countof(m_drawedVerts) >= 2) endDraw(); return true; } } return false; } void DrawMode::endDraw() { // Clean the selection and create the object QList<Vertex>& verts = m_drawedVerts; LDObjectList objs; switch (countof(verts)) { case 2: { // 2 verts - make a line LDLine* obj = LDSpawn<LDLine> (verts[0], verts[1]); obj->setColor (EdgeColor); objs << obj; break; } case 3: case 4: { LDObject* obj = (countof(verts) == 3) ? static_cast<LDObject*> (LDSpawn<LDTriangle>()) : static_cast<LDObject*> (LDSpawn<LDQuad>()); obj->setColor (MainColor); for (int i = 0; i < countof(verts); ++i) obj->setVertex (i, verts[i]); objs << obj; break; } } finishDraw (objs); }