** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: graph3dview.cpp,v 1.31 2002/10/24 21:05:28 kevin Exp $
+** $Id: graph3dview.cpp,v 1.35 2003/03/23 18:37:42 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
** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
******************************************************************************/
-#ifdef __GNUG__
-#pragma implementation
-#pragma interface
-#endif
-
#include "wx/wxprec.h"
#ifndef WX_PRECOMP
: m_pFileMenu(NULL), m_pViewMenu(NULL), m_pStatusBar(NULL), m_pCanvas(NULL),
m_dXRotate(-180), m_dYRotate(-210), m_dZRotate(195),
m_bDoubleBuffer(true), m_bSmooth(true), m_bWireframe(false),
- m_bLighting(true), m_bColor(true), m_bUseVertexArrays(false),
+ m_bLighting(false), m_bColor(true), m_bUseVertexArrays(false),
m_bColorScaleMinSet(false), m_bColorScaleMaxSet(false),
m_pFrame(NULL)
{}
Graph3dFileView::OnCreate (wxDocument *doc, long WXUNUSED(flags) )
{
m_pFrame = CreateChildFrame(doc, this);
+ SetFrame (m_pFrame);
m_pCanvas = CreateCanvas (m_pFrame);
m_pFrame->SetClientSize (m_pCanvas->GetBestSize());
- SetFrame (m_pFrame);
m_pCanvas->SetClientSize (m_pCanvas->GetBestSize());
m_pFrame->SetTitle("Graph3dFileView");
- m_pCanvas->SetCurrent();
-
- InitGL();
-
- m_pFrame->SetFocus();
- m_pFrame->Show(true);
- Activate(true);
-
+ m_pCanvas->SetCurrent();
+ InitGL();
+ m_pCanvas->SwapBuffers();
+
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_WIREFRAME, m_bWireframe);
+
+ m_pFrame->SetFocus();
+ m_pFrame->Show(true);
+ Activate(true);
+
return true;
}
Graph3dFileCanvas*
Graph3dFileView::CreateCanvas (wxFrame* parent)
{
- Graph3dFileCanvas* pCanvas;
-
- pCanvas = new Graph3dFileCanvas (this, parent, wxPoint(-1,-1), wxSize(-1,-1), 0);
+ Graph3dFileCanvas* pCanvas = new Graph3dFileCanvas (this, parent, wxPoint(-1,-1), wxSize(-1,-1), 0);
pCanvas->SetBackgroundColour(*wxWHITE);
pCanvas->Clear();
glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
glCallList (DISPLAYLIST_COLOR);
- glColor3f (0.0f, 0.0f, 0.0f);
+ glEnable (GL_DEPTH_TEST);
+ glColor3f (1.0f, 1.0f, 1.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
+ } else {
+ glColorMaterial (GL_FRONT_AND_BACK, GL_DIFFUSE);
+ glEnable (GL_COLOR_MATERIAL);
+ glShadeModel (GL_FLAT);
glCallList (DISPLAYLIST_COLOR);
+ }
}
}
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]);
+ 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);
{
if (m_pCanvas) {
m_pCanvas->SetCurrent();
+#ifdef DEBUG
+ *theApp->getLog() << "Drawing 3d surface\n";
+#endif
Draw();
m_pCanvas->SwapBuffers();
}
int ny = GetDocument()->ny();
#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 ambient1[] = {0.5f, 0.5f, 0.5f, 1.0f};
+ static float position0[] = {nx/2, ny*2, -ny*2, 0.0f,};
+ static float ambient0[] = {.1f, .1f, .1f, 1.0f};
+ static float diffuse0[] = {1.0f, 1.0f, 1.0f, 1.0f};
+ static float position1[] = {-nx/2, -ny*2, -ny*2, 0.0f,};
+ static float ambient1[] = {.1f, .1f, .1f, .1f};
static float diffuse1[] = {1.0f, 1.0f, 1.0f, 1.0f};
// static float position0[] = {0.0f, 0.0f, 20.0f, 0.0f};
// static float position1[] = {0.0f, 0.0f, -20.0f, 0.0f};
- static float front_mat_shininess[] = {5.0f};
- static float front_mat_specular[] = {0.1f, 0.1f, 0.1f, 1.0f};
+ static float front_mat_shininess[] = {60.0f};
+ static float front_mat_specular[] = {0.2f, 0.2f, 0.2f, 1.0f};
static float front_mat_diffuse[] = {0.3f, 0.3f, 0.3f, 1.0f};
- /*
- static float back_mat_shininess[] = {60.0f};
- static float back_mat_specular[] = {0.2f, 0.2f, 0.2f, 1.0f};
+ static float back_mat_shininess[] = {10.0f};
+ static float back_mat_specular[] = {0.1f, 0.1f, 0.1f, 1.0f};
static float back_mat_diffuse[] = {1.0f, 1.0f, 1.0f, 1.0f};
- */
static float lmodel_ambient[] = {1.0f, 1.0f, 1.0f, 1.0f};
- static float lmodel_twoside[] = {GL_FALSE};
+ static float lmodel_twoside[] = {GL_TRUE};
- glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
+ //glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
glHint(GL_LINE_SMOOTH, GL_DONT_CARE);
glEnable(GL_NORMALIZE);
- glLightfv (GL_LIGHT0, GL_AMBIENT, ambient);
- glLightfv (GL_LIGHT0, GL_DIFFUSE, diffuse);
+ glLightfv (GL_LIGHT0, GL_AMBIENT, ambient0);
+ glLightfv (GL_LIGHT0, GL_DIFFUSE, diffuse0);
glLightfv (GL_LIGHT0, GL_POSITION, position0);
glEnable (GL_LIGHT0);
glMaterialfv (GL_FRONT_AND_BACK, GL_SHININESS, front_mat_shininess);
glMaterialfv (GL_FRONT_AND_BACK, GL_SPECULAR, front_mat_specular);
glMaterialfv (GL_FRONT_AND_BACK, GL_DIFFUSE, front_mat_diffuse);
+ glMaterialfv (GL_BACK, GL_SHININESS, back_mat_shininess);
+ glMaterialfv (GL_BACK, GL_SPECULAR, back_mat_specular);
+ glMaterialfv (GL_BACK, GL_DIFFUSE, back_mat_diffuse);
glColorMaterial (GL_FRONT_AND_BACK, GL_DIFFUSE);
- // glColorMaterial (GL_FRONT_AND_BACK, GL_SPECULAR);
+ glColorMaterial (GL_FRONT_AND_BACK, GL_SPECULAR);
glEnable(GL_COLOR_MATERIAL);
#else
GLfloat impLPos[] = {1.0f, 1.0f, 1.0f, 0.0f};
m_dColorScaleMax = max;
}
double dRadius = maxValue<int> (nx, ny) * SQRT2 / 2;
+
+ if (m_pCanvas)
+ m_pCanvas->SetCurrent();
+
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
glOrtho (-dRadius, dRadius, -dRadius, dRadius, dRadius*5, -dRadius*5);
#endif
CreateDisplayList();
-
- if (m_pCanvas)
+
+ if (m_pCanvas) {
+ m_pCanvas->SwapBuffers();
m_pCanvas->Refresh();
+ }
}
bool
if (deleteWindow) {
delete m_pFrame;
m_pFrame = NULL;
+ if (GetDocument() && GetDocument()->getBadFileOpen())
+ ::wxYield(); // wxWindows bug workaround
}
return true;
}
+void
+Graph3dFileView::setInitialClientSize ()
+{
+ if (m_pFrame && m_pCanvas) {
+ wxSize bestSize = m_pCanvas->GetBestSize();
+
+ m_pFrame->SetClientSize (bestSize);
+ m_pFrame->Show (true);
+ m_pFrame->SetFocus();
+ }
+}
+
void
Graph3dFileView::OnScaleAuto (wxCommandEvent& event)
{
m_pFileMenu->Append(wxID_PRINT, "&Print...");
m_pFileMenu->Append(wxID_PRINT_SETUP, "Print &Setup...");
m_pFileMenu->Append(wxID_PREVIEW, "Print Preview");
-#ifdef CTSIM_MDI
m_pFileMenu->AppendSeparator();
+ m_pFileMenu->Append (MAINMENU_FILE_PREFERENCES, "Prefere&nces...");
m_pFileMenu->Append(MAINMENU_FILE_EXIT, "E&xit");
-#endif
+
GetDocumentManager()->FileHistoryAddFilesToMenu(m_pFileMenu);
GetDocumentManager()->FileHistoryUseMenu(m_pFileMenu);
BEGIN_EVENT_TABLE(Graph3dFileCanvas, wxGLCanvas)
-EVT_PAINT(Graph3dFileCanvas::OnDraw)
+EVT_PAINT(Graph3dFileCanvas::OnPaint)
EVT_SIZE(Graph3dFileCanvas::OnSize)
EVT_CHAR(Graph3dFileCanvas::OnChar)
EVT_MOUSE_EVENTS(Graph3dFileCanvas::OnMouseEvent)
-
Graph3dFileCanvas::Graph3dFileCanvas (Graph3dFileView* view, wxWindow *parent, const wxPoint& pos,
- const wxSize& size, long style):
-wxGLCanvas (parent, -1, pos, size, style, _T("Graph3dCanvas")
- ), m_pView(view)
+ const wxSize& size, long style)
+ : wxGLCanvas (parent, -1, pos, size, style), m_pView(view)
{
- parent->Show (true);
- SetCurrent();
+// parent->Show (true);
#if 0
// Make sure server supports the vertex array extension
char* extensions = (char *) glGetString( GL_EXTENSIONS );
}
void
-Graph3dFileCanvas::OnDraw (wxDC& dc)
+Graph3dFileCanvas::OnPaint (wxPaintEvent& event)
{
+ wxPaintDC dc(this);
if (m_pView)
m_pView->OnDraw(& dc);
}
Graph3dFileCanvas::OnSize (wxSizeEvent& event)
{
#ifndef __WXMOTIF__
- if (!GetContext()) return;
+ // if (!GetContext()) return;
#endif
- SetCurrent();
int width, height;
GetClientSize (&width, &height);
Reshape (width, height);
void
Graph3dFileCanvas::Reshape (int width, int height)
{
+ SetCurrent();
glViewport (0, 0, (GLint)width, (GLint)height);
+ SwapBuffers();
}
projects / ctsim.git / blobdiff