mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-03-08 11:51:34 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Linux.

Browse Source
This commit is contained in:
mfeemster 2014-12-14 20:25:46 -08:00
parent a004f71888
commit 9502ae57ab
13 changed files with 57 additions and 36 deletions

7
Builds/QtCreator/Ember/Ember.pro
View File

@ -16,7 +16,9 @@ INCLUDEPATH += /usr/include/tbb
INCLUDEPATH += /usr/include/libxml2 INCLUDEPATH += /usr/include/libxml2
INCLUDEPATH += ../../../Source/Ember INCLUDEPATH += ../../../Source/Ember
QMAKE_CXXFLAGS += -O2 QMAKE_CXXFLAGS_RELEASE += -O2
QMAKE_CXXFLAGS_RELEASE += -DNDEBUG
QMAKE_CXXFLAGS += -march=k8 QMAKE_CXXFLAGS += -march=k8
QMAKE_CXXFLAGS += -fPIC QMAKE_CXXFLAGS += -fPIC
QMAKE_CXXFLAGS += -fpermissive QMAKE_CXXFLAGS += -fpermissive
@ -43,11 +45,10 @@ QMAKE_CXXFLAGS += -Wno-unused-function
QMAKE_CXXFLAGS += -Wold-style-cast QMAKE_CXXFLAGS += -Wold-style-cast
QMAKE_CXXFLAGS += -D_M_X64 QMAKE_CXXFLAGS += -D_M_X64
QMAKE_CXXFLAGS += -D_USRDLL QMAKE_CXXFLAGS += -D_USRDLL
QMAKE_CXXFLAGS += -DNDEBUG
QMAKE_CXXFLAGS += -D_CONSOLE QMAKE_CXXFLAGS += -D_CONSOLE
QMAKE_CXXFLAGS += -DBUILDING_EMBER QMAKE_CXXFLAGS += -DBUILDING_EMBER
QMAKE_LFLAGS += -s QMAKE_LFLAGS_RELEASE += -s
PRECOMPILED_HEADER = ../../../Source/Ember/EmberPch.h PRECOMPILED_HEADER = ../../../Source/Ember/EmberPch.h

6
Builds/QtCreator/EmberAnimate/EmberAnimate.pro
View File

@ -25,7 +25,9 @@ INCLUDEPATH += ../../../Source/Ember
INCLUDEPATH += ../../../Source/EmberCL INCLUDEPATH += ../../../Source/EmberCL
INCLUDEPATH += ../../../Source/EmberCommon INCLUDEPATH += ../../../Source/EmberCommon
QMAKE_CXXFLAGS += -O2 QMAKE_CXXFLAGS_RELEASE += -O2
QMAKE_CXXFLAGS_RELEASE += -DNDEBUG
QMAKE_CXXFLAGS += -march=k8 QMAKE_CXXFLAGS += -march=k8
QMAKE_CXXFLAGS += -fPIC QMAKE_CXXFLAGS += -fPIC
QMAKE_CXXFLAGS += -fpermissive QMAKE_CXXFLAGS += -fpermissive
@ -55,7 +57,7 @@ QMAKE_CXXFLAGS += -D_USRDLL
QMAKE_CXXFLAGS += -DNDEBUG QMAKE_CXXFLAGS += -DNDEBUG
QMAKE_CXXFLAGS += -D_CONSOLE QMAKE_CXXFLAGS += -D_CONSOLE
QMAKE_LFLAGS += -s QMAKE_LFLAGS_RELEASE += -s
PRECOMPILED_HEADER = ../../../Source/EmberCommon/EmberCommonPch.h PRECOMPILED_HEADER = ../../../Source/EmberCommon/EmberCommonPch.h

7
Builds/QtCreator/EmberCL/EmberCL.pro
View File

