projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r480: no message
[ctsim.git]
/
src
/
graph3dview.h
diff --git
a/src/graph3dview.h
b/src/graph3dview.h
index 2d2bc792159fbc1ba4cc825733fe16b3b6e50701..1cb68cf48d8d341ba94ee485728ca1e793087c25 100644
(file)
--- a/
src/graph3dview.h
+++ b/
src/graph3dview.h
@@
-9,7
+9,7
@@
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: graph3dview.h,v 1.
1 2001/01/30 07:32:13
kevin Exp $
+** $Id: graph3dview.h,v 1.
3 2001/02/02 00:46:38
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
**
** 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
@@
-36,8
+36,6
@@
#include <GL/glu.h>
#include <GL/glu.h>
-typedef GLfloat glTripleFloat[3];
-
class Graph3dFileCanvas;
class Graph3dFileView : public wxView
{
class Graph3dFileCanvas;
class Graph3dFileView : public wxView
{
@@
-48,15
+46,18
@@
private:
DECLARE_EVENT_TABLE()
wxMenu* m_pFileMenu;
DECLARE_EVENT_TABLE()
wxMenu* m_pFileMenu;
+ wxMenu *m_pViewMenu;
+ wxStatusBar m_statusBar;
+
GLfloat m_dXRotate;
GLfloat m_dYRotate;
GLfloat m_dXRotate;
GLfloat m_dYRotate;
-
std::vector<glTripleFloat> m_vecVerts
;
-
std::vector<glTripleFloat> m_vecNorm
s;
-
GLint m_nVerts
;
-
GLboolean m_bUseVertexArrays
;
-
GLboolean m_bDoubleBuffer
;
-
GLboolean m_bSmooth
;
-
GLboolean m_bLighting
;
+
GLfloat m_dZRotate
;
+
bool m_bUseVertexArray
s;
+
bool m_bDoubleBuffer
;
+
bool m_bSmooth
;
+
bool m_bLighting
;
+
bool m_bSurface
;
+
bool m_bColor
;
void Draw();
void DrawSurface();
void Draw();
void DrawSurface();
@@
-92,13
+93,17
@@
public:
void OnUpdate(wxView *sender, wxObject *hint = NULL);
bool OnClose (bool deleteWindow = true);
void OnProperties (wxCommandEvent& event);
void OnUpdate(wxView *sender, wxObject *hint = NULL);
bool OnClose (bool deleteWindow = true);
void OnProperties (wxCommandEvent& event);
+ void OnLighting (wxCommandEvent& event);
+ void OnSurface (wxCommandEvent& event);
+ void OnColor (wxCommandEvent& event);
+ void OnSmooth (wxCommandEvent& event);
#if CTSIM_MDI
wxDocMDIChildFrame* getFrame() { return m_pFrame; }
#else
wxDocChildFrame* getFrame() { return m_pFrame; }
#endif
#if CTSIM_MDI
wxDocMDIChildFrame* getFrame() { return m_pFrame; }
#else
wxDocChildFrame* getFrame() { return m_pFrame; }
#endif
-
+ Graph3dFileCanvas* getCanvas() { return m_pCanvas; }
Graph3dFileDocument* GetDocument()
{ return dynamic_cast<Graph3dFileDocument*>(wxView::GetDocument()); }
};
Graph3dFileDocument* GetDocument()
{ return dynamic_cast<Graph3dFileDocument*>(wxView::GetDocument()); }
};