mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-01-21 21:20:07 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

--User changes

Browse Source 
-Use a green dot for the x axis and purple dot for the y axis when drawing affines to help distinguish them more easily.
This commit is contained in:
Person 2018-09-25 18:37:26 -07:00
parent ace4f6a7d7
commit 5283250204
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Fractorium/GLWidget.cpp
View File

@ -1587,7 +1587,7 @@ void GLEmberController<T>::DrawAffine(Xform<T>* xform, bool pre, bool selected,
m_Verts.push_back(0.0f); m_Verts.push_back(0.0f);
m_Verts.push_back(0.0f); m_Verts.push_back(0.0f);
m_Verts.push_back(1.0f); m_Verts.push_back(1.0f);
m_GL->DrawPointOrLine(col, m_Verts, GL_POINTS, !pre, 5.0f);//Three black points, one in the center and two on the circle. Drawn big 5px first to give a black outline. m_GL->DrawPointOrLine(col, m_Verts, GL_POINTS, !pre, 6.0f);//Three black points, one in the center and two on the circle. Drawn big 5px first to give a black outline.
// //
m_GL->glLineWidth(2.0f * m_GL->devicePixelRatioF());//Draw lines again for y axis only, without drawing the circle, using the color of the selected xform. m_GL->glLineWidth(2.0f * m_GL->devicePixelRatioF());//Draw lines again for y axis only, without drawing the circle, using the color of the selected xform.
m_Verts.clear(); m_Verts.clear();
@ -1607,14 +1607,20 @@ void GLEmberController<T>::DrawAffine(Xform<T>* xform, bool pre, bool selected,
m_GL->DrawPointOrLine(QVector4D(qcol.redF(), qcol.greenF(), qcol.blueF(), 1.0f), m_Verts, GL_LINES, !pre); m_GL->DrawPointOrLine(QVector4D(qcol.redF(), qcol.greenF(), qcol.blueF(), 1.0f), m_Verts, GL_LINES, !pre);
// //
m_Verts.clear(); m_Verts.clear();
m_Verts.push_back(0.0f);//Center.
m_Verts.push_back(0.0f); m_Verts.push_back(0.0f);
m_Verts.push_back(0.0f);
m_Verts.push_back(1.0f);
m_Verts.push_back(0.0f);
m_Verts.push_back(0.0f);
m_Verts.push_back(1.0f);
col = QVector4D(1.0f, 1.0f, 1.0f, selected ? 1.0f : 0.5f); col = QVector4D(1.0f, 1.0f, 1.0f, selected ? 1.0f : 0.5f);
m_GL->DrawPointOrLine(col, m_Verts, GL_POINTS, false, 3.0f);//Draw smaller white points, to give a black outline effect. m_GL->DrawPointOrLine(col, m_Verts, GL_POINTS, false, 5.0f);//Draw smaller white point, to give a black outline effect.
m_Verts.clear();
m_Verts.push_back(1.0f);//X axis.
m_Verts.push_back(0.0f);
col = QVector4D(0.0f, 1.0f, 0.0f, selected ? 1.0f : 0.5f);
m_GL->DrawPointOrLine(col, m_Verts, GL_POINTS, false, 5.0f);//Draw smaller green point, to give a black outline effect.
m_Verts.clear();
m_Verts.push_back(0.0f);//Y axis.
m_Verts.push_back(1.0f);
col = QVector4D(1.0f, 0.0f, 1.0f, selected ? 1.0f : 0.5f);
m_GL->DrawPointOrLine(col, m_Verts, GL_POINTS, false, 5.0f);//Draw smaller purple point, to give a black outline effect.
m_GL->m_ModelViewMatrix.setToIdentity(); m_GL->m_ModelViewMatrix.setToIdentity();
#endif #endif
} }