ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/UserCode/FastOpenGlDisplayer/soft/main.h

Comparing UserCode/FastOpenGlDisplayer/soft/main.h (file contents):
Revision 1.45 by querten, Fri Jul 25 11:47:23 2008 UTC vs.
Revision 1.49 by querten, Fri Aug 22 03:14:31 2008 UTC

#	Line 6 | Line 6
6		#ifndef _MAIN_H__
7		#define _MAIN_H__
8
9	<	#define FROG_VERSION 1.05
9	>	#define FROG_VERSION 1.077
10		#define FROG_AUTHORLIST "Loic.Quertenmont@cern.ch\nVincent.Roberfroid@cern.ch"
11
12	+	#include "Includes/GL/glew.h"
13		#ifdef linux
14	+	#include "Includes/GL/glxew.h"
15		#include <GL/gl.h>
16		#include <GL/glu.h>
17	<	#include "Includes/GLUT/glut.h"
17	>	#include "Includes/GLUT/glut.h"
18		#else
19	<	#include <windows.h>
19	>	#include <windows.h>
20	>	#include "Includes/GL/wglew.h"
21		#include <gl/gl.h>
22		#include <gl/glu.h>
23	<	#include <gl/glut.h>
23	>	#include <gl/glut.h>
24		#pragma comment (lib,"glaux.lib")
25		#pragma comment (lib,"glu32.lib")
26		#pragma comment (lib,"opengl32.lib")
#	Line 68 | Line 71 | bool  FULLSCREEN        = false;
71		int   WINDOW_WIDTH      = 800;
72		int   WINDOW_HEIGHT     = 600;
73		int   SCREENSHOT        = 0;
74	<	char SCREENSHOT_FORMAT[255] = {"png"};
74	>	char  SCREENSHOT_FORMAT[255] = {"png"};
75	>
76	>
77
78		int TEMP_I = 0;
79		bool MouseStates[3];
#	Line 107 | Line 112 | bool mLoading   = true;
112		int  mLoading_I = 0;
113
114		int eventNumber = 0;
115	+	int eventTime   = 5;
116
117		bool  mHelpScreen= false;
118
#	Line 130 | Line 136 | void LoadCard(const char* inputCard );
136		void gl_select(int x, int y);
137		void list_hits(GLint hits, GLuint *names);
138
139	+	void AutomaticEventChanging (int Extra);
140	+
141
142		void updateEventsFile();
143

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines