mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-02-23 11:15:02 +01:00
Code Issues Projects Releases Wiki Activity

- attempt to further stabilize g3d viewer end map editor

Browse Source
This commit is contained in:
SoftCoder 2014-11-29 17:44:22 -08:00
parent 956671f018
commit c21317a5f4
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/glest_game

@ -1 +1 @@
Subproject commit 720a63bb34e0c30add8fb1bf65833db0710ae6fc
Subproject commit f674bb7461ea1ada93c96a7c3167daa4d2dc1ef3

4
source/g3d_viewer/main.cpp
View File

@ -575,7 +575,7 @@ void MainWindow::init() {
#elif wxCHECK_VERSION(2, 9, 1)
#else
//glCanvas->SetCurrent();
glCanvas->SetCurrent();
//printf("setcurrent #2\n");
#endif
@ -593,7 +593,7 @@ void MainWindow::onPaint(wxPaintEvent &event) {
#elif wxCHECK_VERSION(2, 9, 3)
#elif wxCHECK_VERSION(2, 9, 1)
//glCanvas->setCurrentGLContext();
glCanvas->setCurrentGLContext();
#endif
if(startupSettingsInited == false) {

14
source/glest_map_editor/main.cpp
View File

@ -644,11 +644,11 @@ void MainWindow::onPaint(wxPaintEvent &event) {
// glCanvas->setCurrentGLContext();
//#endif
static bool contextSet = false;
if(contextSet == false) {
contextSet = true;
glCanvas->setCurrentGLContext();
}
//static bool contextSet = false;
//if(contextSet == false) {
// contextSet = true;
glCanvas->setCurrentGLContext();
//}
if(lastPaintEvent.getMillis() < 30) {
sleep(1);
@ -1585,6 +1585,10 @@ bool App::OnInit() {
SystemFlags::VERBOSE_MODE_ENABLED = false;
SystemFlags::ENABLE_THREADED_LOGGING = false;
#if defined(wxMAJOR_VERSION) && defined(wxMINOR_VERSION) && defined(wxRELEASE_NUMBER) && defined(wxSUBRELEASE_NUMBER)
printf("Using wxWidgets version [%d.%d.%d.%d]\n",wxMAJOR_VERSION,wxMINOR_VERSION,wxRELEASE_NUMBER,wxSUBRELEASE_NUMBER);
#endif
string fileparam;
if(argc==2){
if(argv[1][0]=='-') { // any flag gives help and exits program.