X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fgraph3dview.cpp;h=d92912fb09a653f164d88460d4067eb86bfd8ac7;hb=9ff5b5165b2c8871bd4b29ccd5ca794638414615;hp=cb9d64f559fe52e3f2b55d80098476c96f646d5d;hpb=d77c9d135405e077047ef3426a54470c144cdd34;p=ctsim.git diff --git a/src/graph3dview.cpp b/src/graph3dview.cpp index cb9d64f..d92912f 100644 --- a/src/graph3dview.cpp +++ b/src/graph3dview.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: graph3dview.cpp,v 1.17 2001/03/05 17:26:46 kevin Exp $ +** $Id: graph3dview.cpp,v 1.19 2001/03/13 04:44:25 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -295,14 +295,14 @@ Graph3dFileView::CreateDisplayList() double dXPos = -dXOffset; for (unsigned ix = 0; ix < nx - 1; ix++, dXPos++) { - double dYPos = -dYOffset; + double dYPos = -dYOffset; glBegin(GL_QUAD_STRIP); - double p1[3], p2[3], p3[3]; - double n1[3]; + double p1[3], p2[3], p3[3], n1[3]; p1[0] = dXPos; p1[1] = actScale * (v[ix][0] + actOffset); p1[2] = dYPos; p2[0] = dXPos+1; p2[1] = actScale * (v[ix+1][0] + actOffset); p2[2] = dYPos; p3[0] = dXPos; p3[1] = actScale * (v[ix][1] + actOffset); p3[2] = dYPos + 1; CalculateVectorNormal (p1, p2, p3, &n1[0], &n1[1], &n1[2]); + double dIntensity1, dIntensity2; if (m_bColor) { dIntensity1 = (v[ix][0] - dMin) / dIntensityScale; @@ -608,7 +608,7 @@ Graph3dFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) glMatrixMode(GL_MODELVIEW); glLoadIdentity(); -#if 1 +#if 0 GLfloat eyep[3], lookp[3], up[3]; eyep[0] = -nx/2; eyep[1] = 0; eyep[2] = -ny/2; lookp[0] = 0; lookp[1] = 0, lookp[2] = 0;