** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: graph3dview.cpp,v 1.5 2001/02/02 00:46:38 kevin Exp $
+** $Id: graph3dview.cpp,v 1.7 2001/02/02 23:04:06 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
m_bLighting = true;
m_bSurface = true;
m_bLighting = true;
- m_bColor = true;
- m_dXRotate = 0;
+ m_bColor = false;
+ m_dXRotate = -45;
m_dYRotate = 0;
- m_dZRotate = 0;
+ m_dZRotate = -45;
}
Graph3dFileView::~Graph3dFileView()
Draw();
std::ostringstream os;
os << "Xangle=" << m_dXRotate << ", Yangle=" << m_dYRotate << ", Zangle=" << m_dZRotate;
- m_statusBar.SetStatusText (os.str().c_str());
+ m_pStatusBar->SetStatusText (os.str().c_str());
m_pCanvas->SwapBuffers();
}
#if 1
static float ambient[] = {0.1, 0.1, 0.1, 1.0};
static float diffuse[] = {1.0, 1.0, 1.0, 1.0};
- static float position0[] = {0, 0, -nx/4, 0, 0.0};
- static float position1[] = {nx/2, ny/2, nx/4, 0.0};
+ static float position0[] = {0, 0, -nx/2, 0, 0.0};
+ static float position1[] = {0, 0, nx/2, 0.0};
+ static float ambient1[] = {0.5, 0.5, 0.5, 1.0};
+ static float diffuse1[] = {1.0, 1.0, 1.0, 1.0};
// static float position0[] = {0.0, 0.0, 20.0, 0.0};
// static float position1[] = {0.0, 0.0, -20.0, 0.0};
static float front_mat_shininess[] = {5.0};
static float lmodel_ambient[] = {1.0, 1.0, 1.0, 1.0};
static float lmodel_twoside[] = {GL_FALSE};
+ 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_POSITION, position0);
glEnable (GL_LIGHT0);
- glLightfv (GL_LIGHT1, GL_AMBIENT, ambient);
- glLightfv (GL_LIGHT1, GL_DIFFUSE, diffuse);
+ glLightfv (GL_LIGHT1, GL_AMBIENT, ambient1);
+ glLightfv (GL_LIGHT1, GL_DIFFUSE, diffuse1);
glLightfv (GL_LIGHT1, GL_POSITION, position1);
glEnable (GL_LIGHT1);
Activate (false);
if (m_pCanvas) {
+// m_pCanvas->Show(false);
m_pCanvas->setView(NULL);
m_pCanvas = NULL;
}
SetFrame(NULL);
if (deleteWindow) {
- m_pFrame->Destroy();
+// m_pFrame->Show(false);
+ delete m_pFrame;
m_pFrame = NULL;
- if (GetDocument() && GetDocument()->getBadFileOpen())
- ::wxYield(); // wxWindows bug workaround
+// if (GetDocument() && GetDocument()->getBadFileOpen())
+// ::wxYield(); // wxWindows bug workaround
}
return true;
#endif
theApp->setIconForFrame (subframe);
- m_statusBar.Create (subframe, -1);
- subframe->SetStatusBar (&m_statusBar);
+ m_pStatusBar = new wxStatusBar (subframe, -1);
+ subframe->SetStatusBar (m_pStatusBar);
m_pFileMenu = new wxMenu;