diff options
| author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2016-12-29 02:32:50 -0200 |
|---|---|---|
| committer | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2016-12-29 02:32:50 -0200 |
| commit | d792fcf7b2a5862ac86ee69aa86021b5637ca8ee (patch) | |
| tree | c00bb1d27666ee7d42839efbd420369b2a0d24e3 /Project/Machines.cpp | |
| parent | fb9de1b7935376897f1c93676ab1faeb1ea25f25 (diff) | |
| download | PSP.git-d792fcf7b2a5862ac86ee69aa86021b5637ca8ee.tar.gz PSP.git-d792fcf7b2a5862ac86ee69aa86021b5637ca8ee.tar.xz PSP.git-d792fcf7b2a5862ac86ee69aa86021b5637ca8ee.zip | |
Copy paste implemented
Some bugs on the text
Diffstat (limited to 'Project/Machines.cpp')
| -rw-r--r-- | Project/Machines.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Project/Machines.cpp b/Project/Machines.cpp index c1970e6..bda8a7a 100644 --- a/Project/Machines.cpp +++ b/Project/Machines.cpp @@ -35,7 +35,7 @@ bool Machines::AddParent(Element* parent, wxPoint2DDouble position) void Machines::Draw(wxPoint2DDouble translation, double scale) const { - OpenGLColour* elementColour; + OpenGLColour elementColour; if(m_online) elementColour = m_onlineElementColour; else elementColour = m_offlineElementColour; @@ -43,7 +43,7 @@ void Machines::Draw(wxPoint2DDouble translation, double scale) const // Draw Selection (layer 1). if(m_selected) { glLineWidth(1.5 + m_borderSize * 2.0); - glColor4dv(m_selectionColour->GetRGBA()); + glColor4dv(m_selectionColour.GetRGBA()); DrawCircle(m_position, 25.0 + (m_borderSize + 1.5) / scale, 20, GL_POLYGON); DrawLine(m_pointList); @@ -55,7 +55,7 @@ void Machines::Draw(wxPoint2DDouble translation, double scale) const glLineWidth(1.5); // Draw node. - glColor4dv(elementColour->GetRGBA()); + glColor4dv(elementColour.GetRGBA()); DrawCircle(m_pointList[0], 5.0, 10, GL_POLYGON); DrawLine(m_pointList); @@ -66,7 +66,7 @@ void Machines::Draw(wxPoint2DDouble translation, double scale) const glColor4d(1.0, 1.0, 1.0, 1.0); DrawCircle(m_position, 25.0, 20, GL_POLYGON); - glColor4dv(elementColour->GetRGBA()); + glColor4dv(elementColour.GetRGBA()); DrawCircle(m_position, 25.0, 20); // Draw machine symbol. |