#include <simgear/compiler.h>
-#ifdef HAVE_WINDOWS_H
-# include <windows.h>
-#endif
-
-#include SG_GL_H
-
#include <fstream>
#include <string>
#include <cstring>
#include <stdlib.h>
-// for help call back
-#ifdef WIN32
-# include <shellapi.h>
-# ifdef __CYGWIN__
-# include <sys/cygwin.h>
-# endif
-#endif
-
#include <simgear/debug/logstream.hxx>
#include <simgear/misc/sg_path.hxx>
#include <simgear/screen/screen-dump.hxx>
#include <Cockpit/panel.hxx>
#include <Main/globals.hxx>
#include <Main/fg_props.hxx>
+#include <Main/fg_os.hxx>
#include <Main/renderer.hxx>
#include <Main/viewmgr.hxx>
#include <GUI/new_gui.hxx>
# include <simgear/screen/win32-printer.h>
# include <simgear/screen/GlBitmaps.h>
#endif
-
+#ifdef __MINGW32__
+#include <shellapi.h>
+#endif
#include "gui.h"
using std::string;
string msg = txt;
msg += '\n';
msg += throwable.getFormattedMessage();
- if (!throwable.getOrigin().empty()) {
+ if (!std::strlen(throwable.getOrigin()) != 0) {
msg += "\n (reported by ";
msg += throwable.getOrigin();
msg += ')';
/* allocate buffer large enough to store one tile */
GLubyte *tile = (GLubyte *)malloc(width * height * 3 * sizeof(GLubyte));
if (!tile) {
+ delete [] filename;
printf("Malloc of tile buffer failed!\n");
return;
}
GLubyte *buffer
= (GLubyte *)malloc(imageWidth * height * 3 * sizeof(GLubyte));
if (!buffer) {
+ delete [] filename;
free(tile);
printf("Malloc of tile row buffer failed!\n");
return;
f = fopen(filename, "wb");
if (!f) {
printf("Couldn't open image file: %s\n", filename);
+ delete [] filename;
free(buffer);
free(tile);
return;
/* just to be safe... */
glPixelStorei(GL_PACK_ALIGNMENT, 1);
+ // OSGFIXME
+#if 0
/* Because the HUD and Panel change the ViewPort we will
* need to handle some lowlevel stuff ourselves */
int ncols = trGet(tr, TR_COLUMNS);
bool do_panel = fgPanelVisible();
GLfloat panel_col_step = globals->get_current_panel()->getWidth() / ncols;
GLfloat panel_row_step = globals->get_current_panel()->getHeight() / nrows;
-
+#endif
glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
glHint(GL_POLYGON_SMOOTH_HINT, GL_NICEST);
glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
while (more) {
trBeginTile(tr);
int curColumn = trGet(tr, TR_CURRENT_COLUMN);
- int curRow = trGet(tr, TR_CURRENT_ROW);
+ // int curRow = trGet(tr, TR_CURRENT_ROW);
renderer->update( false );
// OSGFIXME
renderer->update( true );
renderer->update( true );
- string dir = fgGetString("/sim/paths/screenshot-dir", fgGetString("/sim/fg-current"));
+ string dir = fgGetString("/sim/paths/screenshot-dir");
+ if (dir.empty())
+ dir = fgGetString("/sim/fg-current");
+
SGPath path(dir + '/');
if (path.create_dir( 0755 )) {
SG_LOG(SG_GENERAL, SG_ALERT, "Cannot create screenshot directory '"
char filename[24];
static int count = 1;
while (count < 1000) {
- snprintf(filename, 24, "fgfs-screen-%03d.ppm", count++);
+ snprintf(filename, 24, "fgfs-screen-%03d.png", count++);
SGPath p(dir);
p.append(filename);
string message;
static int count = 1;
- FGRenderer *renderer = globals->get_renderer();
-
static const SGPropertyNode *master_freeze
= fgGetNode("/sim/freeze/master");
string message;
static int count = 1;
- FGRenderer *renderer = globals->get_renderer();
-
static const SGPropertyNode *master_freeze
= fgGetNode("/sim/freeze/master");