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

whoops, fix lighting under DirectX

Browse Source
This commit is contained in:
David Rose 2005-04-29 15:17:12 +00:00
parent d653234504
commit f4a049454e
6 changed files with 84 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
panda/src/dxgsg7/dxGraphicsStateGuardian7.cxx
View File

@ -3962,22 +3962,22 @@ issue_depth_offset(const DepthOffsetAttrib *attrib) {
// properties. // properties.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void DXGraphicsStateGuardian7:: void DXGraphicsStateGuardian7::
bind_light(PointLight *light, int light_id) { bind_light(PointLight *light_obj, const NodePath &light, int light_id) {
// Get the light in "world coordinates". This means the light in // Get the light in "world coordinates". This means the light in
// the coordinate space of the camera, converted to DX's coordinate // the coordinate space of the camera, converted to DX's coordinate
// system. // system.
NodePath light_np(light); CPT(TransformState) transform = light.get_transform(_scene_setup->get_camera_path());
const LMatrix4f &light_mat = light_np.get_mat(_scene_setup->get_camera_path()); const LMatrix4f &light_mat = transform->get_mat();
LMatrix4f rel_mat = light_mat * LMatrix4f::convert_mat(CS_yup_left, CS_default); LMatrix4f rel_mat = light_mat * LMatrix4f::convert_mat(CS_yup_left, CS_default);
LPoint3f pos = light->get_point() * rel_mat; LPoint3f pos = light_obj->get_point() * rel_mat;
D3DCOLORVALUE black; D3DCOLORVALUE black;
black.r = black.g = black.b = black.a = 0.0f; black.r = black.g = black.b = black.a = 0.0f;
D3DLIGHT7 alight; D3DLIGHT7 alight;
alight.dltType = D3DLIGHT_POINT; alight.dltType = D3DLIGHT_POINT;
alight.dcvDiffuse = *(D3DCOLORVALUE *)(light->get_color().get_data()); alight.dcvDiffuse = *(D3DCOLORVALUE *)(light_obj->get_color().get_data());
alight.dcvAmbient = black ; alight.dcvAmbient = black ;
alight.dcvSpecular = *(D3DCOLORVALUE *)(light->get_specular_color().get_data()); alight.dcvSpecular = *(D3DCOLORVALUE *)(light_obj->get_specular_color().get_data());
// 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
@ -3986,7 +3986,7 @@ bind_light(PointLight *light, int light_id) {
alight.dvRange = D3DLIGHT_RANGE_MAX; alight.dvRange = D3DLIGHT_RANGE_MAX;
alight.dvFalloff = 1.0f; alight.dvFalloff = 1.0f;
const LVecBase3f &att = light->get_attenuation(); const LVecBase3f &att = light_obj->get_attenuation();
alight.dvAttenuation0 = (D3DVALUE)att[0]; alight.dvAttenuation0 = (D3DVALUE)att[0];
alight.dvAttenuation1 = (D3DVALUE)att[1]; alight.dvAttenuation1 = (D3DVALUE)att[1];
alight.dvAttenuation2 = (D3DVALUE)att[2]; alight.dvAttenuation2 = (D3DVALUE)att[2];
@ -4003,14 +4003,14 @@ bind_light(PointLight *light, int light_id) {
// properties. // properties.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void DXGraphicsStateGuardian7:: void DXGraphicsStateGuardian7::
bind_light(DirectionalLight *light, int light_id) { bind_light(DirectionalLight *light_obj, const NodePath &light, int light_id) {
// Get the light in "world coordinates". This means the light in // Get the light in "world coordinates". This means the light in
// the coordinate space of the camera, converted to DX's coordinate // the coordinate space of the camera, converted to DX's coordinate
// system. // system.
NodePath light_np(light); CPT(TransformState) transform = light.get_transform(_scene_setup->get_camera_path());
const LMatrix4f &light_mat = light_np.get_mat(_scene_setup->get_camera_path()); const LMatrix4f &light_mat = transform->get_mat();
LMatrix4f rel_mat = light_mat * LMatrix4f::convert_mat(CS_yup_left, CS_default); LMatrix4f rel_mat = light_mat * LMatrix4f::convert_mat(CS_yup_left, CS_default);
LVector3f dir = light->get_direction() * rel_mat; LVector3f dir = light_obj->get_direction() * rel_mat;
D3DCOLORVALUE black; D3DCOLORVALUE black;
black.r = black.g = black.b = black.a = 0.0f; black.r = black.g = black.b = black.a = 0.0f;
@ -4019,9 +4019,9 @@ bind_light(DirectionalLight *light, int light_id) {
ZeroMemory(&alight, sizeof(D3DLIGHT7)); ZeroMemory(&alight, sizeof(D3DLIGHT7));
alight.dltType = D3DLIGHT_DIRECTIONAL; alight.dltType = D3DLIGHT_DIRECTIONAL;
alight.dcvDiffuse = *(D3DCOLORVALUE *)(light->get_color().get_data()); alight.dcvDiffuse = *(D3DCOLORVALUE *)(light_obj->get_color().get_data());
alight.dcvAmbient = black ; alight.dcvAmbient = black ;
alight.dcvSpecular = *(D3DCOLORVALUE *)(light->get_specular_color().get_data()); alight.dcvSpecular = *(D3DCOLORVALUE *)(light_obj->get_specular_color().get_data());
alight.dvDirection = *(D3DVECTOR *)dir.get_data(); alight.dvDirection = *(D3DVECTOR *)dir.get_data();
@ -4044,15 +4044,15 @@ bind_light(DirectionalLight *light, int light_id) {
// properties. // properties.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void DXGraphicsStateGuardian7:: void DXGraphicsStateGuardian7::
bind_light(Spotlight *light, int light_id) { bind_light(Spotlight *light_obj, const NodePath &light, int light_id) {
Lens *lens = light->get_lens(); Lens *lens = light_obj->get_lens();
nassertv(lens != (Lens *)NULL); nassertv(lens != (Lens *)NULL);
// Get the light in "world coordinates". This means the light in // Get the light in "world coordinates". This means the light in
// the coordinate space of the camera, converted to DX's coordinate // the coordinate space of the camera, converted to DX's coordinate
// system. // system.
NodePath light_np(light); CPT(TransformState) transform = light.get_transform(_scene_setup->get_camera_path());
const LMatrix4f &light_mat = light_np.get_mat(_scene_setup->get_camera_path()); const LMatrix4f &light_mat = transform->get_mat();
LMatrix4f rel_mat = light_mat * LMatrix4f::convert_mat(CS_yup_left, CS_default); LMatrix4f rel_mat = light_mat * LMatrix4f::convert_mat(CS_yup_left, CS_default);
LPoint3f pos = lens->get_nodal_point() * rel_mat; LPoint3f pos = lens->get_nodal_point() * rel_mat;
LVector3f dir = lens->get_view_vector() * rel_mat; LVector3f dir = lens->get_view_vector() * rel_mat;
@ -4065,8 +4065,8 @@ bind_light(Spotlight *light, int light_id) {
alight.dltType = D3DLIGHT_SPOT; alight.dltType = D3DLIGHT_SPOT;
alight.dcvAmbient = black ; alight.dcvAmbient = black ;
alight.dcvDiffuse = *(D3DCOLORVALUE *)(light->get_color().get_data()); alight.dcvDiffuse = *(D3DCOLORVALUE *)(light_obj->get_color().get_data());
alight.dcvSpecular = *(D3DCOLORVALUE *)(light->get_specular_color().get_data()); alight.dcvSpecular = *(D3DCOLORVALUE *)(light_obj->get_specular_color().get_data());
alight.dvPosition = *(D3DVECTOR *)pos.get_data(); alight.dvPosition = *(D3DVECTOR *)pos.get_data();
@ -4077,7 +4077,7 @@ bind_light(Spotlight *light, int light_id) {
alight.dvTheta = 0.0f; alight.dvTheta = 0.0f;
alight.dvPhi = lens->get_hfov(); alight.dvPhi = lens->get_hfov();
const LVecBase3f &att = light->get_attenuation(); const LVecBase3f &att = light_obj->get_attenuation();
alight.dvAttenuation0 = (D3DVALUE)att[0]; alight.dvAttenuation0 = (D3DVALUE)att[0];
alight.dvAttenuation1 = (D3DVALUE)att[1]; alight.dvAttenuation1 = (D3DVALUE)att[1];
alight.dvAttenuation2 = (D3DVALUE)att[2]; alight.dvAttenuation2 = (D3DVALUE)att[2];
@ -4512,7 +4512,8 @@ bind_clip_plane(const NodePath &plane, int plane_id) {
// Get the plane in "world coordinates". This means the plane in // Get the plane in "world coordinates". This means the plane in
// the coordinate space of the camera, converted to DX's coordinate // the coordinate space of the camera, converted to DX's coordinate
// system. // system.
const LMatrix4f &plane_mat = plane.get_mat(_scene_setup->get_camera_path()); CPT(TransformState) transform = plane.get_transform(_scene_setup->get_camera_path());
const LMatrix4f &plane_mat = transform->get_mat();
LMatrix4f rel_mat = plane_mat * LMatrix4f::convert_mat(CS_yup_left, CS_default); LMatrix4f rel_mat = plane_mat * LMatrix4f::convert_mat(CS_yup_left, CS_default);
const PlaneNode *plane_node; const PlaneNode *plane_node;
DCAST_INTO_V(plane_node, plane.node()); DCAST_INTO_V(plane_node, plane.node());

9
panda/src/dxgsg7/dxGraphicsStateGuardian7.h
View File

@ -114,9 +114,12 @@ public:
virtual void issue_fog(const FogAttrib *attrib); virtual void issue_fog(const FogAttrib *attrib);
virtual void issue_depth_offset(const DepthOffsetAttrib *attrib); virtual void issue_depth_offset(const DepthOffsetAttrib *attrib);
virtual void bind_light(PointLight *light, int light_id); virtual void bind_light(PointLight *light_obj, const NodePath &light,
virtual void bind_light(DirectionalLight *light, int light_id); int light_id);
virtual void bind_light(Spotlight *light, int light_id); virtual void bind_light(DirectionalLight *light_obj, const NodePath &light,
int light_id);
virtual void bind_light(Spotlight *light_obj, const NodePath &light,
int light_id);
//virtual bool begin_frame(); //virtual bool begin_frame();
virtual bool begin_scene(); virtual bool begin_scene();

43
panda/src/dxgsg8/dxGraphicsStateGuardian8.cxx
View File

@ -4213,22 +4213,22 @@ issue_depth_offset(const DepthOffsetAttrib *attrib) {
// properties. // properties.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void DXGraphicsStateGuardian8:: void DXGraphicsStateGuardian8::
bind_light(PointLight *light, int light_id) { bind_light(PointLight *light_obj, const NodePath &light, int light_id) {
// Get the light in "world coordinates". This means the light in // Get the light in "world coordinates". This means the light in
// the coordinate space of the camera, converted to DX's coordinate // the coordinate space of the camera, converted to DX's coordinate
// system. // system.
NodePath light_np(light); CPT(TransformState) transform = light.get_transform(_scene_setup->get_camera_path());
const LMatrix4f &light_mat = light_np.get_mat(_scene_setup->get_camera_path()); const LMatrix4f &light_mat = transform->get_mat();
LMatrix4f rel_mat = light_mat * LMatrix4f::convert_mat(CS_yup_left, CS_default); LMatrix4f rel_mat = light_mat * LMatrix4f::convert_mat(CS_yup_left, CS_default);
LPoint3f pos = light->get_point() * rel_mat; LPoint3f pos = light_obj->get_point() * rel_mat;
D3DCOLORVALUE black; D3DCOLORVALUE black;
black.r = black.g = black.b = black.a = 0.0f; black.r = black.g = black.b = black.a = 0.0f;
D3DLIGHT8 alight; D3DLIGHT8 alight;
alight.Type = D3DLIGHT_POINT; alight.Type = D3DLIGHT_POINT;
alight.Diffuse = *(D3DCOLORVALUE *)(light->get_color().get_data()); alight.Diffuse = *(D3DCOLORVALUE *)(light_obj->get_color().get_data());
alight.Ambient = black ; alight.Ambient = black ;
alight.Specular = *(D3DCOLORVALUE *)(light->get_specular_color().get_data()); alight.Specular = *(D3DCOLORVALUE *)(light_obj->get_specular_color().get_data());
// 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
@ -4237,7 +4237,7 @@ bind_light(PointLight *light, int light_id) {
alight.Range = __D3DLIGHT_RANGE_MAX; alight.Range = __D3DLIGHT_RANGE_MAX;
alight.Falloff = 1.0f; alight.Falloff = 1.0f;
const LVecBase3f &att = light->get_attenuation(); const LVecBase3f &att = light_obj->get_attenuation();
alight.Attenuation0 = att[0]; alight.Attenuation0 = att[0];
alight.Attenuation1 = att[1]; alight.Attenuation1 = att[1];
alight.Attenuation2 = att[2]; alight.Attenuation2 = att[2];
@ -4259,14 +4259,14 @@ bind_light(PointLight *light, int light_id) {
// properties. // properties.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void DXGraphicsStateGuardian8:: void DXGraphicsStateGuardian8::
bind_light(DirectionalLight *light, int light_id) { bind_light(DirectionalLight *light_obj, const NodePath &light, int light_id) {
// Get the light in "world coordinates". This means the light in // Get the light in "world coordinates". This means the light in
// the coordinate space of the camera, converted to DX's coordinate // the coordinate space of the camera, converted to DX's coordinate
// system. // system.
NodePath light_np(light); CPT(TransformState) transform = light.get_transform(_scene_setup->get_camera_path());
const LMatrix4f &light_mat = light_np.get_mat(_scene_setup->get_camera_path()); const LMatrix4f &light_mat = transform->get_mat();
LMatrix4f rel_mat = light_mat * LMatrix4f::convert_mat(CS_yup_left, CS_default); LMatrix4f rel_mat = light_mat * LMatrix4f::convert_mat(CS_yup_left, CS_default);
LVector3f dir = light->get_direction() * rel_mat; LVector3f dir = light_obj->get_direction() * rel_mat;
D3DCOLORVALUE black; D3DCOLORVALUE black;
black.r = black.g = black.b = black.a = 0.0f; black.r = black.g = black.b = black.a = 0.0f;
@ -4275,9 +4275,9 @@ bind_light(DirectionalLight *light, int light_id) {
ZeroMemory(&alight, sizeof(D3DLIGHT8)); ZeroMemory(&alight, sizeof(D3DLIGHT8));
alight.Type = D3DLIGHT_DIRECTIONAL; alight.Type = D3DLIGHT_DIRECTIONAL;
alight.Diffuse = *(D3DCOLORVALUE *)(light->get_color().get_data()); alight.Diffuse = *(D3DCOLORVALUE *)(light_obj->get_color().get_data());
alight.Ambient = black ; alight.Ambient = black ;
alight.Specular = *(D3DCOLORVALUE *)(light->get_specular_color().get_data()); alight.Specular = *(D3DCOLORVALUE *)(light_obj->get_specular_color().get_data());
alight.Direction = *(D3DVECTOR *)dir.get_data(); alight.Direction = *(D3DVECTOR *)dir.get_data();
@ -4305,15 +4305,15 @@ bind_light(DirectionalLight *light, int light_id) {
// properties. // properties.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void DXGraphicsStateGuardian8:: void DXGraphicsStateGuardian8::
bind_light(Spotlight *light, int light_id) { bind_light(Spotlight *light_obj, const NodePath &light, int light_id) {
Lens *lens = light->get_lens(); Lens *lens = light_obj->get_lens();
nassertv(lens != (Lens *)NULL); nassertv(lens != (Lens *)NULL);
// Get the light in "world coordinates". This means the light in // Get the light in "world coordinates". This means the light in
// the coordinate space of the camera, converted to DX's coordinate // the coordinate space of the camera, converted to DX's coordinate
// system. // system.
NodePath light_np(light); CPT(TransformState) transform = light.get_transform(_scene_setup->get_camera_path());
const LMatrix4f &light_mat = light_np.get_mat(_scene_setup->get_camera_path()); const LMatrix4f &light_mat = transform->get_mat();
LMatrix4f rel_mat = light_mat * LMatrix4f::convert_mat(CS_yup_left, CS_default); LMatrix4f rel_mat = light_mat * LMatrix4f::convert_mat(CS_yup_left, CS_default);
LPoint3f pos = lens->get_nodal_point() * rel_mat; LPoint3f pos = lens->get_nodal_point() * rel_mat;
LVector3f dir = lens->get_view_vector() * rel_mat; LVector3f dir = lens->get_view_vector() * rel_mat;
@ -4326,8 +4326,8 @@ bind_light(Spotlight *light, int light_id) {
alight.Type = D3DLIGHT_SPOT; alight.Type = D3DLIGHT_SPOT;
alight.Ambient = black ; alight.Ambient = black ;
alight.Diffuse = *(D3DCOLORVALUE *)(light->get_color().get_data()); alight.Diffuse = *(D3DCOLORVALUE *)(light_obj->get_color().get_data());
alight.Specular = *(D3DCOLORVALUE *)(light->get_specular_color().get_data()); alight.Specular = *(D3DCOLORVALUE *)(light_obj->get_specular_color().get_data());
alight.Position = *(D3DVECTOR *)pos.get_data(); alight.Position = *(D3DVECTOR *)pos.get_data();
@ -4338,7 +4338,7 @@ bind_light(Spotlight *light, int light_id) {
alight.Theta = 0.0f; alight.Theta = 0.0f;
alight.Phi = lens->get_hfov(); alight.Phi = lens->get_hfov();
const LVecBase3f &att = light->get_attenuation(); const LVecBase3f &att = light_obj->get_attenuation();
alight.Attenuation0 = att[0]; alight.Attenuation0 = att[0];
alight.Attenuation1 = att[1]; alight.Attenuation1 = att[1];
alight.Attenuation2 = att[2]; alight.Attenuation2 = att[2];
@ -4775,7 +4775,8 @@ bind_clip_plane(const NodePath &plane, int plane_id) {
// Get the plane in "world coordinates". This means the plane in // Get the plane in "world coordinates". This means the plane in
// the coordinate space of the camera, converted to DX's coordinate // the coordinate space of the camera, converted to DX's coordinate
// system. // system.
const LMatrix4f &plane_mat = plane.get_mat(_scene_setup->get_camera_path()); CPT(TransformState) transform = plane.get_transform(_scene_setup->get_camera_path());
const LMatrix4f &plane_mat = transform->get_mat();
LMatrix4f rel_mat = plane_mat * LMatrix4f::convert_mat(CS_yup_left, CS_default); LMatrix4f rel_mat = plane_mat * LMatrix4f::convert_mat(CS_yup_left, CS_default);
const PlaneNode *plane_node; const PlaneNode *plane_node;
DCAST_INTO_V(plane_node, plane.node()); DCAST_INTO_V(plane_node, plane.node());

9
panda/src/dxgsg8/dxGraphicsStateGuardian8.h
View File

@ -143,9 +143,12 @@ public:
virtual void issue_tex_gen(const TexGenAttrib *attrib); virtual void issue_tex_gen(const TexGenAttrib *attrib);
virtual void issue_shade_model(const ShadeModelAttrib *attrib); virtual void issue_shade_model(const ShadeModelAttrib *attrib);
virtual void bind_light(PointLight *light, int light_id); virtual void bind_light(PointLight *light_obj, const NodePath &light,
virtual void bind_light(DirectionalLight *light, int light_id); int light_id);
virtual void bind_light(Spotlight *light, int light_id); virtual void bind_light(DirectionalLight *light_obj, const NodePath &light,
int light_id);
virtual void bind_light(Spotlight *light_obj, const NodePath &light,
int light_id);
virtual bool begin_frame(); virtual bool begin_frame();
virtual bool begin_scene(); virtual bool begin_scene();

43
panda/src/dxgsg9/dxGraphicsStateGuardian9.cxx
View File

@ -3398,22 +3398,22 @@ issue_depth_offset(const DepthOffsetAttrib *attrib) {
// properties. // properties.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void DXGraphicsStateGuardian9:: void DXGraphicsStateGuardian9::
bind_light(PointLight *light, int light_id) { bind_light(PointLight *light_obj, const NodePath &light, int light_id) {
// Get the light in "world coordinates". This means the light in // Get the light in "world coordinates". This means the light in
// the coordinate space of the camera, converted to DX's coordinate // the coordinate space of the camera, converted to DX's coordinate
// system. // system.
NodePath light_np(light); CPT(TransformState) transform = light.get_transform(_scene_setup->get_camera_path());
const LMatrix4f &light_mat = light_np.get_mat(_scene_setup->get_camera_path()); const LMatrix4f &light_mat = transform->get_mat();
LMatrix4f rel_mat = light_mat * LMatrix4f::convert_mat(CS_yup_left, CS_default); LMatrix4f rel_mat = light_mat * LMatrix4f::convert_mat(CS_yup_left, CS_default);
LPoint3f pos = light->get_point() * rel_mat; LPoint3f pos = light_obj->get_point() * rel_mat;
D3DCOLORVALUE black; D3DCOLORVALUE black;
black.r = black.g = black.b = black.a = 0.0f; black.r = black.g = black.b = black.a = 0.0f;
D3DLIGHT9 alight; D3DLIGHT9 alight;
alight.Type = D3DLIGHT_POINT; alight.Type = D3DLIGHT_POINT;
alight.Diffuse = *(D3DCOLORVALUE *)(light->get_color().get_data()); alight.Diffuse = *(D3DCOLORVALUE *)(light_obj->get_color().get_data());
alight.Ambient = black ; alight.Ambient = black ;
alight.Specular = *(D3DCOLORVALUE *)(light->get_specular_color().get_data()); alight.Specular = *(D3DCOLORVALUE *)(light_obj->get_specular_color().get_data());
// 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
@ -3422,7 +3422,7 @@ bind_light(PointLight *light, int light_id) {
alight.Range = __D3DLIGHT_RANGE_MAX; alight.Range = __D3DLIGHT_RANGE_MAX;
alight.Falloff = 1.0f; alight.Falloff = 1.0f;
const LVecBase3f &att = light->get_attenuation(); const LVecBase3f &att = light_obj->get_attenuation();
alight.Attenuation0 = att[0]; alight.Attenuation0 = att[0];
alight.Attenuation1 = att[1]; alight.Attenuation1 = att[1];
alight.Attenuation2 = att[2]; alight.Attenuation2 = att[2];
@ -3439,14 +3439,14 @@ bind_light(PointLight *light, int light_id) {
// properties. // properties.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void DXGraphicsStateGuardian9:: void DXGraphicsStateGuardian9::
bind_light(DirectionalLight *light, int light_id) { bind_light(DirectionalLight *light_obj, const NodePath &light, int light_id) {
// Get the light in "world coordinates". This means the light in // Get the light in "world coordinates". This means the light in
// the coordinate space of the camera, converted to DX's coordinate // the coordinate space of the camera, converted to DX's coordinate
// system. // system.
NodePath light_np(light); CPT(TransformState) transform = light.get_transform(_scene_setup->get_camera_path());
const LMatrix4f &light_mat = light_np.get_mat(_scene_setup->get_camera_path()); const LMatrix4f &light_mat = transform->get_mat();
LMatrix4f rel_mat = light_mat * LMatrix4f::convert_mat(CS_yup_left, CS_default); LMatrix4f rel_mat = light_mat * LMatrix4f::convert_mat(CS_yup_left, CS_default);
LVector3f dir = light->get_direction() * rel_mat; LVector3f dir = light_obj->get_direction() * rel_mat;
D3DCOLORVALUE black; D3DCOLORVALUE black;
black.r = black.g = black.b = black.a = 0.0f; black.r = black.g = black.b = black.a = 0.0f;
@ -3455,9 +3455,9 @@ bind_light(DirectionalLight *light, int light_id) {
ZeroMemory(&alight, sizeof(D3DLIGHT9)); ZeroMemory(&alight, sizeof(D3DLIGHT9));
alight.Type = D3DLIGHT_DIRECTIONAL; alight.Type = D3DLIGHT_DIRECTIONAL;
alight.Diffuse = *(D3DCOLORVALUE *)(light->get_color().get_data()); alight.Diffuse = *(D3DCOLORVALUE *)(light_obj->get_color().get_data());
alight.Ambient = black ; alight.Ambient = black ;
alight.Specular = *(D3DCOLORVALUE *)(light->get_specular_color().get_data()); alight.Specular = *(D3DCOLORVALUE *)(light_obj->get_specular_color().get_data());
alight.Direction = *(D3DVECTOR *)dir.get_data(); alight.Direction = *(D3DVECTOR *)dir.get_data();
@ -3480,15 +3480,15 @@ bind_light(DirectionalLight *light, int light_id) {
// properties. // properties.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void DXGraphicsStateGuardian9:: void DXGraphicsStateGuardian9::
bind_light(Spotlight *light, int light_id) { bind_light(Spotlight *light_obj, const NodePath &light, int light_id) {
Lens *lens = light->get_lens(); Lens *lens = light_obj->get_lens();
nassertv(lens != (Lens *)NULL); nassertv(lens != (Lens *)NULL);
// Get the light in "world coordinates". This means the light in // Get the light in "world coordinates". This means the light in
// the coordinate space of the camera, converted to DX's coordinate // the coordinate space of the camera, converted to DX's coordinate
// system. // system.
NodePath light_np(light); CPT(TransformState) transform = light.get_transform(_scene_setup->get_camera_path());
const LMatrix4f &light_mat = light_np.get_mat(_scene_setup->get_camera_path()); const LMatrix4f &light_mat = transform->get_mat();
LMatrix4f rel_mat = light_mat * LMatrix4f::convert_mat(CS_yup_left, CS_default); LMatrix4f rel_mat = light_mat * LMatrix4f::convert_mat(CS_yup_left, CS_default);
LPoint3f pos = lens->get_nodal_point() * rel_mat; LPoint3f pos = lens->get_nodal_point() * rel_mat;
LVector3f dir = lens->get_view_vector() * rel_mat; LVector3f dir = lens->get_view_vector() * rel_mat;
@ -3501,8 +3501,8 @@ bind_light(Spotlight *light, int light_id) {
alight.Type = D3DLIGHT_SPOT; alight.Type = D3DLIGHT_SPOT;
alight.Ambient = black ; alight.Ambient = black ;
alight.Diffuse = *(D3DCOLORVALUE *)(light->get_color().get_data()); alight.Diffuse = *(D3DCOLORVALUE *)(light_obj->get_color().get_data());
alight.Specular = *(D3DCOLORVALUE *)(light->get_specular_color().get_data()); alight.Specular = *(D3DCOLORVALUE *)(light_obj->get_specular_color().get_data());
alight.Position = *(D3DVECTOR *)pos.get_data(); alight.Position = *(D3DVECTOR *)pos.get_data();
@ -3513,7 +3513,7 @@ bind_light(Spotlight *light, int light_id) {
alight.Theta = 0.0f; alight.Theta = 0.0f;
alight.Phi = lens->get_hfov(); alight.Phi = lens->get_hfov();
const LVecBase3f &att = light->get_attenuation(); const LVecBase3f &att = light_obj->get_attenuation();
alight.Attenuation0 = att[0]; alight.Attenuation0 = att[0];
alight.Attenuation1 = att[1]; alight.Attenuation1 = att[1];
alight.Attenuation2 = att[2]; alight.Attenuation2 = att[2];
@ -3855,7 +3855,8 @@ bind_clip_plane(const NodePath &plane, int plane_id) {
// Get the plane in "world coordinates". This means the plane in // Get the plane in "world coordinates". This means the plane in
// the coordinate space of the camera, converted to DX's coordinate // the coordinate space of the camera, converted to DX's coordinate
// system. // system.
const LMatrix4f &plane_mat = plane.get_mat(_scene_setup->get_camera_path()); CPT(TransformState) transform = plane.get_transform(_scene_setup->get_camera_path());
const LMatrix4f &plane_mat = transform->get_mat();
LMatrix4f rel_mat = plane_mat * LMatrix4f::convert_mat(CS_yup_left, CS_default); LMatrix4f rel_mat = plane_mat * LMatrix4f::convert_mat(CS_yup_left, CS_default);
const PlaneNode *plane_node; const PlaneNode *plane_node;
DCAST_INTO_V(plane_node, plane.node()); DCAST_INTO_V(plane_node, plane.node());

9
panda/src/dxgsg9/dxGraphicsStateGuardian9.h
View File

@ -118,9 +118,12 @@ public:
virtual void issue_fog(const FogAttrib *attrib); virtual void issue_fog(const FogAttrib *attrib);
virtual void issue_depth_offset(const DepthOffsetAttrib *attrib); virtual void issue_depth_offset(const DepthOffsetAttrib *attrib);
virtual void bind_light(PointLight *light, int light_id); virtual void bind_light(PointLight *light_obj, const NodePath &light,
virtual void bind_light(DirectionalLight *light, int light_id); int light_id);
virtual void bind_light(Spotlight *light, int light_id); virtual void bind_light(DirectionalLight *light_obj, const NodePath &light,
int light_id);
virtual void bind_light(Spotlight *light_obj, const NodePath &light,
int light_id);
virtual bool begin_frame(); virtual bool begin_frame();
virtual bool begin_scene(); virtual bool begin_scene();