From 6e1cff8d5acac918633e909c60090aaef0b6a684 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 17 Apr 2021 13:06:44 +0200 Subject: [PATCH] Added a new TerraTerrarinJobStep Reference class. It will be used to simplify the logic in TerrarinJob, and to make it better scriptable (this way mesh generation logic can be changed with the graphic settings aswell). --- SCsub | 1 + register_types.cpp | 3 +- world/jobs/terra_terrarin_job_step.cpp | 62 ++++++++++++++++++++++++ world/jobs/terra_terrarin_job_step.h | 65 ++++++++++++++++++++++++++ 4 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 world/jobs/terra_terrarin_job_step.cpp create mode 100644 world/jobs/terra_terrarin_job_step.h diff --git a/SCsub b/SCsub index 57ea570..55e7789 100644 --- a/SCsub +++ b/SCsub @@ -64,6 +64,7 @@ sources = [ "world/jobs/terra_job.cpp", "world/jobs/terra_terrarin_job.cpp", + "world/jobs/terra_terrarin_job_step.cpp", "world/jobs/terra_light_job.cpp", "world/jobs/terra_prop_job.cpp", ] diff --git a/register_types.cpp b/register_types.cpp index 1626f75..ebe10e0 100644 --- a/register_types.cpp +++ b/register_types.cpp @@ -65,7 +65,7 @@ SOFTWARE. #include "world/jobs/terra_light_job.h" #include "world/jobs/terra_prop_job.h" #include "world/jobs/terra_terrarin_job.h" - +#include "world/jobs/terra_terrarin_job_step.h" void register_terraman_types() { ClassDB::register_class(); @@ -106,6 +106,7 @@ void register_terraman_types() { ClassDB::register_class(); ClassDB::register_class(); + ClassDB::register_class(); ClassDB::register_class(); ClassDB::register_class(); diff --git a/world/jobs/terra_terrarin_job_step.cpp b/world/jobs/terra_terrarin_job_step.cpp new file mode 100644 index 0000000..91b1422 --- /dev/null +++ b/world/jobs/terra_terrarin_job_step.cpp @@ -0,0 +1,62 @@ +/* +Copyright (c) 2019-2021 Péter Magyar + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ + +#include "terra_terrarin_job_step.h" + +const String TerraTerrarinJobStep::BINDING_STRING_TERRA_TERRARIN_JOB_STEP_TYPE = "Normal,Drop UV2,Merge Verts,Bake Texture"; + +TerraTerrarinJobStep::TerraTerrarinJobStepType TerraTerrarinJobStep::get_job_type() const { + return _job_type; +} +void TerraTerrarinJobStep::set_job_type(const TerraTerrarinJobStep::TerraTerrarinJobStepType value) { + _job_type = value; +} + +int TerraTerrarinJobStep::get_lod_index() const { + return _lod_index; +} +void TerraTerrarinJobStep::set_lod_index(const int value) { + _lod_index = value; +} + +TerraTerrarinJobStep::TerraTerrarinJobStep() { + _job_type = TYPE_NORMAL; + _lod_index = 0; +} + +TerraTerrarinJobStep::~TerraTerrarinJobStep() { +} + +void TerraTerrarinJobStep::_bind_methods() { + ClassDB::bind_method(D_METHOD("get_job_type"), &TerraTerrarinJobStep::get_job_type); + ClassDB::bind_method(D_METHOD("set_job_type", "value"), &TerraTerrarinJobStep::set_job_type); + ADD_PROPERTY(PropertyInfo(Variant::INT, "job_type", PROPERTY_HINT_ENUM, TerraTerrarinJobStep::BINDING_STRING_TERRA_TERRARIN_JOB_STEP_TYPE), "set_job_type", "get_job_type"); + + ClassDB::bind_method(D_METHOD("get_lod_index"), &TerraTerrarinJobStep::get_lod_index); + ClassDB::bind_method(D_METHOD("set_lod_index", "value"), &TerraTerrarinJobStep::set_lod_index); + ADD_PROPERTY(PropertyInfo(Variant::INT, "lod_index"), "set_lod_index", "get_lod_index"); + + BIND_ENUM_CONSTANT(TYPE_NORMAL); + BIND_ENUM_CONSTANT(TYPE_DROP_UV2); + BIND_ENUM_CONSTANT(TYPE_MERGE_VERTS); + BIND_ENUM_CONSTANT(TYPE_BAKE_TEXTURE); +} diff --git a/world/jobs/terra_terrarin_job_step.h b/world/jobs/terra_terrarin_job_step.h new file mode 100644 index 0000000..81c9052 --- /dev/null +++ b/world/jobs/terra_terrarin_job_step.h @@ -0,0 +1,65 @@ +/* +Copyright (c) 2019-2021 Péter Magyar + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ + +#ifndef TERRA_TERRARIN_JOB_STEP_H +#define TERRA_TERRARIN_JOB_STEP_H + +#include "core/version.h" + +#if VERSION_MAJOR > 3 +#include "core/io/reference.h" +#else +#include "core/reference.h" +#endif + +class TerraTerrarinJobStep : public Reference { + GDCLASS(TerraTerrarinJobStep, Reference); + +public: + enum TerraTerrarinJobStepType { + TYPE_NORMAL = 0, + TYPE_DROP_UV2, + TYPE_MERGE_VERTS, + TYPE_BAKE_TEXTURE, + }; + + static const String BINDING_STRING_TERRA_TERRARIN_JOB_STEP_TYPE; + + TerraTerrarinJobStepType get_job_type() const; + void set_job_type(const TerraTerrarinJobStepType value); + + int get_lod_index() const; + void set_lod_index(const int value); + + TerraTerrarinJobStep(); + ~TerraTerrarinJobStep(); + +protected: + static void _bind_methods(); + + TerraTerrarinJobStepType _job_type; + int _lod_index; +}; + +VARIANT_ENUM_CAST(TerraTerrarinJobStep::TerraTerrarinJobStepType); + +#endif