@ -18,7 +18,9 @@ INCLUDEPATH += /usr/include/tbb
INCLUDEPATH += /usr/include/libxml2 INCLUDEPATH += /usr/include/libxml2
INCLUDEPATH += ../../../Source/Ember INCLUDEPATH += ../../../Source/Ember
QMAKE_CXXFLAGS += -O2 QMAKE_CXXFLAGS_RELEASE += -O2
QMAKE_CXXFLAGS_RELEASE += -DNDEBUG
QMAKE_CXXFLAGS += -march=k8 QMAKE_CXXFLAGS += -march=k8
QMAKE_CXXFLAGS += -fPIC QMAKE_CXXFLAGS += -fPIC
QMAKE_CXXFLAGS += -fpermissive QMAKE_CXXFLAGS += -fpermissive
@ -45,11 +47,10 @@ QMAKE_CXXFLAGS += -Wno-unused-function
QMAKE_CXXFLAGS += -Wold-style-cast QMAKE_CXXFLAGS += -Wold-style-cast
QMAKE_CXXFLAGS += -D_M_X64 QMAKE_CXXFLAGS += -D_M_X64
QMAKE_CXXFLAGS += -D_USRDLL QMAKE_CXXFLAGS += -D_USRDLL
QMAKE_CXXFLAGS += -DNDEBUG
QMAKE_CXXFLAGS += -D_CONSOLE QMAKE_CXXFLAGS += -D_CONSOLE
QMAKE_CXXFLAGS += -BUILDING_EMBERCL QMAKE_CXXFLAGS += -BUILDING_EMBERCL
QMAKE_LFLAGS += -s QMAKE_LFLAGS_RELEASE += -s
PRECOMPILED_HEADER = ../../../Source/EmberCL/EmberCLPch.h PRECOMPILED_HEADER = ../../../Source/EmberCL/EmberCLPch.h

6
Builds/QtCreator/EmberGenome/EmberGenome.pro
View File

@ -25,7 +25,9 @@ INCLUDEPATH += ../../../Source/Ember
INCLUDEPATH += ../../../Source/EmberCL INCLUDEPATH += ../../../Source/EmberCL
INCLUDEPATH += ../../../Source/EmberCommon INCLUDEPATH += ../../../Source/EmberCommon
QMAKE_CXXFLAGS += -O2 QMAKE_CXXFLAGS_RELEASE += -O2
QMAKE_CXXFLAGS_RELEASE += -DNDEBUG
QMAKE_CXXFLAGS += -march=k8 QMAKE_CXXFLAGS += -march=k8
QMAKE_CXXFLAGS += -fPIC QMAKE_CXXFLAGS += -fPIC
QMAKE_CXXFLAGS += -fpermissive QMAKE_CXXFLAGS += -fpermissive
@ -55,7 +57,7 @@ QMAKE_CXXFLAGS += -D_USRDLL
QMAKE_CXXFLAGS += -DNDEBUG QMAKE_CXXFLAGS += -DNDEBUG
QMAKE_CXXFLAGS += -D_CONSOLE QMAKE_CXXFLAGS += -D_CONSOLE
QMAKE_LFLAGS += -s QMAKE_LFLAGS_RELEASE += -s
PRECOMPILED_HEADER = ../../../Source/EmberCommon/EmberCommonPch.h PRECOMPILED_HEADER = ../../../Source/EmberCommon/EmberCommonPch.h

6
Builds/QtCreator/EmberRender/EmberRender.pro
View File

@ -25,7 +25,9 @@ INCLUDEPATH += ../../../Source/Ember
INCLUDEPATH += ../../../Source/EmberCL INCLUDEPATH += ../../../Source/EmberCL
INCLUDEPATH += ../../../Source/EmberCommon INCLUDEPATH += ../../../Source/EmberCommon
QMAKE_CXXFLAGS += -O2 QMAKE_CXXFLAGS_RELEASE += -O2
QMAKE_CXXFLAGS_RELEASE += -DNDEBUG
QMAKE_CXXFLAGS += -march=k8 QMAKE_CXXFLAGS += -march=k8
QMAKE_CXXFLAGS += -fPIC QMAKE_CXXFLAGS += -fPIC
QMAKE_CXXFLAGS += -fpermissive QMAKE_CXXFLAGS += -fpermissive
@ -55,7 +57,7 @@ QMAKE_CXXFLAGS += -D_USRDLL
QMAKE_CXXFLAGS += -DNDEBUG QMAKE_CXXFLAGS += -DNDEBUG
QMAKE_CXXFLAGS += -D_CONSOLE QMAKE_CXXFLAGS += -D_CONSOLE
QMAKE_LFLAGS += -s QMAKE_LFLAGS_RELEASE += -s
PRECOMPILED_HEADER = ../../../Source/EmberCommon/EmberCommonPch.h PRECOMPILED_HEADER = ../../../Source/EmberCommon/EmberCommonPch.h

7
Builds/QtCreator/Fractorium/Fractorium.pro
View File

