TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

minor api reduction

Browse Source
This commit is contained in:
David Rose 2008-05-06 01:57:29 +00:00
parent 6e67368d89
commit acedeeceff
3 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
panda/src/tinydisplay/light.c
View File

@ -8,23 +8,7 @@ static inline float clampf(float a,float min,float max)
else return a; else return a;
} }
void gl_enable_disable_light(GLContext *c,int light,int v) /* non optimized lighting model */
{
GLLight *l=&c->lights[light];
if (v && !l->enabled) {
l->enabled=1;
l->next=c->first_light;
c->first_light=l;
l->prev=NULL;
} else if (!v && l->enabled) {
l->enabled=0;
if (l->prev == NULL) c->first_light=l->next;
else l->prev->next=l->next;
if (l->next != NULL) l->next->prev=l->prev;
}
}
/* non optimized lightening model */
void gl_shade_vertex(GLContext *c,GLVertex *v) void gl_shade_vertex(GLContext *c,GLVertex *v)
{ {
float R,G,B,A; float R,G,B,A;

2
panda/src/tinydisplay/tinyGraphicsStateGuardian.cxx
View File

@ -1643,7 +1643,6 @@ do_issue_light() {
GLLight *gl_light = _c->first_light; GLLight *gl_light = _c->first_light;
while (gl_light != (GLLight *)NULL) { while (gl_light != (GLLight *)NULL) {
GLLight *next = gl_light->next; GLLight *next = gl_light->next;
gl_light->enabled = false;
gl_light->next = NULL; gl_light->next = NULL;
gl_light = next; gl_light = next;
} }
@ -1675,7 +1674,6 @@ do_issue_light() {
nassertv(num_enabled < MAX_LIGHTS); nassertv(num_enabled < MAX_LIGHTS);
GLLight *gl_light = &_c->lights[num_enabled]; GLLight *gl_light = &_c->lights[num_enabled];
memset(gl_light, 0, sizeof(GLLight)); memset(gl_light, 0, sizeof(GLLight));
gl_light->enabled = true;
gl_light->next = _c->first_light; gl_light->next = _c->first_light;
_c->first_light = gl_light; _c->first_light = gl_light;

11
panda/src/tinydisplay/zgl.h
View File

@ -59,9 +59,7 @@ typedef struct GLLight {
float cos_spot_cutoff; float cos_spot_cutoff;
V3 norm_spot_direction; V3 norm_spot_direction;
V3 norm_position; V3 norm_position;
/* we use a linked list to know which are the enabled lights */ struct GLLight *next;
int enabled;
struct GLLight *next,*prev;
} GLLight; } GLLight;
typedef struct GLMaterial { typedef struct GLMaterial {
@ -125,13 +123,6 @@ typedef struct GLTexture {
int s_max, t_max; int s_max, t_max;
} GLTexture; } GLTexture;
/* shared state */
typedef struct GLSharedState {
GLList **lists;
GLTexture **texture_hash_table;
} GLSharedState;
struct GLContext; struct GLContext;
typedef void (*gl_draw_triangle_func)(struct GLContext *c, typedef void (*gl_draw_triangle_func)(struct GLContext *c,