Zylann
/
godot_voxel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix node config warning with file streams by using channels from the fallback stream

master
Marc Gilleron 2020-07-26 18:42:17 +01:00
parent e3abe2f7c0
commit d96db0d329
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
streams/voxel_stream_file.cpp
View File

@ -46,6 +46,12 @@ void VoxelStreamFile::emerge_blocks_fallback(Vector<VoxelBlockRequest> &requests
} }
} }
int VoxelStreamFile::get_used_channels_mask() const {
if (_fallback_stream.is_valid()) {
return _fallback_stream->get_used_channels_mask();
}
}
FileAccess *VoxelStreamFile::open_file(const String &fpath, int mode_flags, Error *err) { FileAccess *VoxelStreamFile::open_file(const String &fpath, int mode_flags, Error *err) {
VOXEL_PROFILE_SCOPE(profile_scope); VOXEL_PROFILE_SCOPE(profile_scope);
uint64_t time_before = OS::get_singleton()->get_ticks_usec(); uint64_t time_before = OS::get_singleton()->get_ticks_usec();

2
streams/voxel_stream_file.h
View File

@ -24,6 +24,8 @@ public:
virtual int get_block_size_po2() const; virtual int get_block_size_po2() const;
virtual int get_lod_count() const; virtual int get_lod_count() const;
int get_used_channels_mask() const override;
protected: protected:
static void _bind_methods(); static void _bind_methods();