From 1e6a70c77a153366751ed3001735138aa895b0ec Mon Sep 17 00:00:00 2001 From: Relintai Date: Wed, 16 Mar 2022 10:15:33 +0100 Subject: [PATCH] Fix uninitialized variable warnings. --- drivers/gles2/rasterizer_storage_gles2.cpp | 2 ++ modules/props_2d/prop_2d_instance_merger.cpp | 2 +- modules/props_2d/prop_2d_instance_prop_job.cpp | 2 +- modules/skeleton_editor/skeleton_editor_plugin.cpp | 8 ++++---- .../world/default/terrain_2d_chunk_default.cpp | 2 +- modules/terraman_2d/world/terrain_2d_world_editor.cpp | 2 ++ servers/audio_server.cpp | 3 +++ 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/gles2/rasterizer_storage_gles2.cpp b/drivers/gles2/rasterizer_storage_gles2.cpp index b428b4121..bf3b5101d 100644 --- a/drivers/gles2/rasterizer_storage_gles2.cpp +++ b/drivers/gles2/rasterizer_storage_gles2.cpp @@ -4873,6 +4873,8 @@ void RasterizerStorageGLES2::_render_target_allocate(RenderTarget *rt) { while (true) { RenderTarget::MipMaps::Size mm; + mm.fbo = 0; + mm.color = 0; mm.width = w; mm.height = h; rt->mip_maps[i].sizes.push_back(mm); diff --git a/modules/props_2d/prop_2d_instance_merger.cpp b/modules/props_2d/prop_2d_instance_merger.cpp index d36f61fc1..d05098df5 100644 --- a/modules/props_2d/prop_2d_instance_merger.cpp +++ b/modules/props_2d/prop_2d_instance_merger.cpp @@ -236,7 +236,7 @@ void Prop2DInstanceMerger::debug_mesh_send() { if (_debug_mesh_array.size() == 0) return; - SceneTree *st = SceneTree::get_singleton(); + //SceneTree *st = SceneTree::get_singleton(); Array arr; arr.resize(VisualServer::ARRAY_MAX); diff --git a/modules/props_2d/prop_2d_instance_prop_job.cpp b/modules/props_2d/prop_2d_instance_prop_job.cpp index e7744c3cf..c3f776aa1 100644 --- a/modules/props_2d/prop_2d_instance_prop_job.cpp +++ b/modules/props_2d/prop_2d_instance_prop_job.cpp @@ -294,7 +294,7 @@ void Prop2DInstanceProp2DJob::phase_prop() { Ref pdtw = e.data; //Transform t = pdtw->get_transform(); - Transform2D t = e.base_transform; + //Transform2D t = e.base_transform; //_prop_mesher->add_tiled_wall_simple(pdtw->get_width(), pdtw->get_heigth(), t, pdtw->get_data(), _material_cache); } diff --git a/modules/skeleton_editor/skeleton_editor_plugin.cpp b/modules/skeleton_editor/skeleton_editor_plugin.cpp index 63095bb15..4144d5232 100644 --- a/modules/skeleton_editor/skeleton_editor_plugin.cpp +++ b/modules/skeleton_editor/skeleton_editor_plugin.cpp @@ -1276,7 +1276,7 @@ bool ModuleSkeletonEditor::forward_spatial_gui_input(int p_index, Camera *p_came case SpatialEditorViewport::TRANSFORM_SCALE: { Vector3 motion_mask; Plane plane; - bool plane_mv = false; + //bool plane_mv = false; switch (_edit.plane) { case SpatialEditorViewport::TRANSFORM_VIEW: @@ -1298,17 +1298,17 @@ bool ModuleSkeletonEditor::forward_spatial_gui_input(int p_index, Camera *p_came case SpatialEditorViewport::TRANSFORM_YZ: motion_mask = se->get_gizmo_transform().basis.get_axis(2) + se->get_gizmo_transform().basis.get_axis(1); plane = Plane(_edit.center, se->get_gizmo_transform().basis.get_axis(0)); - plane_mv = true; + //plane_mv = true; break; case SpatialEditorViewport::TRANSFORM_XZ: motion_mask = se->get_gizmo_transform().basis.get_axis(2) + se->get_gizmo_transform().basis.get_axis(0); plane = Plane(_edit.center, se->get_gizmo_transform().basis.get_axis(1)); - plane_mv = true; + //plane_mv = true; break; case SpatialEditorViewport::TRANSFORM_XY: motion_mask = se->get_gizmo_transform().basis.get_axis(0) + se->get_gizmo_transform().basis.get_axis(1); plane = Plane(_edit.center, se->get_gizmo_transform().basis.get_axis(2)); - plane_mv = true; + //plane_mv = true; break; } diff --git a/modules/terraman_2d/world/default/terrain_2d_chunk_default.cpp b/modules/terraman_2d/world/default/terrain_2d_chunk_default.cpp index f9c7984c0..b74b352f5 100644 --- a/modules/terraman_2d/world/default/terrain_2d_chunk_default.cpp +++ b/modules/terraman_2d/world/default/terrain_2d_chunk_default.cpp @@ -652,7 +652,7 @@ void Terrain2DChunkDefault::draw_debug_mdr_colliders() { if (!shape.is_valid()) continue; - Transform2D t = collider_get_transform(i); + //Transform2D t = collider_get_transform(i); //shape->add_vertices_to_array(_debug_mesh_array, t); //draw diff --git a/modules/terraman_2d/world/terrain_2d_world_editor.cpp b/modules/terraman_2d/world/terrain_2d_world_editor.cpp index 17d10434d..aa76c13b6 100644 --- a/modules/terraman_2d/world/terrain_2d_world_editor.cpp +++ b/modules/terraman_2d/world/terrain_2d_world_editor.cpp @@ -321,6 +321,7 @@ void Terrain2DWorldEditor::_on_tool_button_pressed() { } void Terrain2DWorldEditor::_on_insert_block_at_camera_button_pressed() { + /* int selected_voxel = 0; int channel = 0; @@ -341,6 +342,7 @@ void Terrain2DWorldEditor::_on_insert_block_at_camera_button_pressed() { Vector3 pos = cam->get_transform().origin; selected_voxel = _selected_type + 1; + */ /* if (_channel_isolevel == -1) { _world->set_voxel_at_world_position(pos, selected_voxel, channel); diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp index 1d03b94a9..9ed7e8aba 100644 --- a/servers/audio_server.cpp +++ b/servers/audio_server.cpp @@ -1190,6 +1190,9 @@ void AudioServer::set_bus_layout(const Ref &p_bus_layout) { Bus::Effect bfx; bfx.effect = fx; bfx.enabled = p_bus_layout->buses[i].effects[j].enabled; +#ifdef DEBUG_ENABLED + bfx.prof_time = 0; +#endif bus->effects.push_back(bfx); } }