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.15 by roberfro, Wed Apr 30 09:48:03 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	+	int TRANS_tx = 0.0;
69	+	int TRANS_ty = 0.0;
70
71		int CMS_TRACKER_RADIUS = 129;
72	<	int CMS_TRACKER_LENGTH = 280;
72	>	int CMS_TRACKER_LENGTH = 300;
73
74		int TRACKING_RADIUS = 129;//295;
75	<	int TRACKING_LENGTH = 280;//645;
75	>	int TRACKING_LENGTH = 300;//645;
76
77		float PT_CUTOFF = 1.0;
78	<	float EHCAL_CUTOFF = 4.0;
79	<	float EECAL_CUTOFF = 4.0;
78	>	double EECAL_CUTOFF[3] = {0.2,0.6,0.0001};
79	>	double EHCAL_CUTOFF[4] = {1.5,1.5,0.5,5.0};
80
81		bool MouseStates[3];
82
83		std::vector<GLuint> theSimTracks;
84	+	GLuint theGeomMuon[3];
85	+	GLuint theGeomMuonInEvent;
86		GLuint theGeomTracker[6];
87		GLuint theGeomTrackerInEvent;
88		GLuint theGeomEcal[3];
#	Line 79 | Line 98 | std::string inputVisFile;
98		std::string inputTrackerGeom;
99		std::string inputEcalGeom;
100		std::string inputHcalGeom;
101	+	std::string inputMuonGeom;
102
103		MySimEvent*  event;
104		MySimEvents* events;
#	Line 88 | Line 108 | Geometry* geom;
108		char gTracker   = 0;
109		char gEcal      = 0;
110		char gHcal      = 0;
111	<	char gSim       = 2;
112	<	char gReco      = 7;
111	>	char gMuon      = 0;
112	>	char gSim       = 0;
113	>	char gReco      = 15;
114
115	<	int   mTrackI   = -1;
115	>	int  mObj_I     = -1;
116	>	int  mColl_I    = -1;
117		bool mLoading   = true;
118		int  mLoading_I = 0;
119
#	Line 99 | Line 121 | int eventNumber = 0;
121
122		bool  mHelpScreen= false;
123		bool  mRotate    = true;
124	+
125	+	bool mTranslation = false;
126	+	bool stateChanged = false;
127		float mDt                = 0.005f;
128
129
130		GLint Menu_Geom_Tracker = 0;
131		GLint Menu_Geom_Ecal    = 0;
132		GLint Menu_Geom_Hcal    = 0;
133	+	GLint Menu_Geom_Muon    = 0;
134		GLint Menu_Geom         = 0;
135		GLint Menu_SimEvent     = 0;
136		GLint Menu_RecoEvent    = 0;
#	Line 117 | Line 143 | WidthAndColor WaC_LHC_Axis          = {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};
145
146	+	std::vector<IdAndWidthAndColor*> WaC_SimTracks;
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

Diff Legend

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