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.12 by querten, Sat Apr 26 10:43:48 2008 UTC vs.
Revision 1.13 by querten, Sun Apr 27 07:27:30 2008 UTC

#	Line 27 | Line 27
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, less<unsigned int> >> HASH_Map;
30	>	typedef hash_map<unsigned int, char*, hash_compare<unsigned int, std::less<unsigned int> >> HASH_Map;
31		#endif
32
33		HASH_Map test;
#	Line 107 | Line 107 | char gTracker   = 0;
107		char gEcal      = 0;
108		char gHcal      = 0;
109		char gMuon      = 0;
110	<	char gSim       = 2;
110	>	char gSim       = 0;
111		char gReco      = 15;
112
113		int  mObj_I     = -1;
#	Line 140 | Line 140 | WidthAndColor WaC_Selected_SimTrack = {2
140
141		std::vector<IdAndWidthAndColor*> WaC_SimTracks;
142
143	–	//ObjectsInfo objInfos;
144	–
143		void DrawTrack(MySimTrack* track, MySimVertex* vertex1, MySimVertex* vertex2);
144		void reshape (int w, int h);
145		void display();

Diff Legend

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