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.6 by querten, Sat Apr 19 14:34:58 2008 UTC vs.
Revision 1.10 by roberfro, Fri Apr 25 14:03:42 2008 UTC

#	Line 36 | Line 36
36		#include "Texture.h"
37		#include "ReadCards.h"
38		#include "FROG_Struct.h"
39	+	#include "ObjectsInfo.h"
40
41		int SAVE_WINDOW_W = 800;
42		int SAVE_WINDOW_H = 600;
#	Line 47 | Line 48 | int WINDOW_WIDTH = 800;
48		int WINDOW_HEIGHT = 600;
49		int SCREENSHOT = 0;
50
51	+	int TEMP_I = 0;
52	+
53		float CAM_R  = 700;
54		float CAM_tx = 0.0;
55		float CAM_ty = 0.0;
#	Line 58 | Line 61 | int TRACKING_RADIUS = 129;//295;
61		int TRACKING_LENGTH = 300;//645;
62
63		float PT_CUTOFF = 1.0;
64	<	float EHCAL_CUTOFF = 4.0;
65	<	float EECAL_CUTOFF = 4.0;
64	>	double EECAL_CUTOFF[3] = {0.2,0.6,0.0001};
65	>	double EHCAL_CUTOFF[4] = {1.5,1.5,0.5,5.0};
66
67		bool MouseStates[3];
68
#	Line 93 | Line 96 | char gEcal      = 0;
96		char gHcal      = 0;
97		char gMuon      = 0;
98		char gSim       = 2;
99	<	char gReco      = 7;
99	>	char gReco      = 15;
100
101		int   mTrackI   = -1;
102		bool mLoading   = true;
#	Line 122 | Line 125 | WidthAndColor WaC_LHC_Axis          = {3
125		WidthAndColor WaC_Default_SimTrack  = {2.0 , 0.0 , 1.0 , 1.0 , 1.0};
126		WidthAndColor WaC_Selected_SimTrack = {2.0 , 1.0 , 1.0 , 0.0 , 1.0};
127
128	+	std::vector<IdAndWidthAndColor*> WaC_SimTracks;
129	+
130	+	ObjectsInfo objInfos;
131	+
132		void DrawTrack(MySimTrack* track, MySimVertex* vertex1, MySimVertex* vertex2);
133		void reshape (int w, int h);
134		void display();
#	Line 139 | Line 146 | void init();
146		void menu_callback(int value);
147		void menu_create();
148		void LoadCard(const char* inputCard );
149	+	void gl_select(int x, int y);
150	+	void list_hits(GLint hits, GLuint *names);
151
152		#endif
153

Diff Legend

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