diff --git a/tutorials/gl/glViewerExercise.C b/tutorials/gl/glViewerExercise.C
index adc5f6d8a0b15970b99595f2837b0c74a414861e..71c2b5dc04e2a50f2e19f288fd05b08520226185 100644
--- a/tutorials/gl/glViewerExercise.C
+++ b/tutorials/gl/glViewerExercise.C
@@ -26,7 +26,8 @@ void AnimateCamera()
static Double_t fovStep = randGen.Rndm()*3.0 - 0.5;
static Double_t zoomStep = (20 - randGen.Rndm())/1000.;
static Double_t dollyStep = randGen.Rndm()*5.0 - 1.0;
- static Double_t centerStep[3] = {randGen.Rndm()*4, randGen.Rndm()*4, randGen.Rndm()*4 };
+ static Double_t centerStep[3] = {randGen.Rndm()*4, randGen.Rndm()*4,
+ randGen.Rndm()*4 };
static Double_t hRotateStep = randGen.Rndm()*0.025;
static Double_t vRotateStep = randGen.Rndm()*0.05;
@@ -34,7 +35,8 @@ void AnimateCamera()
center[0] += centerStep[0];
center[1] += centerStep[1];
center[2] += centerStep[2];
- Double_t mag = TMath::Sqrt(center[0]*center[0] + center[1]*center[1] + center[2]*center[2]);
+ Double_t mag = TMath::Sqrt(center[0]*center[0] + center[1]*center[1] +
+ center[2]*center[2]);
if(mag > 500)
{
centerStep[0] = -centerStep[0];
@@ -48,8 +50,10 @@ void AnimateCamera()
if (vRotate >= TMath::TwoPi() || vRotate <= 0.0)
vRotateStep = -vRotateStep;
- if (hRotate >= (TMath::PiOver2()- 0.02f)|| hRotate <= (0.07f -TMath::PiOver2()))
+ if (hRotate >= (TMath::PiOver2()- 0.02f) ||
+ hRotate <= (0.07f -TMath::PiOver2())) {
hRotateStep = -hRotateStep;
+ }
// dolly
dolly += dollyStep;
@@ -72,9 +76,11 @@ void AnimateCamera()
// apply
if(camera < 3)
- v->SetPerspectiveCamera(camera, fov, dollyStep, center, hRotateStep, vRotateStep);
+ v->SetPerspectiveCamera(camera, fov, dollyStep, center, hRotateStep,
+ vRotateStep);
else
- v->SetOrthoCamera(camera, zoom, dollyStep, center, hRotateStep, vRotateStep);
+ v->SetOrthoCamera(camera, zoom, dollyStep, center, hRotateStep,
+ vRotateStep);
if (++moveCount % 10 == 0)
v->RefreshPadEditor(v);
diff --git a/tutorials/gl/glbox.C b/tutorials/gl/glbox.C
index 9f875970108356ec28351e836f7fed0b953380f9..314f8567a58efbfe4b93702e6da46e4351c64b95 100644
--- a/tutorials/gl/glbox.C
+++ b/tutorials/gl/glbox.C
@@ -4,7 +4,8 @@ void glbox()
//Author: Timur Pocheptsov
gStyle->SetCanvasPreferGL(kTRUE);
TCanvas *c = new TCanvas("glc","TH3 Drawing", 100, 10, 850, 400);
- TPaveLabel *title = new TPaveLabel(0.04, 0.86, 0.96, 0.98, "\"glbox\" and \"glbox1\" options for TH3.");
+ TPaveLabel *title = new TPaveLabel(0.04, 0.86, 0.96, 0.98,
+ "\"glbox\" and \"glbox1\" options for TH3.");
title->SetFillColor(32);
title->Draw();
diff --git a/tutorials/gl/glh3c.C b/tutorials/gl/glh3c.C
index c0ed0b9d1e70162b5b985c59dbfd0b1d641d2927..ef59eccf416d6f2ee61bcee9177352861a934f55 100644
--- a/tutorials/gl/glh3c.C
+++ b/tutorials/gl/glh3c.C
@@ -22,7 +22,8 @@ void glh3c()
comp->Draw();
- TPaveLabel *title = new TPaveLabel(0.04, 0.86, 0.96, 0.98, "TH3 composition.");
+ TPaveLabel *title = new TPaveLabel(0.04, 0.86, 0.96, 0.98,
+ "TH3 composition.");
title->SetFillColor(32);
title->Draw();
}
diff --git a/tutorials/gl/glparametric.C b/tutorials/gl/glparametric.C
index 7ea1627c85a57071e0f2656ea0548eceb04b8319..1577b2ad2c3fdb044bb4149c0ed33e817ff4156e 100644
--- a/tutorials/gl/glparametric.C
+++ b/tutorials/gl/glparametric.C
@@ -5,42 +5,44 @@ void glparametric()
// A parametric surface is defined by three functions:
// S(u, v) : {x(u, v), y(u, v), z(u, v)}.
// To create parametric surface and draw it one has to:
- // 1. Create canvas, which support OpenGL drawing (two ways):
- // a. Call gStyle->SetCanvasPreferGL(kTRUE)
- // b. Or create canvas with name, wich contains "gl".
- // 2. create TGLParametricEquation object.
- // TGLParametricEquation *eq = new TGLParametricEquation("name_of_object",
- // "some FORMULA here - x(u, v)",
- // "some FORMULA here - y(u, v)",
- // "some FORMULA here - z(u, v)",
- // uMin, uMax, vMin, vMax);
- // where FORMULA is the same string (mathematical expression),
- // as in TF2, but you should use 'u' (or 'U') instead of 'x'
- // and 'v' (or 'V') instead of 'y'.
- // 3. Call equation->Draw();
- // Parametric surfaces support 21 color "schemes", you can change the color:
- // -place mouse cursor above surface (surface is selected in pad)
- // -press 's' or 'S'.
+ // 1. Create canvas, which support OpenGL drawing (two ways):
+ // a. Call gStyle->SetCanvasPreferGL(kTRUE)
+ // b. Or create canvas with name, wich contains "gl".
+ // 2. create TGLParametricEquation object.
+ // TGLParametricEquation *eq = new TGLParametricEquation("name",
+ // "some FORMULA here - x(u, v)",
+ // "some FORMULA here - y(u, v)",
+ // "some FORMULA here - z(u, v)",
+ // uMin, uMax, vMin, vMax);
+ // where FORMULA is the same string (mathematical expression),
+ // as in TF2, but you should use 'u' (or 'U') instead of 'x'
+ // and 'v' (or 'V') instead of 'y'.
+ // 3. Call equation->Draw();
+ // Parametric surfaces support 21 color "schemes", you can change
+ // the color:
+ // -place mouse cursor above surface (surface is selected in pad)
+ // -press 's' or 'S'.
gStyle->SetCanvasPreferGL(kTRUE);
- TCanvas *c = new TCanvas("canvas","Parametric surfaces with gl", 100, 10, 700, 700);
+ TCanvas *c = new TCanvas("canvas","Parametric surfaces with gl", 100, 10,
+ 700, 700);
c->SetFillColor(42);
gStyle->SetFrameFillColor(42);
c->Divide(2, 2);
c->cd(1);
TGLParametricEquation *p1 = new TGLParametricEquation("Conchoid",
- "1.2 ^ u * (1 + cos(v)) * cos(u)",
- "1.2 ^ u * (1 + cos(v)) * sin(u)",
- "1.2 ^ u * sin(v) - 1.5 * 1.2 ^ u",
- 0., 6 * TMath::Pi(), 0., TMath::TwoPi());
+ "1.2 ^ u * (1 + cos(v)) * cos(u)",
+ "1.2 ^ u * (1 + cos(v)) * sin(u)",
+ "1.2 ^ u * sin(v) - 1.5 * 1.2 ^ u",
+ 0., 6 * TMath::Pi(), 0., TMath::TwoPi());
p1->Draw();
c->cd(2);
TGLParametricEquation *p2 = new TGLParametricEquation("Apple",
- "cos(u) * (4 + 3.8 * cos(v)) ",
- "sin(u) * (4 + 3.8 * cos(v))",
- "(cos(v) + sin(v) - 1) * (1 + sin(v)) * log(1 - pi * v / 10) + 7.5 * sin(v)",
- 0, TMath::TwoPi(), -TMath::Pi(), TMath::Pi());
+ "cos(u) * (4 + 3.8 * cos(v)) ",
+ "sin(u) * (4 + 3.8 * cos(v))",
+ "(cos(v) + sin(v) - 1) * (1 + sin(v)) * log(1 - pi * v / 10) + 7.5 * sin(v)",
+ 0, TMath::TwoPi(), -TMath::Pi(), TMath::Pi());
p2->Draw();
c->cd(3);
@@ -53,9 +55,9 @@ void glparametric()
c->cd(4);
TGLParametricEquation *p4 = new TGLParametricEquation("Trangluoid trefoil",
- "2 * sin(3 * u) / (2 + cos(v))",
- "2 * (sin(u) + 2 * sin(2 * u)) / (2 + cos(v + 2 * pi / 3))",
- "(cos(u) - 2 * cos(2 * u)) * (2 + cos(v)) * (2 + cos(v + 2 * pi / 3)) / 4",
- -TMath::Pi(), TMath::Pi(), -TMath::Pi(), TMath::Pi());
+ "2 * sin(3 * u) / (2 + cos(v))",
+ "2 * (sin(u) + 2 * sin(2 * u)) / (2 + cos(v + 2 * pi / 3))",
+ "(cos(u) - 2 * cos(2 * u)) * (2 + cos(v)) * (2 + cos(v + 2 * pi / 3)) / 4",
+ -TMath::Pi(), TMath::Pi(), -TMath::Pi(), TMath::Pi());
p4->Draw();
}
diff --git a/tutorials/gl/glrose.C b/tutorials/gl/glrose.C
index 6026099833c8c8075cb2c12dfa27dad8971596ee..3d157ec49e290cb259e9e8ffe0a342a993d18974 100644
--- a/tutorials/gl/glrose.C
+++ b/tutorials/gl/glrose.C
@@ -27,7 +27,8 @@ void glrose()
gStyle->SetCanvasPreferGL(1);
TCanvas *cnv = new TCanvas("glc", "Surface sample", 200, 10, 600, 550);
- TPaveLabel *title = new TPaveLabel(0.04, 0.86, 0.96, 0.98, "\"glsurf2pol\" option + user defined palette.");
+ TPaveLabel *title = new TPaveLabel(0.04, 0.86, 0.96, 0.98,
+ "\"glsurf2pol\" option + user defined palette.");
title->SetFillColor(32);
title->Draw();