Commit f4940d2bc782fe8c6637f4c9b2c874810f1aa688

Authored by Jiaming Guo
1 parent 8f96cac6

fixed syntax errors

Showing 1 changed file with 1 additions and 56 deletions   Show diff stats
... ... @@ -23,15 +23,9 @@
23 23 // BOOST includes
24 24 #include <boost/tuple/tuple.hpp>
25 25  
26   -<<<<<<< HEAD
27 26 // visualization objects
28 27 stim::gl_aaboundingbox<float> bb; // axis-aligned bounding box object
29 28 stim::camera cam; // camera object
30   -=======
31   -//visualization objects
32   -stim::gl_aaboundingbox<float> bb; //axis-aligned bounding box object
33   -stim::camera cam; //camera object
34   ->>>>>>> 09cb5950f628309ac65c6b85119d3f16e5bcd0a2
35 29  
36 30 // overall parameters
37 31 unsigned num_nets = 0; // number of networks that've been loaded
... ... @@ -40,7 +34,6 @@ float radius = 0.7; // equals to radius
40 34 float delta; // camera moving parameter
41 35  
42 36 // networks
43   -<<<<<<< HEAD
44 37 stim::gl_network<float> GT; // ground truth network
45 38 stim::gl_network<float> T; // test network
46 39 stim::gl_network<float> _GT; // splitted GT
... ... @@ -66,29 +59,6 @@ float radius_factor = 0.5f; // radius changing factor
66 59  
67 60 // mouse click
68 61 bool LButtonDown = false; // true when left button down
69   -=======
70   -stim::gl_network<float> GT; //ground truth network
71   -stim::gl_network<float> T; //test network
72   -stim::gl_network<float> _GT; //splitted GT
73   -stim::gl_network<float> _T; //splitted T
74   -
75   -// indicator
76   -unsigned ind = 0; //indicator of mapping
77   -
78   -// relationships
79   -std::vector<unsigned> _gt_t; // store indices of nearest edge points in _T for _GT
80   -std::vector<unsigned> _t_gt; // store indices of nearest edge points in _GT for _T
81   -
82   -//hard-coded parameters
83   -float resample_rate = 0.5f; //sample rate for the network (fraction of sigma used as the maximum sample rate)
84   -float camera_factor = 1.2f; //start point of the camera as a function of X and Y size
85   -float orbit_factor = 0.01f; //degrees per pixel used to orbit the camera
86   -float zoom_factor = 10.0f;
87   -float radius_factor = 0.5f;
88   -
89   -//mouse click
90   -bool LButtonDown = false; // true when left button down
91   ->>>>>>> 09cb5950f628309ac65c6b85119d3f16e5bcd0a2
92 62 bool RButtonDown = false;
93 63  
94 64 // mouse position tracking
... ... @@ -96,7 +66,7 @@ int mouse_x;
96 66 int mouse_y;
97 67  
98 68 // render modes
99   -bool compareMode = true; // default mode is compare mode
  69 +bool compareMode = true; // default mode is compare mode
100 70 bool mappingMode = false;
101 71 bool volumeMode = false;
102 72  
... ... @@ -106,24 +76,12 @@ std::vector&lt;float&gt; colormap;
106 76 // special key indicator
107 77 int mods;
108 78  
109   -<<<<<<< HEAD
110 79 // OpenGL objects
111 80 GLuint cmap_tex = 0; // texture name for the color map
112 81  
113 82 // Stack view parameter
114 83 stim::gl_texture<unsigned char> S; // texture storing the image stack
115 84 float planes[3] = { 0.0f, 0.0f, 0.0f }; // plane position in world space
116   -=======
117   -//OpenGL objects
118   -GLuint cmap_tex = 0; //texture name for the color map
119   -
120   -float delta;
121   -float sigma = 3; //default sigma
122   -float radius = 0.7; //equals to radius
123   -int adjoint_fac = 0;
124   -int light_fac = 0;
125   -int difference_fac = 0;
126   ->>>>>>> 09cb5950f628309ac65c6b85119d3f16e5bcd0a2
127 85  
128 86 // sets an OpenGL viewport taking up the entire window
129 87 void glut_render_single_projection(){
... ... @@ -960,14 +918,9 @@ void advertise(){
960 918 std::cout<<" mapping two files in random colors with a threshold of value"<<std::endl<<std::endl;
961 919 }
962 920  
963   -<<<<<<< HEAD
964 921 int main(int argc, char* argv[])
965 922 {
966 923 stim::arglist args; // create an instance of arglist
967   -=======
968   -int main(int argc, char* argv[]) {
969   - stim::arglist args; //create an instance of arglist
970   ->>>>>>> 09cb5950f628309ac65c6b85119d3f16e5bcd0a2
971 924  
972 925 // add arguments
973 926 args.add("help", "prints this help");
... ... @@ -1022,7 +975,6 @@ int main(int argc, char* argv[]) {
1022 975 float threshold = args["mapping"].as_float();
1023 976 mapping(sigma, device, threshold);
1024 977 }
1025   -<<<<<<< HEAD
1026 978 else
1027 979 compare(sigma, device); // run the comparison algorithm
1028 980 }
... ... @@ -1046,12 +998,6 @@ int main(int argc, char* argv[]) {
1046 998 planes[0] = S.size(0) / 4.0f; // initialize the start positions for the orthogonal display planes
1047 999 planes[1] = S.size(1) / 4.0f;
1048 1000 planes[2] = S.size(2) / 4.0f;
1049   -=======
1050   - else {
1051   - compare(sigma, device); //run the comparison algorithm
1052   - }
1053   - }
1054   ->>>>>>> 09cb5950f628309ac65c6b85119d3f16e5bcd0a2
1055 1001  
1056 1002 //if a GUI is requested, display the network using OpenGL
1057 1003 if(args["gui"].is_set()){
... ... @@ -1067,5 +1013,4 @@ int main(int argc, char* argv[]) {
1067 1013 glutMainLoop(); // enter GLUT event processing cycle
1068 1014 }
1069 1015 }
1070   - return 1;
1071 1016 }
... ...