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.4 by querten, Thu Apr 17 07:30:17 2008 UTC vs.
Revision 1.13 by querten, Sun Apr 27 07:27:30 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 "ObjectInfo.h"
52
53		int SAVE_WINDOW_W = 800;
54		int SAVE_WINDOW_H = 600;
#	Line 47 | Line 60 | int WINDOW_WIDTH = 800;
60		int WINDOW_HEIGHT = 600;
61		int SCREENSHOT = 0;
62
63	+	int TEMP_I = 0;
64	+
65		float CAM_R  = 700;
66		float CAM_tx = 0.0;
67		float CAM_ty = 0.0;
68
69		int CMS_TRACKER_RADIUS = 129;
70	<	int CMS_TRACKER_LENGTH = 280;
70	>	int CMS_TRACKER_LENGTH = 300;
71
72		int TRACKING_RADIUS = 129;//295;
73	<	int TRACKING_LENGTH = 280;//645;
73	>	int TRACKING_LENGTH = 300;//645;
74
75		float PT_CUTOFF = 1.0;
76	<	float EHCAL_CUTOFF = 4.0;
77	<	float EECAL_CUTOFF = 4.0;
76	>	double EECAL_CUTOFF[3] = {0.2,0.6,0.0001};
77	>	double EHCAL_CUTOFF[4] = {1.5,1.5,0.5,5.0};
78
79		bool MouseStates[3];
80
81		std::vector<GLuint> theSimTracks;
82	+	GLuint theGeomMuon[3];
83	+	GLuint theGeomMuonInEvent;
84		GLuint theGeomTracker[6];
85		GLuint theGeomTrackerInEvent;
86		GLuint theGeomEcal[3];
#	Line 79 | Line 96 | std::string inputVisFile;
96		std::string inputTrackerGeom;
97		std::string inputEcalGeom;
98		std::string inputHcalGeom;
99	+	std::string inputMuonGeom;
100
101		MySimEvent*  event;
102		MySimEvents* events;
#	Line 88 | Line 106 | Geometry* geom;
106		char gTracker   = 0;
107		char gEcal      = 0;
108		char gHcal      = 0;
109	<	char gSim       = 2;
110	<	char gReco      = 7;
109	>	char gMuon      = 0;
110	>	char gSim       = 0;
111	>	char gReco      = 15;
112
113	<	int   mTrackI   = -1;
113	>	int  mObj_I     = -1;
114	>	int  mColl_I    = -1;
115		bool mLoading   = true;
116		int  mLoading_I = 0;
117
#	Line 105 | Line 125 | float mDt               = 0.005f;
125		GLint Menu_Geom_Tracker = 0;
126		GLint Menu_Geom_Ecal    = 0;
127		GLint Menu_Geom_Hcal    = 0;
128	+	GLint Menu_Geom_Muon    = 0;
129		GLint Menu_Geom         = 0;
130		GLint Menu_SimEvent     = 0;
131		GLint Menu_RecoEvent    = 0;
#	Line 117 | Line 138 | WidthAndColor WaC_LHC_Axis          = {3
138		WidthAndColor WaC_Default_SimTrack  = {2.0 , 0.0 , 1.0 , 1.0 , 1.0};
139		WidthAndColor WaC_Selected_SimTrack = {2.0 , 1.0 , 1.0 , 0.0 , 1.0};
140
141	+	std::vector<IdAndWidthAndColor*> WaC_SimTracks;
142	+
143		void DrawTrack(MySimTrack* track, MySimVertex* vertex1, MySimVertex* vertex2);
144		void reshape (int w, int h);
145		void display();
146	+	void initGeomMuon();
147	+	void initGeomMuonInEvent();
148		void initGeomTracker();
149		void initGeomTrackerInEvent();
150		void initGeomEcal();
151		void initGeomEcalInEvent();
152		void initGeomHcal();
153		void initGeomHcalInEvent();
154	+	void defineColorForSimTrack(unsigned int i);
155	+
156		void initSimTrack();
157		void init();
158		void menu_callback(int value);
159		void menu_create();
160		void LoadCard(const char* inputCard );
161	+	void gl_select(int x, int y);
162	+	void list_hits(GLint hits, GLuint *names);
163	+
164
165		#endif
166

Diff Legend

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