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.14 by roberfro, Mon Apr 28 11:47:49 2008 UTC vs.
Revision 1.19 by querten, Fri May 2 14:30:34 2008 UTC

#	Line 10 | Line 10
10		#ifdef linux
11		#include <GL/gl.h>
12		#include <GL/glu.h>
13	<	#include "../interface/glut.h"
13	>	#include "Includes/GLUT/glut.h"
14		#include <ext/hash_map>
15		using namespace __gnu_cxx;
16		typedef hash_map<unsigned int, char*, hash<unsigned int>, equal_to<unsigned int> > HASH_Map;
17		#else
18		#define _CRT_SECURE_NO_DEPRECATE 1
19	<	#include <windows.h>
19	>	#include <windows.h>
20		#include <gl/gl.h>
21		#include <gl/glu.h>
22		#include <gl/glut.h>
#	Line 25 | Line 25
25		#pragma comment (lib,"opengl32.lib")
26		#pragma comment (lib,"glut.lib")
27		#pragma comment (lib,"glut32.lib")
28	+
29		#include <hash_map>
30		using namespace stdext;
31		typedef hash_map<unsigned int, char*, hash_compare<unsigned int, std::less<unsigned int> > > HASH_Map;
#	Line 42 | Line 43 | time_t end;
43		#include "../interface/SimEvent.h"
44		#include "../interface/Geometry.h"
45
46	<	#include "DrawPrimitive.h"
47	<	#include "ScreenShot.h"
48	<	#include "Logo.h"
49	<	#include "Texture.h"
50	<	#include "ReadCards.h"
51	<	#include "FROG_Struct.h"
52	<	#include "ObjectInfo.h"
46	>	#include "Includes/FROG/DrawPrimitive.h"
47	>	#include "Includes/FROG/Logo.h"
48	>	#include "Includes/FROG/Texture.h"
49	>	#include "Includes/FROG/ReadCards.h"
50	>	#include "Includes/FROG/FROG_Struct.h"
51	>	#include "Includes/FROG/FROG_Camera.h"
52	>	#include "Includes/FROG/ObjectInfo.h"
53
54		int SAVE_WINDOW_W = 800;
55		int SAVE_WINDOW_H = 600;
56		int SAVE_WINDOW_X = 10;
57		int SAVE_WINDOW_Y = 10;
58
59	<	bool FULLSCREEN = false;
60	<	int WINDOW_WIDTH = 800;
61	<	int WINDOW_HEIGHT = 600;
62	<	int SCREENSHOT = 0;
59	>	bool  FULLSCREEN        = false;
60	>	int   WINDOW_WIDTH      = 800;
61	>	int   WINDOW_HEIGHT     = 600;
62	>	int   SCREENSHOT        = 0;
63	>	char* SCREENSHOT_FORMAT = new char[255];
64
65		int TEMP_I = 0;
66
67	<	float CAM_R  = 700;
66	<	float CAM_tx = 0.0;
67	<	float CAM_ty = 0.0;
67	>	FROG_Camera Cam;
68
69		int CMS_TRACKER_RADIUS = 129;
70		int CMS_TRACKER_LENGTH = 300;
#	Line 119 | Line 119 | int eventNumber = 0;
119
120		bool  mHelpScreen= false;
121		bool  mRotate    = true;
122	+
123	+
124	+	bool stateChanged = false;
125		float mDt                = 0.005f;
126
127	+	bool print_FrameWork = false;
128	+
129
130		GLint Menu_Geom_Tracker = 0;
131		GLint Menu_Geom_Ecal    = 0;
#	Line 136 | Line 141 | WidthAndColor WaC_Txt               = {1
141		WidthAndColor WaC_CMS_Framework     = {1.0 , 1.0 , 0.5 , 1.0 , 0.3};
142		WidthAndColor WaC_LHC_Axis          = {3.0 , 1.0 , 0.5 , 1.0 , 0.3};
143		WidthAndColor WaC_Default_SimTrack  = {2.0 , 0.0 , 1.0 , 1.0 , 1.0};
144	<	WidthAndColor WaC_Selected_SimTrack = {2.0 , 1.0 , 1.0 , 0.0 , 1.0};
144	>	WidthAndColor WaC_Selected_Object   = {2.0 , 1.0 , 1.0 , 0.0 , 1.0};
145
146		std::vector<IdAndWidthAndColor*> WaC_SimTracks;
147	+	std::vector<IdAndWidthAndColor*> WaC_RecoTracks;
148
149		void DrawTrack(MySimTrack* track, MySimVertex* vertex1, MySimVertex* vertex2);
150		void reshape (int w, int h);
#	Line 161 | Line 167 | void LoadCard(const char* inputCard );
167		void gl_select(int x, int y);
168		void list_hits(GLint hits, GLuint *names);
169
164	–
170		#endif
171

Diff Legend

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