X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=src%2Fgraph3dview.cpp;h=15d560f839f2f3af63cfb4d9b5c7549160b883b9;hp=4295f4c9a3da128a61901d449082c83f4207a343;hb=3ea498d51ce4597e9649cd21f155b51175ea0bea;hpb=8cce345df80fdbeea1c03a04a71d805951a87b74 diff --git a/src/graph3dview.cpp b/src/graph3dview.cpp index 4295f4c..15d560f 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.16 2001/03/04 03:14:47 kevin Exp $ +** $Id: graph3dview.cpp,v 1.21 2001/03/21 21:45:31 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 @@ -117,40 +117,20 @@ Graph3dFileView::intensityToColor (double dIntensity, GLfloat* vecColor) // fNormalZ == Z vector for the normal vector //************************************************************************* -void -CalculateVectorNormal (GLfloat fVert1[], GLfloat fVert2[], - GLfloat fVert3[], GLfloat *fNormalX, - GLfloat *fNormalY, GLfloat *fNormalZ) -{ - GLfloat Qx = fVert2[0] - fVert1[0]; - GLfloat Qy = fVert2[1] - fVert1[1]; - GLfloat Qz = fVert2[2] - fVert1[2]; - GLfloat Px = fVert3[0] - fVert1[0]; - GLfloat Py = fVert3[1] - fVert1[1]; - GLfloat Pz = fVert3[2] - fVert1[2]; - - *fNormalX = Py*Qz - Pz*Qy; - *fNormalY = Pz*Qx - Px*Qz; - *fNormalZ = Px*Qy - Py*Qx; - -} - -void -CalculateVectorNormal (GLdouble fVert1[], GLdouble fVert2[], - GLdouble fVert3[], GLdouble *fNormalX, - GLdouble *fNormalY, GLdouble *fNormalZ) +template +static void +CalculateVectorNormal (T fVert1[], T fVert2[], T fVert3[], T *fNormalX, T *fNormalY, T *fNormalZ) { - GLdouble Qx = fVert2[0] - fVert1[0]; - GLdouble Qy = fVert2[1] - fVert1[1]; - GLdouble Qz = fVert2[2] - fVert1[2]; - GLdouble Px = fVert3[0] - fVert1[0]; - GLdouble Py = fVert3[1] - fVert1[1]; - GLdouble Pz = fVert3[2] - fVert1[2]; + T Qx = fVert2[0] - fVert1[0]; + T Qy = fVert2[1] - fVert1[1]; + T Qz = fVert2[2] - fVert1[2]; + T Px = fVert3[0] - fVert1[0]; + T Py = fVert3[1] - fVert1[1]; + T Pz = fVert3[2] - fVert1[2]; *fNormalX = Py*Qz - Pz*Qy; *fNormalY = Pz*Qx - Px*Qz; *fNormalZ = Px*Qy - Py*Qx; - } IMPLEMENT_DYNAMIC_CLASS(Graph3dFileView, wxView) @@ -160,7 +140,7 @@ EVT_MENU(IFMENU_FILE_PROPERTIES, Graph3dFileView::OnProperties) EVT_MENU(GRAPH3D_VIEW_LIGHTING, Graph3dFileView::OnLighting) EVT_MENU(GRAPH3D_VIEW_COLOR, Graph3dFileView::OnColor) EVT_MENU(GRAPH3D_VIEW_SMOOTH, Graph3dFileView::OnSmooth) -EVT_MENU(GRAPH3D_VIEW_SURFACE, Graph3dFileView::OnSurface) +EVT_MENU(GRAPH3D_VIEW_WIREFRAME, Graph3dFileView::OnWireframe) EVT_MENU(GRAPH3D_VIEW_SCALE_MINMAX, Graph3dFileView::OnScaleSet) EVT_MENU(GRAPH3D_VIEW_SCALE_AUTO, Graph3dFileView::OnScaleAuto) EVT_MENU(GRAPH3D_VIEW_SCALE_FULL, Graph3dFileView::OnScaleFull) @@ -172,12 +152,12 @@ Graph3dFileView::Graph3dFileView () m_bDoubleBuffer = true; m_bSmooth = true; m_bLighting = true; - m_bSurface = true; + m_bWireframe = false; m_bLighting = true; - m_bColor = false; - m_dXRotate = -45; - m_dYRotate = 0; - m_dZRotate = -45; + m_bColor = true; + m_dXRotate = -180; + m_dYRotate = -210; + m_dZRotate = -195; m_bColorScaleMinSet = false; m_bColorScaleMaxSet = false; } @@ -213,7 +193,7 @@ Graph3dFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) ) m_pViewMenu->Check (GRAPH3D_VIEW_COLOR, m_bColor); m_pViewMenu->Check (GRAPH3D_VIEW_LIGHTING, m_bLighting); m_pViewMenu->Check (GRAPH3D_VIEW_SMOOTH, m_bSmooth); - m_pViewMenu->Check (GRAPH3D_VIEW_SURFACE, m_bSurface); + m_pViewMenu->Check (GRAPH3D_VIEW_WIREFRAME, m_bWireframe); return true; } @@ -236,6 +216,9 @@ Graph3dFileView::CreateCanvas (wxFrame* parent) void Graph3dFileView::DrawSurface() { + if (! GetDocument()) + return; + if (m_bSmooth) { glShadeModel (GL_SMOOTH); } else { @@ -248,23 +231,36 @@ Graph3dFileView::DrawSurface() glDisable (GL_LIGHTING); } - if (m_bSurface) - glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); - else - glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); - - InitMaterials(); - - if (! GetDocument()) - return; - unsigned int nx = GetDocument()->nx(); unsigned int ny = GetDocument()->ny(); + glRotated (m_dZRotate, 0.0, 1.0, 0.0); glRotated (m_dXRotate, 0.0, 0.0, 1.0); glRotated (m_dYRotate, 1.0, 0.0, 0.0); glTranslated (-static_cast(nx - 1) / 2, 0.0, -static_cast(ny - 1) / 2); - glCallList (DISPLAYLIST_SURFACE); + + InitMaterials(); + if (m_bWireframe) { + if (! m_bColor) + glColor3f (1.0f, 1.0f, 1.0f); + glPolygonOffset (1.0f, 1.0f); + glEnable (GL_POLYGON_OFFSET_FILL); + glPolygonMode (GL_FRONT_AND_BACK, GL_FILL); + glCallList (DISPLAYLIST_COLOR); + + glColor3f (0.0f, 0.0f, 0.0f); + glPolygonOffset (0.0f, 0.0f); + glPolygonMode (GL_FRONT_AND_BACK, GL_LINE); + glCallList (DISPLAYLIST_NO_COLOR); + } else { + glPolygonMode (GL_FRONT_AND_BACK, GL_FILL); + if (! m_bColor) { + glColor3f (1.0f, 1.0f, 1.0f); + glCallList (DISPLAYLIST_NO_COLOR); + } else + glCallList (DISPLAYLIST_COLOR); + } + } void @@ -279,7 +275,7 @@ Graph3dFileView::CreateDisplayList() if (nx == 0 || ny == 0 || ! v) return; - glNewList (DISPLAYLIST_SURFACE, GL_COMPILE); + glNewList (DISPLAYLIST_COLOR, GL_COMPILE); double dMin = m_dColorScaleMin; double dIntensityScale = m_dColorScaleMax - m_dColorScaleMin; @@ -290,19 +286,16 @@ Graph3dFileView::CreateDisplayList() dXOffset = 0; dYOffset = 0; - if (! m_bColor) - glColor3f (1.0f, 1.0f, 1.0f); - 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]); + CalculateVectorNormal (p1, p2, p3, &n1[0], &n1[1], &n1[2]); + double dIntensity1, dIntensity2; if (m_bColor) { dIntensity1 = (v[ix][0] - dMin) / dIntensityScale; @@ -315,10 +308,8 @@ Graph3dFileView::CreateDisplayList() } glVertex3dv (p1); glNormal3dv (n1); - if (m_bColor) { intensityToColor (dIntensity2, vecColor); glColor3fv (vecColor); - } glVertex3dv (p2); glNormal3dv (n1); double lastP[3]; @@ -328,19 +319,43 @@ Graph3dFileView::CreateDisplayList() p2[0] = dXPos+1; p2[1] = actScale * (v[ix+1][iy] + actOffset); p2[2] = dYPos; CalculateVectorNormal (p1, p2, lastP, &n1[0], &n1[1], &n1[2]); lastP[0] = p1[0]; lastP[1] = p1[1]; lastP[2] = p1[2]; - if (m_bColor) { dIntensity1 = (v[ix][iy] - dMin) / dIntensityScale; dIntensity2 = (v[ix+1][iy] - dMin) / dIntensityScale; - } - if (m_bColor) { intensityToColor (dIntensity1, vecColor); glColor3fv (vecColor); - } glVertex3dv (p1); glNormal3dv (n1); - if (m_bColor) { intensityToColor (dIntensity2, vecColor); glColor3fv (vecColor); - } + glVertex3dv (p2); glNormal3dv (n1); + } + glEnd(); // QUAD_STRIP + } + glEndList(); + + + glNewList (DISPLAYLIST_NO_COLOR, GL_COMPILE); + dXPos = -dXOffset; + for (ix = 0; ix < nx - 1; ix++, dXPos++) { + double dYPos = -dYOffset; + glBegin(GL_QUAD_STRIP); + 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]); + + glVertex3dv (p1); + glNormal3dv (n1); + glVertex3dv (p2); + glNormal3dv (n1); + double lastP[3]; + lastP[0] = ix; lastP[1] = actScale * (v[ix][0] + actOffset); lastP[2] = 0; + for (unsigned int iy = 1; iy < ny - 1; iy++, dYPos++) { + p1[0] = dXPos; p1[1] = actScale * (v[ix][iy] + actOffset); p1[2] = dYPos; + p2[0] = dXPos+1; p2[1] = actScale * (v[ix+1][iy] + actOffset); p2[2] = dYPos; + CalculateVectorNormal (p1, p2, lastP, &n1[0], &n1[1], &n1[2]); + lastP[0] = p1[0]; lastP[1] = p1[1]; lastP[2] = p1[2]; + glVertex3dv (p1); glNormal3dv (n1); glVertex3dv (p2); glNormal3dv (n1); } glEnd(); // QUAD_STRIP @@ -368,10 +383,10 @@ Graph3dFileView::OnLighting (wxCommandEvent& event) } void -Graph3dFileView::OnSurface (wxCommandEvent& event) +Graph3dFileView::OnWireframe (wxCommandEvent& event) { - m_bSurface = ! m_bSurface; - m_pViewMenu->Check (GRAPH3D_VIEW_SURFACE, m_bSurface); + m_bWireframe = ! m_bWireframe; + m_pViewMenu->Check (GRAPH3D_VIEW_WIREFRAME, m_bWireframe); m_pCanvas->Refresh(); } @@ -380,7 +395,7 @@ Graph3dFileView::OnColor (wxCommandEvent& event) { m_bColor = ! m_bColor; m_pViewMenu->Check (GRAPH3D_VIEW_COLOR, m_bColor); - OnUpdate (this, NULL); + m_pCanvas->Refresh(); } void @@ -434,8 +449,8 @@ Graph3dFileView::InitMaterials() #if 1 static float ambient[] = {0.1f, 0.1f, 0.1f, 1.0f}; static float diffuse[] = {1.0f, 1.0f, 1.0f, 1.0f}; - static float position0[] = {-nx/2, -ny/2, -ny/2, 0.0f, 0.0f}; - static float position1[] = {-nx/2, -ny/2, ny/2, 0.0f}; + static float position0[] = {-nx/2, -ny/2, ny/2, 0.0f, 0.0f}; + static float position1[] = {-nx/2, -ny/2, -ny/2, 0.0f}; static float ambient1[] = {0.5f, 0.5f, 0.5f, 1.0f}; static float diffuse1[] = {1.0f, 1.0f, 1.0f, 1.0f}; // static float position0[] = {0.0f, 0.0f, 20.0f, 0.0f}; @@ -579,8 +594,8 @@ Graph3dFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) if (! GetDocument()) return; - int nx = GetDocument()->nx(); - int ny = GetDocument()->ny(); + unsigned int nx = GetDocument()->nx(); + unsigned int ny = GetDocument()->ny(); const ImageFileArrayConst v = GetDocument()->getArray(); if (v != NULL && nx != 0 && ny != 0) { double min = v[0][0]; @@ -600,7 +615,6 @@ Graph3dFileView::OnUpdate (wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) ) if (! m_bColorScaleMaxSet) m_dColorScaleMax = max; } - double dRadius = maxValue (nx, ny) * SQRT2 / 2; glMatrixMode(GL_PROJECTION); glLoadIdentity(); @@ -608,7 +622,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; @@ -754,7 +768,7 @@ Graph3dFileView::CreateChildFrame (wxDocument *doc, wxView *view) GetDocumentManager()->FileHistoryUseMenu(m_pFileMenu); m_pViewMenu = new wxMenu; - m_pViewMenu->Append(GRAPH3D_VIEW_SURFACE, "Su&rface\tCtrl-R", "", true); + m_pViewMenu->Append(GRAPH3D_VIEW_WIREFRAME, "Wi&reframe\tCtrl-R", "", true); m_pViewMenu->Append(GRAPH3D_VIEW_SMOOTH, "S&mooth\tCtrl-M", "", true); m_pViewMenu->Append(GRAPH3D_VIEW_COLOR, "Co&lor\tCtrl-L", "", true); m_pViewMenu->Append(GRAPH3D_VIEW_LIGHTING, "Li&ghting\tCtrl-G", "", true); @@ -779,7 +793,7 @@ Graph3dFileView::CreateChildFrame (wxDocument *doc, wxView *view) subframe->Centre(wxBOTH); wxAcceleratorEntry accelEntries[7]; - accelEntries[0].Set (wxACCEL_CTRL, static_cast('R'), GRAPH3D_VIEW_SURFACE); + accelEntries[0].Set (wxACCEL_CTRL, static_cast('R'), GRAPH3D_VIEW_WIREFRAME); accelEntries[1].Set (wxACCEL_CTRL, static_cast('L'), GRAPH3D_VIEW_COLOR); accelEntries[2].Set (wxACCEL_CTRL, static_cast('G'), GRAPH3D_VIEW_LIGHTING); accelEntries[3].Set (wxACCEL_CTRL, static_cast('M'), GRAPH3D_VIEW_SMOOTH); @@ -878,8 +892,8 @@ Graph3dFileCanvas::OnChar(wxKeyEvent& event) m_pView->m_dYRotate -= 15.0; Refresh (false); break; - case 'r': case 'R': - m_pView->OnSurface (dummyEvent); + case 'w': case 'W': + m_pView->OnWireframe (dummyEvent); break; case 's': case 'S': m_pView->OnSmooth (dummyEvent);