@ -34,7 +34,9 @@ INCLUDEPATH += ../../../Source/EmberCL
INCLUDEPATH += ../../../Source/EmberCommon INCLUDEPATH += ../../../Source/EmberCommon
INCLUDEPATH += ../../../Source/Fractorium INCLUDEPATH += ../../../Source/Fractorium
QMAKE_CXXFLAGS += -O2 QMAKE_CXXFLAGS_RELEASE += -O2
QMAKE_CXXFLAGS_RELEASE += -DNDEBUG
QMAKE_CXXFLAGS += -march=k8 QMAKE_CXXFLAGS += -march=k8
QMAKE_CXXFLAGS += -fPIC QMAKE_CXXFLAGS += -fPIC
QMAKE_CXXFLAGS += -fpermissive QMAKE_CXXFLAGS += -fpermissive
@ -62,10 +64,9 @@ QMAKE_CXXFLAGS += -Wno-unused-function
QMAKE_CXXFLAGS += -Wold-style-cast QMAKE_CXXFLAGS += -Wold-style-cast
QMAKE_CXXFLAGS += -D_M_X64 QMAKE_CXXFLAGS += -D_M_X64
QMAKE_CXXFLAGS += -D_USRDLL QMAKE_CXXFLAGS += -D_USRDLL
QMAKE_CXXFLAGS += -DNDEBUG
QMAKE_CXXFLAGS += -D_CONSOLE QMAKE_CXXFLAGS += -D_CONSOLE
QMAKE_LFLAGS += -s QMAKE_LFLAGS_RELEASE += -s
PRECOMPILED_HEADER = ../../../Source/Fractorium/FractoriumPch.h PRECOMPILED_HEADER = ../../../Source/Fractorium/FractoriumPch.h

2
Source/Ember/Timing.h
View File

@ -193,6 +193,8 @@ private:
CriticalSection() CriticalSection()
{ {
pthread_mutexattr_t attr; pthread_mutexattr_t attr;
pthread_mutexattr_init(&attr);
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL); pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL);
pthread_mutex_init(&m_CriticalSection, &attr); pthread_mutex_init(&m_CriticalSection, &attr);
pthread_mutexattr_destroy(&attr); pthread_mutexattr_destroy(&attr);

2
Source/Fractorium/Fractorium.cpp
View File

@ -149,6 +149,7 @@ Fractorium::Fractorium(QWidget* p)
//Setup pointer in the GL window to point back to here. //Setup pointer in the GL window to point back to here.
ui.GLDisplay->SetMainWindow(this); ui.GLDisplay->SetMainWindow(this);
//ui.GLDisplay->setParent(this);
SetCoordinateStatus(0, 0, 0, 0); SetCoordinateStatus(0, 0, 0, 0);
SetTabOrders(); SetTabOrders();
@ -262,6 +263,7 @@ bool Fractorium::eventFilter(QObject* o, QEvent* e)
{ {
m_WidthSpin->DoubleClickNonZero(ui.GLParentScrollArea->width()); m_WidthSpin->DoubleClickNonZero(ui.GLParentScrollArea->width());
m_HeightSpin->DoubleClickNonZero(ui.GLParentScrollArea->height()); m_HeightSpin->DoubleClickNonZero(ui.GLParentScrollArea->height());
//qDebug() << "scroll area resized";
} }
return QMainWindow::eventFilter(o, e); return QMainWindow::eventFilter(o, e);

30
Source/Fractorium/Fractorium.ui
View File

@ -35,6 +35,12 @@
<property name="styleSheet"> <property name="styleSheet">
<string notr="true"/> <string notr="true"/>
</property> </property>
<property name="iconSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<widget class="QScrollArea" name="GLParentScrollArea"> <widget class="QScrollArea" name="GLParentScrollArea">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@ -65,12 +71,12 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>923</width> <width>926</width>
<height>942</height> <height>941</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Ignored"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -89,7 +95,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1214</width> <width>1214</width>
<height>21</height> <height>20</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="MenuFile"> <widget class="QMenu" name="MenuFile">
@ -382,8 +388,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>259</width> <width>261</width>
<height>852</height> <height>845</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout_11"> <layout class="QGridLayout" name="gridLayout_11">
@ -489,8 +495,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>259</width> <width>261</width>
<height>852</height> <height>845</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
@ -2810,8 +2816,8 @@ SpinBox
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>245</width> <width>141</width>
<height>747</height> <height>610</height>
</rect> </rect>
</property> </property>
<property name="autoFillBackground"> <property name="autoFillBackground">
@ -5026,8 +5032,8 @@ SpinBox
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>259</width> <width>98</width>
<height>853</height> <height>470</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">

