ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libgender/entity.h
(Generate patch)

Comparing libgender/entity.h (file contents):
Revision 1.7 by root, Sun Oct 3 03:19:56 2004 UTC vs.
Revision 1.10 by root, Sun Oct 3 20:14:33 2004 UTC

… …
5 5
6#include <vector> 6#include <vector>
7 7
8#include "util.h" 8#include "util.h"
9#include "oct.h" 9#include "oct.h"
10#include "view.h"
10 11
11using namespace std; 12using namespace std;
12 13
13struct entity_base { 14struct entity_base {
14 struct entity_base *parent; 15 struct entity_base *parent;
16 sector orig;
15 vector<octant *> o; 17 vector<octant *> o;
16 box bbox; 18 box bbox;
17 19
18 virtual void update_bbox (); 20 virtual void update_bbox ();
19 virtual void show (const sector &sec) { }; 21 virtual void show () { world.add (orig, this); };
20 void hide (); 22 void hide ();
23 void display (draw_context &ctx);
21 virtual void draw (const draw_context &ctx) = 0; 24 virtual void draw (draw_context &ctx) = 0;
25
26 entity_base ();
22 virtual ~entity_base () 27 virtual ~entity_base ();
23 {
24 hide ();
25 };
26}; 28};
27 29
28struct entity_container : entity_base, protected vector<entity_base *> { 30struct entity_container : entity_base, protected vector<entity_base *> {
29 void add (entity_base *e) { push_back (e); e->parent = this; } 31 void add (entity_base *e) { push_back (e); e->parent = this; }
30 void update_bbox (); 32 void update_bbox ();
31 void show (const sector &sec); 33 void show ();
32 void draw (const draw_context &ctx); 34 void draw (draw_context &ctx);
33 ~entity_container (); 35 ~entity_container ();
34}; 36};
35 37
36struct entity_filter : entity_base { 38struct entity_filter : entity_base {
37protected: 39protected:
… …
51 } 53 }
52 54
53 entity_base *content () { return e; }; 55 entity_base *content () { return e; };
54 56
55 void update_bbox (); 57 void update_bbox ();
56 void show (const sector &sec); 58 void show ();
57 void draw (const draw_context &ctx); 59 void draw (draw_context &ctx);
58 ~entity_filter (); 60 ~entity_filter ();
59}; 61};
60 62
61struct entity : entity_filter { 63struct entity : entity_filter {
62 sector sec;
63
64 void show (const sector &sec);
65 void show ();
66 void draw (const draw_context &ctx);
67}; 64};
68 65
69#if 0 66#if 0
70struct entity_affine : entity_filter { 67struct entity_affine : entity_filter {
71 GLfloat m[4][4]; 68 GLfloat m[4][4];
72 69
73 void draw (const draw_context &ctx); 70 void draw (draw_context &ctx);
74}; 71};
75#endif 72#endif
76 73
77struct vertex1d { 74struct vertex1d {
78 colour c; // colour 75 colour c; // colour
… …
92}; 89};
93 90
94template<GLenum type> 91template<GLenum type>
95struct entity_opengl1d : entity_opengl, vector<vertex1d> { 92struct entity_opengl1d : entity_opengl, vector<vertex1d> {
96 void update_bbox (); 93 void update_bbox ();
97 void show (const sector &sec);
98 void draw (const draw_context &ctx); 94 void draw (draw_context &ctx);
99}; 95};
100 96
101template<GLenum type> 97template<GLenum type>
102struct entity_opengl2d : entity_opengl, vector<vertex2d> { 98struct entity_opengl2d : entity_opengl, vector<vertex2d> {
103 material m; 99 material m;
100 GLuint list;
104 101
105 void update_bbox (); 102 void update_bbox ();
106 void show (const sector &sec);
107 void draw (const draw_context &ctx); 103 void draw (draw_context &ctx);
104
105 entity_opengl2d ()
106 : list(0)
107 {
108 }
109
110 ~entity_opengl2d ()
111 {
112 if (list)
113 glDeleteLists (list, 1);
114 }
108}; 115};
109 116
110typedef entity_opengl1d<GL_POINTS> entity_points; 117typedef entity_opengl1d<GL_POINTS> entity_points;
111typedef entity_opengl1d<GL_LINES> entity_lines; 118typedef entity_opengl1d<GL_LINES> entity_lines;
112typedef entity_opengl1d<GL_LINE_STRIP> entity_line_strip; 119typedef entity_opengl1d<GL_LINE_STRIP> entity_line_strip;
… …
116typedef entity_opengl2d<GL_TRIANGLE_FAN> entity_triangle_fan; 123typedef entity_opengl2d<GL_TRIANGLE_FAN> entity_triangle_fan;
117typedef entity_opengl2d<GL_QUADS> entity_quads; 124typedef entity_opengl2d<GL_QUADS> entity_quads;
118typedef entity_opengl2d<GL_QUAD_STRIP> entity_quad_strip; 125typedef entity_opengl2d<GL_QUAD_STRIP> entity_quad_strip;
119typedef entity_opengl2d<GL_POLYGON> entity_polygon; 126typedef entity_opengl2d<GL_POLYGON> entity_polygon;
120 127
121struct view {
122 point p;
123 vec3 d, u;
124 float fov;
125 int w, h;
126
127 void draw (const draw_context &ctx);
128};
129
130#endif 128#endif
131 129
132 130
133 131

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines