diff options
author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2020-06-02 21:47:06 -0300 |
---|---|---|
committer | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2020-06-02 21:47:06 -0300 |
commit | 113a35d0fe8938973fa1c100b77f456ed250e61b (patch) | |
tree | 586d1c3113082cbb2b92cd46c3c96a25a0e75e67 /Project/MathExpression.cpp | |
parent | 6ce2bdcf85dffee6b6ef7b95b888b8b96372a3d6 (diff) | |
download | PSP.git-113a35d0fe8938973fa1c100b77f456ed250e61b.tar.gz PSP.git-113a35d0fe8938973fa1c100b77f456ed250e61b.tar.xz PSP.git-113a35d0fe8938973fa1c100b77f456ed250e61b.zip |
OpenGL bugfixes and wxGC port alternative init
OpenGL major bugfixes;
Device context port alternative to OpenGL code init (WorkspaceDC). Some machines don't support OpenGL 3+;
Fixed some issues with MSVC.
Diffstat (limited to 'Project/MathExpression.cpp')
-rw-r--r-- | Project/MathExpression.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Project/MathExpression.cpp b/Project/MathExpression.cpp index 066825f..e6515b5 100644 --- a/Project/MathExpression.cpp +++ b/Project/MathExpression.cpp @@ -45,11 +45,11 @@ MathExpression::MathExpression(int id) : ControlElement(id) } else { nodePosition = m_position + wxPoint2DDouble(-m_width / 2, 9 + 18 * i - m_height / 2); } - Node* nodeIn = new Node(nodePosition, Node::NODE_IN, m_borderSize); + Node* nodeIn = new Node(nodePosition, Node::NodeType::NODE_IN, m_borderSize); nodeIn->StartMove(m_position); m_nodeList.push_back(nodeIn); } - Node* nodeOut = new Node(m_position + wxPoint2DDouble(m_width / 2, 0), Node::NODE_OUT, m_borderSize); + Node* nodeOut = new Node(m_position + wxPoint2DDouble(m_width / 2, 0), Node::NodeType::NODE_OUT, m_borderSize); nodeOut->SetAngle(180.0); nodeOut->StartMove(m_position); m_nodeList.push_back(nodeOut); @@ -165,7 +165,7 @@ bool MathExpression::Solve(double* input, double timeStep) int i = 3; for(auto itN = m_nodeList.begin(), itNEnd = m_nodeList.end(); itN != itNEnd; ++itN) { Node* node = *itN; - if(node->GetNodeType() != Node::NODE_OUT) { + if(node->GetNodeType() != Node::NodeType::NODE_OUT) { if(!node->IsConnected()) { m_inputValues[i] = 0.0; // Node not connected means zero value as input. } else { @@ -243,7 +243,7 @@ void MathExpression::UpdatePoints() void MathExpression::AddInNode() { - Node* newNode = new Node(wxPoint2DDouble(0, 0), Node::NODE_IN, m_borderSize); + Node* newNode = new Node(wxPoint2DDouble(0, 0), Node::NodeType::NODE_IN, m_borderSize); newNode->SetAngle(m_angle); m_nodeList.insert(m_nodeList.end() - 1, newNode); } |