2
Source/Fractorium/FractoriumRender.cpp
View File

@ -266,7 +266,7 @@ bool FractoriumEmberController<T>::SyncSizes()
{ {
bool changed = false; bool changed = false;
GLWidget* gl = m_Fractorium->ui.GLDisplay; GLWidget* gl = m_Fractorium->ui.GLDisplay;
RendererCL<T>* rendererCL; RendererCL<T>* rendererCL = nullptr;
if (!m_GLController->SizesMatch()) if (!m_GLController->SizesMatch())
{ {

11
Source/Fractorium/GLWidget.cpp
View File

@ -176,9 +176,14 @@ void GLWidget::initializeGL()
{ {
glClearColor(0.0, 0.0, 0.0, 1.0); glClearColor(0.0, 0.0, 0.0, 1.0);
//int w = m_Fractorium->width() - m_Fractorium->ui.DockWidget->width();
//int h = m_Fractorium->ui.DockWidget->height();
int w = m_Fractorium->ui.GLParentScrollArea->width(); int w = m_Fractorium->ui.GLParentScrollArea->width();
int h = m_Fractorium->ui.GLParentScrollArea->height(); int h = m_Fractorium->ui.GLParentScrollArea->height();
//show();
//m_Fractorium->ui.GLParentScrollArea->showMaximized();
SetDimensions(w, h); SetDimensions(w, h);
m_Fractorium->m_WidthSpin->setValue(w); m_Fractorium->m_WidthSpin->setValue(w);
m_Fractorium->m_HeightSpin->setValue(h); m_Fractorium->m_HeightSpin->setValue(h);
@ -193,6 +198,7 @@ void GLWidget::initializeGL()
//Start with a flock of 10 random embers. Can't do this until now because the window wasn't maximized yet, so the sizes would have been off. //Start with a flock of 10 random embers. Can't do this until now because the window wasn't maximized yet, so the sizes would have been off.
m_Fractorium->OnActionNewFlock(false); m_Fractorium->OnActionNewFlock(false);
//m_Fractorium->repaint();
m_Fractorium->m_Controller->DelayedStartRenderTimer(); m_Fractorium->m_Controller->DelayedStartRenderTimer();
m_Init = true; m_Init = true;
} }
@ -740,6 +746,7 @@ void GLWidget::resizeEvent(QResizeEvent* e)
void GLWidget::SetDimensions(int w, int h) void GLWidget::SetDimensions(int w, int h)
{ {
setFixedSize(w, h); setFixedSize(w, h);
//resize(w, h);
//m_Fractorium->ui.GLParentScrollAreaContents->setFixedSize(w, h); //m_Fractorium->ui.GLParentScrollAreaContents->setFixedSize(w, h);
} }
@ -764,10 +771,7 @@ bool GLWidget::Allocate(bool force)
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
if (doResize) if (doResize)
{
glBindTexture(GL_TEXTURE_2D, m_OutputTexID);
Deallocate(); Deallocate();
}
glGenTextures(1, &m_OutputTexID); glGenTextures(1, &m_OutputTexID);
glBindTexture(GL_TEXTURE_2D, m_OutputTexID); glBindTexture(GL_TEXTURE_2D, m_OutputTexID);
@ -799,6 +803,7 @@ bool GLWidget::Deallocate()
if (m_OutputTexID != 0) if (m_OutputTexID != 0)
{ {
glBindTexture(GL_TEXTURE_2D, m_OutputTexID);
glDeleteTextures(1, &m_OutputTexID); glDeleteTextures(1, &m_OutputTexID);
m_OutputTexID = 0; m_OutputTexID = 0;
deleted = true; deleted = true;

3
Source/Fractorium/Main.cpp
View File

@ -31,9 +31,6 @@ int main(int argc, char *argv[])
#endif #endif
#ifndef WIN32 #ifndef WIN32
//a.setStyle("motif");
//a.setStyleSheet("QGroupBox { border: 1px solid gray; border-radius: 3px; margin-top: 1em; } ");
a.setStyleSheet("QGroupBox { border: 1px solid gray; border-radius: 3px; margin-top: 1.1em; background-color: transparent; } \n" a.setStyleSheet("QGroupBox { border: 1px solid gray; border-radius: 3px; margin-top: 1.1em; background-color: transparent; } \n"
"QTabBar::tab { height: 2.8ex; } \n" "QTabBar::tab { height: 2.8ex; } \n"
"QGroupBox::title " "QGroupBox::title "