Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- bugfix for g3d viewer to work in wxwidgets 2.9.4

This commit is contained in:
Mark Vejvoda 2013-11-17 08:01:45 +00:00
parent ac59cf5ab8
commit c825acd69f
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/g3d_viewer/main.cpp
View File

@ -602,8 +602,16 @@ void MainWindow::onPaint(wxPaintEvent &event) {
// notice that we use GetSize() here and not GetClientSize() because // notice that we use GetSize() here and not GetClientSize() because
// the latter doesn't return correct results for the minimized windows // the latter doesn't return correct results for the minimized windows
// (at least not under Windows) // (at least not under Windows)
#if defined(WIN32)
int viewportW = GetClientSize().x; int viewportW = GetClientSize().x;
int viewportH = GetClientSize().y; int viewportH = GetClientSize().y;
#else
int viewportW = GetSize().x;
int viewportH = GetSize().y;
#endif
printf("%d x %d\n",viewportW,viewportH);
#if defined(WIN32) #if defined(WIN32)
renderer->reset(viewportW, viewportH, playerColor); renderer->reset(viewportW, viewportH, playerColor);
@ -611,6 +619,8 @@ void MainWindow::onPaint(wxPaintEvent &event) {
renderer->reset(viewportW, viewportH, playerColor); renderer->reset(viewportW, viewportH, playerColor);
#endif #endif
renderer->transform(rotX, rotY, zoom); renderer->transform(rotX, rotY, zoom);
renderer->renderGrid(); renderer->renderGrid();
@ -636,7 +646,7 @@ void MainWindow::onPaint(wxPaintEvent &event) {
bool haveLoadedParticles = (particleProjectilePathList.empty() == false || particleSplashPathList.empty() == false); bool haveLoadedParticles = (particleProjectilePathList.empty() == false || particleSplashPathList.empty() == false);
if(autoScreenShotAndExit == true) { if(autoScreenShotAndExit == true && viewportW > 0 && viewportH > 0) {
printf("Auto exiting app...\n"); printf("Auto exiting app...\n");
fflush(stdout); fflush(stdout);
@ -648,6 +658,9 @@ void MainWindow::onPaint(wxPaintEvent &event) {
glCanvas->SwapBuffers(); glCanvas->SwapBuffers();
if(autoScreenShotAndExit == true && viewportW == 0 && viewportH == 0) {
return;
}
if((modelPathList.empty() == false) && resetAnimation && haveLoadedParticles) { if((modelPathList.empty() == false) && resetAnimation && haveLoadedParticles) {
if(anim >= resetAnim && resetAnim > 0) { if(anim >= resetAnim && resetAnim > 0) {
printf("RESETTING EVERYTHING [%f][%f]...\n",anim,resetAnim); printf("RESETTING EVERYTHING [%f][%f]...\n",anim,resetAnim);