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

Comparing libgender/entity.h (file contents):
Revision 1.1 by root, Sat Oct 2 15:54:43 2004 UTC vs.
Revision 1.10 by root, Sun Oct 3 20:14:33 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
26struct colour {
27 GLfloat r, g, b;
28};
29
30struct vect {
31 GLfloat x, y, z;
32};
33
34struct texc {
35 GLfloat u, v;
36};
37
38struct box {
39 point a, b;
40
41 void reset ()
42 {
43 a.x = a.y = a.z = GLFLOAT_MAX;
44 b.x = b.y = b.z = GLFLOAT_MIN;
45 }
46
47 void add (const box &o);
48};
49
50struct entity_base { 14struct entity_base {
51 struct entity_base *parent; 15 struct entity_base *parent;
16 sector orig;
52 vector<octant *> o; 17 vector<octant *> o;
53 box bbox; 18 box bbox;
54 19
55 virtual void update_bbox (); 20 virtual void update_bbox ();
56 virtual void show (const sector &sec) { }; 21 virtual void show () { world.add (orig, this); };
57 void hide (); 22 void hide ();
23 void display (draw_context &ctx);
58 virtual void draw () = 0; 24 virtual void draw (draw_context &ctx) = 0;
25
26 entity_base ();
59 virtual ~entity_base () 27 virtual ~entity_base ();
60 {
61 hide ();
62 };
63}; 28};
64 29
65struct 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; }
66 void update_bbox (); 32 void update_bbox ();
67 void show (const sector &sec);
68 void draw (); 33 void show ();
34 void draw (draw_context &ctx);
69 ~entity_container (); 35 ~entity_container ();
70}; 36};
71 37
72struct entity_filter : entity_base { 38struct entity_filter : entity_base {
73protected: 39protected:
… …
87 } 53 }
88 54
89 entity_base *content () { return e; }; 55 entity_base *content () { return e; };
90 56
91 void update_bbox (); 57 void update_bbox ();
92 void show (const sector &sec);
93 void draw (); 58 void show ();
59 void draw (draw_context &ctx);
94 ~entity_filter (); 60 ~entity_filter ();
95}; 61};
96 62
97struct entity : entity_filter { 63struct entity : entity_filter {
98 sector sec;
99
100 void show (const sector &sec);
101 void draw ();
102}; 64};
103 65
66#if 0
104struct entity_affine : entity_filter { 67struct entity_affine : entity_filter {
105 //matrix m; 68 GLfloat m[4][4];
69
70 void draw (draw_context &ctx);
106}; 71};
72#endif
107 73
108struct vertex1d { 74struct vertex1d {
109 point v; // vertex
110 colour c; // colour 75 colour c; // colour
76 point p; // vertex
111}; 77};
112 78
113struct vertex2d { 79struct vertex2d {
114 point v; // vertex 80 point p; // vertex
115 colour c; // colour
116 vect n; // normal 81 vec3 n; // normal
117 texc t; // texture 82 texc t; // texture
83
84 vertex2d () { };
85 vertex2d (point p, vec3 n, texc t = texc()) : p(p), n(n), t(t) { };
86};
87
88struct entity_opengl : entity_base {
118}; 89};
119 90
120template<GLenum type> 91template<GLenum type>
121struct entity_opengl1d : entity_base, vector<vertex1d> { 92struct entity_opengl1d : entity_opengl, vector<vertex1d> {
122 void update_bbox (); 93 void update_bbox ();
123 void show (const sector &sec); 94 void draw (draw_context &ctx);
124 void draw ();
125}; 95};
126 96
127template<GLenum type> 97template<GLenum type>
128struct entity_opengl2d : entity_base, vector<vertex2d> { 98struct entity_opengl2d : entity_opengl, vector<vertex2d> {
99 material m;
100 GLuint list;
101
129 void update_bbox (); 102 void update_bbox ();
130 void show (const sector &sec); 103 void draw (draw_context &ctx);
131 void draw (); 104
105 entity_opengl2d ()
106 : list(0)
107 {
108 }
109
110 ~entity_opengl2d ()
111 {
112 if (list)
113 glDeleteLists (list, 1);
114 }
132}; 115};
133 116
134typedef entity_opengl1d<GL_POINTS> entity_points; 117typedef entity_opengl1d<GL_POINTS> entity_points;
135typedef entity_opengl1d<GL_LINES> entity_lines; 118typedef entity_opengl1d<GL_LINES> entity_lines;
136typedef entity_opengl1d<GL_LINE_STRIP> entity_linestrip; 119typedef entity_opengl1d<GL_LINE_STRIP> entity_line_strip;
137typedef entity_opengl1d<GL_LINE_LOOP> entity_lineloop; 120typedef entity_opengl1d<GL_LINE_LOOP> entity_line_loop;
138typedef entity_opengl2d<GL_TRIANGLES> entity_triangles; 121typedef entity_opengl2d<GL_TRIANGLES> entity_triangles;
139typedef entity_opengl2d<GL_TRIANGLE_STRIP> entity_trianglestrip; 122typedef entity_opengl2d<GL_TRIANGLE_STRIP> entity_triangle_strip;
140typedef entity_opengl2d<GL_TRIANGLE_FAN> entity_trianglefan; 123typedef entity_opengl2d<GL_TRIANGLE_FAN> entity_triangle_fan;
141typedef entity_opengl2d<GL_QUADS> entity_quads; 124typedef entity_opengl2d<GL_QUADS> entity_quads;
142typedef entity_opengl2d<GL_QUAD_STRIP> entity_quad_strip; 125typedef entity_opengl2d<GL_QUAD_STRIP> entity_quad_strip;
143typedef entity_opengl2d<GL_POLYGON> entity_polygon; 126typedef entity_opengl2d<GL_POLYGON> entity_polygon;
144 127
145#endif 128#endif

Diff Legend

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