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/SyncMachineForm.h | |
| 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/SyncMachineForm.h')
| -rw-r--r-- | Project/SyncMachineForm.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Project/SyncMachineForm.h b/Project/SyncMachineForm.h index 793ca79..421a975 100644 --- a/Project/SyncMachineForm.h +++ b/Project/SyncMachineForm.h @@ -17,6 +17,7 @@ #ifndef SYNCMACHINEFORM_H #define SYNCMACHINEFORM_H +#include <wx/glcanvas.h> #include "ElementFormBase.h" @@ -34,7 +35,7 @@ class SyncMotor; class SyncMachineForm : public SyncMachineFormBase { public: - SyncMachineForm(wxWindow* parent, SyncGenerator* syncGenerator); + SyncMachineForm(wxWindow* parent, SyncGenerator* syncGenerator, wxGLContext* sharedGLContext); SyncMachineForm(wxWindow* parent, SyncMotor* syncMotor); virtual ~SyncMachineForm(); @@ -44,6 +45,7 @@ class SyncMachineForm : public SyncMachineFormBase virtual void OnCheckMinReactive(wxCommandEvent& event); virtual void OnOKButtonClick(wxCommandEvent& event); virtual void OnStabilityButtonClick(wxCommandEvent& event); + wxGLContext* GetSharedGLContext() const { return m_sharedGLContext; } virtual bool ValidateData(); virtual void ReplaceStaticTextLabelChar(wxStaticText* staticText, wchar_t newChar); @@ -51,5 +53,6 @@ class SyncMachineForm : public SyncMachineFormBase SyncGenerator* m_syncGenerator = NULL; SyncMotor* m_syncMotor = NULL; wxWindow* m_parent = NULL; + wxGLContext* m_sharedGLContext = NULL; }; #endif // SYNCMACHINEFORM_H |