Postfixed every file with 2d. And changed include guards.

SCsub

@@ -29,48 +29,48 @@ sources = [
 
     "register_types.cpp",
 
-    "lights/prop_light.cpp",
+    "lights/prop_light_2d.cpp",
 
-    "tiled_wall/tiled_wall.cpp",
-    "tiled_wall/tiled_wall_data.cpp",
+    "tiled_wall/tiled_wall_2d.cpp",
+    "tiled_wall/tiled_wall_data_2d.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_data_2d.cpp",
+    "props/prop_data_entry_2d.cpp",
+    "props/prop_data_scene_2d.cpp",
+    "props/prop_data_light_2d.cpp",
+    "props/prop_data_prop_2d.cpp",
+    "props/prop_data_tiled_wall_2d.cpp",
 
-    "clutter/ground_clutter.cpp",
-    "clutter/ground_clutter_foliage.cpp",
+    "clutter/ground_clutter_2d.cpp",
+    "clutter/ground_clutter_foliage_2d.cpp",
 
-    "prop_instance.cpp",
-    "prop_instance_merger.cpp",
-    "prop_ess_entity.cpp",
-    "prop_instance_job.cpp",
-    "prop_instance_prop_job.cpp",
+    "prop_instance_2d.cpp",
+    "prop_instance_merger_2d.cpp",
+    "prop_ess_entity_2d.cpp",
+    "prop_instance_job_2d.cpp",
+    "prop_instance_prop_job_2d.cpp",
 
-    "prop_scene_instance.cpp",
+    "prop_scene_instance_2d.cpp",
 
-    "singleton/prop_utils.cpp",
-    "singleton/prop_cache.cpp",
+    "singleton/prop_utils_2d.cpp",
+    "singleton/prop_cache_2d.cpp",
 
-    "editor/prop_editor_plugin.cpp",
+    "editor/prop_editor_plugin_2d.cpp",
 
-    "prop_mesher.cpp",
+    "prop_mesher_2d.cpp",
 
-    "jobs/prop_texture_job.cpp",
+    "jobs/prop_texture_job_2d.cpp",
 
-    "jobs/prop_mesher_job_step.cpp",
+    "jobs/prop_mesher_job_step_2d.cpp",
 
-    "material_cache/prop_material_cache.cpp"
+    "material_cache/prop_material_cache_2d.cpp"
 ]
 
 if version.minor >= 4:
-    sources.append("props/prop_data_portal.cpp")
+    sources.append("props/prop_data_portal_2d.cpp")
 
 if has_texture_packer:
-    sources.append("material_cache/prop_material_cache_pcm.cpp")
+    sources.append("material_cache/prop_material_cache_pcm_2d.cpp")
 
 if ARGUMENTS.get('custom_modules_shared', 'no') == 'yes':
     # Shared lib compilation

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"

clutter/ground_clutter_2d.h

@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef GROUND_CLUTTER_H
-#define GROUND_CLUTTER_H
+#ifndef GROUND_CLUTTER_2D_H
+#define GROUND_CLUTTER_2D_H
 
 #include "core/version.h"
 

