From 9c076cb694510d10cfdf3ae8545d6abb6d07d142 Mon Sep 17 00:00:00 2001 From: Relintai Date: Mon, 21 Feb 2022 22:02:46 +0100 Subject: [PATCH] Add 2d to the file names. --- SCsub | 54 +++++++++---------- ...ound_clutter.cpp => ground_clutter_2d.cpp} | 2 +- .../{ground_clutter.h => ground_clutter_2d.h} | 0 ...iage.cpp => ground_clutter_2d_foliage.cpp} | 2 +- ..._foliage.h => ground_clutter_2d_foliage.h} | 2 +- ...r_plugin.cpp => prop_2d_editor_plugin.cpp} | 6 +-- ...ditor_plugin.h => prop_2d_editor_plugin.h} | 0 ...b_step.cpp => prop_2d_mesher_job_step.cpp} | 2 +- ...r_job_step.h => prop_2d_mesher_job_step.h} | 0 ...exture_job.cpp => prop_2d_texture_job.cpp} | 2 +- ...op_texture_job.h => prop_2d_texture_job.h} | 0 lights/{prop_light.cpp => prop_2d_light.cpp} | 2 +- lights/{prop_light.h => prop_2d_light.h} | 0 ...l_cache.cpp => prop_2d_material_cache.cpp} | 12 ++--- ...erial_cache.h => prop_2d_material_cache.h} | 0 ...pcm.cpp => prop_2d_material_cache_pcm.cpp} | 4 +- ...che_pcm.h => prop_2d_material_cache_pcm.h} | 2 +- prop_ess_entity.cpp => prop_2d_ess_entity.cpp | 2 +- prop_ess_entity.h => prop_2d_ess_entity.h | 0 prop_instance.cpp => prop_2d_instance.cpp | 16 +++--- prop_instance.h => prop_2d_instance.h | 2 +- ...stance_job.cpp => prop_2d_instance_job.cpp | 6 +-- prop_instance_job.h => prop_2d_instance_job.h | 0 ..._merger.cpp => prop_2d_instance_merger.cpp | 22 ++++---- ...ance_merger.h => prop_2d_instance_merger.h | 6 +-- ...p_job.cpp => prop_2d_instance_prop_job.cpp | 20 +++---- ..._prop_job.h => prop_2d_instance_prop_job.h | 2 +- prop_mesher.cpp => prop_2d_mesher.cpp | 8 +-- prop_mesher.h => prop_2d_mesher.h | 0 ...instance.cpp => prop_2d_scene_instance.cpp | 2 +- ...ene_instance.h => prop_2d_scene_instance.h | 2 +- props/{prop_data.cpp => prop_2d_data.cpp} | 8 +-- props/{prop_data.h => prop_2d_data.h} | 2 +- ..._data_entry.cpp => prop_2d_data_entry.cpp} | 6 +-- ...prop_data_entry.h => prop_2d_data_entry.h} | 0 ..._data_light.cpp => prop_2d_data_light.cpp} | 4 +- ...prop_data_light.h => prop_2d_data_light.h} | 2 +- ...ata_portal.cpp => prop_2d_data_portal.cpp} | 4 +- ...op_data_portal.h => prop_2d_data_portal.h} | 2 +- ...op_data_prop.cpp => prop_2d_data_prop.cpp} | 6 +-- .../{prop_data_prop.h => prop_2d_data_prop.h} | 5 +- ..._data_scene.cpp => prop_2d_data_scene.cpp} | 6 +-- ...prop_data_scene.h => prop_2d_data_scene.h} | 2 +- ...all.cpp => prop_2d_data_tiled_wall_2d.cpp} | 8 +-- ...ed_wall.h => prop_2d_data_tiled_wall_2d.h} | 2 +- register_types.cpp | 52 +++++++++--------- .../{prop_cache.cpp => prop_2d_cache.cpp} | 12 ++--- singleton/{prop_cache.h => prop_2d_cache.h} | 2 +- .../{prop_utils.cpp => prop_2d_utils.cpp} | 6 +-- singleton/{prop_utils.h => prop_2d_utils.h} | 0 .../{tiled_wall.cpp => tiled_wall_2d.cpp} | 10 ++-- tiled_wall/{tiled_wall.h => tiled_wall_2d.h} | 0 ...d_wall_data.cpp => tiled_wall_2d_data.cpp} | 4 +- ...tiled_wall_data.h => tiled_wall_2d_data.h} | 0 54 files changed, 161 insertions(+), 160 deletions(-) rename clutter/{ground_clutter.cpp => ground_clutter_2d.cpp} (98%) rename clutter/{ground_clutter.h => ground_clutter_2d.h} (100%) rename clutter/{ground_clutter_foliage.cpp => ground_clutter_2d_foliage.cpp} (98%) rename clutter/{ground_clutter_foliage.h => ground_clutter_2d_foliage.h} (98%) rename editor/{prop_editor_plugin.cpp => prop_2d_editor_plugin.cpp} (97%) rename editor/{prop_editor_plugin.h => prop_2d_editor_plugin.h} (100%) rename jobs/{prop_mesher_job_step.cpp => prop_2d_mesher_job_step.cpp} (99%) rename jobs/{prop_mesher_job_step.h => prop_2d_mesher_job_step.h} (100%) rename jobs/{prop_texture_job.cpp => prop_2d_texture_job.cpp} (99%) rename jobs/{prop_texture_job.h => prop_2d_texture_job.h} (100%) rename lights/{prop_light.cpp => prop_2d_light.cpp} (98%) rename lights/{prop_light.h => prop_2d_light.h} (100%) rename material_cache/{prop_material_cache.cpp => prop_2d_material_cache.cpp} (97%) rename material_cache/{prop_material_cache.h => prop_2d_material_cache.h} (100%) rename material_cache/{prop_material_cache_pcm.cpp => prop_2d_material_cache_pcm.cpp} (98%) rename material_cache/{prop_material_cache_pcm.h => prop_2d_material_cache_pcm.h} (98%) rename prop_ess_entity.cpp => prop_2d_ess_entity.cpp (77%) rename prop_ess_entity.h => prop_2d_ess_entity.h (100%) rename prop_instance.cpp => prop_2d_instance.cpp (96%) rename prop_instance.h => prop_2d_instance.h (98%) rename prop_instance_job.cpp => prop_2d_instance_job.cpp (98%) rename prop_instance_job.h => prop_2d_instance_job.h (100%) rename prop_instance_merger.cpp => prop_2d_instance_merger.cpp (98%) rename prop_instance_merger.h => prop_2d_instance_merger.h (97%) rename prop_instance_prop_job.cpp => prop_2d_instance_prop_job.cpp (98%) rename prop_instance_prop_job.h => prop_2d_instance_prop_job.h (99%) rename prop_mesher.cpp => prop_2d_mesher.cpp (99%) rename prop_mesher.h => prop_2d_mesher.h (100%) rename prop_scene_instance.cpp => prop_2d_scene_instance.cpp (98%) rename prop_scene_instance.h => prop_2d_scene_instance.h (98%) rename props/{prop_data.cpp => prop_2d_data.cpp} (97%) rename props/{prop_data.h => prop_2d_data.h} (98%) rename props/{prop_data_entry.cpp => prop_2d_data_entry.cpp} (98%) rename props/{prop_data_entry.h => prop_2d_data_entry.h} (100%) rename props/{prop_data_light.cpp => prop_2d_data_light.cpp} (98%) rename props/{prop_data_light.h => prop_2d_data_light.h} (98%) rename props/{prop_data_portal.cpp => prop_2d_data_portal.cpp} (98%) rename props/{prop_data_portal.h => prop_2d_data_portal.h} (98%) rename props/{prop_data_prop.cpp => prop_2d_data_prop.cpp} (97%) rename props/{prop_data_prop.h => prop_2d_data_prop.h} (97%) rename props/{prop_data_scene.cpp => prop_2d_data_scene.cpp} (97%) rename props/{prop_data_scene.h => prop_2d_data_scene.h} (98%) rename props/{prop_data_tiled_wall.cpp => prop_2d_data_tiled_wall_2d.cpp} (96%) rename props/{prop_data_tiled_wall.h => prop_2d_data_tiled_wall_2d.h} (98%) rename singleton/{prop_cache.cpp => prop_2d_cache.cpp} (98%) rename singleton/{prop_cache.h => prop_2d_cache.h} (99%) rename singleton/{prop_utils.cpp => prop_2d_utils.cpp} (99%) rename singleton/{prop_utils.h => prop_2d_utils.h} (100%) rename tiled_wall/{tiled_wall.cpp => tiled_wall_2d.cpp} (98%) rename tiled_wall/{tiled_wall.h => tiled_wall_2d.h} (100%) rename tiled_wall/{tiled_wall_data.cpp => tiled_wall_2d_data.cpp} (99%) rename tiled_wall/{tiled_wall_data.h => tiled_wall_2d_data.h} (100%) diff --git a/SCsub b/SCsub index 51e2202..6e848ba 100644 --- a/SCsub +++ b/SCsub @@ -29,54 +29,54 @@ sources = [ "register_types.cpp", - "lights/prop_light.cpp", + "lights/prop_2d_light.cpp", - "tiled_wall/tiled_wall.cpp", - "tiled_wall/tiled_wall_data.cpp", + "tiled_wall/tiled_wall_2d.cpp", + "tiled_wall/tiled_wall_2d_data.cpp", - "props/prop_data.cpp", - "props/prop_data_entry.cpp", - "props/prop_data_scene.cpp", - "props/prop_data_light.cpp", - "props/prop_data_prop.cpp", - "props/prop_data_tiled_wall.cpp", + "props/prop_2d_data.cpp", + "props/prop_2d_data_entry.cpp", + "props/prop_2d_data_scene.cpp", + "props/prop_2d_data_light.cpp", + "props/prop_2d_data_prop.cpp", + "props/prop_2d_data_tiled_wall_2d.cpp", - "clutter/ground_clutter.cpp", - "clutter/ground_clutter_foliage.cpp", + "clutter/ground_clutter_2d.cpp", + "clutter/ground_clutter_2d_foliage.cpp", - "prop_instance.cpp", - "prop_instance_merger.cpp", - "prop_ess_entity.cpp", - "prop_instance_job.cpp", - "prop_instance_prop_job.cpp", + "prop_2d_instance.cpp", + "prop_2d_instance_merger.cpp", + "prop_2d_ess_entity.cpp", + "prop_2d_instance_job.cpp", + "prop_2d_instance_prop_job.cpp", - "prop_scene_instance.cpp", + "prop_2d_scene_instance.cpp", - "singleton/prop_utils.cpp", - "singleton/prop_cache.cpp", + "singleton/prop_2d_utils.cpp", + "singleton/prop_2d_cache.cpp", - "editor/prop_editor_plugin.cpp", + "editor/prop_2d_editor_plugin.cpp", - "prop_mesher.cpp", + "prop_2d_mesher.cpp", - "jobs/prop_texture_job.cpp", + "jobs/prop_2d_texture_job.cpp", - "jobs/prop_mesher_job_step.cpp", + "jobs/prop_2d_mesher_job_step.cpp", - "material_cache/prop_material_cache.cpp" + "material_cache/prop_2d_material_cache.cpp" ] if version.minor >= 4: - sources.append("props/prop_data_portal.cpp") + sources.append("props/prop_2d_data_portal.cpp") if has_texture_packer: - sources.append("material_cache/prop_material_cache_pcm.cpp") + sources.append("material_cache/prop_2d_material_cache_pcm.cpp") if ARGUMENTS.get('custom_modules_shared', 'no') == 'yes': # Shared lib compilation module_env.Append(CCFLAGS=['-fPIC']) module_env['LIBS'] = [] - shared_lib = module_env.SharedLibrary(target='#bin/props', source=sources) + shared_lib = module_env.SharedLibrary(target='#bin/props_2d', source=sources) shared_lib_shim = shared_lib[0].name.rsplit('.', 1)[0] env.Append(LIBS=[shared_lib_shim]) env.Append(LIBPATH=['#bin']) diff --git a/clutter/ground_clutter.cpp b/clutter/ground_clutter_2d.cpp similarity index 98% rename from clutter/ground_clutter.cpp rename to clutter/ground_clutter_2d.cpp index ef7e590..ca2c437 100644 --- a/clutter/ground_clutter.cpp +++ b/clutter/ground_clutter_2d.cpp @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "ground_clutter.h" +#include "ground_clutter_2d.h" #ifdef VOXELMAN_PRESENT #include "../../voxelman/world/voxel_chunk.h" diff --git a/clutter/ground_clutter.h b/clutter/ground_clutter_2d.h similarity index 100% rename from clutter/ground_clutter.h rename to clutter/ground_clutter_2d.h diff --git a/clutter/ground_clutter_foliage.cpp b/clutter/ground_clutter_2d_foliage.cpp similarity index 98% rename from clutter/ground_clutter_foliage.cpp rename to clutter/ground_clutter_2d_foliage.cpp index 2f399f1..9d73414 100644 --- a/clutter/ground_clutter_foliage.cpp +++ b/clutter/ground_clutter_2d_foliage.cpp @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "ground_clutter_foliage.h" +#include "ground_clutter_2d_foliage.h" int GroundClutterFoliage::get_texture_count() const { return _textures.size(); diff --git a/clutter/ground_clutter_foliage.h b/clutter/ground_clutter_2d_foliage.h similarity index 98% rename from clutter/ground_clutter_foliage.h rename to clutter/ground_clutter_2d_foliage.h index a92f24c..c51caa1 100644 --- a/clutter/ground_clutter_foliage.h +++ b/clutter/ground_clutter_2d_foliage.h @@ -31,7 +31,7 @@ SOFTWARE. #include "core/vector.h" #endif -#include "ground_clutter.h" +#include "ground_clutter_2d.h" #include "scene/resources/texture.h" diff --git a/editor/prop_editor_plugin.cpp b/editor/prop_2d_editor_plugin.cpp similarity index 97% rename from editor/prop_editor_plugin.cpp rename to editor/prop_2d_editor_plugin.cpp index 21519d9..78e479c 100644 --- a/editor/prop_editor_plugin.cpp +++ b/editor/prop_2d_editor_plugin.cpp @@ -20,10 +20,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "prop_editor_plugin.h" +#include "prop_2d_editor_plugin.h" -#include "../props/prop_data.h" -#include "../singleton/prop_utils.h" +#include "../props/prop_2d_data.h" +#include "../singleton/prop_2d_utils.h" #include "core/os/keyboard.h" #include "core/version.h" diff --git a/editor/prop_editor_plugin.h b/editor/prop_2d_editor_plugin.h similarity index 100% rename from editor/prop_editor_plugin.h rename to editor/prop_2d_editor_plugin.h diff --git a/jobs/prop_mesher_job_step.cpp b/jobs/prop_2d_mesher_job_step.cpp similarity index 99% rename from jobs/prop_mesher_job_step.cpp rename to jobs/prop_2d_mesher_job_step.cpp index 20d69fd..dd7929a 100644 --- a/jobs/prop_mesher_job_step.cpp +++ b/jobs/prop_2d_mesher_job_step.cpp @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "prop_mesher_job_step.h" +#include "prop_2d_mesher_job_step.h" const String PropMesherJobStep::BINDING_STRING_PROP_MESHER_JOB_STEP_TYPE = "Normal,Normal LOD,Drop UV2,Merge Verts,Bake Texture,Simplify Mesh"; diff --git a/jobs/prop_mesher_job_step.h b/jobs/prop_2d_mesher_job_step.h similarity index 100% rename from jobs/prop_mesher_job_step.h rename to jobs/prop_2d_mesher_job_step.h diff --git a/jobs/prop_texture_job.cpp b/jobs/prop_2d_texture_job.cpp similarity index 99% rename from jobs/prop_texture_job.cpp rename to jobs/prop_2d_texture_job.cpp index 5444bc9..0775353 100644 --- a/jobs/prop_texture_job.cpp +++ b/jobs/prop_2d_texture_job.cpp @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "prop_texture_job.h" +#include "prop_2d_texture_job.h" #if TEXTURE_PACKER_PRESENT #include "../../texture_packer/texture_packer.h" diff --git a/jobs/prop_texture_job.h b/jobs/prop_2d_texture_job.h similarity index 100% rename from jobs/prop_texture_job.h rename to jobs/prop_2d_texture_job.h diff --git a/lights/prop_light.cpp b/lights/prop_2d_light.cpp similarity index 98% rename from lights/prop_light.cpp rename to lights/prop_2d_light.cpp index 8957798..74f7bc4 100644 --- a/lights/prop_light.cpp +++ b/lights/prop_2d_light.cpp @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "prop_light.h" +#include "prop_2d_light.h" Vector3 PropLight::get_position() { return _position; diff --git a/lights/prop_light.h b/lights/prop_2d_light.h similarity index 100% rename from lights/prop_light.h rename to lights/prop_2d_light.h diff --git a/material_cache/prop_material_cache.cpp b/material_cache/prop_2d_material_cache.cpp similarity index 97% rename from material_cache/prop_material_cache.cpp rename to material_cache/prop_2d_material_cache.cpp index 3837003..5c69595 100644 --- a/material_cache/prop_material_cache.cpp +++ b/material_cache/prop_2d_material_cache.cpp @@ -20,13 +20,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "prop_material_cache.h" +#include "prop_2d_material_cache.h" -#include "../props/prop_data.h" -#include "../props/prop_data_prop.h" -#include "../props/prop_data_tiled_wall.h" -#include "../singleton/prop_cache.h" -#include "../tiled_wall/tiled_wall_data.h" +#include "../props/prop_2d_data.h" +#include "../props/prop_2d_data_prop.h" +#include "../props/prop_2d_data_tiled_wall_2d.h" +#include "../singleton/prop_2d_cache.h" +#include "../tiled_wall/tiled_wall_2d_data.h" #if MESH_DATA_RESOURCE_PRESENT //define PROPS_PRESENT, so things compile. That module's scsub will define this too while compiling, diff --git a/material_cache/prop_material_cache.h b/material_cache/prop_2d_material_cache.h similarity index 100% rename from material_cache/prop_material_cache.h rename to material_cache/prop_2d_material_cache.h diff --git a/material_cache/prop_material_cache_pcm.cpp b/material_cache/prop_2d_material_cache_pcm.cpp similarity index 98% rename from material_cache/prop_material_cache_pcm.cpp rename to material_cache/prop_2d_material_cache_pcm.cpp index eb35af8..6425d95 100644 --- a/material_cache/prop_material_cache_pcm.cpp +++ b/material_cache/prop_2d_material_cache_pcm.cpp @@ -20,10 +20,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "prop_material_cache_pcm.h" +#include "prop_2d_material_cache_pcm.h" #include "../../texture_packer/texture_packer.h" -#include "../singleton/prop_cache.h" +#include "../singleton/prop_2d_cache.h" #include "scene/resources/texture.h" int PropMaterialCachePCM::get_texture_flags() const { diff --git a/material_cache/prop_material_cache_pcm.h b/material_cache/prop_2d_material_cache_pcm.h similarity index 98% rename from material_cache/prop_material_cache_pcm.h rename to material_cache/prop_2d_material_cache_pcm.h index f11e763..2c18bcd 100644 --- a/material_cache/prop_material_cache_pcm.h +++ b/material_cache/prop_2d_material_cache_pcm.h @@ -23,7 +23,7 @@ SOFTWARE. #ifndef PROP_MATERIAL_CACHE_PCM_H #define PROP_MATERIAL_CACHE_PCM_H -#include "prop_material_cache.h" +#include "prop_2d_material_cache.h" #include "core/version.h" diff --git a/prop_ess_entity.cpp b/prop_2d_ess_entity.cpp similarity index 77% rename from prop_ess_entity.cpp rename to prop_2d_ess_entity.cpp index 947deb2..7a0df37 100644 --- a/prop_ess_entity.cpp +++ b/prop_2d_ess_entity.cpp @@ -1,4 +1,4 @@ -#include "prop_ess_entity.h" +#include "prop_2d_ess_entity.h" PropESSEntity::PropESSEntity() { } diff --git a/prop_ess_entity.h b/prop_2d_ess_entity.h similarity index 100% rename from prop_ess_entity.h rename to prop_2d_ess_entity.h diff --git a/prop_instance.cpp b/prop_2d_instance.cpp similarity index 96% rename from prop_instance.cpp rename to prop_2d_instance.cpp index 845ed64..a90abaf 100644 --- a/prop_instance.cpp +++ b/prop_2d_instance.cpp @@ -1,4 +1,4 @@ -#include "prop_instance.h" +#include "prop_2d_instance.h" #include "../mesh_data_resource/nodes/mesh_data_instance.h" @@ -19,14 +19,14 @@ #include "../mesh_data_resource/props_2d/prop_2d_data_mesh_data.h" #endif -#include "./props/prop_data_entry.h" -#include "./props/prop_data_light.h" -#include "./props/prop_data_prop.h" -#include "./props/prop_data_scene.h" -#include "./props/prop_data_tiled_wall.h" +#include "./props/prop_2d_data_entry.h" +#include "./props/prop_2d_data_light.h" +#include "./props/prop_2d_data_prop.h" +#include "./props/prop_2d_data_scene.h" +#include "./props/prop_2d_data_tiled_wall_2d.h" -#include "tiled_wall/tiled_wall.h" -#include "tiled_wall/tiled_wall_data.h" +#include "tiled_wall/tiled_wall_2d.h" +#include "tiled_wall/tiled_wall_2d_data.h" Ref PropInstance::get_prop_data() { return _prop_data; diff --git a/prop_instance.h b/prop_2d_instance.h similarity index 98% rename from prop_instance.h rename to prop_2d_instance.h index 8ce49bb..3324b74 100644 --- a/prop_instance.h +++ b/prop_2d_instance.h @@ -37,7 +37,7 @@ SOFTWARE. #include "core/math/vector3.h" -#include "props/prop_data.h" +#include "props/prop_2d_data.h" class PropInstance : public Spatial { GDCLASS(PropInstance, Spatial); diff --git a/prop_instance_job.cpp b/prop_2d_instance_job.cpp similarity index 98% rename from prop_instance_job.cpp rename to prop_2d_instance_job.cpp index fe2af45..1b05a2b 100644 --- a/prop_instance_job.cpp +++ b/prop_2d_instance_job.cpp @@ -20,11 +20,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "prop_instance_job.h" +#include "prop_2d_instance_job.h" -#include "prop_instance.h" +#include "prop_2d_instance.h" -#include "./props/prop_data.h" +#include "./props/prop_2d_data.h" #include "../opensimplex/open_simplex_noise.h" diff --git a/prop_instance_job.h b/prop_2d_instance_job.h similarity index 100% rename from prop_instance_job.h rename to prop_2d_instance_job.h diff --git a/prop_instance_merger.cpp b/prop_2d_instance_merger.cpp similarity index 98% rename from prop_instance_merger.cpp rename to prop_2d_instance_merger.cpp index 7084bf5..9883975 100644 --- a/prop_instance_merger.cpp +++ b/prop_2d_instance_merger.cpp @@ -1,4 +1,4 @@ -#include "prop_instance_merger.h" +#include "prop_2d_instance_merger.h" #include "../mesh_data_resource/nodes/mesh_data_instance.h" @@ -44,26 +44,26 @@ typedef class RenderingServer VS; #include "../mesh_data_resource/props_2d/prop_2d_data_mesh_data.h" #endif -#include "./props/prop_data_entry.h" -#include "./props/prop_data_light.h" -#include "./props/prop_data_prop.h" -#include "./props/prop_data_scene.h" -#include "jobs/prop_mesher_job_step.h" -#include "lights/prop_light.h" -#include "material_cache/prop_material_cache.h" +#include "./props/prop_2d_data_entry.h" +#include "./props/prop_2d_data_light.h" +#include "./props/prop_2d_data_prop.h" +#include "./props/prop_2d_data_scene.h" +#include "jobs/prop_2d_mesher_job_step.h" +#include "lights/prop_2d_light.h" +#include "material_cache/prop_2d_material_cache.h" #include "scene/3d/camera.h" #if TEXTURE_PACKER_PRESENT -#include "./singleton/prop_cache.h" +#include "./singleton/prop_2d_cache.h" #endif #if THREAD_POOL_PRESENT #include "../thread_pool/thread_pool.h" #endif -#include "./props/prop_data_tiled_wall.h" +#include "./props/prop_2d_data_tiled_wall_2d.h" -#include "tiled_wall/tiled_wall_data.h" +#include "tiled_wall/tiled_wall_2d_data.h" #include "scene/resources/box_shape.h" diff --git a/prop_instance_merger.h b/prop_2d_instance_merger.h similarity index 97% rename from prop_instance_merger.h rename to prop_2d_instance_merger.h index 9cc8289..6b6101b 100644 --- a/prop_instance_merger.h +++ b/prop_2d_instance_merger.h @@ -23,7 +23,7 @@ SOFTWARE. #ifndef PROP_INSTANCE_MERGER_H #define PROP_INSTANCE_MERGER_H -#include "prop_instance.h" +#include "prop_2d_instance.h" #include "core/version.h" @@ -37,9 +37,9 @@ SOFTWARE. #include "core/math/vector3.h" -#include "prop_instance_prop_job.h" +#include "prop_2d_instance_prop_job.h" -#include "props/prop_data.h" +#include "props/prop_2d_data.h" class MeshDataInstance; diff --git a/prop_instance_prop_job.cpp b/prop_2d_instance_prop_job.cpp similarity index 98% rename from prop_instance_prop_job.cpp rename to prop_2d_instance_prop_job.cpp index 0adacab..a7beb92 100644 --- a/prop_instance_prop_job.cpp +++ b/prop_2d_instance_prop_job.cpp @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "prop_instance_prop_job.h" +#include "prop_2d_instance_prop_job.h" #include "core/version.h" @@ -30,14 +30,14 @@ SOFTWARE. #define GET_WORLD get_world #endif -#include "jobs/prop_mesher_job_step.h" -#include "lights/prop_light.h" -#include "material_cache/prop_material_cache.h" -#include "prop_instance.h" -#include "prop_instance_merger.h" -#include "prop_mesher.h" +#include "jobs/prop_2d_mesher_job_step.h" +#include "lights/prop_2d_light.h" +#include "material_cache/prop_2d_material_cache.h" +#include "prop_2d_instance.h" +#include "prop_2d_instance_merger.h" +#include "prop_2d_mesher.h" #include "scene/resources/shape.h" -#include "singleton/prop_cache.h" +#include "singleton/prop_2d_cache.h" #ifdef MESH_DATA_RESOURCE_PRESENT #include "../mesh_data_resource/mesh_data_resource.h" @@ -58,8 +58,8 @@ SOFTWARE. #include "../mesh_data_resource/props_2d/prop_2d_data_mesh_data.h" #endif -#include "props/prop_data_tiled_wall.h" -#include "tiled_wall/tiled_wall_data.h" +#include "props/prop_2d_data_tiled_wall_2d.h" +#include "tiled_wall/tiled_wall_2d_data.h" Ref PropInstancePropJob::get_material_cache() { return _material_cache; diff --git a/prop_instance_prop_job.h b/prop_2d_instance_prop_job.h similarity index 99% rename from prop_instance_prop_job.h rename to prop_2d_instance_prop_job.h index 3d3e789..9820693 100644 --- a/prop_instance_prop_job.h +++ b/prop_2d_instance_prop_job.h @@ -23,7 +23,7 @@ SOFTWARE. #ifndef PROP_JOB_H #define PROP_JOB_H -#include "prop_instance_job.h" +#include "prop_2d_instance_job.h" class PropMesher; class PropInstance; diff --git a/prop_mesher.cpp b/prop_2d_mesher.cpp similarity index 99% rename from prop_mesher.cpp rename to prop_2d_mesher.cpp index b77d2c0..c7e9173 100644 --- a/prop_mesher.cpp +++ b/prop_2d_mesher.cpp @@ -20,13 +20,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "prop_mesher.h" +#include "prop_2d_mesher.h" -#include "lights/prop_light.h" +#include "lights/prop_2d_light.h" #include "modules/opensimplex/open_simplex_noise.h" -#include "material_cache/prop_material_cache.h" -#include "tiled_wall/tiled_wall_data.h" +#include "material_cache/prop_2d_material_cache.h" +#include "tiled_wall/tiled_wall_2d_data.h" const String PropMesher::BINDING_STRING_BUILD_FLAGS = "Use Lighting,Use AO,Use RAO,Bake Lights"; diff --git a/prop_mesher.h b/prop_2d_mesher.h similarity index 100% rename from prop_mesher.h rename to prop_2d_mesher.h diff --git a/prop_scene_instance.cpp b/prop_2d_scene_instance.cpp similarity index 98% rename from prop_scene_instance.cpp rename to prop_2d_scene_instance.cpp index 8609a0c..c66846c 100644 --- a/prop_scene_instance.cpp +++ b/prop_2d_scene_instance.cpp @@ -1,4 +1,4 @@ -#include "prop_scene_instance.h" +#include "prop_2d_scene_instance.h" #include "core/version.h" diff --git a/prop_scene_instance.h b/prop_2d_scene_instance.h similarity index 98% rename from prop_scene_instance.h rename to prop_2d_scene_instance.h index 6c862c1..9d9921b 100644 --- a/prop_scene_instance.h +++ b/prop_2d_scene_instance.h @@ -35,7 +35,7 @@ SOFTWARE. #include "core/math/vector3.h" -#include "props/prop_data.h" +#include "props/prop_2d_data.h" #include "scene/resources/packed_scene.h" class PropSceneInstance : public Spatial { diff --git a/props/prop_data.cpp b/props/prop_2d_data.cpp similarity index 97% rename from props/prop_data.cpp rename to props/prop_2d_data.cpp index 7015e11..21c5823 100644 --- a/props/prop_data.cpp +++ b/props/prop_2d_data.cpp @@ -20,11 +20,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "prop_data.h" +#include "prop_2d_data.h" -#include "prop_data_entry.h" -#include "prop_data_light.h" -#include "prop_data_prop.h" +#include "prop_2d_data_entry.h" +#include "prop_2d_data_light.h" +#include "prop_2d_data_prop.h" #if VERSION_MAJOR < 4 #include "servers/physics_server.h" diff --git a/props/prop_data.h b/props/prop_2d_data.h similarity index 98% rename from props/prop_data.h rename to props/prop_2d_data.h index f5ff102..af2e87f 100644 --- a/props/prop_data.h +++ b/props/prop_2d_data.h @@ -44,7 +44,7 @@ SOFTWARE. #include "core/version.h" -#include "prop_data_entry.h" +#include "prop_2d_data_entry.h" #if TEXTURE_PACKER_PRESENT #include "../../texture_packer/texture_packer.h" diff --git a/props/prop_data_entry.cpp b/props/prop_2d_data_entry.cpp similarity index 98% rename from props/prop_data_entry.cpp rename to props/prop_2d_data_entry.cpp index 3843361..46f1788 100644 --- a/props/prop_data_entry.cpp +++ b/props/prop_2d_data_entry.cpp @@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "prop_data_entry.h" +#include "prop_2d_data_entry.h" -#include "prop_data.h" +#include "prop_2d_data.h" #include "core/version.h" @@ -38,7 +38,7 @@ SOFTWARE. #endif -#include "../prop_mesher.h" +#include "../prop_2d_mesher.h" Transform PropDataEntry::get_transform() const { return _transform; diff --git a/props/prop_data_entry.h b/props/prop_2d_data_entry.h similarity index 100% rename from props/prop_data_entry.h rename to props/prop_2d_data_entry.h diff --git a/props/prop_data_light.cpp b/props/prop_2d_data_light.cpp similarity index 98% rename from props/prop_data_light.cpp rename to props/prop_2d_data_light.cpp index e2b61e7..a803aaf 100644 --- a/props/prop_data_light.cpp +++ b/props/prop_2d_data_light.cpp @@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "prop_data_light.h" +#include "prop_2d_data_light.h" -#include "prop_data.h" +#include "prop_2d_data.h" #if VERSION_MAJOR < 4 #include "scene/3d/light.h" diff --git a/props/prop_data_light.h b/props/prop_2d_data_light.h similarity index 98% rename from props/prop_data_light.h rename to props/prop_2d_data_light.h index bbd3588..fc90167 100644 --- a/props/prop_data_light.h +++ b/props/prop_2d_data_light.h @@ -31,7 +31,7 @@ SOFTWARE. #include "core/color.h" #endif -#include "prop_data_entry.h" +#include "prop_2d_data_entry.h" class PropDataLight : public PropDataEntry { GDCLASS(PropDataLight, PropDataEntry); diff --git a/props/prop_data_portal.cpp b/props/prop_2d_data_portal.cpp similarity index 98% rename from props/prop_data_portal.cpp rename to props/prop_2d_data_portal.cpp index 538d13d..5ee706a 100644 --- a/props/prop_data_portal.cpp +++ b/props/prop_2d_data_portal.cpp @@ -20,9 +20,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "prop_data_portal.h" +#include "prop_2d_data_portal.h" -#include "prop_data.h" +#include "prop_2d_data.h" #include "scene/3d/portal.h" diff --git a/props/prop_data_portal.h b/props/prop_2d_data_portal.h similarity index 98% rename from props/prop_data_portal.h rename to props/prop_2d_data_portal.h index 66469ea..b93fc28 100644 --- a/props/prop_data_portal.h +++ b/props/prop_2d_data_portal.h @@ -25,7 +25,7 @@ SOFTWARE. #include "core/version.h" -#include "prop_data_entry.h" +#include "prop_2d_data_entry.h" class PropDataPortal : public PropDataEntry { GDCLASS(PropDataPortal, PropDataEntry); diff --git a/props/prop_data_prop.cpp b/props/prop_2d_data_prop.cpp similarity index 97% rename from props/prop_data_prop.cpp rename to props/prop_2d_data_prop.cpp index 10317b8..0f519df 100644 --- a/props/prop_data_prop.cpp +++ b/props/prop_2d_data_prop.cpp @@ -20,10 +20,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "prop_data_prop.h" +#include "prop_2d_data_prop.h" -#include "../prop_instance.h" -#include "prop_data.h" +#include "../prop_2d_instance.h" +#include "prop_2d_data.h" Ref PropDataProp::get_prop() const { return _prop; diff --git a/props/prop_data_prop.h b/props/prop_2d_data_prop.h similarity index 97% rename from props/prop_data_prop.h rename to props/prop_2d_data_prop.h index 66be634..7973843 100644 --- a/props/prop_data_prop.h +++ b/props/prop_2d_data_prop.h @@ -24,9 +24,10 @@ SOFTWARE. #define PROP_DATA_PROP_H #include "core/math/vector3.h" -#include "prop_data_entry.h" -#include "prop_data.h" +#include "prop_2d_data_entry.h" + +#include "prop_2d_data.h" #if TEXTURE_PACKER_PRESENT #include "../../texture_packer/texture_packer.h" diff --git a/props/prop_data_scene.cpp b/props/prop_2d_data_scene.cpp similarity index 97% rename from props/prop_data_scene.cpp rename to props/prop_2d_data_scene.cpp index ea814d9..0372165 100644 --- a/props/prop_data_scene.cpp +++ b/props/prop_2d_data_scene.cpp @@ -20,10 +20,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "prop_data_scene.h" +#include "prop_2d_data_scene.h" -#include "../prop_scene_instance.h" -#include "prop_data.h" +#include "../prop_2d_scene_instance.h" +#include "prop_2d_data.h" Ref PropDataScene::get_scene() { return _scene; diff --git a/props/prop_data_scene.h b/props/prop_2d_data_scene.h similarity index 98% rename from props/prop_data_scene.h rename to props/prop_2d_data_scene.h index 69dd410..5abf86b 100644 --- a/props/prop_data_scene.h +++ b/props/prop_2d_data_scene.h @@ -24,7 +24,7 @@ SOFTWARE. #define PROP_DATA_SCENE_H #include "core/math/vector3.h" -#include "prop_data_entry.h" +#include "prop_2d_data_entry.h" #include "scene/resources/packed_scene.h" diff --git a/props/prop_data_tiled_wall.cpp b/props/prop_2d_data_tiled_wall_2d.cpp similarity index 96% rename from props/prop_data_tiled_wall.cpp rename to props/prop_2d_data_tiled_wall_2d.cpp index 71fd130..78b6d6d 100644 --- a/props/prop_data_tiled_wall.cpp +++ b/props/prop_2d_data_tiled_wall_2d.cpp @@ -20,12 +20,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "prop_data_tiled_wall.h" +#include "prop_2d_data_tiled_wall_2d.h" -#include "../tiled_wall/tiled_wall.h" -#include "../tiled_wall/tiled_wall_data.h" +#include "../tiled_wall/tiled_wall_2d.h" +#include "../tiled_wall/tiled_wall_2d_data.h" -#include "prop_data.h" +#include "prop_2d_data.h" int PropDataTiledWall::get_width() const { return _width; diff --git a/props/prop_data_tiled_wall.h b/props/prop_2d_data_tiled_wall_2d.h similarity index 98% rename from props/prop_data_tiled_wall.h rename to props/prop_2d_data_tiled_wall_2d.h index 8e5137d..1790f0f 100644 --- a/props/prop_data_tiled_wall.h +++ b/props/prop_2d_data_tiled_wall_2d.h @@ -24,7 +24,7 @@ SOFTWARE. #define PROP_DATA_TILED_WALL_H #include "core/math/vector3.h" -#include "prop_data_entry.h" +#include "prop_2d_data_entry.h" class TiledWallData; diff --git a/register_types.cpp b/register_types.cpp index f6a44a1..f37da02 100644 --- a/register_types.cpp +++ b/register_types.cpp @@ -30,48 +30,48 @@ SOFTWARE. #include "core/engine.h" #endif -#include "tiled_wall/tiled_wall.h" -#include "tiled_wall/tiled_wall_data.h" +#include "tiled_wall/tiled_wall_2d.h" +#include "tiled_wall/tiled_wall_2d_data.h" -#include "props/prop_data.h" -#include "props/prop_data_entry.h" -#include "props/prop_data_light.h" -#include "props/prop_data_prop.h" -#include "props/prop_data_scene.h" -#include "props/prop_data_tiled_wall.h" +#include "props/prop_2d_data.h" +#include "props/prop_2d_data_entry.h" +#include "props/prop_2d_data_light.h" +#include "props/prop_2d_data_prop.h" +#include "props/prop_2d_data_scene.h" +#include "props/prop_2d_data_tiled_wall_2d.h" #if VERSION_MINOR >= 4 -#include "props/prop_data_portal.h" +#include "props/prop_2d_data_portal.h" #endif -#include "clutter/ground_clutter.h" -#include "clutter/ground_clutter_foliage.h" +#include "clutter/ground_clutter_2d.h" +#include "clutter/ground_clutter_2d_foliage.h" -#include "prop_ess_entity.h" -#include "prop_instance.h" -#include "prop_instance_merger.h" +#include "prop_2d_ess_entity.h" +#include "prop_2d_instance.h" +#include "prop_2d_instance_merger.h" -#include "prop_instance_job.h" -#include "prop_instance_prop_job.h" +#include "prop_2d_instance_job.h" +#include "prop_2d_instance_prop_job.h" -#include "jobs/prop_mesher_job_step.h" -#include "jobs/prop_texture_job.h" +#include "jobs/prop_2d_mesher_job_step.h" +#include "jobs/prop_2d_texture_job.h" -#include "prop_scene_instance.h" +#include "prop_2d_scene_instance.h" -#include "singleton/prop_cache.h" -#include "singleton/prop_utils.h" +#include "singleton/prop_2d_cache.h" +#include "singleton/prop_2d_utils.h" -#include "lights/prop_light.h" +#include "lights/prop_2d_light.h" -#include "./editor/prop_editor_plugin.h" +#include "./editor/prop_2d_editor_plugin.h" -#include "prop_mesher.h" +#include "prop_2d_mesher.h" -#include "material_cache/prop_material_cache.h" +#include "material_cache/prop_2d_material_cache.h" #ifdef TEXTURE_PACKER_PRESENT -#include "material_cache/prop_material_cache_pcm.h" +#include "material_cache/prop_2d_material_cache_pcm.h" #endif static PropUtils *prop_utils = NULL; diff --git a/singleton/prop_cache.cpp b/singleton/prop_2d_cache.cpp similarity index 98% rename from singleton/prop_cache.cpp rename to singleton/prop_2d_cache.cpp index 49d38e8..a44208f 100644 --- a/singleton/prop_cache.cpp +++ b/singleton/prop_2d_cache.cpp @@ -20,10 +20,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "prop_cache.h" +#include "prop_2d_cache.h" -#include "../props/prop_data.h" -#include "../props/prop_data_entry.h" +#include "../props/prop_2d_data.h" +#include "../props/prop_2d_data_entry.h" #include "core/version.h" @@ -35,14 +35,14 @@ SOFTWARE. #include "core/project_settings.h" #endif -#include "../jobs/prop_texture_job.h" +#include "../jobs/prop_2d_texture_job.h" #if THREAD_POOL_PRESENT #include "../../thread_pool/thread_pool.h" #endif -#include "../material_cache/prop_material_cache.h" -#include "../tiled_wall/tiled_wall_data.h" +#include "../material_cache/prop_2d_material_cache.h" +#include "../tiled_wall/tiled_wall_2d_data.h" #include "core/hashfuncs.h" diff --git a/singleton/prop_cache.h b/singleton/prop_2d_cache.h similarity index 99% rename from singleton/prop_cache.h rename to singleton/prop_2d_cache.h index 15529e6..af84785 100644 --- a/singleton/prop_cache.h +++ b/singleton/prop_2d_cache.h @@ -45,7 +45,7 @@ SOFTWARE. #include "core/os/mutex.h" -#include "../props/prop_data.h" +#include "../props/prop_2d_data.h" class PropMaterialCache; class TiledWallData; diff --git a/singleton/prop_utils.cpp b/singleton/prop_2d_utils.cpp similarity index 99% rename from singleton/prop_utils.cpp rename to singleton/prop_2d_utils.cpp index 26f5c81..37d616b 100644 --- a/singleton/prop_utils.cpp +++ b/singleton/prop_2d_utils.cpp @@ -20,10 +20,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "prop_utils.h" +#include "prop_2d_utils.h" -#include "../props/prop_data.h" -#include "../props/prop_data_entry.h" +#include "../props/prop_2d_data.h" +#include "../props/prop_2d_data_entry.h" #include "core/version.h" diff --git a/singleton/prop_utils.h b/singleton/prop_2d_utils.h similarity index 100% rename from singleton/prop_utils.h rename to singleton/prop_2d_utils.h diff --git a/tiled_wall/tiled_wall.cpp b/tiled_wall/tiled_wall_2d.cpp similarity index 98% rename from tiled_wall/tiled_wall.cpp rename to tiled_wall/tiled_wall_2d.cpp index b1488ee..c45e13c 100644 --- a/tiled_wall/tiled_wall.cpp +++ b/tiled_wall/tiled_wall_2d.cpp @@ -1,4 +1,4 @@ -#include "tiled_wall.h" +#include "tiled_wall_2d.h" #include "core/version.h" @@ -18,12 +18,12 @@ #include "../../texture_packer/texture_resource/packer_image_resource.h" #endif -#include "../material_cache/prop_material_cache.h" -#include "../prop_mesher.h" -#include "../singleton/prop_cache.h" +#include "../material_cache/prop_2d_material_cache.h" +#include "../prop_2d_mesher.h" +#include "../singleton/prop_2d_cache.h" #include "core/core_string_names.h" -#include "tiled_wall_data.h" +#include "tiled_wall_2d_data.h" int TiledWall::get_width() const { return _width; diff --git a/tiled_wall/tiled_wall.h b/tiled_wall/tiled_wall_2d.h similarity index 100% rename from tiled_wall/tiled_wall.h rename to tiled_wall/tiled_wall_2d.h diff --git a/tiled_wall/tiled_wall_data.cpp b/tiled_wall/tiled_wall_2d_data.cpp similarity index 99% rename from tiled_wall/tiled_wall_data.cpp rename to tiled_wall/tiled_wall_2d_data.cpp index 31a7be6..7af1459 100644 --- a/tiled_wall/tiled_wall_data.cpp +++ b/tiled_wall/tiled_wall_2d_data.cpp @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "tiled_wall_data.h" +#include "tiled_wall_2d_data.h" #if VERSION_MAJOR < 4 #include "servers/physics_server.h" @@ -57,7 +57,7 @@ SOFTWARE. arr_into.push_back(e); \ } -#include "../material_cache/prop_material_cache.h" +#include "../material_cache/prop_2d_material_cache.h" const String TiledWallData::BINDING_STRING_TILED_WALL_TILING_TYPE = "None,Horizontal,Vertical,Both"; diff --git a/tiled_wall/tiled_wall_data.h b/tiled_wall/tiled_wall_2d_data.h similarity index 100% rename from tiled_wall/tiled_wall_data.h rename to tiled_wall/tiled_wall_2d_data.h