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

Merge branch 'master' into voxel_gen_graph

Browse Source
This commit is contained in:
Marc Gilleron 2020-07-08 19:38:10 +01:00
commit db0b454ed9
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
generators/voxel_generator.cpp
View File

@ -5,12 +5,10 @@ VoxelGenerator::VoxelGenerator() {
}
void VoxelGenerator::generate_block(VoxelBlockRequest &input) {
ERR_FAIL_COND(input.voxel_buffer.is_null());
ScriptInstance *script = get_script_instance();
if (script) {
if (script && script->has_method(VoxelStringNames::get_singleton()->generate_block)) {
// Call script to generate buffer
Variant arg1 = input.voxel_buffer;
Variant arg2 = input.origin_in_voxels.to_vec3();
@ -21,7 +19,7 @@ void VoxelGenerator::generate_block(VoxelBlockRequest &input) {
script->call(VoxelStringNames::get_singleton()->generate_block, args, 3, err);
ERR_FAIL_COND_MSG(err.error != Variant::CallError::CALL_OK,
"voxel_generator.cpp:emerge_block gave an error: " + String::num(err.error) +
"voxel_generator.cpp:generate_block gave an error: " + String::num(err.error) +
", Argument: " + String::num(err.argument) +
", Expected type: " + Variant::get_type_name(err.expected));

6
streams/voxel_stream.cpp
View File

@ -8,7 +8,7 @@ VoxelStream::VoxelStream() {
void VoxelStream::emerge_block(Ref<VoxelBuffer> out_buffer, Vector3i origin_in_voxels, int lod) {
ERR_FAIL_COND(out_buffer.is_null());
ScriptInstance *script = get_script_instance();
if (script) {
if (script && script->has_method(VoxelStringNames::get_singleton()->emerge_block)) {
// Call script to generate buffer
Variant arg1 = out_buffer;
Variant arg2 = origin_in_voxels.to_vec3();
@ -27,7 +27,7 @@ void VoxelStream::emerge_block(Ref<VoxelBuffer> out_buffer, Vector3i origin_in_v
void VoxelStream::immerge_block(Ref<VoxelBuffer> buffer, Vector3i origin_in_voxels, int lod) {
ERR_FAIL_COND(buffer.is_null());
ScriptInstance *script = get_script_instance();
if (script) {
if (script && script->has_method(VoxelStringNames::get_singleton()->immerge_block)) {
// Call script to save buffer
Variant arg1 = buffer;
Variant arg2 = origin_in_voxels.to_vec3();
@ -79,7 +79,7 @@ void VoxelStream::_immerge_block(Ref<VoxelBuffer> buffer, Vector3 origin_in_voxe
int VoxelStream::get_used_channels_mask() const {
ScriptInstance *script = get_script_instance();
int mask = 0;
if (script) {
if (script && script->has_method(VoxelStringNames::get_singleton()->get_used_channels_mask)) {
// Call script to get mask
Variant::CallError err;
//const Variant *args[3] = { &arg1, &arg2, &arg3 };