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

Comparing libgender/entity.h (file contents):
Revision 1.13 by root, Mon Oct 4 02:06:57 2004 UTC vs.
Revision 1.16 by root, Mon Oct 4 23:44:53 2004 UTC

… …
15 struct entity_base *parent; 15 struct entity_base *parent;
16 sector orig; 16 sector orig;
17 vector<octant *> o; 17 vector<octant *> o;
18 box bbox; 18 box bbox;
19 19
20 virtual void update_bbox (); 20 virtual void update ();
21 virtual void show () { world.add (this); }; 21 virtual void show () { world.add (this); };
22 void hide (); 22 void hide ();
23 void display (draw_context &ctx); 23 void display (draw_context &ctx);
24 virtual void draw (draw_context &ctx) = 0; 24 virtual void draw (draw_context &ctx) = 0;
25 25
26 entity_base (); 26 entity_base ();
27 virtual ~entity_base (); 27 virtual ~entity_base ();
28}; 28};
29 29
30struct entity_container : entity_base, protected vector<entity_base *> { 30struct entity_container : entity_base, protected vector<entity_base *> {
31 void add (entity_base *e) { push_back (e); e->parent = this; } 31 void add (entity_base *e)
32 {
33 push_back (e);
34 e->parent = this;
35 update ();
36 }
37
32 void update_bbox (); 38 void update ();
33 void show (); 39 void show ();
34 void draw (draw_context &ctx); 40 void draw (draw_context &ctx);
35 ~entity_container (); 41 ~entity_container ();
36}; 42};
37 43
… …
42 48
43 void set (entity_base *e) 49 void set (entity_base *e)
44 { 50 {
45 this->e = e; 51 this->e = e;
46 e->parent = this; 52 e->parent = this;
53 update ();
47 } 54 }
48 55
49 void remove () 56 void remove ()
50 { 57 {
51 this->e->parent = 0; 58 this->e->parent = 0;
52 this->e = 0; 59 this->e = 0;
53 } 60 }
54 61
55 entity_base *content () { return e; }; 62 entity_base *content () { return e; };
56 63
57 void update_bbox (); 64 void update ();
58 void show (); 65 void show ();
59 void draw (draw_context &ctx); 66 void draw (draw_context &ctx);
60 ~entity_filter (); 67 ~entity_filter ();
61}; 68};
62 69
… …
84 ~entity_opengl (); 91 ~entity_opengl ();
85}; 92};
86 93
87template<GLenum type> 94template<GLenum type>
88struct entity_opengl1d : entity_opengl, vector<vertex1d> { 95struct entity_opengl1d : entity_opengl, vector<vertex1d> {
89 void update_bbox (); 96 void update ();
90 void draw (draw_context &ctx); 97 void draw (draw_context &ctx);
91}; 98};
92 99
93template<GLenum type> 100template<GLenum type>
94struct entity_opengl2d : entity_opengl { 101struct entity_opengl2d : entity_opengl {
95 material m; 102 material m;
96 103
97 void set (const vector<vertex2d> &v); 104 void set (const vector<vertex2d> &v);
98 void draw (draw_context &ctx); 105 void draw (draw_context &ctx);
99
100}; 106};
101 107
102typedef entity_opengl1d<GL_POINTS> entity_points; 108typedef entity_opengl1d<GL_POINTS> entity_points;
103typedef entity_opengl1d<GL_LINES> entity_lines; 109typedef entity_opengl1d<GL_LINES> entity_lines;
104typedef entity_opengl1d<GL_LINE_STRIP> entity_line_strip; 110typedef entity_opengl1d<GL_LINE_STRIP> entity_line_strip;
… …
109typedef entity_opengl2d<GL_QUADS> entity_quads; 115typedef entity_opengl2d<GL_QUADS> entity_quads;
110typedef entity_opengl2d<GL_QUAD_STRIP> entity_quad_strip; 116typedef entity_opengl2d<GL_QUAD_STRIP> entity_quad_strip;
111typedef entity_opengl2d<GL_POLYGON> entity_polygon; 117typedef entity_opengl2d<GL_POLYGON> entity_polygon;
112 118
113struct entity_transform : entity_filter { 119struct entity_transform : entity_filter {
120protected:
114 gl_matrix m; 121 gl_matrix m;
122 void renormalize ();
123public:
115 124
116 entity_transform (); 125 entity_transform ();
117 126
118 void update_bbox (); 127 void update ();
119 void show (); 128 void show ();
120 void draw (draw_context &ctx); 129 void draw (draw_context &ctx);
130 void set_matrix (const gl_matrix &xfrm);
131 void update (const gl_matrix &xfrm);
121}; 132};
122 133
123struct entity_anim : entity_transform { 134struct entity_anim : entity_transform {
124 GLfloat vx, vy, vz; 135 GLfloat vx, vy, vz;
125 void draw (draw_context &ctx); 136 void draw (draw_context &ctx);

Diff Legend

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