mirror of
https://github.com/godotengine/godot
synced 2024-09-04 22:38:28 +00:00
Fix another batch of -Wmaybe-uninitialized warnings
And simplify code in CSGShape.
This commit is contained in:
parent
b383484e44
commit
f097511b96
|
@ -158,8 +158,8 @@ static Ref<Image> basis_universal_unpacker(const Vector<uint8_t> &p_buffer) {
|
|||
const uint8_t *ptr = r;
|
||||
int size = p_buffer.size();
|
||||
|
||||
basist::transcoder_texture_format format;
|
||||
Image::Format imgfmt;
|
||||
basist::transcoder_texture_format format = basist::transcoder_texture_format::cTFTotalTextureFormats;
|
||||
Image::Format imgfmt = Image::FORMAT_MAX;
|
||||
|
||||
switch (*(uint32_t *)(ptr)) {
|
||||
case BASIS_DECOMPRESS_RG: {
|
||||
|
|
|
@ -742,18 +742,14 @@ CSGBrush *CSGMesh3D::_build_brush() {
|
|||
|
||||
Vector<Vector3> anormals = arrays[Mesh::ARRAY_NORMAL];
|
||||
const Vector3 *nr = NULL;
|
||||
bool nr_used = false;
|
||||
if (anormals.size()) {
|
||||
nr = anormals.ptr();
|
||||
nr_used = true;
|
||||
}
|
||||
|
||||
Vector<Vector2> auvs = arrays[Mesh::ARRAY_TEX_UV];
|
||||
const Vector2 *uvr = NULL;
|
||||
bool uvr_used = false;
|
||||
if (auvs.size()) {
|
||||
uvr = auvs.ptr();
|
||||
uvr_used = true;
|
||||
}
|
||||
|
||||
Ref<Material> mat;
|
||||
|
@ -789,10 +785,10 @@ CSGBrush *CSGMesh3D::_build_brush() {
|
|||
for (int k = 0; k < 3; k++) {
|
||||
int idx = ir[j + k];
|
||||
vertex[k] = vr[idx];
|
||||
if (nr_used) {
|
||||
if (nr) {
|
||||
normal[k] = nr[idx];
|
||||
}
|
||||
if (uvr_used) {
|
||||
if (uvr) {
|
||||
uv[k] = uvr[idx];
|
||||
}
|
||||
}
|
||||
|
@ -832,10 +828,10 @@ CSGBrush *CSGMesh3D::_build_brush() {
|
|||
|
||||
for (int k = 0; k < 3; k++) {
|
||||
vertex[k] = vr[j + k];
|
||||
if (nr_used) {
|
||||
if (nr) {
|
||||
normal[k] = nr[j + k];
|
||||
}
|
||||
if (uvr_used) {
|
||||
if (uvr) {
|
||||
uv[k] = uvr[j + k];
|
||||
}
|
||||
}
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
/*************************************************************************/
|
||||
|
||||
#include "audio_stream_player_3d.h"
|
||||
|
||||
#include "core/engine.h"
|
||||
#include "scene/3d/area_3d.h"
|
||||
#include "scene/3d/camera_3d.h"
|
||||
|
@ -96,7 +97,7 @@ static const Vector3 speaker_directions[7] = {
|
|||
};
|
||||
|
||||
void AudioStreamPlayer3D::_calc_output_vol(const Vector3 &source_dir, real_t tightness, AudioStreamPlayer3D::Output &output) {
|
||||
unsigned int speaker_count; // only main speakers (no LFE)
|
||||
unsigned int speaker_count = 0; // only main speakers (no LFE)
|
||||
switch (AudioServer::get_singleton()->get_speaker_mode()) {
|
||||
case AudioServer::SPEAKER_MODE_STEREO:
|
||||
speaker_count = 2;
|
||||
|
|
Loading…
Reference in a new issue