- Timestamp:
- Dec 22, 2014 1:54:15 AM (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
nanovis/trunk/Grid.cpp
r4901 r4902 205 205 _axisColor.a); 206 206 207 if (gluProject(1.0 + xTitleOfs, 0.0, 0.0, mv, prjm, viewport, &wx, &wy, &wz) && 207 if (gluProject(1.0 + xTitleOfs, 0.0, 0.0, 208 mv, prjm, viewport, 209 &wx, &wy, &wz) && 208 210 wz >= 0.0 && wz <= 1.0) { 209 211 glLoadIdentity(); … … 216 218 } 217 219 218 if (gluProject(0.0, 1.0 + yTitleOfs, 0.0, mv, prjm, viewport, &wx, &wy, &wz) && 220 if (gluProject(0.0, 1.0 + yTitleOfs, 0.0, 221 mv, prjm, viewport, 222 &wx, &wy, &wz) && 219 223 wz >= 0.0 && wz <= 1.0) { 220 224 glLoadIdentity(); … … 227 231 } 228 232 229 if (gluProject(0.0, 0.0, 1.0 + zTitleOfs, mv, prjm, viewport, &wx, &wy, &wz) && 233 if (gluProject(0.0, 0.0, 1.0 + zTitleOfs, 234 mv, prjm, viewport, 235 &wx, &wy, &wz) && 230 236 wz >= 0.0 && wz <= 1.0) { 231 237 glLoadIdentity(); … … 244 250 float x; 245 251 x = xAxis.map(iter.getValue()); 246 if (gluProject(x, 0.0f, 1.0 + zLabelOfs, mv, prjm, viewport, &wx, &wy, &wz) && 252 if (gluProject(x, 0.0f, 1.0 + zLabelOfs, 253 mv, prjm, viewport, 254 &wx, &wy, &wz) && 247 255 wz >= 0.0 && wz <= 1.0) { 248 256 char buff[20]; … … 256 264 float y; 257 265 y = yAxis.map(iter.getValue()); 258 if (gluProject(1.0 + xLabelOfs, y, 0.0f, mv, prjm, viewport, &wx, &wy, &wz) && 266 if (gluProject(1.0 + xLabelOfs, y, 0.0f, 267 mv, prjm, viewport, 268 &wx, &wy, &wz) && 259 269 wz >= 0.0 && wz <= 1.0) { 260 270 char buff[20]; … … 268 278 float z; 269 279 z = zAxis.map(iter.getValue()); 270 if (gluProject(1.0 + xLabelOfs, 0.0f, z, mv, prjm, viewport, &wx, &wy, &wz) && 280 if (gluProject(1.0 + xLabelOfs, 0.0f, z, 281 mv, prjm, viewport, 282 &wx, &wy, &wz) && 271 283 wz >= 0.0 && wz <= 1.0) { 272 284 char buff[20];
Note: See TracChangeset
for help on using the changeset viewer.