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/ControlEditor.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/ControlEditor.cpp')
-rw-r--r-- | Project/ControlEditor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Project/ControlEditor.cpp b/Project/ControlEditor.cpp index cdd172e..709fb25 100644 --- a/Project/ControlEditor.cpp +++ b/Project/ControlEditor.cpp @@ -131,10 +131,10 @@ void ControlElementButton::OnLeftClickUp(wxMouseEvent& event) event.Skip(); } -ControlEditor::ControlEditor(wxWindow* parent, int ioflags) : ControlEditorBase(parent) +ControlEditor::ControlEditor(wxWindow* parent, wxGLContext* sharedGLContext, int ioflags) : ControlEditorBase(parent) { BuildControlElementPanel(); - m_glContext = new wxGLContext(m_glCanvas); + m_glContext = new wxGLContext(m_glCanvas, sharedGLContext); m_glContext->SetCurrent(*m_glCanvas); m_camera = new Camera(); m_selectionRect = wxRect2DDouble(0, 0, 0, 0); |