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

Comparing libgender/entity.h (file contents):
Revision 1.3 by root, Sun Oct 3 01:14:40 2004 UTC vs.
Revision 1.11 by root, Sun Oct 3 22:46:03 2004 UTC

… …
3 3
4#include <GL/gl.h> 4#include <GL/gl.h>
5 5
6#include <vector> 6#include <vector>
7 7
8#include "util.h"
8#include "oct.h" 9#include "oct.h"
10#include "view.h"
9 11
10using namespace std; 12using namespace std;
11 13
12typedef unsigned int soffs; // 32 bit
13const soffs soffs_max = 1UL << 31;
14
15#define GLFLOAT_MAX 1e30
16#define GLFLOAT_MIN -1e30
17
18struct sector {
19 soffs x, y, z;
20};
21
22struct point {
23 GLfloat x, y, z;
24
25 point () { };
26 point (GLfloat x, GLfloat y, GLfloat z) : x(x), y(y), z(z) { };
27};
28
29struct colour {
30 GLfloat r, g, b;
31 colour (GLfloat r = 1., GLfloat g = 1., GLfloat b = 1.) : r(r), g(g), b(b) { };
32};
33
34struct vec3 {
35 GLfloat x, y, z;
36 vec3 () { };
37 vec3 (GLfloat x, GLfloat y, GLfloat z) : x(x), y(y), z(z) { };
38
39 const vec3 operator -() const
40 { return vec3 (-x, -y, -z); }
41};
42
43const vec3 cross (const vec3 &a, const vec3 &b);
44GLfloat dot (const vec3 &a, const vec3 &b);
45
46struct texc {
47 GLfloat s, t;
48 texc () { };
49 texc (GLfloat s, GLfloat t) : s(s), t(t) { };
50};
51
52struct box {
53 point a, b;
54
55 void reset ()
56 {
57 a = point (GLFLOAT_MAX, GLFLOAT_MAX, GLFLOAT_MAX);
58 b = point (GLFLOAT_MIN, GLFLOAT_MIN, GLFLOAT_MIN);
59 }
60
61 void add (const box &o);
62};
63
64struct entity_base { 14struct entity_base {
65 struct entity_base *parent; 15 struct entity_base *parent;
16 sector orig;
66 vector<octant *> o; 17 vector<octant *> o;
67 box bbox; 18 box bbox;
68 19
69 virtual void update_bbox (); 20 virtual void update_bbox ();
70 virtual void show (const sector &sec) { }; 21 virtual void show () { world.add (this); };
71 void hide (); 22 void hide ();
23 void display (draw_context &ctx);
72 virtual void draw () = 0; 24 virtual void draw (draw_context &ctx) = 0;
25
26 entity_base ();
73 virtual ~entity_base () 27 virtual ~entity_base ();
74 {
75 hide ();
76 };
77}; 28};
78 29
79struct 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; }
80 void update_bbox (); 32 void update_bbox ();
81 void show (const sector &sec);
82 void draw (); 33 void show ();
34 void draw (draw_context &ctx);
83 ~entity_container (); 35 ~entity_container ();
84}; 36};
85 37
86struct entity_filter : entity_base { 38struct entity_filter : entity_base {
87protected: 39protected:
… …
101 } 53 }
102 54
103 entity_base *content () { return e; }; 55 entity_base *content () { return e; };
104 56
105 void update_bbox (); 57 void update_bbox ();
106 void show (const sector &sec);
107 void draw (); 58 void show ();
59 void draw (draw_context &ctx);
108 ~entity_filter (); 60 ~entity_filter ();
109}; 61};
110 62
111struct entity : entity_filter { 63struct entity : entity_filter {
112 sector sec;
113
114 void show (const sector &sec);
115 void show ();
116 void draw ();
117};
118
119struct entity_affine : entity_filter {
120 //matrix m;
121}; 64};
122 65
123struct vertex1d { 66struct vertex1d {
124 colour c; // colour 67 colour c; // colour
125 point p; // vertex 68 point p; // vertex
126}; 69};
127 70
128struct vertex2d { 71struct vertex2d {
129 colour c; // colour
130 point p; // vertex 72 point p; // vertex
131 vec3 n; // normal 73 vec3 n; // normal
132 texc t; // texture 74 texc t; // texture
133 75
134 vertex2d () { }; 76 vertex2d () { };
135 vertex2d (colour c, point p, vec3 n, texc t = texc()) : c(c), p(p), n(n), t(t) { }; 77 vertex2d (point p, vec3 n, texc t = texc()) : p(p), n(n), t(t) { };
78};
79
80struct entity_opengl : entity_base {
136}; 81};
137 82
138template<GLenum type> 83template<GLenum type>
139struct entity_opengl1d : entity_base, vector<vertex1d> { 84struct entity_opengl1d : entity_opengl, vector<vertex1d> {
140 void update_bbox (); 85 void update_bbox ();
141 void show (const sector &sec); 86 void draw (draw_context &ctx);
142 void draw ();
143}; 87};
144 88
145template<GLenum type> 89template<GLenum type>
146struct entity_opengl2d : entity_base, vector<vertex2d> { 90struct entity_opengl2d : entity_opengl, vector<vertex2d> {
91 material m;
92 GLuint list;
93
147 void update_bbox (); 94 void update_bbox ();
148 void show (const sector &sec); 95 void draw (draw_context &ctx);
149 void draw (); 96
97 entity_opengl2d ()
98 : list(0)
99 {
100 }
101
102 ~entity_opengl2d ()
103 {
104 if (list)
105 glDeleteLists (list, 1);
106 }
150}; 107};
151 108
152typedef entity_opengl1d<GL_POINTS> entity_points; 109typedef entity_opengl1d<GL_POINTS> entity_points;
153typedef entity_opengl1d<GL_LINES> entity_lines; 110typedef entity_opengl1d<GL_LINES> entity_lines;
154typedef entity_opengl1d<GL_LINE_STRIP> entity_line_strip; 111typedef entity_opengl1d<GL_LINE_STRIP> entity_line_strip;
… …
158typedef entity_opengl2d<GL_TRIANGLE_FAN> entity_triangle_fan; 115typedef entity_opengl2d<GL_TRIANGLE_FAN> entity_triangle_fan;
159typedef entity_opengl2d<GL_QUADS> entity_quads; 116typedef entity_opengl2d<GL_QUADS> entity_quads;
160typedef entity_opengl2d<GL_QUAD_STRIP> entity_quad_strip; 117typedef entity_opengl2d<GL_QUAD_STRIP> entity_quad_strip;
161typedef entity_opengl2d<GL_POLYGON> entity_polygon; 118typedef entity_opengl2d<GL_POLYGON> entity_polygon;
162 119
163struct light { 120struct entity_transform : entity_filter {
164 point p; 121 gl_matrix m;
165 colour c;
166 GLfloat intensity;
167 GLfloat radius;
168};
169 122
170struct draw_context { 123 entity_transform ();
171 enum { DEPTH, AMBIENT, LIGHTED } mode;
172 light *l;
173};
174 124
175struct view { 125 void update_bbox ();
176 point p; 126 void show ();
177 vec3 d, u;
178 float fov;
179 int w, h;
180
181 void draw (const draw_context &c); 127 void draw (draw_context &ctx);
182}; 128};
183 129
184#endif 130#endif
185 131
186 132

Diff Legend

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