mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-03 10:22:45 -04:00
compiler warnings
This commit is contained in:
parent
7f60835723
commit
1073b9e643
@ -29,10 +29,10 @@ PointerEvent() :
|
||||
_ypos(0),
|
||||
_dx(0),
|
||||
_dy(0),
|
||||
_sequence(0),
|
||||
_length(0.0),
|
||||
_direction(0.0),
|
||||
_rotation(0.0),
|
||||
_sequence(0),
|
||||
_time(0.0)
|
||||
{
|
||||
}
|
||||
@ -49,10 +49,10 @@ PointerEvent(const PointerEvent ©) :
|
||||
_ypos(copy._ypos),
|
||||
_dx(copy._dx),
|
||||
_dy(copy._dy),
|
||||
_sequence(copy._sequence),
|
||||
_length(copy._length),
|
||||
_direction(copy._direction),
|
||||
_rotation(copy._rotation),
|
||||
_sequence(copy._sequence),
|
||||
_time(copy._time)
|
||||
{
|
||||
}
|
||||
|
@ -40,11 +40,11 @@ PreparedGraphicsObjects::
|
||||
PreparedGraphicsObjects() :
|
||||
_lock("PreparedGraphicsObjects::_lock"),
|
||||
_name(init_name()),
|
||||
_vertex_buffer_cache_size(0),
|
||||
_index_buffer_cache_size(0),
|
||||
_texture_residency(_name, "texture"),
|
||||
_vbuffer_residency(_name, "vbuffer"),
|
||||
_ibuffer_residency(_name, "ibuffer"),
|
||||
_vertex_buffer_cache_size(0),
|
||||
_index_buffer_cache_size(0)
|
||||
_ibuffer_residency(_name, "ibuffer")
|
||||
{
|
||||
// GLGSG will turn this flag on. This is a temporary hack to
|
||||
// disable this feature for DX8/DX9 for now, until we work out the
|
||||
|
@ -108,9 +108,6 @@ Texture(const Texture ©) :
|
||||
_x_size(copy._x_size),
|
||||
_y_size(copy._y_size),
|
||||
_z_size(copy._z_size),
|
||||
_pad_x_size(copy._pad_x_size),
|
||||
_pad_y_size(copy._pad_y_size),
|
||||
_pad_z_size(copy._pad_z_size),
|
||||
_num_components(copy._num_components),
|
||||
_component_width(copy._component_width),
|
||||
_texture_type(copy._texture_type),
|
||||
@ -131,6 +128,9 @@ Texture(const Texture ©) :
|
||||
_border_color(copy._border_color),
|
||||
_compression(copy._compression),
|
||||
_match_framebuffer_format(copy._match_framebuffer_format),
|
||||
_pad_x_size(copy._pad_x_size),
|
||||
_pad_y_size(copy._pad_y_size),
|
||||
_pad_z_size(copy._pad_z_size),
|
||||
_ram_image_compression(copy._ram_image_compression),
|
||||
_ram_images(copy._ram_images)
|
||||
{
|
||||
|
@ -396,6 +396,18 @@ operator << (ostream &out, TextureStage::Mode mode) {
|
||||
|
||||
case TextureStage::M_blend_color_scale:
|
||||
return out << "blend_color_scale";
|
||||
|
||||
case TextureStage::M_normal_map:
|
||||
return out << "normal_map";
|
||||
|
||||
case TextureStage::M_gloss_map:
|
||||
return out << "gloss_map";
|
||||
|
||||
case TextureStage::M_normal_gloss_map:
|
||||
return out << "normal_gloss_map";
|
||||
|
||||
case TextureStage::M_selector_map:
|
||||
return out << "selector_map";
|
||||
}
|
||||
|
||||
return out << "**invalid Mode(" << (int)mode << ")**";
|
||||
|
@ -742,6 +742,14 @@ make_texture_layer(const NodePath &render,
|
||||
CPT(RenderAttrib) cba;
|
||||
|
||||
switch (stage_info._stage->get_mode()) {
|
||||
case TextureStage::M_normal_map:
|
||||
case TextureStage::M_gloss_map:
|
||||
case TextureStage::M_normal_gloss_map:
|
||||
case TextureStage::M_selector_map:
|
||||
// Don't know what to do with these funny modes. We should
|
||||
// probably raise an exception or something. Fall through for
|
||||
// now.
|
||||
|
||||
case TextureStage::M_modulate:
|
||||
cba = ColorBlendAttrib::make
|
||||
(ColorBlendAttrib::M_add, ColorBlendAttrib::O_fbuffer_color,
|
||||
|
Loading…
x
Reference in New Issue
Block a user