asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #12064 from endragor/junk-logs

Browse source 
Remove junk output

[ci skip]
This commit is contained in:
Rémi Verschelde 2017-10-13 08:51:38 +02:00 committed by GitHub
commit e97ada6413
4 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/io/file_access_encrypted.cpp
View file

@ -62,12 +62,12 @@ Error FileAccessEncrypted::open_and_parse(FileAccess *p_base, const Vector<uint8
writing = false; writing = false;
key = p_key; key = p_key;
uint32_t magic = p_base->get_32(); uint32_t magic = p_base->get_32();
print_line("MAGIC: " + itos(magic));
ERR_FAIL_COND_V(magic != COMP_MAGIC, ERR_FILE_UNRECOGNIZED); ERR_FAIL_COND_V(magic != COMP_MAGIC, ERR_FILE_UNRECOGNIZED);
mode = Mode(p_base->get_32()); mode = Mode(p_base->get_32());
ERR_FAIL_INDEX_V(mode, MODE_MAX, ERR_FILE_CORRUPT); ERR_FAIL_INDEX_V(mode, MODE_MAX, ERR_FILE_CORRUPT);
ERR_FAIL_COND_V(mode == 0, ERR_FILE_CORRUPT); ERR_FAIL_COND_V(mode == 0, ERR_FILE_CORRUPT);
print_line("MODE: " + itos(mode));
unsigned char md5d[16]; unsigned char md5d[16];
p_base->get_buffer(md5d, 16); p_base->get_buffer(md5d, 16);
length = p_base->get_64(); length = p_base->get_64();

3
modules/stb_vorbis/audio_stream_ogg_vorbis.cpp
View file

@ -129,7 +129,6 @@ AudioStreamPlaybackOGGVorbis::~AudioStreamPlaybackOGGVorbis() {
Ref<AudioStreamPlayback> AudioStreamOGGVorbis::instance_playback() { Ref<AudioStreamPlayback> AudioStreamOGGVorbis::instance_playback() {
Ref<AudioStreamPlaybackOGGVorbis> ovs; Ref<AudioStreamPlaybackOGGVorbis> ovs;
printf("instance at %p, data %p\n", this, data);
ERR_FAIL_COND_V(data == NULL, ovs); ERR_FAIL_COND_V(data == NULL, ovs);
@ -208,8 +207,6 @@ void AudioStreamOGGVorbis::set_data(const PoolVector<uint8_t> &p_data) {
break; break;
} }
} }
printf("create at %p, data %p\n", this, data);
} }
PoolVector<uint8_t> AudioStreamOGGVorbis::get_data() const { PoolVector<uint8_t> AudioStreamOGGVorbis::get_data() const {

4
scene/3d/particles.cpp
View file

@ -462,8 +462,6 @@ void ParticlesMaterial::finish_shaders() {
void ParticlesMaterial::_update_shader() { void ParticlesMaterial::_update_shader() {
print_line("updating shader");
dirty_materials.remove(&element); dirty_materials.remove(&element);
MaterialKey mk = _compute_key(); MaterialKey mk = _compute_key();
@ -913,9 +911,7 @@ void ParticlesMaterial::_queue_shader_change() {
if (material_mutex) if (material_mutex)
material_mutex->lock(); material_mutex->lock();
print_line("queuing change");
if (!element.in_list()) { if (!element.in_list()) {
print_line("not in list, adding");
dirty_materials.add(&element); dirty_materials.add(&element);
} }

2
scene/resources/shader.cpp
View file

@ -43,8 +43,6 @@ void Shader::set_code(const String &p_code) {
String type = ShaderLanguage::get_shader_type(p_code); String type = ShaderLanguage::get_shader_type(p_code);
print_line("mode: " + type);
if (type == "canvas_item") { if (type == "canvas_item") {
mode = MODE_CANVAS_ITEM; mode = MODE_CANVAS_ITEM;
} else if (type == "particles") { } else if (type == "particles") {