comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2026-06-26 05:23:26 -04:00
Code Issues Projects Releases Wiki Activity

Cleanup MSVC warnings and deprecated C++ exception stuff

Browse Source
This commit is contained in:
Charles J. Cliffe
2016-06-01 19:42:34 -04:00
parent c1863d9319
commit 688181e566
26 changed files with 267 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/visual/ScopeCanvas.cpp
+4 -4
View File
@@ -33,9 +33,9 @@ ScopeCanvas::ScopeCanvas(wxWindow *parent, int *dispAttrs) : InteractiveCanvas(p
glContext = new ScopeContext(this, &wxGetApp().GetContext(this));
inputData.set_max_num_items(2);
bgPanel.setFill(GLPanel::GLPANEL_FILL_GRAD_Y);
bgPanel.setSize(1.0, 0.5);
bgPanel.setPosition(0.0, -0.5);
panelSpacing = 0.4;
bgPanel.setSize(1.0, 0.5f);
bgPanel.setPosition(0.0, -0.5f);
panelSpacing = 0.4f;
parentPanel.addChild(&scopePanel);
parentPanel.addChild(&spectrumPanel);
@@ -147,7 +147,7 @@ void ScopeCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
CubicVR::mat4 modelView = CubicVR::mat4::lookat(0, 0, -1.205, 0, 0, 0, 0, -1, 0);
CubicVR::mat4 modelView = CubicVR::mat4::lookat(0, 0, -1.205f, 0, 0, 0, 0, -1, 0);
float panelWidth = 1.0;
float panelInterval = (panelWidth * 2.0 + panelSpacing);