EpicSparrow/PixelWars
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed debug textarea not updating and updated qtutils

Browse Source
This commit is contained in:
Anselme 2016-09-18 22:16:51 +02:00
parent 3ec9f35fd6
commit 4473aee625
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mainwindow.cpp
View File

@ -94,7 +94,7 @@ void MainWindow::updateSimu()
ui->drawWidget->updateDudesBehavior(); ui->drawWidget->updateDudesBehavior();
ui->drawWidget->setFlatSphere(ui->flatSphereSlider->value()); ui->drawWidget->setFlatSphere(ui->flatSphereSlider->value());
ui->drawWidget->setSurfaceRatio(ui->surfaceRatioSlider->value()); ui->drawWidget->setSurfaceRatio(ui->surfaceRatioSlider->value());
if(m_debugEnabled) if(ui->debugGroupBox->isVisible())
updateDebugMessage(); updateDebugMessage();
ui->drawWidget->repaint(); ui->drawWidget->repaint();
} }

1
src/mainwindow.h
View File

@ -26,7 +26,6 @@ private:
int m_simSpeed; int m_simSpeed;
bool m_simSpeedChanged; bool m_simSpeedChanged;
bool m_paused; bool m_paused;
bool m_debugEnabled;
Coord m_debugCursorPos; Coord m_debugCursorPos;
void updateDebugMessage(); void updateDebugMessage();

4
src/qtutils.cpp
View File

@ -23,7 +23,7 @@ EditorImage* QtUtils::loadImage(const QString &filename)
img->width = glImage.width(); img->width = glImage.width();
img->height = glImage.height(); img->height = glImage.height();
img->allocate(glImage.byteCount()); img->allocate(glImage.byteCount());
memcpy(img->pixels, glImage.bits(), glImage.byteCount()); memcpy(img->pixels.data(), glImage.bits(), glImage.byteCount());
return img; return img;
} }
@ -44,7 +44,7 @@ EditorImage::EditorImage(int myWidth, int myHeight, float frequency, float ampli
depth = 32; depth = 32;
Image::allocate(width*height*depth); Image::allocate(width*height*depth);
GLubyte *data = (GLubyte*)Image::pixels; GLubyte *data = (GLubyte*)Image::pixels.data();
float xFactor = 1.0f / (width - 1); float xFactor = 1.0f / (width - 1);
float yFactor = 1.0f / (height - 1); float yFactor = 1.0f / (height - 1);