mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-02-01 10:30:08 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

--User changes

Browse Source 
-Formatting.
This commit is contained in:
Person 2019-06-11 19:25:21 -07:00
parent 6289ea7808
commit 35ea85ad35
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Fractorium/FractoriumMenus.cpp
View File

@ -261,7 +261,7 @@ void FractoriumEmberController<T>::OpenAndPrepFiles(const QStringList& filenames
FillLibraryTree(append ? previousSize - 1 : 0); FillLibraryTree(append ? previousSize - 1 : 0);
ClearUndo(); ClearUndo();
m_GLController->ClearControl(); m_GLController->ClearControl();
SetEmber(previousSize, false); SetEmber(previousSize, false);
} }
} }
@ -280,7 +280,7 @@ void Fractorium::OnActionOpen(bool checked) { m_Controller->OpenAndPrepFiles(Set
template <typename T> template <typename T>
void FractoriumEmberController<T>::SaveCurrentAsXml() void FractoriumEmberController<T>::SaveCurrentAsXml()
{ {
QString filename; QString filename;
auto s = m_Fractorium->m_Settings; auto s = m_Fractorium->m_Settings;
if (s->SaveAutoUnique() && m_LastSaveCurrent != "") if (s->SaveAutoUnique() && m_LastSaveCurrent != "")
@ -323,7 +323,7 @@ void FractoriumEmberController<T>::SaveCurrentAsXml()
m_Fractorium->ShowCritical("Save Failed", "Could not save file, try saving to a different folder."); m_Fractorium->ShowCritical("Save Failed", "Could not save file, try saving to a different folder.");
} }
m_GLController->ClearControl(); m_GLController->ClearControl();
} }
void Fractorium::OnActionSaveCurrentAsXml(bool checked) { m_Controller->SaveCurrentAsXml(); } void Fractorium::OnActionSaveCurrentAsXml(bool checked) { m_Controller->SaveCurrentAsXml(); }
@ -368,7 +368,7 @@ void FractoriumEmberController<T>::SaveEntireFileAsXml()
m_Fractorium->ShowCritical("Save Failed", "Could not save file, try saving to a different folder."); m_Fractorium->ShowCritical("Save Failed", "Could not save file, try saving to a different folder.");
} }
m_GLController->ClearControl(); m_GLController->ClearControl();
} }
void Fractorium::OnActionSaveEntireFileAsXml(bool checked) { m_Controller->SaveEntireFileAsXml(); } void Fractorium::OnActionSaveEntireFileAsXml(bool checked) { m_Controller->SaveEntireFileAsXml(); }

50
Source/Fractorium/GLWidget.cpp
View File