clutter/ground_clutter_foliage_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_foliage.h"
+#include "ground_clutter_foliage_2d.h"
 
 int GroundClutterFoliage::get_texture_count() const {
 	return _textures.size();

clutter/ground_clutter_foliage_2d.h

@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef GROUND_CLUTTER_FOLIAGE_H
-#define GROUND_CLUTTER_FOLIAGE_H
+#ifndef GROUND_CLUTTER_FOLIAGE_2D_H
+#define GROUND_CLUTTER_FOLIAGE_2D_H
 
 #include "core/version.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"
 

editor/prop_editor_plugin_2d.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_editor_plugin_2d.h"
 
-#include "../props/prop_data.h"
-#include "../singleton/prop_utils.h"
+#include "../props/prop_data_2d.h"
+#include "../singleton/prop_utils_2d.h"
 #include "core/os/keyboard.h"
 
 #include "core/version.h"

editor/prop_editor_plugin_2d.h

@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_EDITOR_PLUGIN_H
-#define PROP_EDITOR_PLUGIN_H
+#ifndef PROP_EDITOR_PLUGIN_2D_H
+#define PROP_EDITOR_PLUGIN_2D_H
 
 #include "editor/editor_node.h"
 #include "editor/editor_plugin.h"

jobs/prop_mesher_job_step_2d.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_mesher_job_step_2d.h"
 
 const String PropMesherJobStep::BINDING_STRING_PROP_MESHER_JOB_STEP_TYPE = "Normal,Normal LOD,Drop UV2,Merge Verts,Bake Texture,Simplify Mesh";
 

jobs/prop_mesher_job_step_2d.h

@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_MESHER_JOB_STEP_H
-#define PROP_MESHER_JOB_STEP_H
+#ifndef PROP_MESHER_JOB_STEP_2D_H
+#define PROP_MESHER_JOB_STEP_2D_H
 
 #include "core/version.h"
 

jobs/prop_texture_job_2d.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_texture_job_2d.h"
 
 #if TEXTURE_PACKER_PRESENT
 #include "../../texture_packer/texture_packer.h"

jobs/prop_texture_job_2d.h

@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_TEXTURE_JOB
-#define PROP_TEXTURE_JOB
+#ifndef PROP_TEXTURE_JOB_2D_H
+#define PROP_TEXTURE_JOB_2D_H
 
 #include "scene/resources/texture.h"
 

lights/prop_light_2d.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_light_2d.h"
 
 Vector3 PropLight::get_position() {
 	return _position;

lights/prop_light_2d.h

@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_LIGHT_H
-#define PROP_LIGHT_H
+#ifndef PROP_LIGHT_2D_H
+#define PROP_LIGHT_2D_H
 
 #include "core/version.h"
 

material_cache/prop_material_cache_2d.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_material_cache_2d.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_data_2d.h"
+#include "../props/prop_data_prop_2d.h"
+#include "../props/prop_data_tiled_wall_2d.h"
+#include "../singleton/prop_cache_2d.h"
+#include "../tiled_wall/tiled_wall_data_2d.h"
 
 #if MESH_DATA_RESOURCE_PRESENT
 #define PROPS_PRESENT 1

material_cache/prop_material_cache_2d.h

@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_MATERIAL_CACHE_H
-#define PROP_MATERIAL_CACHE_H
+#ifndef PROP_MATERIAL_CACHE_2D_H
+#define PROP_MATERIAL_CACHE_2D_H
 
 #include "core/version.h"
 

material_cache/prop_material_cache_pcm_2d.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_material_cache_pcm_2d.h"
 
 #include "../../texture_packer/texture_packer.h"
-#include "../singleton/prop_cache.h"
+#include "../singleton/prop_cache_2d.h"
 #include "scene/resources/texture.h"
 
 int PropMaterialCachePCM::get_texture_flags() const {

material_cache/prop_material_cache_pcm_2d.h

@@ -20,10 +20,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_MATERIAL_CACHE_PCM_H
-#define PROP_MATERIAL_CACHE_PCM_H
+#ifndef PROP_MATERIAL_CACHE_PCM_2D_H
+#define PROP_MATERIAL_CACHE_PCM_2D_H
 
-#include "prop_material_cache.h"
+#include "prop_material_cache_2d.h"
 
 #include "core/version.h"
 

prop_ess_entity_2d.cpp

@@ -1,4 +1,4 @@
-#include "prop_ess_entity.h"
+#include "prop_ess_entity_2d.h"
 
 PropESSEntity::PropESSEntity() {
 }

prop_ess_entity_2d.h

@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_ESS_ENTITY_H
-#define PROP_ESS_ENTITY_H
+#ifndef PROP_ESS_ENTITY_2D_H
+#define PROP_ESS_ENTITY_2D_H
 
 #include "core/version.h"
 

prop_instance_2d.cpp

@@ -1,4 +1,4 @@
-#include "prop_instance.h"
+#include "prop_instance_2d.h"
 
 #include "../mesh_data_resource/nodes/mesh_data_instance.h"
 
@@ -19,14 +19,14 @@
 #include "../mesh_data_resource/props/prop_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_data_entry_2d.h"
+#include "./props/prop_data_light_2d.h"
+#include "./props/prop_data_prop_2d.h"
+#include "./props/prop_data_scene_2d.h"
+#include "./props/prop_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_data_2d.h"
 
 Ref<PropData> PropInstance::get_prop_data() {
 	return _prop_data;

prop_instance_2d.h

@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_INSTANCE_H
-#define PROP_INSTANCE_H
+#ifndef PROP_INSTANCE_2D_H
+#define PROP_INSTANCE_2D_H
 
 #include "core/version.h"
 
@@ -37,7 +37,7 @@ SOFTWARE.
 
 #include "core/math/vector3.h"
 
-#include "props/prop_data.h"
+#include "props/prop_data_2d.h"
 
 class PropInstance : public Spatial {
 	GDCLASS(PropInstance, Spatial);

prop_instance_job_2d.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_instance_job_2d.h"
 
-#include "prop_instance.h"
+#include "prop_instance_2d.h"
 
-#include "./props/prop_data.h"
+#include "./props/prop_data_2d.h"
 
 #include "../opensimplex/open_simplex_noise.h"
 

prop_instance_job_2d.h

@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_INSTANCE_JOB
-#define PROP_INSTANCE_JOB
+#ifndef PROP_INSTANCE_2D_JOB
+#define PROP_INSTANCE_2D_JOB
 
 #include "scene/resources/texture.h"
 

prop_instance_merger_2d.cpp

@@ -1,4 +1,4 @@
-#include "prop_instance_merger.h"
+#include "prop_instance_merger_2d.h"
 
 #include "../mesh_data_resource/nodes/mesh_data_instance.h"
 
@@ -44,26 +44,26 @@ typedef class RenderingServer VS;
 #include "../mesh_data_resource/props/prop_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_data_entry_2d.h"
+#include "./props/prop_data_light_2d.h"
+#include "./props/prop_data_prop_2d.h"
+#include "./props/prop_data_scene_2d.h"
+#include "jobs/prop_mesher_job_step_2d.h"
+#include "lights/prop_light_2d.h"
+#include "material_cache/prop_material_cache_2d.h"
 #include "scene/3d/camera.h"
 
 #if TEXTURE_PACKER_PRESENT
-#include "./singleton/prop_cache.h"
+#include "./singleton/prop_cache_2d.h"
 #endif
 
 #if THREAD_POOL_PRESENT
 #include "../thread_pool/thread_pool.h"
 #endif
 
-#include "./props/prop_data_tiled_wall.h"
+#include "./props/prop_data_tiled_wall_2d.h"
 
-#include "tiled_wall/tiled_wall_data.h"
+#include "tiled_wall/tiled_wall_data_2d.h"
 
 #include "scene/resources/box_shape.h"
 

prop_instance_merger_2d.h

@@ -20,10 +20,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_INSTANCE_MERGER_H
-#define PROP_INSTANCE_MERGER_H
+#ifndef PROP_INSTANCE_MERGER_2D_H
+#define PROP_INSTANCE_MERGER_2D_H
 
-#include "prop_instance.h"
+#include "prop_instance_2d.h"
 
 #include "core/version.h"
 
@@ -37,9 +37,9 @@ SOFTWARE.
 
 #include "core/math/vector3.h"
 
-#include "prop_instance_prop_job.h"
+#include "prop_instance_prop_job_2d.h"
 
-#include "props/prop_data.h"
+#include "props/prop_data_2d.h"
 
 class MeshDataInstance;
 

prop_instance_prop_job_2d.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_instance_prop_job_2d.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_mesher_job_step_2d.h"
+#include "lights/prop_light_2d.h"
+#include "material_cache/prop_material_cache_2d.h"
+#include "prop_instance_2d.h"
+#include "prop_instance_merger_2d.h"
+#include "prop_mesher_2d.h"
 #include "scene/resources/shape.h"
-#include "singleton/prop_cache.h"
+#include "singleton/prop_cache_2d.h"
 
 #ifdef MESH_DATA_RESOURCE_PRESENT
 #include "../mesh_data_resource/mesh_data_resource.h"
@@ -59,8 +59,8 @@ SOFTWARE.
 #undef PROPS_PRESENT
 #endif
 
-#include "props/prop_data_tiled_wall.h"
-#include "tiled_wall/tiled_wall_data.h"
+#include "props/prop_data_tiled_wall_2d.h"
+#include "tiled_wall/tiled_wall_data_2d.h"
 
 Ref<PropMaterialCache> PropInstancePropJob::get_material_cache() {
 	return _material_cache;

prop_instance_prop_job_2d.h

@@ -20,10 +20,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_JOB_H
-#define PROP_JOB_H
+#ifndef PROP_JOB_2D_H
+#define PROP_JOB_2D_H
 
-#include "prop_instance_job.h"
+#include "prop_instance_job_2d.h"
 
 class PropMesher;
 class PropInstance;

prop_mesher_2d.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_mesher_2d.h"
 
-#include "lights/prop_light.h"
+#include "lights/prop_light_2d.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_material_cache_2d.h"
+#include "tiled_wall/tiled_wall_data_2d.h"
 
 const String PropMesher::BINDING_STRING_BUILD_FLAGS = "Use Lighting,Use AO,Use RAO,Bake Lights";
 

prop_mesher_2d.h

@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_MESHER_H
-#define PROP_MESHER_H
+#ifndef PROP_MESHER_2D_H
+#define PROP_MESHER_2D_H
 
 #include "core/version.h"
 

prop_scene_instance_2d.cpp

@@ -1,4 +1,4 @@
-#include "prop_scene_instance.h"
+#include "prop_scene_instance_2d.h"
 
 #include "core/version.h"
 

prop_scene_instance_2d.h

@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_SCENE_INSTANCE_H
-#define PROP_SCENE_INSTANCE_H
+#ifndef PROP_SCENE_INSTANCE_2D_H
+#define PROP_SCENE_INSTANCE_2D_H
 
 #include "core/version.h"
 
@@ -35,7 +35,7 @@ SOFTWARE.
 
 #include "core/math/vector3.h"
 
-#include "props/prop_data.h"
+#include "props/prop_data_2d.h"
 #include "scene/resources/packed_scene.h"
 
 class PropSceneInstance : public Spatial {

props/prop_data_2d.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_data_2d.h"
 
-#include "prop_data_entry.h"
-#include "prop_data_light.h"
-#include "prop_data_prop.h"
+#include "prop_data_entry_2d.h"
+#include "prop_data_light_2d.h"
+#include "prop_data_prop_2d.h"
 
 #if VERSION_MAJOR < 4
 #include "servers/physics_server.h"

props/prop_data_2d.h

@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_DATA_H
-#define PROP_DATA_H
+#ifndef PROP_DATA_2D_H
+#define PROP_DATA_2D_H
 
 #include "core/version.h"
 
@@ -40,7 +40,7 @@ SOFTWARE.
 
 #include "core/version.h"
 
-#include "prop_data_entry.h"
+#include "prop_data_entry_2d.h"
 
 #if TEXTURE_PACKER_PRESENT
 #include "../../texture_packer/texture_packer.h"

props/prop_data_entry_2d.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_data_entry_2d.h"
 
-#include "prop_data.h"
+#include "prop_data_2d.h"
 
 #include "core/version.h"
 
@@ -38,7 +38,7 @@ SOFTWARE.
 #endif
 
 
-#include "../prop_mesher.h"
+#include "../prop_mesher_2d.h"
 
 Transform PropDataEntry::get_transform() const {
 	return _transform;

props/prop_data_entry_2d.h

@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_DATA_DATA_H
-#define PROP_DATA_DATA_H
+#ifndef PROP_DATA_DATA_2D_H
+#define PROP_DATA_DATA_2D_H
 
 #include "core/version.h"
 

props/prop_data_light_2d.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_data_light_2d.h"
 
-#include "prop_data.h"
+#include "prop_data_2d.h"
 
 #if VERSION_MAJOR < 4
 #include "scene/3d/light.h"

props/prop_data_light_2d.h

@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_DATA_LIGHT_H
-#define PROP_DATA_LIGHT_H
+#ifndef PROP_DATA_LIGHT_2D_H
+#define PROP_DATA_LIGHT_2D_H
 
 #include "core/version.h"
 
@@ -31,7 +31,7 @@ SOFTWARE.
 #include "core/color.h"
 #endif
 
-#include "prop_data_entry.h"
+#include "prop_data_entry_2d.h"
 
 class PropDataLight : public PropDataEntry {
 	GDCLASS(PropDataLight, PropDataEntry);

props/prop_data_portal_2d.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_data_portal_2d.h"
 
-#include "prop_data.h"
+#include "prop_data_2d.h"
 
 #include "scene/3d/portal.h"
 

props/prop_data_portal_2d.h

@@ -20,12 +20,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_DATA_PORTAL_H
-#define PROP_DATA_PORTAL_H
+#ifndef PROP_DATA_PORTAL_2D_H
+#define PROP_DATA_PORTAL_2D_H
 
 #include "core/version.h"
 
-#include "prop_data_entry.h"
+#include "prop_data_entry_2d.h"
 
 class PropDataPortal : public PropDataEntry {
 	GDCLASS(PropDataPortal, PropDataEntry);

props/prop_data_prop_2d.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_data_prop_2d.h"
 
-#include "../prop_instance.h"
-#include "prop_data.h"
+#include "../prop_instance_2d.h"
+#include "prop_data_2d.h"
 
 Ref<PropData> PropDataProp::get_prop() const {
 	return _prop;

props/prop_data_prop_2d.h

@@ -20,13 +20,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_DATA_PROP_H
-#define PROP_DATA_PROP_H
+#ifndef PROP_DATA_PROP_2D_H
+#define PROP_DATA_PROP_2D_H
 
 #include "core/math/vector3.h"
-#include "prop_data_entry.h"
+#include "prop_data_entry_2d.h"
 
-#include "prop_data.h"
+#include "prop_data_2d.h"
 
 #if TEXTURE_PACKER_PRESENT
 #include "../../texture_packer/texture_packer.h"

props/prop_data_scene_2d.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_data_scene_2d.h"
 
-#include "../prop_scene_instance.h"
-#include "prop_data.h"
+#include "../prop_scene_instance_2d.h"
+#include "prop_data_2d.h"
 
 Ref<PackedScene> PropDataScene::get_scene() {
 	return _scene;

props/prop_data_scene_2d.h

@@ -20,11 +20,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_DATA_SCENE_H
-#define PROP_DATA_SCENE_H
+#ifndef PROP_DATA_SCENE_2D_H
+#define PROP_DATA_SCENE_2D_H
 
 #include "core/math/vector3.h"
-#include "prop_data_entry.h"
+#include "prop_data_entry_2d.h"
 
 #include "scene/resources/packed_scene.h"
 

props/prop_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_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_data_2d.h"
 
-#include "prop_data.h"
+#include "prop_data_2d.h"
 
 int PropDataTiledWall::get_width() const {
 	return _width;

props/prop_data_tiled_wall_2d.h

@@ -20,11 +20,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_DATA_TILED_WALL_H
-#define PROP_DATA_TILED_WALL_H
+#ifndef PROP_DATA_TILED_WALL_2D_H
+#define PROP_DATA_TILED_WALL_2D_H
 
 #include "core/math/vector3.h"
-#include "prop_data_entry.h"
+#include "prop_data_entry_2d.h"
 
 class TiledWallData;
 

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_data_2d.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_data_2d.h"
+#include "props/prop_data_entry_2d.h"
+#include "props/prop_data_light_2d.h"
+#include "props/prop_data_prop_2d.h"
+#include "props/prop_data_scene_2d.h"
+#include "props/prop_data_tiled_wall_2d.h"
 
 #if VERSION_MINOR >= 4
-#include "props/prop_data_portal.h"
+#include "props/prop_data_portal_2d.h"
 #endif
 
-#include "clutter/ground_clutter.h"
-#include "clutter/ground_clutter_foliage.h"
+#include "clutter/ground_clutter_2d.h"
+#include "clutter/ground_clutter_foliage_2d.h"
 
-#include "prop_ess_entity.h"
-#include "prop_instance.h"
-#include "prop_instance_merger.h"
+#include "prop_ess_entity_2d.h"
+#include "prop_instance_2d.h"
+#include "prop_instance_merger_2d.h"
 
-#include "prop_instance_job.h"
-#include "prop_instance_prop_job.h"
+#include "prop_instance_job_2d.h"
+#include "prop_instance_prop_job_2d.h"
 
-#include "jobs/prop_mesher_job_step.h"
-#include "jobs/prop_texture_job.h"
+#include "jobs/prop_mesher_job_step_2d.h"
+#include "jobs/prop_texture_job_2d.h"
 
-#include "prop_scene_instance.h"
+#include "prop_scene_instance_2d.h"
 
-#include "singleton/prop_cache.h"
-#include "singleton/prop_utils.h"
+#include "singleton/prop_cache_2d.h"
+#include "singleton/prop_utils_2d.h"
 
-#include "lights/prop_light.h"
+#include "lights/prop_light_2d.h"
 
-#include "./editor/prop_editor_plugin.h"
+#include "./editor/prop_editor_plugin_2d.h"
 
-#include "prop_mesher.h"
+#include "prop_mesher_2d.h"
 
-#include "material_cache/prop_material_cache.h"
+#include "material_cache/prop_material_cache_2d.h"
 
 #ifdef TEXTURE_PACKER_PRESENT
-#include "material_cache/prop_material_cache_pcm.h"
+#include "material_cache/prop_material_cache_pcm_2d.h"
 #endif
 
 static PropUtils *prop_utils = NULL;

singleton/prop_cache_2d.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_cache_2d.h"
 
-#include "../props/prop_data.h"
-#include "../props/prop_data_entry.h"
+#include "../props/prop_data_2d.h"
+#include "../props/prop_data_entry_2d.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_texture_job_2d.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_material_cache_2d.h"
+#include "../tiled_wall/tiled_wall_data_2d.h"
 
 #include "core/hashfuncs.h"
 

singleton/prop_cache_2d.h

@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_CACHE_H
-#define PROP_CACHE_H
+#ifndef PROP_CACHE_2D_H
+#define PROP_CACHE_2D_H
 
 #include "core/version.h"
 
@@ -45,7 +45,7 @@ SOFTWARE.
 
 #include "core/os/mutex.h"
 
-#include "../props/prop_data.h"
+#include "../props/prop_data_2d.h"
 
 class PropMaterialCache;
 class TiledWallData;

singleton/prop_utils_2d.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_utils_2d.h"
 
-#include "../props/prop_data.h"
-#include "../props/prop_data_entry.h"
+#include "../props/prop_data_2d.h"
+#include "../props/prop_data_entry_2d.h"
 
 #include "core/version.h"
 

singleton/prop_utils_2d.h

@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef PROP_UTILS_H
-#define PROP_UTILS_H
+#ifndef PROP_UTILS_2D_H
+#define PROP_UTILS_2D_H
 
 #include "core/version.h"
 

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_material_cache_2d.h"
+#include "../prop_mesher_2d.h"
+#include "../singleton/prop_cache_2d.h"
 
 #include "core/core_string_names.h"
-#include "tiled_wall_data.h"
+#include "tiled_wall_data_2d.h"
 
 int TiledWall::get_width() const {
 	return _width;

tiled_wall/tiled_wall_2d.h

@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef TILED_WALL_H
-#define TILED_WALL_H
+#ifndef TILED_WALL_2D_H
+#define TILED_WALL_2D_H
 
 #include "core/version.h"
 #include "scene/resources/texture.h"

tiled_wall/tiled_wall_data_2d.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_data_2d.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_material_cache_2d.h"
 
 const String TiledWallData::BINDING_STRING_TILED_WALL_TILING_TYPE = "None,Horizontal,Vertical,Both";
 

tiled_wall/tiled_wall_data_2d.h

@@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef TILED_WALL_DATA_H
-#define TILED_WALL_DATA_H
+#ifndef TILED_WALL_DATA_2D_H
+#define TILED_WALL_DATA_2D_H
 
 #include "core/version.h"