Mercurial > hg > forks > multipaint-js

comparison draw_inputs.pde @ 179:934934bb1fbb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename global variable s/machine/g_machine/g
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 23 Aug 2018 13:11:47 +0300
parents 8d239bd81584
children 6d866e284dd2
comparison
equal deleted inserted replaced
178:66c1d15e335a 179:934934bb1fbb
58 case 1: 58 case 1:
59 return g_brush[looks]; 59 return g_brush[looks];
60 case 2: 60 case 2:
61 return g_brush[looks + 1000]; 61 return g_brush[looks + 1000];
62 case 3: 62 case 3:
63 if (machine == PLUS4M) return int(g_map[2]); 63 if (g_machine == PLUS4M) return int(g_map[2]);
64 return g_brush[looks + 2000]; 64 return g_brush[looks + 2000];
65 } 65 }
66 return g_brush[ad] + g_brush[ad + 1] * 2; 66 return g_brush[ad] + g_brush[ad + 1] * 2;
67 } 67 }
68 68
115 case 1: 115 case 1:
116 return g_map[looks]; 116 return g_map[looks];
117 case 2: 117 case 2:
118 return g_map[looks + 1000]; 118 return g_map[looks + 1000];
119 case 3: 119 case 3:
120 if (machine == PLUS4M) return int(g_map[2]); 120 if (g_machine == PLUS4M) return int(g_map[2]);
121 return g_map[looks + 2000]; 121 return g_map[looks + 2000];
122 } 122 }
123 } 123 }
124 else 124 else
125 if (mode == 1) 125 if (mode == 1)
131 case 1: 131 case 1:
132 return g_brush[looks]; 132 return g_brush[looks];
133 case 2: 133 case 2:
134 return g_brush[looks + 1000]; 134 return g_brush[looks + 1000];
135 case 3: 135 case 3:
136 if (machine == PLUS4M) return int(g_map[2]); 136 if (g_machine == PLUS4M) return int(g_map[2]);
137 return g_brush[looks + 2000]; 137 return g_brush[looks + 2000];
138 } 138 }
139 } 139 }
140 140
141 return source1 + source2; 141 return source1 + source2;