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.1 by querten, Sun Apr 6 13:56:09 2008 UTC vs.
Revision 1.17 by querten, Thu May 1 07:35:42 2008 UTC

#	Line 11 | Line 11
11		#include <GL/gl.h>
12		#include <GL/glu.h>
13		#include "../interface/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>
#	Line 22 | Line 25
25		#pragma comment (lib,"opengl32.lib")
26		#pragma comment (lib,"glut.lib")
27		#pragma comment (lib,"glut32.lib")
28	+	#include <hash_map>
29	+	using namespace stdext;
30	+	typedef hash_map<unsigned int, char*, hash_compare<unsigned int, std::less<unsigned int> > > HASH_Map;
31		#endif
32
33	+	HASH_Map test;
34	+
35	+	#include <time.h>
36	+	time_t start;
37	+	time_t end;
38	+
39		#include <stdio.h>
40		#include <math.h>
41
#	Line 36 | Line 48
48		#include "Texture.h"
49		#include "ReadCards.h"
50		#include "FROG_Struct.h"
51	+	#include "FROG_Camera.h"
52	+	#include "ObjectInfo.h"
53
54		int SAVE_WINDOW_W = 800;
55		int SAVE_WINDOW_H = 600;
#	Line 47 | Line 61 | int WINDOW_WIDTH = 800;
61		int WINDOW_HEIGHT = 600;
62		int SCREENSHOT = 0;
63
64	<	float CAM_R  = 700;
65	<	float CAM_tx = 0.0;
66	<	float CAM_ty = 0.0;
64	>	int TEMP_I = 0;
65	>
66	>	FROG_Camera Cam;
67
68		int CMS_TRACKER_RADIUS = 129;
69	<	int CMS_TRACKER_LENGTH = 280;
69	>	int CMS_TRACKER_LENGTH = 300;
70
71		int TRACKING_RADIUS = 129;//295;
72	<	int TRACKING_LENGTH = 280;//645;
72	>	int TRACKING_LENGTH = 300;//645;
73
74		float PT_CUTOFF = 1.0;
75	+	double EECAL_CUTOFF[3] = {0.2,0.6,0.0001};
76	+	double EHCAL_CUTOFF[4] = {1.5,1.5,0.5,5.0};
77
78		bool MouseStates[3];
79
80		std::vector<GLuint> theSimTracks;
81	+	GLuint theGeomMuon[3];
82	+	GLuint theGeomMuonInEvent;
83		GLuint theGeomTracker[6];
84		GLuint theGeomTrackerInEvent;
85		GLuint theGeomEcal[3];
#	Line 73 | Line 91 | GLuint LogoTexture;
91
92		double t = 0;
93
94	<	std::string inputVisFile = "MinBias.vis";
94	>	std::string inputVisFile;
95	>	std::string inputTrackerGeom;
96	>	std::string inputEcalGeom;
97	>	std::string inputHcalGeom;
98	>	std::string inputMuonGeom;
99
100		MySimEvent*  event;
101		MySimEvents* events;
102
103		Geometry* geom;
104
83	–
84	–	bool  mPSimHit   = false;
85	–	bool  mSimTrack  = true;
86	–	bool  mSimVertex = true;
87	–	bool  mRecoTrack = true;
88	–	bool  mRecoEcalHit = true;
89	–	bool  mRecoHcalHit = true;
90	–
105		char gTracker   = 0;
106		char gEcal      = 0;
107		char gHcal      = 0;
108	+	char gMuon      = 0;
109	+	char gSim       = 0;
110	+	char gReco      = 15;
111
112	<	int   mTrackI   = -1;
112	>	int  mObj_I     = -1;
113	>	int  mColl_I    = -1;
114		bool mLoading   = true;
115		int  mLoading_I = 0;
116
#	Line 100 | Line 118 | int eventNumber = 0;
118
119		bool  mHelpScreen= false;
120		bool  mRotate    = true;
121	+
122	+
123	+	bool stateChanged = false;
124		float mDt                = 0.005f;
125
126	+	bool print_FrameWork = false;
127	+
128
129		GLint Menu_Geom_Tracker = 0;
130		GLint Menu_Geom_Ecal    = 0;
131		GLint Menu_Geom_Hcal    = 0;
132	+	GLint Menu_Geom_Muon    = 0;
133		GLint Menu_Geom         = 0;
134		GLint Menu_SimEvent     = 0;
135		GLint Menu_RecoEvent    = 0;
#	Line 116 | Line 140 | WidthAndColor WaC_Txt               = {1
140		WidthAndColor WaC_CMS_Framework     = {1.0 , 1.0 , 0.5 , 1.0 , 0.3};
141		WidthAndColor WaC_LHC_Axis          = {3.0 , 1.0 , 0.5 , 1.0 , 0.3};
142		WidthAndColor WaC_Default_SimTrack  = {2.0 , 0.0 , 1.0 , 1.0 , 1.0};
143	<	WidthAndColor WaC_Selected_SimTrack = {2.0 , 1.0 , 1.0 , 0.0 , 1.0};
143	>	WidthAndColor WaC_Selected_Object   = {2.0 , 1.0 , 1.0 , 0.0 , 1.0};
144	>
145	>	std::vector<IdAndWidthAndColor*> WaC_SimTracks;
146	>	std::vector<IdAndWidthAndColor*> WaC_RecoTracks;
147
148		void DrawTrack(MySimTrack* track, MySimVertex* vertex1, MySimVertex* vertex2);
149		void reshape (int w, int h);
150		void display();
151	+	void initGeomMuon();
152	+	void initGeomMuonInEvent();
153		void initGeomTracker();
154		void initGeomTrackerInEvent();
155		void initGeomEcal();
156		void initGeomEcalInEvent();
157		void initGeomHcal();
158		void initGeomHcalInEvent();
159	+	void defineColorForSimTrack(int i);
160	+
161		void initSimTrack();
162		void init();
163		void menu_callback(int value);
164		void menu_create();
165		void LoadCard(const char* inputCard );
166	+	void gl_select(int x, int y);
167	+	void list_hits(GLint hits, GLuint *names);
168	+
169	+	#endif
170
136	–	#endif

Diff Legend

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