@ -183,19 +183,19 @@ void GLWidget::InitGL()
m_Fractorium->m_Controller->DelayedStartRenderTimer(); m_Fractorium->m_Controller->DelayedStartRenderTimer();
m_Init = true; m_Init = true;
/* /*
auto clinfo = OpenCLInfo::DefInstance(); auto clinfo = OpenCLInfo::DefInstance();
auto& platforms = clinfo->Platforms(); auto& platforms = clinfo->Platforms();
auto& alldevices = clinfo->Devices(); auto& alldevices = clinfo->Devices();
std::vector<std::string> strs; std::vector<std::string> strs;
auto cdc = wglGetCurrentDC(); auto cdc = wglGetCurrentDC();
auto cc = wglGetCurrentContext(); auto cc = wglGetCurrentContext();
ostringstream os; ostringstream os;
strs.push_back(os.str()); os.str(""); os << "GLWidget::InitGL():"; strs.push_back(os.str()); os.str(""); os << "GLWidget::InitGL():";
strs.push_back(os.str()); os.str(""); os << "\nCurrent DC: " << cdc; strs.push_back(os.str()); os.str(""); os << "\nCurrent DC: " << cdc;
strs.push_back(os.str()); os.str(""); os << "\nCurrent Context: " << cc; strs.push_back(os.str()); os.str(""); os << "\nCurrent Context: " << cc;
for (int platform = 0; platform < platforms.size(); platform++) for (int platform = 0; platform < platforms.size(); platform++)
{ {
cl_context_properties props[] = cl_context_properties props[] =
{ {
CL_GL_CONTEXT_KHR, (cl_context_properties)wglGetCurrentContext(), CL_GL_CONTEXT_KHR, (cl_context_properties)wglGetCurrentContext(),
@ -237,9 +237,9 @@ void GLWidget::InitGL()
strs.push_back(os.str()); os.str(""); os << "\nDevice OpenCL C version: " << dev.getInfo<CL_DEVICE_OPENCL_C_VERSION>(nullptr).c_str() << endl; strs.push_back(os.str()); os.str(""); os << "\nDevice OpenCL C version: " << dev.getInfo<CL_DEVICE_OPENCL_C_VERSION>(nullptr).c_str() << endl;
} }
} }
} }
m_Fractorium->ErrorReportToQTextEdit(strs, m_Fractorium->ui.InfoRenderingTextEdit); m_Fractorium->ErrorReportToQTextEdit(strs, m_Fractorium->ui.InfoRenderingTextEdit);
*/ */
} }
} }
@ -374,7 +374,7 @@ void GLEmberControllerBase::ClearControl() { m_DragModifier &= ~et(eDragModifier
template <typename T> template <typename T>
void GLEmberController<T>::ClearWindow() void GLEmberController<T>::ClearWindow()
{ {
auto ember = m_FractoriumEmberController->CurrentEmber(); auto ember = m_FractoriumEmberController->CurrentEmber();
m_GL->makeCurrent(); m_GL->makeCurrent();
m_GL->glClearColor(ember->m_Background.r, ember->m_Background.g, ember->m_Background.b, 1.0); m_GL->glClearColor(ember->m_Background.r, ember->m_Background.g, ember->m_Background.b, 1.0);
m_GL->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); m_GL->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@ -524,12 +524,12 @@ void GLWidget::initializeGL()
void GLWidget::paintGL() void GLWidget::paintGL()
{ {
/* /*
auto qsf = this->format(); auto qsf = this->format();
qDebug() << "paintGL*****************\nVersion: " << qsf.majorVersion() << ',' << qsf.minorVersion(); qDebug() << "paintGL*****************\nVersion: " << qsf.majorVersion() << ',' << qsf.minorVersion();
qDebug() << "Profile: " << qsf.profile(); qDebug() << "Profile: " << qsf.profile();
qDebug() << "Depth buffer size: " << qsf.depthBufferSize(); qDebug() << "Depth buffer size: " << qsf.depthBufferSize();
qDebug() << "Swap behavior: " << qsf.swapBehavior(); qDebug() << "Swap behavior: " << qsf.swapBehavior();
qDebug() << "Swap interval: " << qsf.swapInterval(); qDebug() << "Swap interval: " << qsf.swapInterval();
*/ */
auto controller = m_Fractorium->m_Controller.get(); auto controller = m_Fractorium->m_Controller.get();
@ -804,7 +804,7 @@ bool GLEmberControllerBase::KeyPress_(QKeyEvent* e)
{ {
SetControl(); SetControl();
return true; return true;
} }
return false; return false;
} }
@ -829,7 +829,7 @@ bool GLEmberControllerBase::KeyRelease_(QKeyEvent* e)
{ {
if (e->key() == Qt::Key_Control) if (e->key() == Qt::Key_Control)
{ {
ClearControl(); ClearControl();
return true; return true;
} }
@ -1116,10 +1116,10 @@ void GLEmberController<T>::Wheel(QWheelEvent* e)
} }
else else
{ {
if (m_Fractorium->DrawImage() && (!(e->buttons() & Qt::MiddleButton)) && (!(e->modifiers() & Qt::ShiftModifier))) //Middle button does whole image translation, so ignore the mouse wheel while panning to avoid inadvertent zooming. ShiftModifier for sensitive mouse. if (m_Fractorium->DrawImage() && !(e->buttons() & Qt::MiddleButton) && !(e->modifiers() & Qt::ShiftModifier))//Middle button does whole image translation, so ignore the mouse wheel while panning to avoid inadvertent zooming. ShiftModifier for sensitive mouse.
{ {
auto ember = m_FractoriumEmberController->CurrentEmber(); auto ember = m_FractoriumEmberController->CurrentEmber();
m_Fractorium->SetScale(ember->m_PixelsPerUnit + (e->angleDelta().y() >= 0 ? 50 : -50)); m_Fractorium->SetScale(ember->m_PixelsPerUnit + (e->angleDelta().y() >= 0 ? 50 : -50));
} }
} }
} }