Skip to content
Snippets Groups Projects
Commit f561725e authored by Matevz Tadel's avatar Matevz Tadel
Browse files

Reformat into 80 columns.

git-svn-id: http://root.cern.ch/svn/root/trunk@37562 27541ba8-7e3a-0410-8455-c3a389f83636
parent 0dc25177
No related branches found
No related tags found
No related merge requests found
......@@ -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);
......
......@@ -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();
......
......@@ -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();
}
......@@ -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();
}
......@@ -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();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment