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

retab

Browse Source
This commit is contained in:
David Rose 2006-01-26 01:50:26 +00:00
parent b99be8da93
commit 8e7e0f5332
1 changed files with 78 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1658,7 +1658,7 @@ reset() {
hr = _d3d_device->GetCreationParameters (&creation_parameters);
// default render to texture format
// _screen->_render_to_texture_d3d_format = D3DFMT_X8R8G8B8;
// _screen->_render_to_texture_d3d_format = D3DFMT_X8R8G8B8;
// match the display mode format for render to texture
_screen->_render_to_texture_d3d_format = _screen->_display_mode.Format;
@ -2518,7 +2518,7 @@ do_issue_texture() {
apply_texture(i, tc);
set_texture_blend_mode(i, stage);
int texcoord_dimensions = 0;
int texcoord_dimensions = 2;
CPT(TransformState) tex_mat = TransformState::make_identity();
if (_state._tex_matrix->has_stage(stage)) {
@ -2623,7 +2623,7 @@ do_issue_texture() {
_d3d_device->SetRenderState(D3DRS_POINTSPRITEENABLE, any_point_sprite);
if (!tex_mat->is_identity()) {
if (tex_mat->is_2d() && texcoord_dimensions <= 2) {
if (/*tex_mat->is_2d() &&*/ texcoord_dimensions <= 2) {
// For 2-d texture coordinates, we have to reorder the matrix.
LMatrix4f m = tex_mat->get_mat();
m.set(m(0, 0), m(0, 1), m(0, 3), 0.0f,
@ -3811,9 +3811,6 @@ draw_indexed_primitive_up(D3DPRIMITIVETYPE primitive_type,
const unsigned char *buffer_start = buffer + stride * min_index;
const unsigned char *buffer_end = buffer + stride * (max_index + 1);
bool is_mickey = (_vertex_data->get_name() == "mickey");
is_mickey = false;
if (buffer_end - buffer > 0x10000) {
// Actually, the buffer doesn't fit within the required limit
// anyway. Go ahead and draw it and hope for the best.