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

lighting optimization

Browse Source
This commit is contained in:
David Rose 2008-11-14 00:23:40 +00:00
parent c6ec6b12be
commit d653bfc559
3 changed files with 167 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
panda/src/tinydisplay/tinyGraphicsStateGuardian.I
View File

@ -12,3 +12,23 @@
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////
// Function: TinyGraphicsStateGuardian::clear_light_state
// Access: Private
// Description: Removes the current list of active lights from the
// current state context.
////////////////////////////////////////////////////////////////////
INLINE void TinyGraphicsStateGuardian::
clear_light_state() {
_c->lighting_enabled = false;
#ifndef NDEBUG
GLLight *gl_light = _c->first_light;
while (gl_light != (GLLight *)NULL) {
GLLight *next = gl_light->next;
gl_light->next = NULL;
gl_light = next;
}
#endif // NDEBUG
_c->first_light = NULL;
}

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

@ -438,6 +438,13 @@ end_scene() {
} }
_c->zb = _current_frame_buffer; _c->zb = _current_frame_buffer;
} }
// Clear the lighting state.
clear_light_state();
_plights.clear();
_dlights.clear();
_slights.clear();
GraphicsStateGuardian::end_scene(); GraphicsStateGuardian::end_scene();
} }
@ -1571,15 +1578,7 @@ do_issue_light() {
} }
// First, release all of the previously-assigned lights. // First, release all of the previously-assigned lights.
_c->lighting_enabled = false; clear_light_state();
GLLight *gl_light = _c->first_light;
while (gl_light != (GLLight *)NULL) {
GLLight *next = gl_light->next;
gl_light->next = NULL;
gl_light = next;
}
_c->first_light = NULL;
// Now, assign new lights. // Now, assign new lights.
if (_target._light != (LightAttrib *)NULL) { if (_target._light != (LightAttrib *)NULL) {
@ -1604,21 +1603,18 @@ do_issue_light() {
} else { } else {
// Other kinds of lights each get their own GLLight object. // Other kinds of lights each get their own GLLight object.
nassertv(num_enabled < MAX_LIGHTS); light_obj->bind(this, light, num_enabled);
GLLight *gl_light = &_c->lights[num_enabled]; num_enabled++;
memset(gl_light, 0, sizeof(GLLight));
gl_light->next = _c->first_light;
_c->first_light = gl_light;
// Handle the diffuse color here, since all lights have this
// property.
GLLight *gl_light = _c->first_light;
nassertv(gl_light != NULL);
const Colorf &diffuse = light_obj->get_color(); const Colorf &diffuse = light_obj->get_color();
gl_light->diffuse.v[0] = diffuse[0]; gl_light->diffuse.v[0] = diffuse[0];
gl_light->diffuse.v[1] = diffuse[1]; gl_light->diffuse.v[1] = diffuse[1];
gl_light->diffuse.v[2] = diffuse[2]; gl_light->diffuse.v[2] = diffuse[2];
gl_light->diffuse.v[3] = diffuse[3]; gl_light->diffuse.v[3] = diffuse[3];
light_obj->bind(this, light, num_enabled);
num_enabled++;
} }
} }
} }
@ -1643,39 +1639,49 @@ do_issue_light() {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void TinyGraphicsStateGuardian:: void TinyGraphicsStateGuardian::
bind_light(PointLight *light_obj, const NodePath &light, int light_id) { bind_light(PointLight *light_obj, const NodePath &light, int light_id) {
GLLight *gl_light = _c->first_light; pair<Lights::iterator, bool> lookup = _plights.insert(Lights::value_type(light, GLLight()));
nassertv(gl_light != (GLLight *)NULL); GLLight *gl_light = &(*lookup.first).second;
if (lookup.second) {
// It's a brand new light. Define it.
memset(gl_light, 0, sizeof(GLLight));
const Colorf &specular = light_obj->get_specular_color(); const Colorf &specular = light_obj->get_specular_color();
gl_light->specular.v[0] = specular[0]; gl_light->specular.v[0] = specular[0];
gl_light->specular.v[1] = specular[1]; gl_light->specular.v[1] = specular[1];
gl_light->specular.v[2] = specular[2]; gl_light->specular.v[2] = specular[2];
gl_light->specular.v[3] = specular[3]; gl_light->specular.v[3] = specular[3];
// Position needs to specify x, y, z, and w // Position needs to specify x, y, z, and w
// w == 1 implies non-infinite position // w == 1 implies non-infinite position
CPT(TransformState) render_transform = CPT(TransformState) render_transform =
_cs_transform->compose(_scene_setup->get_world_transform()); _cs_transform->compose(_scene_setup->get_world_transform());
CPT(TransformState) transform = light.get_transform(_scene_setup->get_scene_root().get_parent()); CPT(TransformState) transform = light.get_transform(_scene_setup->get_scene_root().get_parent());
CPT(TransformState) net_transform = render_transform->compose(transform); CPT(TransformState) net_transform = render_transform->compose(transform);
LPoint3f pos = light_obj->get_point() * net_transform->get_mat(); LPoint3f pos = light_obj->get_point() * net_transform->get_mat();
gl_light->position.v[0] = pos[0]; gl_light->position.v[0] = pos[0];
gl_light->position.v[1] = pos[1]; gl_light->position.v[1] = pos[1];
gl_light->position.v[2] = pos[2]; gl_light->position.v[2] = pos[2];
gl_light->position.v[3] = 1.0f; gl_light->position.v[3] = 1.0f;
// Exponent == 0 implies uniform light distribution // Exponent == 0 implies uniform light distribution
gl_light->spot_exponent = 0.0f; gl_light->spot_exponent = 0.0f;
// Cutoff == 180 means uniform point light source // Cutoff == 180 means uniform point light source
gl_light->spot_cutoff = 180.0f; gl_light->spot_cutoff = 180.0f;
const LVecBase3f &att = light_obj->get_attenuation(); const LVecBase3f &att = light_obj->get_attenuation();
gl_light->attenuation[0] = att[0]; gl_light->attenuation[0] = att[0];
gl_light->attenuation[1] = att[1]; gl_light->attenuation[1] = att[1];
gl_light->attenuation[2] = att[2]; gl_light->attenuation[2] = att[2];
}
nassertv(gl_light->next == NULL);
// Add it to the linked list of active lights.
gl_light->next = _c->first_light;
_c->first_light = gl_light;
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -1688,46 +1694,56 @@ bind_light(PointLight *light_obj, const NodePath &light, int light_id) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void TinyGraphicsStateGuardian:: void TinyGraphicsStateGuardian::
bind_light(DirectionalLight *light_obj, const NodePath &light, int light_id) { bind_light(DirectionalLight *light_obj, const NodePath &light, int light_id) {
GLLight *gl_light = _c->first_light; pair<Lights::iterator, bool> lookup = _dlights.insert(Lights::value_type(light, GLLight()));
nassertv(gl_light != (GLLight *)NULL); GLLight *gl_light = &(*lookup.first).second;
if (lookup.second) {
// It's a brand new light. Define it.
memset(gl_light, 0, sizeof(GLLight));
const Colorf &specular = light_obj->get_specular_color(); const Colorf &specular = light_obj->get_specular_color();
gl_light->specular.v[0] = specular[0]; gl_light->specular.v[0] = specular[0];
gl_light->specular.v[1] = specular[1]; gl_light->specular.v[1] = specular[1];
gl_light->specular.v[2] = specular[2]; gl_light->specular.v[2] = specular[2];
gl_light->specular.v[3] = specular[3]; gl_light->specular.v[3] = specular[3];
// Position needs to specify x, y, z, and w // Position needs to specify x, y, z, and w
// w == 0 implies light is at infinity // w == 0 implies light is at infinity
CPT(TransformState) render_transform = CPT(TransformState) render_transform =
_cs_transform->compose(_scene_setup->get_world_transform()); _cs_transform->compose(_scene_setup->get_world_transform());
CPT(TransformState) transform = light.get_transform(_scene_setup->get_scene_root().get_parent()); CPT(TransformState) transform = light.get_transform(_scene_setup->get_scene_root().get_parent());
CPT(TransformState) net_transform = render_transform->compose(transform); CPT(TransformState) net_transform = render_transform->compose(transform);
LVector3f dir = light_obj->get_direction() * net_transform->get_mat(); LVector3f dir = light_obj->get_direction() * net_transform->get_mat();
dir.normalize(); dir.normalize();
gl_light->position.v[0] = -dir[0]; gl_light->position.v[0] = -dir[0];
gl_light->position.v[1] = -dir[1]; gl_light->position.v[1] = -dir[1];
gl_light->position.v[2] = -dir[2]; gl_light->position.v[2] = -dir[2];
gl_light->position.v[3] = 0.0f; gl_light->position.v[3] = 0.0f;
gl_light->norm_position.v[0] = -dir[0]; gl_light->norm_position.v[0] = -dir[0];
gl_light->norm_position.v[1] = -dir[1]; gl_light->norm_position.v[1] = -dir[1];
gl_light->norm_position.v[2] = -dir[2]; gl_light->norm_position.v[2] = -dir[2];
gl_V3_Norm(&gl_light->norm_position); gl_V3_Norm(&gl_light->norm_position);
// Exponent == 0 implies uniform light distribution // Exponent == 0 implies uniform light distribution
gl_light->spot_exponent = 0.0f; gl_light->spot_exponent = 0.0f;
// Cutoff == 180 means uniform point light source // Cutoff == 180 means uniform point light source
gl_light->spot_cutoff = 180.0f; gl_light->spot_cutoff = 180.0f;
// Default attenuation values (only spotlight and point light can // Default attenuation values (only spotlight and point light can
// modify these) // modify these)
gl_light->attenuation[0] = 1.0f; gl_light->attenuation[0] = 1.0f;
gl_light->attenuation[1] = 0.0f; gl_light->attenuation[1] = 0.0f;
gl_light->attenuation[2] = 0.0f; gl_light->attenuation[2] = 0.0f;
}
nassertv(gl_light->next == NULL);
// Add it to the linked list of active lights.
gl_light->next = _c->first_light;
_c->first_light = gl_light;
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
@ -1740,52 +1756,62 @@ bind_light(DirectionalLight *light_obj, const NodePath &light, int light_id) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void TinyGraphicsStateGuardian:: void TinyGraphicsStateGuardian::
bind_light(Spotlight *light_obj, const NodePath &light, int light_id) { bind_light(Spotlight *light_obj, const NodePath &light, int light_id) {
GLLight *gl_light = _c->first_light; pair<Lights::iterator, bool> lookup = _plights.insert(Lights::value_type(light, GLLight()));
nassertv(gl_light != (GLLight *)NULL); GLLight *gl_light = &(*lookup.first).second;
if (lookup.second) {
// It's a brand new light. Define it.
memset(gl_light, 0, sizeof(GLLight));
const Colorf &specular = light_obj->get_specular_color(); const Colorf &specular = light_obj->get_specular_color();
gl_light->specular.v[0] = specular[0]; gl_light->specular.v[0] = specular[0];
gl_light->specular.v[1] = specular[1]; gl_light->specular.v[1] = specular[1];
gl_light->specular.v[2] = specular[2]; gl_light->specular.v[2] = specular[2];
gl_light->specular.v[3] = specular[3]; gl_light->specular.v[3] = specular[3];
Lens *lens = light_obj->get_lens(); Lens *lens = light_obj->get_lens();
nassertv(lens != (Lens *)NULL); nassertv(lens != (Lens *)NULL);
// Position needs to specify x, y, z, and w // Position needs to specify x, y, z, and w
// w == 1 implies non-infinite position // w == 1 implies non-infinite position
CPT(TransformState) render_transform = CPT(TransformState) render_transform =
_cs_transform->compose(_scene_setup->get_world_transform()); _cs_transform->compose(_scene_setup->get_world_transform());
CPT(TransformState) transform = light.get_transform(_scene_setup->get_scene_root().get_parent()); CPT(TransformState) transform = light.get_transform(_scene_setup->get_scene_root().get_parent());
CPT(TransformState) net_transform = render_transform->compose(transform); CPT(TransformState) net_transform = render_transform->compose(transform);
const LMatrix4f &light_mat = net_transform->get_mat(); const LMatrix4f &light_mat = net_transform->get_mat();
LPoint3f pos = lens->get_nodal_point() * light_mat; LPoint3f pos = lens->get_nodal_point() * light_mat;
LVector3f dir = lens->get_view_vector() * light_mat; LVector3f dir = lens->get_view_vector() * light_mat;
dir.normalize(); dir.normalize();
gl_light->position.v[0] = pos[0]; gl_light->position.v[0] = pos[0];
gl_light->position.v[1] = pos[1]; gl_light->position.v[1] = pos[1];
gl_light->position.v[2] = pos[2]; gl_light->position.v[2] = pos[2];
gl_light->position.v[3] = 1.0f; gl_light->position.v[3] = 1.0f;
gl_light->spot_direction.v[0] = dir[0]; gl_light->spot_direction.v[0] = dir[0];
gl_light->spot_direction.v[1] = dir[1]; gl_light->spot_direction.v[1] = dir[1];
gl_light->spot_direction.v[2] = dir[2]; gl_light->spot_direction.v[2] = dir[2];
gl_light->norm_spot_direction.v[0] = dir[0]; gl_light->norm_spot_direction.v[0] = dir[0];
gl_light->norm_spot_direction.v[1] = dir[1]; gl_light->norm_spot_direction.v[1] = dir[1];
gl_light->norm_spot_direction.v[2] = dir[2]; gl_light->norm_spot_direction.v[2] = dir[2];
gl_V3_Norm(&gl_light->norm_spot_direction); gl_V3_Norm(&gl_light->norm_spot_direction);
gl_light->spot_exponent = light_obj->get_exponent(); gl_light->spot_exponent = light_obj->get_exponent();
gl_light->spot_cutoff = lens->get_hfov() * 0.5f; gl_light->spot_cutoff = lens->get_hfov() * 0.5f;
const LVecBase3f &att = light_obj->get_attenuation(); const LVecBase3f &att = light_obj->get_attenuation();
gl_light->attenuation[0] = att[0]; gl_light->attenuation[0] = att[0];
gl_light->attenuation[1] = att[1]; gl_light->attenuation[1] = att[1];
gl_light->attenuation[2] = att[2]; gl_light->attenuation[2] = att[2];
}
nassertv(gl_light->next == NULL);
// Add it to the linked list of active lights.
gl_light->next = _c->first_light;
_c->first_light = gl_light;
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////

13
panda/src/tinydisplay/tinyGraphicsStateGuardian.h
View File

@ -22,12 +22,9 @@
#include "simpleLru.h" #include "simpleLru.h"
#include "zmath.h" #include "zmath.h"
#include "zbuffer.h" #include "zbuffer.h"
#include "zgl.h"
class TinyTextureContext; class TinyTextureContext;
struct GLContext;
struct GLVertex;
struct GLMaterial;
struct GLTexture;
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Class : TinyGraphicsStateGuardian // Class : TinyGraphicsStateGuardian
@ -126,6 +123,8 @@ private:
static int get_color_blend_op(ColorBlendAttrib::Operand operand); static int get_color_blend_op(ColorBlendAttrib::Operand operand);
static ZB_lookupTextureFunc get_tex_filter_func(Texture::FilterType filter); static ZB_lookupTextureFunc get_tex_filter_func(Texture::FilterType filter);
INLINE void clear_light_state();
public: public:
// Filled in by the Tiny*GraphicsWindow at begin_frame(). // Filled in by the Tiny*GraphicsWindow at begin_frame().
ZBuffer *_current_frame_buffer; ZBuffer *_current_frame_buffer;
@ -150,6 +149,12 @@ private:
CPT(TransformState) _scissor_mat; CPT(TransformState) _scissor_mat;
// Cache the data necessary to bind each particular light each
// frame, so if we bind a given light multiple times, we only have
// to compute its data once.
typedef pmap<NodePath, GLLight> Lights;
Lights _plights, _dlights, _slights;
// Used during being_draw_primitives() .. end_draw_primitives(). // Used during being_draw_primitives() .. end_draw_primitives().
int _min_vertex; int _min_vertex;
int _max_vertex; int _max_vertex;