diff --git a/Source/EmberCL/OpenCLInfo.cpp b/Source/EmberCL/OpenCLInfo.cpp index 43cbf9d..73ceff0 100644 --- a/Source/EmberCL/OpenCLInfo.cpp +++ b/Source/EmberCL/OpenCLInfo.cpp @@ -184,7 +184,7 @@ size_t OpenCLInfo::TotalDeviceIndex(size_t platform, size_t device) const } /// -/// Create a context that is optionally shared with OpenGL and plact it in the +/// Create a context that is optionally shared with OpenGL and place it in the /// passed in context ref parameter. /// /// The platform object to create the context on diff --git a/Source/Fractorium/FractoriumXformsColor.cpp b/Source/Fractorium/FractoriumXformsColor.cpp index cddb4f7..30034fc 100644 --- a/Source/Fractorium/FractoriumXformsColor.cpp +++ b/Source/Fractorium/FractoriumXformsColor.cpp @@ -20,10 +20,10 @@ void Fractorium::InitXformsColorUI() connect(ui.ToggleColorIndicesButton, SIGNAL(clicked(bool)), this, SLOT(OnToggleColorIndicesButtonClicked(bool)), Qt::QueuedConnection); connect(ui.RandomColorSpeedButton, SIGNAL(clicked(bool)), this, SLOT(OnRandomColorSpeedButtonClicked(bool)), Qt::QueuedConnection); connect(ui.ToggleColorSpeedButton, SIGNAL(clicked(bool)), this, SLOT(OnToggleColorSpeedButtonClicked(bool)), Qt::QueuedConnection); - SetupSpinner(ui.XformColorIndexTable, this, row, 1, m_XformColorIndexSpin, spinHeight, 0, 1, 0.01, SIGNAL(valueChanged(double)), SLOT(OnXformColorIndexChanged(double)), false, 0, 1, 0); - SetupSpinner(ui.XformColorValuesTable, this, row, 1, m_XformColorSpeedSpin, spinHeight, -1, 1, 0.1, SIGNAL(valueChanged(double)), SLOT(OnXformColorSpeedChanged(double)), true, 0.5, 0.5, 0.5); - SetupSpinner(ui.XformColorValuesTable, this, row, 1, m_XformOpacitySpin, spinHeight, 0, 1, 0.1, SIGNAL(valueChanged(double)), SLOT(OnXformOpacityChanged(double)), true, 1, 1, 0); - SetupSpinner(ui.XformColorValuesTable, this, row, 1, m_XformDirectColorSpin, spinHeight, 0, 1, 0.1, SIGNAL(valueChanged(double)), SLOT(OnXformDirectColorChanged(double)), true, 1, 1, 0); + SetupSpinner(ui.XformColorIndexTable, this, row, 1, m_XformColorIndexSpin, spinHeight, 0, 1, 0.01, SIGNAL(valueChanged(double)), SLOT(OnXformColorIndexChanged(double)), false, 0, 1, 0); + SetupSpinner(ui.XformColorValuesTable, this, row, 1, m_XformColorSpeedSpin, spinHeight, -1, 1, 0.1, SIGNAL(valueChanged(double)), SLOT(OnXformColorSpeedChanged(double)), true, 0.5, 0.5, 0); + SetupSpinner(ui.XformColorValuesTable, this, row, 1, m_XformOpacitySpin, spinHeight, 0, 1, 0.1, SIGNAL(valueChanged(double)), SLOT(OnXformOpacityChanged(double)), true, 1, 1, 0); + SetupSpinner(ui.XformColorValuesTable, this, row, 1, m_XformDirectColorSpin, spinHeight, 0, 1, 0.1, SIGNAL(valueChanged(double)), SLOT(OnXformDirectColorChanged(double)), true, 1, 1, 0); m_XformColorIndexSpin->setDecimals(3); m_XformColorSpeedSpin->setDecimals(3); m_XformOpacitySpin->setDecimals(3); diff --git a/Source/Fractorium/GLWidget.cpp b/Source/Fractorium/GLWidget.cpp index 6f1f516..779810f 100644 --- a/Source/Fractorium/GLWidget.cpp +++ b/Source/Fractorium/GLWidget.cpp @@ -254,7 +254,11 @@ void GLWidget::paintGL() glEnable(GL_BLEND); glEnable(GL_LINE_SMOOTH); glEnable(GL_POINT_SMOOTH); +#if defined (__APPLE__) || defined(MACOSX) + glBlendFunc(GL_SRC_ALPHA, GL_ONE); +#else glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO); +#endif glMatrixMode(GL_PROJECTION); glPushMatrix(); glLoadIdentity(); @@ -788,7 +792,11 @@ bool GLWidget::Allocate(bool force) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); +#if defined (__APPLE__) || defined(MACOSX) + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, m_TexWidth, m_TexHeight, 0, GL_RGB, GL_FLOAT, nullptr); +#else glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, m_TexWidth, m_TexHeight, 0, GL_RGBA, GL_FLOAT, nullptr); +#endif alloc = true; } @@ -929,6 +937,7 @@ void GLEmberController::DrawGrid() m_GL->glColor4f(0.0f, 0.5f, 0.0f, alpha); m_GL->glVertex2f(0.0f, 0.0f); m_GL->glVertex2f(0.0f, yLow); + m_GL->glColor4f(0.0f, 0.0f, 0.0f, 1.0f); m_GL->glEnd(); m_GL->glPopMatrix(); } @@ -980,6 +989,7 @@ void GLEmberController::DrawAffine(Xform* xform, bool pre, bool selected) m_GL->glVertex2f(0.0f, 0.0f); m_GL->glVertex2f(1.0f, 0.0f); m_GL->glVertex2f(0.0f, 1.0f); + m_GL->glColor4f(0.0f, 0.0f, 0.0f, 1.0f); m_GL->glEnd(); m_GL->glPopMatrix(); }