From c69213e14ef5cca2c5150b3cfbe561a0b25750c5 Mon Sep 17 00:00:00 2001
From: Olivier Couet <Olivier.Couet@cern.ch>
Date: Thu, 24 Nov 2005 12:29:12 +0000
Subject: [PATCH] - More coding conventions fixes
git-svn-id: http://root.cern.ch/svn/root/trunk@13336 27541ba8-7e3a-0410-8455-c3a389f83636
---
gl/inc/CsgOps.h | 29 ++--
gl/inc/TGLKernel.h | 6 +-
gl/inc/TGLSceneObject.h | 4 +-
gl/src/TArcBall.cxx | 10 +-
gl/src/TGLHistPainter.cxx | 20 +--
gl/src/TGLKernel.cxx | 314 +++++++++++++++++++-------------------
gl/src/TGLPixmap.cxx | 46 +++---
gl/src/TGLSceneObject.cxx | 24 +--
gl/src/TGLUtil.cxx | 4 +-
gl/src/TX11GL.cxx | 20 +--
10 files changed, 237 insertions(+), 240 deletions(-)
diff --git a/gl/inc/CsgOps.h b/gl/inc/CsgOps.h
index a659eeb993a..3124fee80ba 100644
--- a/gl/inc/CsgOps.h
+++ b/gl/inc/CsgOps.h
@@ -1,4 +1,4 @@
-// @(#)root/gl:$Name: $:$Id: CsgOps.h,v 1.25 2005/03/09 18:19:26 brun Exp $
+// @(#)root/gl:$Name: $:$Id: CsgOps.h,v 1.1 2005/04/01 13:53:18 brun Exp $
// Author: Timur Pocheptsov 01/04/2005
#ifndef ROOT_CsgOps
@@ -12,26 +12,23 @@ class TBuffer3D;
namespace RootCsg {
- /*
- I need BaseMesh to have an opaque pointer
- to hidden representatioin of resulting mesh.
- */
-
- class BaseMesh {
- public:
- virtual ~BaseMesh(){}
- virtual UInt_t NumberOfPolys()const = 0;
- virtual UInt_t NumberOfVertices()const = 0;
- virtual UInt_t SizeOfPoly(UInt_t polyIndex)const = 0;
- virtual const Double_t *GetVertex(UInt_t vertNum)const = 0;
- virtual Int_t GetVertexIndex(UInt_t polyNum, UInt_t vertNum)const = 0;
- };
+ // I need BaseMesh to have an opaque pointer
+ // to hidden representation of resulting mesh.
+
+class BaseMesh {
+public:
+
+ virtual ~BaseMesh(){}
+ virtual UInt_t NumberOfPolys()const = 0;
+ virtual UInt_t NumberOfVertices()const = 0;
+ virtual UInt_t SizeOfPoly(UInt_t polyIndex)const = 0;
+ virtual const Double_t *GetVertex(UInt_t vertNum)const = 0;
+ virtual Int_t GetVertexIndex(UInt_t polyNum, UInt_t vertNum)const = 0; };
BaseMesh *ConvertToMesh(const TBuffer3D &buff);
BaseMesh *BuildUnion(const BaseMesh *leftOperand, const BaseMesh *rightOperand);
BaseMesh *BuildIntersection(const BaseMesh *leftOperand, const BaseMesh *rightOperand);
BaseMesh *BuildDifference(const BaseMesh *leftOperand, const BaseMesh *rightOperand);
-
}
#endif
diff --git a/gl/inc/TGLKernel.h b/gl/inc/TGLKernel.h
index d598050c0b7..aaf097fae32 100644
--- a/gl/inc/TGLKernel.h
+++ b/gl/inc/TGLKernel.h
@@ -1,4 +1,4 @@
-// @(#)root/base:$Name: $:$Id: TGLKernel.h,v 1.20 2005/08/10 16:26:35 brun Exp $
+// @(#)root/base:$Name: $:$Id: TGLKernel.h,v 1.21 2005/10/03 15:19:35 brun Exp $
// Author: Valery Fine(fine@vxcern.cern.ch) 05/03/97
/*************************************************************************
@@ -125,8 +125,8 @@ public:
void SetGLNormal(const Double_t * normal);
void PaintPolyMarker(const Double_t * vertex, Style_t marker_style, UInt_t size);
void DrawSelectionBox(Double_t xmin, Double_t xmax,
- Double_t ymin, Double_t ymax,
- Double_t zmin, Double_t zmax);
+ Double_t ymin, Double_t ymax,
+ Double_t zmin, Double_t zmax);
void EnterSelectionMode(UInt_t * buff, Int_t size, Event_t *, Int_t * viewport);
Int_t ExitSelectionMode();
void GLLoadName(UInt_t name);
diff --git a/gl/inc/TGLSceneObject.h b/gl/inc/TGLSceneObject.h
index e2fba7fef3b..37ba6f92db6 100644
--- a/gl/inc/TGLSceneObject.h
+++ b/gl/inc/TGLSceneObject.h
@@ -1,4 +1,4 @@
-// @(#)root/gl:$Name: $:$Id: TGLSceneObject.h,v 1.26 2005/06/01 14:07:14 brun Exp $
+// @(#)root/gl:$Name: $:$Id: TGLSceneObject.h,v 1.27 2005/06/13 10:20:10 brun Exp $
// Author: Timur Pocheptsov 03/08/2004
/*************************************************************************
@@ -44,7 +44,7 @@ public:
TGLSceneObject(const TBuffer3D &buffer, Int_t verticesReserve,
TObject *realObj = 0);
TGLSceneObject(const TBuffer3D &buffer, TObject *realObj = 0);
- TGLSceneObject(TObject *realObj);
+ TGLSceneObject(TObject *realObj);
void InvokeContextMenu(TContextMenu &menu, UInt_t x, UInt_t y) const;
diff --git a/gl/src/TArcBall.cxx b/gl/src/TArcBall.cxx
index 286c42e6425..0243efc725c 100644
--- a/gl/src/TArcBall.cxx
+++ b/gl/src/TArcBall.cxx
@@ -1,4 +1,4 @@
-// @(#)root/gl:$Name: $:$Id: TArcBall.cxx,v 1.7 2004/11/24 14:48:02 brun Exp $
+// @(#)root/gl:$Name: $:$Id: TArcBall.cxx,v 1.8 2005/08/30 10:29:52 brun Exp $
// Author: Timur Pocheptsov 03/08/2004
/*************************************************************************
@@ -210,10 +210,10 @@ inline void TArcBall::MapToSphere(const TPoint &NewPt, Double_t *NewVec) const
//______________________________________________________________________________
TArcBall::TArcBall(UInt_t Width, UInt_t Height)
- :fThisRot(), fLastRot(),
- fTransform(), fStVec(),
- fEnVec(), fAdjustWidth(0.),
- fAdjustHeight(0.)
+ :fThisRot(), fLastRot(),
+ fTransform(), fStVec(),
+ fEnVec(), fAdjustWidth(0.),
+ fAdjustHeight(0.)
{
SetBounds(Width, Height);
ResetMatrices();
diff --git a/gl/src/TGLHistPainter.cxx b/gl/src/TGLHistPainter.cxx
index ba957e79a4f..a75036af2ea 100644
--- a/gl/src/TGLHistPainter.cxx
+++ b/gl/src/TGLHistPainter.cxx
@@ -1273,12 +1273,12 @@ namespace {
}
//Option time display is required ?
if (axis->GetTimeDisplay()) {
- option += 't';
+ option += 't';
- if (!strlen(axis->GetTimeFormatOnly()))
- axisPainter.SetTimeFormat(axis->ChooseTimeFormat(max - min));
- else
- axisPainter.SetTimeFormat(axis->GetTimeFormat());
+ if (!strlen(axis->GetTimeFormatOnly()))
+ axisPainter.SetTimeFormat(axis->ChooseTimeFormat(max - min));
+ else
+ axisPainter.SetTimeFormat(axis->GetTimeFormat());
}
axisPainter.SetOption(option.c_str());
@@ -1744,11 +1744,11 @@ void TGLHistPainter::DrawGrid(Int_t plane)const
glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
Double_t lineCaps[][4] = {
- {fMinXScaled, fMinXScaled, fMinYScaled, fMaxYScaled},
- {fMinXScaled, fMaxXScaled, fMinYScaled, fMinYScaled},
- {fMaxXScaled, fMaxXScaled, fMinYScaled, fMaxYScaled},
- {fMinXScaled, fMaxXScaled, fMaxYScaled, fMaxYScaled}
- };
+ {fMinXScaled, fMinXScaled, fMinYScaled, fMaxYScaled},
+ {fMinXScaled, fMaxXScaled, fMinYScaled, fMinYScaled},
+ {fMaxXScaled, fMaxXScaled, fMinYScaled, fMaxYScaled},
+ {fMinXScaled, fMaxXScaled, fMaxYScaled, fMaxYScaled}
+ };
for (UInt_t i = 0; i < fZLevels.size(); ++i) {
glBegin(GL_LINES);
diff --git a/gl/src/TGLKernel.cxx b/gl/src/TGLKernel.cxx
index 5cf462d8380..3a033ca7a6f 100644
--- a/gl/src/TGLKernel.cxx
+++ b/gl/src/TGLKernel.cxx
@@ -1,4 +1,4 @@
-// @(#)root/gl:$Name: $:$Id: TGLKernel.cxx,v 1.36 2005/09/07 11:43:36 rdm Exp $
+// @(#)root/gl:$Name: $:$Id: TGLKernel.cxx,v 1.37 2005/10/03 15:19:35 brun Exp $
// Author: Valery Fine(fine@vxcern.cern.ch) 05/03/97
/*************************************************************************
@@ -34,7 +34,7 @@
#include "gl2ps.h"
#ifndef ColorOffset
- #define ColorOffset 0
+#define ColorOffset 0
#endif
//ClassImp(TGLKernel)
@@ -902,195 +902,195 @@ void TGLKernel::PaintCone(Float_t *vertex,Int_t nseg,Int_t nstacks)
if (*(nextv+1) == 0.0 && *nextv == 0.0) { // The inner radius is ZERO
//*-* Draw the "Triangle fan"
- glBegin(GL_TRIANGLE_FAN);
- glVertex3f(0.0,0.0,*(nextv+2)); //*-* Set the center of the fan
- nextv += pt3;
- for (i=0;i<ndiv;i++) {
- glVertex3fv(nextv);
- nextv += 3;
- }
- if (nseg > 0)
- glVertex3fv(nextv-pt3);
- } else {
+ glBegin(GL_TRIANGLE_FAN);
+ glVertex3f(0.0,0.0,*(nextv+2)); //*-* Set the center of the fan
+ nextv += pt3;
+ for (i=0;i<ndiv;i++) {
+ glVertex3fv(nextv);
+ nextv += 3;
+ }
+ if (nseg > 0)
+ glVertex3fv(nextv-pt3);
+ } else {
//*-* Draws the series of the quadrilaterals
- glBegin(GL_QUAD_STRIP);
- exnextv = nextv + pt3;
- for (i=0;i<ndiv;i++) {
- glVertex3fv(nextv);
- glVertex3fv(exnextv);
- nextv += 3;
- exnextv += 3;
- }
- if (nseg > 0 ) {
- glVertex3fv(nextv - pt3);
- glVertex3fv(exnextv- pt3);
- }
+ glBegin(GL_QUAD_STRIP);
+ exnextv = nextv + pt3;
+ for (i=0;i<ndiv;i++) {
+ glVertex3fv(nextv);
+ glVertex3fv(exnextv);
+ nextv += 3;
+ exnextv += 3;
+ }
+ if (nseg > 0 ) {
+ glVertex3fv(nextv - pt3);
+ glVertex3fv(exnextv- pt3);
+ }
- }
- glEnd();
+ }
+ glEnd();
//*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* "Bottom" of TPCON
- if (!fRootLight)
- glNormal3fv(backone);
+ if (!fRootLight)
+ glNormal3fv(backone);
- nextv = vert(0,0,0);
- if (*(nextv+1) == 0.0 && *nextv == 0.0 ) {
+ nextv = vert(0,0,0);
+ if (*(nextv+1) == 0.0 && *nextv == 0.0 ) {
//*-* Draw the "Triangle fan"
- glBegin(GL_TRIANGLE_FAN);
- glVertex3f(0.0,0.0,*(nextv+2)); //*-* Set the center of the fan
- nextv += pt6;
- for (i=0;i<ndiv;i++) {
- nextv -= 3;
- glVertex3fv(nextv);
- }
- if (nseg > 0)
- glVertex3fv(nextv+pt3-3);
- } else {
- //*-* Draws the series of the quadrilaterals
- glBegin(GL_QUAD_STRIP);
- exnextv = nextv + pt3;
- for (i=0;i<ndiv;i++) {
- glVertex3fv(exnextv);
- glVertex3fv(nextv);
- nextv += 3;
- exnextv +=3;
- }
- if (nseg > 0) {
- glVertex3fv(exnextv- pt3);
- glVertex3fv(nextv - pt3);
- }
- }
- glEnd();
+ glBegin(GL_TRIANGLE_FAN);
+ glVertex3f(0.0,0.0,*(nextv+2)); //*-* Set the center of the fan
+ nextv += pt6;
+ for (i=0;i<ndiv;i++) {
+ nextv -= 3;
+ glVertex3fv(nextv);
+ }
+ if (nseg > 0)
+ glVertex3fv(nextv+pt3-3);
+ } else {
+ //*-* Draws the series of the quadrilaterals
+ glBegin(GL_QUAD_STRIP);
+ exnextv = nextv + pt3;
+ for (i=0;i<ndiv;i++) {
+ glVertex3fv(exnextv);
+ glVertex3fv(nextv);
+ nextv += 3;
+ exnextv +=3;
+ }
+ if (nseg > 0) {
+ glVertex3fv(exnextv- pt3);
+ glVertex3fv(nextv - pt3);
+ }
+ }
+ glEnd();
//*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* "Walls" of TPCON
//*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* Create the external walls
- nextv = vertex + pt3;
- for (i=0;i<nstacks-1;i++) {
- glBegin(GL_QUAD_STRIP);
- {
+ nextv = vertex + pt3;
+ for (i=0;i<nstacks-1;i++) {
+ glBegin(GL_QUAD_STRIP);
+ {
// nextv = vert(0,i,1);
- exnextv = nextv+pt6;
- for(j=0;j<ndiv;j++) {
- if (fRootLight)
- LightIndex(j>>1);
- else
- glNormal3fv(Normal2Line(exnextv,nextv,normal));
-
- glVertex3fv(exnextv);
- glVertex3fv(nextv);
- nextv += 3;
- exnextv += 3;
- }
- if (nseg > 0) {
+ exnextv = nextv+pt6;
+ for(j=0;j<ndiv;j++) {
+ if (fRootLight)
+ LightIndex(j>>1);
+ else
+ glNormal3fv(Normal2Line(exnextv,nextv,normal));
+
+ glVertex3fv(exnextv);
+ glVertex3fv(nextv);
+ nextv += 3;
+ exnextv += 3;
+ }
+ if (nseg > 0) {
//*-* To "close" shape we have to add on extra "wall"
- if (fRootLight)
- LightIndex(j>>1);
- else
- glNormal3fv(Normal2Line(exnextv-pt3,nextv-pt3,normal));
-
- glVertex3fv(exnextv - pt3);
- glVertex3fv(nextv - pt3);
- }
- nextv += 3*ndiv;
+ if (fRootLight)
+ LightIndex(j>>1);
+ else
+ glNormal3fv(Normal2Line(exnextv-pt3,nextv-pt3,normal));
+
+ glVertex3fv(exnextv - pt3);
+ glVertex3fv(nextv - pt3);
}
- glEnd();
- }
+ nextv += 3*ndiv;
+ }
+ glEnd();
+ }
//*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* Create the internal walls
- exnextv = vertex;
- for (i=0;i<nstacks-1;i++) {
- if (*(exnextv+1) == 0.0 && *exnextv == 0.0) continue; // No internal wall at all
-
- glBegin(GL_QUAD_STRIP);
- {
- nextv = exnextv+pt6;
- for(j=0;j<ndiv;j++) {
- if (fRootLight)
- LightIndex(j>>1);
- else
- glNormal3fv(Invert(Normal2Line(nextv,exnextv,normal)));
-
- glVertex3fv(exnextv);
- glVertex3fv(nextv);
- nextv += 3;
- exnextv += 3;
- }
- if (nseg > 0) {
+ exnextv = vertex;
+ for (i=0;i<nstacks-1;i++) {
+ if (*(exnextv+1) == 0.0 && *exnextv == 0.0) continue; // No internal wall at all
+
+ glBegin(GL_QUAD_STRIP);
+ {
+ nextv = exnextv+pt6;
+ for(j=0;j<ndiv;j++) {
+ if (fRootLight)
+ LightIndex(j>>1);
+ else
+ glNormal3fv(Invert(Normal2Line(nextv,exnextv,normal)));
+
+ glVertex3fv(exnextv);
+ glVertex3fv(nextv);
+ nextv += 3;
+ exnextv += 3;
+ }
+ if (nseg > 0) {
//*-* To "close" shape we have to add on extra "wall"
- if (fRootLight)
- LightIndex(j>>1);
- else
- glNormal3fv(Invert(Normal2Line(nextv-pt3,exnextv-pt3,normal)));
-
- glVertex3fv(exnextv - pt3);
- glVertex3fv(nextv - pt3);
- }
- exnextv += pt3;
- }
- glEnd();
- }
- if (nseg < 0 ) {
+ if (fRootLight)
+ LightIndex(j>>1);
+ else
+ glNormal3fv(Invert(Normal2Line(nextv-pt3,exnextv-pt3,normal)));
+
+ glVertex3fv(exnextv - pt3);
+ glVertex3fv(nextv - pt3);
+ }
+ exnextv += pt3;
+ }
+ glEnd();
+ }
+ if (nseg < 0 ) {
//*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* Close the side holes
//*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
- Float_t oz[3] = {0.0,0.0,1.0};
- Float_t base[3] = {0.0,0.0,0.0};
+ Float_t oz[3] = {0.0,0.0,1.0};
+ Float_t base[3] = {0.0,0.0,0.0};
//*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* First hole
- nextv = vertex;
- base[0] = *(nextv+pt3);
- base[1] = *(nextv+pt3+1);
- if (fRootLight) {
- LightIndex(2>>1);
- } else {
- TMath::NormCross(base,oz,normal);
- glNormal3fv(normal);
- }
+ nextv = vertex;
+ base[0] = *(nextv+pt3);
+ base[1] = *(nextv+pt3+1);
+ if (fRootLight) {
+ LightIndex(2>>1);
+ } else {
+ TMath::NormCross(base,oz,normal);
+ glNormal3fv(normal);
+ }
- glBegin(GL_QUAD_STRIP);
- {
- for (i=0;i<nstacks;i++) {
- glVertex3fv(nextv);
+ glBegin(GL_QUAD_STRIP);
+ {
+ for (i=0;i<nstacks;i++) {
+ glVertex3fv(nextv);
- nextv += pt3;
- glVertex3fv(nextv);
+ nextv += pt3;
+ glVertex3fv(nextv);
- nextv += pt3;
- }
+ nextv += pt3;
}
- glEnd();
+ }
+ glEnd();
//*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
//*-* Second one
- nextv = vertex + 3*(ndiv-1);
- base[0] = *(nextv+pt3);
- base[1] = *(nextv+pt3+1);
-
- if (fRootLight) {
- LightIndex(ndiv>>1);
- } else {
- TMath::NormCross(oz,base,normal);
- glNormal3fv(normal);
- }
+ nextv = vertex + 3*(ndiv-1);
+ base[0] = *(nextv+pt3);
+ base[1] = *(nextv+pt3+1);
+
+ if (fRootLight) {
+ LightIndex(ndiv>>1);
+ } else {
+ TMath::NormCross(oz,base,normal);
+ glNormal3fv(normal);
+ }
- glBegin(GL_QUAD_STRIP);
- {
- for (i=0;i<nstacks;i++) {
- glVertex3fv(nextv+pt3);
- glVertex3fv(nextv);
- nextv += 6*ndiv;
- }
+ glBegin(GL_QUAD_STRIP);
+ {
+ for (i=0;i<nstacks;i++) {
+ glVertex3fv(nextv+pt3);
+ glVertex3fv(nextv);
+ nextv += 6*ndiv;
}
- glEnd();
- }
- if (fRootLight)
- LightIndex(0); //Reset the original color
- }
+ }
+ glEnd();
+ }
+ if (fRootLight)
+ LightIndex(0); //Reset the original color
+ }
#undef vert
}
diff --git a/gl/src/TGLPixmap.cxx b/gl/src/TGLPixmap.cxx
index 23eb6f479be..2c5beeff037 100644
--- a/gl/src/TGLPixmap.cxx
+++ b/gl/src/TGLPixmap.cxx
@@ -1,4 +1,4 @@
-// @(#)root/gl:$Name: $:$Id: TGLPixmap.cxx,v 1.7 2005/11/04 20:13:08 pcanal Exp $
+// @(#)root/gl:$Name: $:$Id: TGLPixmap.cxx,v 1.8 2005/11/23 14:48:02 couet Exp $
// Author: Timur Pocheptsov 18/08/2005
/*************************************************************************
@@ -418,10 +418,10 @@ void GLFaceSet::GLDraw()const
//______________________________________________________________________________
void GLFaceSet::GLDrawPolys()const
{
- GLUtriangulatorObj *tessObj = getTesselator();
- const Double_t *pnts = &fVertices[0];
- const Double_t *normals = &fNormals[0];
- const Int_t *pols = &fPolyDesc[0];
+ GLUtriangulatorObj *tessObj = getTesselator();
+ const Double_t *pnts = &fVertices[0];
+ const Double_t *normals = &fNormals[0];
+ const Int_t *pols = &fPolyDesc[0];
for (UInt_t i = 0, j = 0; i < fNbPols; ++i) {
Int_t npoints = pols[j++];
@@ -918,29 +918,29 @@ void TGLPixmap::DrawObjects()const
//______________________________________________________________________________
void TGLPixmap::UpdateRange(const GLSelection *box)
{
- const Double_t *X = box->GetRangeX();
- const Double_t *Y = box->GetRangeY();
- const Double_t *Z = box->GetRangeZ();
+ const Double_t *x = box->GetRangeX();
+ const Double_t *y = box->GetRangeY();
+ const Double_t *z = box->GetRangeZ();
if (!fRender->GetSize()) {
- fRangeX.first = X[0], fRangeX.second = X[1];
- fRangeY.first = Y[0], fRangeY.second = Y[1];
- fRangeZ.first = Z[0], fRangeZ.second = Z[1];
+ fRangeX.first = x[0], fRangeX.second = x[1];
+ fRangeY.first = y[0], fRangeY.second = y[1];
+ fRangeZ.first = z[0], fRangeZ.second = z[1];
return;
}
- if (fRangeX.first > X[0])
- fRangeX.first = X[0];
- if (fRangeX.second < X[1])
- fRangeX.second = X[1];
- if (fRangeY.first > Y[0])
- fRangeY.first = Y[0];
- if (fRangeY.second < Y[1])
- fRangeY.second = Y[1];
- if (fRangeZ.first > Z[0])
- fRangeZ.first = Z[0];
- if (fRangeZ.second < Z[1])
- fRangeZ.second = Z[1];
+ if (fRangeX.first > x[0])
+ fRangeX.first = x[0];
+ if (fRangeX.second < x[1])
+ fRangeX.second = x[1];
+ if (fRangeY.first > y[0])
+ fRangeY.first = y[0];
+ if (fRangeY.second < y[1])
+ fRangeY.second = y[1];
+ if (fRangeZ.first > z[0])
+ fRangeZ.first = z[0];
+ if (fRangeZ.second < z[1])
+ fRangeZ.second = z[1];
}
diff --git a/gl/src/TGLSceneObject.cxx b/gl/src/TGLSceneObject.cxx
index e39572be4c5..9921337a709 100644
--- a/gl/src/TGLSceneObject.cxx
+++ b/gl/src/TGLSceneObject.cxx
@@ -1,4 +1,4 @@
-// @(#)root/gl:$Name: $:$Id: TGLSceneObject.cxx,v 1.44 2005/09/07 11:43:36 rdm Exp $
+// @(#)root/gl:$Name: $:$Id: TGLSceneObject.cxx,v 1.46 2005/10/24 14:49:33 brun Exp $
// Author: Timur Pocheptsov 03/08/2004
/*************************************************************************
@@ -196,15 +196,15 @@ void TGLFaceSet::SetFromMesh(const RootCsg::BaseMesh *mesh)
// Should only be done on an empty faceset object
assert(fNbPols == 0);
- UInt_t nv = mesh->NumberOfVertices();
- fVertices.reserve(3 * nv);
- fNormals.resize(mesh->NumberOfPolys() * 3);
+ UInt_t nv = mesh->NumberOfVertices();
+ fVertices.reserve(3 * nv);
+ fNormals.resize(mesh->NumberOfPolys() * 3);
UInt_t i;
- for (i = 0; i < nv; ++i) {
- const Double_t *v = mesh->GetVertex(i);
- fVertices.insert(fVertices.end(), v, v + 3);
- }
+ for (i = 0; i < nv; ++i) {
+ const Double_t *v = mesh->GetVertex(i);
+ fVertices.insert(fVertices.end(), v, v + 3);
+ }
fNbPols = mesh->NumberOfPolys();
@@ -217,7 +217,7 @@ void TGLFaceSet::SetFromMesh(const RootCsg::BaseMesh *mesh)
for (UInt_t polyIndex = 0; polyIndex < fNbPols; ++polyIndex) {
UInt_t polySize = mesh->SizeOfPoly(polyIndex);
- fPolyDesc.push_back(polySize);
+ fPolyDesc.push_back(polySize);
for(UInt_t i = 0; i < polySize; ++i) fPolyDesc.push_back(mesh->GetVertexIndex(polyIndex, i));
}
@@ -1082,9 +1082,9 @@ void TGLCylinder::CreateParts(const TBuffer3DTube &buffer)
Double_t phi1 = segBuffer->fPhiMin;
Double_t phi2 = segBuffer->fPhiMax;
- if (phi2 < phi1) phi2 += 360.;
- phi1 *= TMath::DegToRad();
- phi2 *= TMath::DegToRad();
+ if (phi2 < phi1) phi2 += 360.;
+ phi1 *= TMath::DegToRad();
+ phi2 *= TMath::DegToRad();
if (buffer.Type() == TBuffer3DTypes::kCutTube) {
const TBuffer3DCutTube * cutBuffer = dynamic_cast<const TBuffer3DCutTube *>(&buffer);
diff --git a/gl/src/TGLUtil.cxx b/gl/src/TGLUtil.cxx
index 8cebe4927e5..7f6faf6d53e 100644
--- a/gl/src/TGLUtil.cxx
+++ b/gl/src/TGLUtil.cxx
@@ -1,4 +1,4 @@
-// @(#)root/gl:$Name: $:$Id: TGLUtil.cxx,v 1.15 2005/11/16 16:41:59 brun Exp $
+// @(#)root/gl:$Name: $:$Id: TGLUtil.cxx,v 1.16 2005/11/22 18:05:46 brun Exp $
// Author: Richard Maunder 25/05/2005
/*************************************************************************
@@ -344,7 +344,7 @@ void TGLPlane::Dump() const
// Output plane equation to std::out
std::cout.precision(6);
std::cout << "Plane : " << fVals[0] << "x + " << fVals[1] << "y + " << fVals[2] << "z + " << fVals[3] << std::endl;
- }
+}
//////////////////////////////////////////////////////////////////////////
// //
diff --git a/gl/src/TX11GL.cxx b/gl/src/TX11GL.cxx
index 5172a79fe5b..1ece32107c7 100644
--- a/gl/src/TX11GL.cxx
+++ b/gl/src/TX11GL.cxx
@@ -1,4 +1,4 @@
-// @(#)root/gx11:$Name: $:$Id: TX11GL.cxx,v 1.9 2005/10/04 07:51:29 brun Exp $
+// @(#)root/gx11:$Name: $:$Id: TX11GL.cxx,v 1.10 2005/11/17 14:43:17 couet Exp $
// Author: Timur Pocheptsov 09/08/2004
/*************************************************************************
@@ -39,14 +39,14 @@ Window_t TX11GL::CreateGLWindow(Window_t wind)
fDpy = (Display *)gVirtualX->GetDisplay();
static int dblBuf[] = {
- GLX_DOUBLEBUFFER,
+ GLX_DOUBLEBUFFER,
#ifdef STEREO_GL
- GLX_STEREO,
+ GLX_STEREO,
#endif
- GLX_RGBA, GLX_DEPTH_SIZE, 16,
- GLX_RED_SIZE, 1, GLX_GREEN_SIZE, 1,
- GLX_BLUE_SIZE, 1,None
- };
+ GLX_RGBA, GLX_DEPTH_SIZE, 16,
+ GLX_RED_SIZE, 1, GLX_GREEN_SIZE, 1,
+ GLX_BLUE_SIZE, 1,None
+ };
static int * snglBuf = dblBuf + 1;
if(!fVisInfo){
@@ -78,11 +78,11 @@ Window_t TX11GL::CreateGLWindow(Window_t wind)
mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask |
CWBackingStore | CWBitGravity;
- Window GLWin = XCreateWindow(fDpy, wind, xval, yval, wval, hval,
+ Window glWin = XCreateWindow(fDpy, wind, xval, yval, wval, hval,
0, fVisInfo->depth, InputOutput,
fVisInfo->visual, mask, &attr);
- XMapWindow(fDpy, GLWin);
- return (Window_t)GLWin;
+ XMapWindow(fDpy, glWin);
+ return (Window_t)glWin;
}
//______________________________________________________________________________
--
GitLab