From 9b2cc6908326cb75e23a8ebcca80008abfe13f2a Mon Sep 17 00:00:00 2001 From: Xottab-DUTY Date: Tue, 5 Sep 2017 07:11:50 +0500 Subject: [PATCH] Rename editor::property_holder to editor::property_holder_base (https://github.com/Xottab-DUTY/xray-16/issues/1) --- src/Include/editor/engine.hpp | 8 +-- src/Include/editor/ide.hpp | 10 ++-- ...ty_holder.hpp => property_holder_base.hpp} | 30 +++++------ src/editors/xrWeatherEditor/ide_impl.cpp | 4 +- src/editors/xrWeatherEditor/ide_impl.hpp | 2 +- .../xrWeatherEditor/property_boolean.hpp | 4 +- .../property_boolean_values_value.hpp | 4 +- ...roperty_boolean_values_value_reference.hpp | 4 +- .../property_collection_base.cpp | 6 +-- .../property_collection_base.hpp | 2 +- .../property_collection_enumerator.cpp | 2 +- .../xrWeatherEditor/property_color.hpp | 4 +- .../xrWeatherEditor/property_color_base.cpp | 4 +- .../property_editor_file_name.hpp | 4 +- .../property_file_name_value.hpp | 4 +- .../xrWeatherEditor/property_float.hpp | 4 +- .../property_float_enum_value.hpp | 4 +- .../property_float_enum_value_reference.hpp | 4 +- .../xrWeatherEditor/property_holder.hpp | 4 +- .../property_holder_container.cpp | 2 +- .../property_holder_include.hpp | 4 +- .../xrWeatherEditor/property_integer.hpp | 4 +- .../property_integer_enum_value.hpp | 4 +- .../property_integer_values_value.hpp | 4 +- .../property_integer_values_value_getter.hpp | 2 +- ..._integer_values_value_reference_getter.hpp | 2 +- .../xrWeatherEditor/property_string.hpp | 4 +- .../property_string_values_value.hpp | 4 +- .../property_string_values_value_getter.hpp | 8 +-- ..._string_values_value_shared_str_getter.hpp | 8 +-- .../xrWeatherEditor/property_vec3f.hpp | 4 +- .../xrWeatherEditor/property_vec3f_base.cpp | 4 +- .../xrWeatherEditor/xrWeatherEditor.vcxproj | 2 +- .../xrWeatherEditor.vcxproj.filters | 2 +- .../editor_environment_ambients_ambient.cpp | 8 +-- .../editor_environment_ambients_ambient.hpp | 4 +- .../editor_environment_ambients_effect_id.cpp | 8 +-- .../editor_environment_ambients_effect_id.hpp | 4 +- .../editor_environment_ambients_manager.cpp | 4 +- .../editor_environment_ambients_manager.hpp | 6 +-- .../editor_environment_ambients_sound_id.cpp | 8 +-- .../editor_environment_ambients_sound_id.hpp | 4 +- .../editor_environment_effects_effect.cpp | 20 ++++---- .../editor_environment_effects_effect.hpp | 4 +- .../editor_environment_effects_manager.cpp | 6 +-- .../editor_environment_effects_manager.hpp | 6 +-- .../editor_environment_levels_manager.cpp | 8 +-- .../editor_environment_levels_manager.hpp | 4 +- src/xrEngine/editor_environment_manager.hpp | 4 +- .../editor_environment_manager_properties.cpp | 50 +++++++++---------- ...tor_environment_sound_channels_channel.cpp | 6 +-- ...tor_environment_sound_channels_channel.hpp | 4 +- ...tor_environment_sound_channels_manager.cpp | 4 +- ...tor_environment_sound_channels_manager.hpp | 6 +-- ...itor_environment_sound_channels_source.cpp | 2 +- ...itor_environment_sound_channels_source.hpp | 4 +- .../editor_environment_suns_blend.cpp | 6 +-- .../editor_environment_suns_blend.hpp | 4 +- .../editor_environment_suns_flare.cpp | 6 +-- .../editor_environment_suns_flare.hpp | 4 +- .../editor_environment_suns_flares.cpp | 10 ++-- .../editor_environment_suns_flares.hpp | 4 +- .../editor_environment_suns_gradient.cpp | 20 ++++---- .../editor_environment_suns_gradient.hpp | 4 +- .../editor_environment_suns_manager.cpp | 6 +-- .../editor_environment_suns_manager.hpp | 4 +- src/xrEngine/editor_environment_suns_sun.cpp | 14 +++--- src/xrEngine/editor_environment_suns_sun.hpp | 8 +-- ...or_environment_thunderbolts_collection.cpp | 10 ++-- ...or_environment_thunderbolts_collection.hpp | 4 +- ...itor_environment_thunderbolts_gradient.cpp | 12 ++--- ...itor_environment_thunderbolts_gradient.hpp | 8 +-- ...ditor_environment_thunderbolts_manager.cpp | 10 ++-- ...ditor_environment_thunderbolts_manager.hpp | 6 +-- ...r_environment_thunderbolts_thunderbolt.cpp | 10 ++-- ...r_environment_thunderbolts_thunderbolt.hpp | 4 +- ...nvironment_thunderbolts_thunderbolt_id.cpp | 8 +-- ...nvironment_thunderbolts_thunderbolt_id.hpp | 4 +- .../editor_environment_weathers_manager.cpp | 4 +- .../editor_environment_weathers_manager.hpp | 6 +-- .../editor_environment_weathers_time.cpp | 28 +++++------ .../editor_environment_weathers_time.hpp | 5 +- .../editor_environment_weathers_weather.cpp | 6 +-- .../editor_environment_weathers_weather.hpp | 4 +- src/xrEngine/engine_impl.cpp | 8 +-- src/xrEngine/engine_impl.hpp | 6 +-- src/xrEngine/property_collection.hpp | 4 +- src/xrEngine/property_collection_inline.hpp | 4 +- 88 files changed, 291 insertions(+), 290 deletions(-) rename src/Include/editor/{property_holder.hpp => property_holder_base.hpp} (95%) diff --git a/src/Include/editor/engine.hpp b/src/Include/editor/engine.hpp index d47bba51e65..1f9fdfc708a 100644 --- a/src/Include/editor/engine.hpp +++ b/src/Include/editor/engine.hpp @@ -13,7 +13,7 @@ class shared_str; namespace editor { -class property_holder; +class property_holder_base; class engine { @@ -44,9 +44,9 @@ class engine virtual void track_weather(float const& time) = 0; virtual float track_weather() = 0; - virtual property_holder* current_frame_property_holder() = 0; - virtual property_holder* blend_frame_property_holder() = 0; - virtual property_holder* target_frame_property_holder() = 0; + virtual property_holder_base* current_frame_property_holder() = 0; + virtual property_holder_base* blend_frame_property_holder() = 0; + virtual property_holder_base* target_frame_property_holder() = 0; virtual void weather_paused(bool const& value) = 0; virtual bool weather_paused() = 0; diff --git a/src/Include/editor/ide.hpp b/src/Include/editor/ide.hpp index 391ff381e67..78dad2ad7f1 100644 --- a/src/Include/editor/ide.hpp +++ b/src/Include/editor/ide.hpp @@ -11,7 +11,7 @@ namespace editor { -class property_holder; +class property_holder_base; class property_holder_collection; class property_holder_holder; @@ -25,11 +25,11 @@ class ide virtual void pause() = 0; public: - virtual property_holder* create_property_holder( + virtual property_holder_base* create_property_holder( LPCSTR display_name, property_holder_collection* collection = 0, property_holder_holder* holder = 0) = 0; - virtual void destroy(property_holder*& property_holder) = 0; - virtual void environment_levels(property_holder* property_holder) = 0; - virtual void environment_weathers(property_holder* property_holder) = 0; + virtual void destroy(property_holder_base*& property_holder) = 0; + virtual void environment_levels(property_holder_base* property_holder) = 0; + virtual void environment_weathers(property_holder_base* property_holder) = 0; public: typedef fastdelegate::FastDelegate0 weathers_getter_type; diff --git a/src/Include/editor/property_holder.hpp b/src/Include/editor/property_holder_base.hpp similarity index 95% rename from src/Include/editor/property_holder.hpp rename to src/Include/editor/property_holder_base.hpp index 4d7744128d3..2456ebaad82 100644 --- a/src/Include/editor/property_holder.hpp +++ b/src/Include/editor/property_holder_base.hpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////// -// Module : property_holder.hpp +// Module : property_holder_base.hpp // Created : 04.12.2007 // Modified : 04.12.2007 // Author : Dmitriy Iassenev @@ -25,12 +25,12 @@ struct vec3f }; #pragma pack(pop) -class property_holder; +class property_holder_base; class property_holder_holder { public: - virtual property_holder* object() = 0; + virtual property_holder_base* object() = 0; virtual ~property_holder_holder() = 0 {} }; @@ -38,19 +38,19 @@ class property_holder_collection { public: virtual void clear() = 0; - virtual void insert(property_holder* holder, u32 const& position) = 0; + virtual void insert(property_holder_base* holder, u32 const& position) = 0; virtual void erase(u32 const& position) = 0; - virtual int index(property_holder* holder) = 0; - virtual property_holder* item(u32 const& position) = 0; + virtual int index(property_holder_base* holder) = 0; + virtual property_holder_base* item(u32 const& position) = 0; virtual u32 size() = 0; virtual void display_name(u32 const& item_index, char* const& buffer, u32 const& buffer_size) = 0; - virtual property_holder* create() = 0; - virtual void destroy(property_holder* holder) = 0; + virtual property_holder_base* create() = 0; + virtual void destroy(property_holder_base* holder) = 0; }; // class propery_holder_collection class property_value; -class property_holder +class property_holder_base { public: typedef fastdelegate::FastDelegate0 boolean_getter_type; @@ -321,7 +321,7 @@ class property_holder notify_parent_on_change_enum const& notify_parent = do_not_notify_parent_on_change, password_char_enum const& password = no_password_char, refresh_grid_on_change_enum const& refresh_grid = do_not_refresh_grid_on_change) = 0; - virtual property_value* add_property(LPCSTR identifier, LPCSTR category, LPCSTR description, property_holder* value, + virtual property_value* add_property(LPCSTR identifier, LPCSTR category, LPCSTR description, property_holder_base* value, readonly_enum const& read_only = property_read_write, notify_parent_on_change_enum const& notify_parent = do_not_notify_parent_on_change, password_char_enum const& password = no_password_char, @@ -337,15 +337,15 @@ class property_holder notify_parent_on_change_enum const& notify_parent = do_not_notify_parent_on_change, password_char_enum const& password = no_password_char, refresh_grid_on_change_enum const& refresh_grid = do_not_refresh_grid_on_change) = 0; -}; // class property_holder +}; // class property_holder_base class property_value { public: - virtual void attribute(property_holder::readonly_enum const& read_only) = 0; - virtual void attribute(property_holder::notify_parent_on_change_enum const& notify_parent) = 0; - virtual void attribute(property_holder::password_char_enum const& password_char) = 0; - virtual void attribute(property_holder::refresh_grid_on_change_enum const& refresh_grid) = 0; + virtual void attribute(property_holder_base::readonly_enum const& read_only) = 0; + virtual void attribute(property_holder_base::notify_parent_on_change_enum const& notify_parent) = 0; + virtual void attribute(property_holder_base::password_char_enum const& password_char) = 0; + virtual void attribute(property_holder_base::refresh_grid_on_change_enum const& refresh_grid) = 0; }; // class property_value } // namespace editor diff --git a/src/editors/xrWeatherEditor/ide_impl.cpp b/src/editors/xrWeatherEditor/ide_impl.cpp index ed8ff886f87..0ad8173d21d 100644 --- a/src/editors/xrWeatherEditor/ide_impl.cpp +++ b/src/editors/xrWeatherEditor/ide_impl.cpp @@ -55,13 +55,13 @@ void ide_impl::on_load_finished() } void ide_impl::pause() { m_window->view().pause(); } -editor::property_holder* ide_impl::create_property_holder( +editor::property_holder_base* ide_impl::create_property_holder( LPCSTR display_name, editor::property_holder_collection* collection, editor::property_holder_holder* holder) { return (new ::property_holder(m_engine, display_name, collection, holder)); } -void ide_impl::destroy(editor::property_holder*& property_holder) +void ide_impl::destroy(editor::property_holder_base*& property_holder) { delete (property_holder); property_holder = 0; diff --git a/src/editors/xrWeatherEditor/ide_impl.hpp b/src/editors/xrWeatherEditor/ide_impl.hpp index 2bbafda810e..dd0a3255db5 100644 --- a/src/editors/xrWeatherEditor/ide_impl.hpp +++ b/src/editors/xrWeatherEditor/ide_impl.hpp @@ -29,7 +29,7 @@ class ide_impl : public editor::ide { public: typedef editor::window_ide window_ide; - typedef editor::property_holder property_holder; + typedef editor::property_holder_base property_holder; public: ide_impl(editor::engine* engine); diff --git a/src/editors/xrWeatherEditor/property_boolean.hpp b/src/editors/xrWeatherEditor/property_boolean.hpp index f721ca3dbff..572a97228a6 100644 --- a/src/editors/xrWeatherEditor/property_boolean.hpp +++ b/src/editors/xrWeatherEditor/property_boolean.hpp @@ -16,8 +16,8 @@ public ref class property_boolean : public IProperty { public: - typedef editor::property_holder::boolean_getter_type boolean_getter_type; - typedef editor::property_holder::boolean_setter_type boolean_setter_type; + typedef editor::property_holder_base::boolean_getter_type boolean_getter_type; + typedef editor::property_holder_base::boolean_setter_type boolean_setter_type; public: property_boolean(boolean_getter_type const& getter, boolean_setter_type const& setter); diff --git a/src/editors/xrWeatherEditor/property_boolean_values_value.hpp b/src/editors/xrWeatherEditor/property_boolean_values_value.hpp index 23f30d2f7f2..d2f2871650e 100644 --- a/src/editors/xrWeatherEditor/property_boolean_values_value.hpp +++ b/src/editors/xrWeatherEditor/property_boolean_values_value.hpp @@ -15,8 +15,8 @@ public ref class property_boolean_values_value : public property_boolean { public: - typedef editor::property_holder::boolean_getter_type boolean_getter_type; - typedef editor::property_holder::boolean_setter_type boolean_setter_type; + typedef editor::property_holder_base::boolean_getter_type boolean_getter_type; + typedef editor::property_holder_base::boolean_setter_type boolean_setter_type; private: typedef property_boolean inherited; diff --git a/src/editors/xrWeatherEditor/property_boolean_values_value_reference.hpp b/src/editors/xrWeatherEditor/property_boolean_values_value_reference.hpp index f17ae45b6bf..f30d0310461 100644 --- a/src/editors/xrWeatherEditor/property_boolean_values_value_reference.hpp +++ b/src/editors/xrWeatherEditor/property_boolean_values_value_reference.hpp @@ -15,8 +15,8 @@ public ref class property_boolean_values_value_reference : public property_boolean_reference { public: - typedef editor::property_holder::boolean_getter_type boolean_getter_type; - typedef editor::property_holder::boolean_setter_type boolean_setter_type; + typedef editor::property_holder_base::boolean_getter_type boolean_getter_type; + typedef editor::property_holder_base::boolean_setter_type boolean_setter_type; private: typedef property_boolean_reference inherited; diff --git a/src/editors/xrWeatherEditor/property_collection_base.cpp b/src/editors/xrWeatherEditor/property_collection_base.cpp index 0247930b263..91636b9ab2a 100644 --- a/src/editors/xrWeatherEditor/property_collection_base.cpp +++ b/src/editors/xrWeatherEditor/property_collection_base.cpp @@ -25,7 +25,7 @@ void property_collection_base::CopyTo(Array ^ items, int index) collection_type* collection = this->collection(); for (int i = index, n = collection->size(); i < n; ++i) { - editor::property_holder* holder_raw = collection->item(i); + editor::property_holder_base* holder_raw = collection->item(i); ::property_holder* holder = dynamic_cast<::property_holder*>(holder_raw); VERIFY(holder); items->SetValue(holder->container(), i); @@ -65,7 +65,7 @@ bool property_collection_base::IsFixedSize::get() { return (false); } bool property_collection_base::IsReadOnly::get() { return (false); } Object ^ property_collection_base::default ::get(int index) { - editor::property_holder* holder_raw = collection()->item(index); + editor::property_holder_base* holder_raw = collection()->item(index); ::property_holder* holder = dynamic_cast<::property_holder*>(holder_raw); return (holder->container()); } @@ -78,7 +78,7 @@ void property_collection_base::default ::set(int index, Object ^ value) property_container ^ property_collection_base::create() { - editor::property_holder* holder_raw = collection()->create(); + editor::property_holder_base* holder_raw = collection()->create(); ::property_holder* holder = dynamic_cast<::property_holder*>(holder_raw); return (holder->container()); } diff --git a/src/editors/xrWeatherEditor/property_collection_base.hpp b/src/editors/xrWeatherEditor/property_collection_base.hpp index 166112e6293..0ae4d7bf7b1 100644 --- a/src/editors/xrWeatherEditor/property_collection_base.hpp +++ b/src/editors/xrWeatherEditor/property_collection_base.hpp @@ -24,7 +24,7 @@ ref class property_collection_converter; { public: typedef editor::property_holder_collection collection_type; - typedef editor::property_holder property_holder; + typedef editor::property_holder_base property_holder; typedef System::Collections::IEnumerator IEnumerator; typedef System::Array Array; typedef System::Object Object; diff --git a/src/editors/xrWeatherEditor/property_collection_enumerator.cpp b/src/editors/xrWeatherEditor/property_collection_enumerator.cpp index eec530e6b68..031637bd7c1 100644 --- a/src/editors/xrWeatherEditor/property_collection_enumerator.cpp +++ b/src/editors/xrWeatherEditor/property_collection_enumerator.cpp @@ -35,7 +35,7 @@ Object ^ property_collection_enumerator::Current::get() if (m_cursor >= (int)m_collection->size()) throw(gcnew InvalidOperationException()); - editor::property_holder* holder_raw = m_collection->item((u32)m_cursor); + editor::property_holder_base* holder_raw = m_collection->item((u32)m_cursor); property_holder* holder = dynamic_cast(holder_raw); VERIFY(holder); return (holder->container()); diff --git a/src/editors/xrWeatherEditor/property_color.hpp b/src/editors/xrWeatherEditor/property_color.hpp index 679eea85ba3..4cdbc85cd0e 100644 --- a/src/editors/xrWeatherEditor/property_color.hpp +++ b/src/editors/xrWeatherEditor/property_color.hpp @@ -15,8 +15,8 @@ public ref class property_color : public property_color_base { public: - typedef editor::property_holder::color_getter_type color_getter_type; - typedef editor::property_holder::color_setter_type color_setter_type; + typedef editor::property_holder_base::color_getter_type color_getter_type; + typedef editor::property_holder_base::color_setter_type color_setter_type; typedef property_color_base inherited; public: diff --git a/src/editors/xrWeatherEditor/property_color_base.cpp b/src/editors/xrWeatherEditor/property_color_base.cpp index e3db5d4704a..0bad0174de1 100644 --- a/src/editors/xrWeatherEditor/property_color_base.cpp +++ b/src/editors/xrWeatherEditor/property_color_base.cpp @@ -43,8 +43,8 @@ property_color_base::property_color_base(editor::color const % color, array ValuePair; private: diff --git a/src/editors/xrWeatherEditor/property_float_enum_value_reference.hpp b/src/editors/xrWeatherEditor/property_float_enum_value_reference.hpp index 398c91ccbcc..862994facb5 100644 --- a/src/editors/xrWeatherEditor/property_float_enum_value_reference.hpp +++ b/src/editors/xrWeatherEditor/property_float_enum_value_reference.hpp @@ -15,8 +15,8 @@ public ref class property_float_enum_value_reference : public property_float_reference { public: - typedef editor::property_holder::float_getter_type float_getter_type; - typedef editor::property_holder::float_setter_type float_setter_type; + typedef editor::property_holder_base::float_getter_type float_getter_type; + typedef editor::property_holder_base::float_setter_type float_setter_type; typedef Pair ValuePair; private: diff --git a/src/editors/xrWeatherEditor/property_holder.hpp b/src/editors/xrWeatherEditor/property_holder.hpp index 5a18d05a45e..6a57bef4477 100644 --- a/src/editors/xrWeatherEditor/property_holder.hpp +++ b/src/editors/xrWeatherEditor/property_holder.hpp @@ -20,7 +20,7 @@ class engine; class property_holder_collection; } // namespace editor -class property_holder : public editor::property_holder +class property_holder : public editor::property_holder_base { public: property_holder(editor::engine* engine, LPCSTR display_name, editor::property_holder_collection* collection, @@ -185,7 +185,7 @@ class property_holder : public editor::property_holder notify_parent_on_change_enum const& notify_parent, password_char_enum const& password, refresh_grid_on_change_enum const& refresh_grid); virtual editor::property_value* add_property(LPCSTR identifier, LPCSTR category, LPCSTR description, - editor::property_holder* value, readonly_enum const& read_only, + editor::property_holder_base* value, readonly_enum const& read_only, notify_parent_on_change_enum const& notify_parent, password_char_enum const& password, refresh_grid_on_change_enum const& refresh_grid); virtual editor::property_value* add_property(LPCSTR identifier, LPCSTR category, LPCSTR description, diff --git a/src/editors/xrWeatherEditor/property_holder_container.cpp b/src/editors/xrWeatherEditor/property_holder_container.cpp index 81e6ffea7b7..d6448424253 100644 --- a/src/editors/xrWeatherEditor/property_holder_container.cpp +++ b/src/editors/xrWeatherEditor/property_holder_container.cpp @@ -14,7 +14,7 @@ using Flobbster::Windows::Forms::PropertySpec; editor::property_value* property_holder::add_property(LPCSTR identifier, LPCSTR category, LPCSTR description, - editor::property_holder* value, readonly_enum const& read_only, notify_parent_on_change_enum const& notify_parent, + editor::property_holder_base* value, readonly_enum const& read_only, notify_parent_on_change_enum const& notify_parent, password_char_enum const& password, refresh_grid_on_change_enum const& refresh_grid) { property_holder* real_value = dynamic_cast(value); diff --git a/src/editors/xrWeatherEditor/property_holder_include.hpp b/src/editors/xrWeatherEditor/property_holder_include.hpp index df538101040..d583d25a88c 100644 --- a/src/editors/xrWeatherEditor/property_holder_include.hpp +++ b/src/editors/xrWeatherEditor/property_holder_include.hpp @@ -11,9 +11,9 @@ #pragma unmanaged #include "Common/Noncopyable.hpp" -#include "xrcore/fastdelegate.h" +#include "xrCore/fastdelegate.h" #include -#include "include/editor/property_holder.hpp" +#include "Include/editor/property_holder_base.hpp" #pragma managed generic private ref struct Pair diff --git a/src/editors/xrWeatherEditor/property_integer.hpp b/src/editors/xrWeatherEditor/property_integer.hpp index a857b14c057..e43d43a040c 100644 --- a/src/editors/xrWeatherEditor/property_integer.hpp +++ b/src/editors/xrWeatherEditor/property_integer.hpp @@ -15,8 +15,8 @@ public ref class property_integer : public XRay::SdkControls::IProperty { public: - typedef editor::property_holder::integer_getter_type integer_getter_type; - typedef editor::property_holder::integer_setter_type integer_setter_type; + typedef editor::property_holder_base::integer_getter_type integer_getter_type; + typedef editor::property_holder_base::integer_setter_type integer_setter_type; public: property_integer(integer_getter_type const& getter, integer_setter_type const& setter); diff --git a/src/editors/xrWeatherEditor/property_integer_enum_value.hpp b/src/editors/xrWeatherEditor/property_integer_enum_value.hpp index 0a0571c0637..047f164dfab 100644 --- a/src/editors/xrWeatherEditor/property_integer_enum_value.hpp +++ b/src/editors/xrWeatherEditor/property_integer_enum_value.hpp @@ -15,8 +15,8 @@ public ref class property_integer_enum_value : public property_integer { public: - typedef editor::property_holder::integer_getter_type integer_getter_type; - typedef editor::property_holder::integer_setter_type integer_setter_type; + typedef editor::property_holder_base::integer_getter_type integer_getter_type; + typedef editor::property_holder_base::integer_setter_type integer_setter_type; typedef Pair ValuePair; private: diff --git a/src/editors/xrWeatherEditor/property_integer_values_value.hpp b/src/editors/xrWeatherEditor/property_integer_values_value.hpp index e28a04f70d9..a34d3a0ae32 100644 --- a/src/editors/xrWeatherEditor/property_integer_values_value.hpp +++ b/src/editors/xrWeatherEditor/property_integer_values_value.hpp @@ -16,8 +16,8 @@ public ref class property_integer_values_value : public property_integer, public property_integer_values_value_base { public: - typedef editor::property_holder::integer_getter_type integer_getter_type; - typedef editor::property_holder::integer_setter_type integer_setter_type; + typedef editor::property_holder_base::integer_getter_type integer_getter_type; + typedef editor::property_holder_base::integer_setter_type integer_setter_type; private: typedef property_integer inherited; diff --git a/src/editors/xrWeatherEditor/property_integer_values_value_getter.hpp b/src/editors/xrWeatherEditor/property_integer_values_value_getter.hpp index 9c82d33bc68..aa28301bcd7 100644 --- a/src/editors/xrWeatherEditor/property_integer_values_value_getter.hpp +++ b/src/editors/xrWeatherEditor/property_integer_values_value_getter.hpp @@ -16,7 +16,7 @@ public ref class property_integer_values_value_getter : public property_integer, public property_integer_values_value_base { public: - typedef editor::property_holder property_holder; + typedef editor::property_holder_base property_holder; typedef property_holder::integer_getter_type integer_getter_type; typedef property_holder::integer_setter_type integer_setter_type; typedef property_holder::string_collection_getter_type string_collection_getter_type; diff --git a/src/editors/xrWeatherEditor/property_integer_values_value_reference_getter.hpp b/src/editors/xrWeatherEditor/property_integer_values_value_reference_getter.hpp index bfba3405774..b9cc54b0952 100644 --- a/src/editors/xrWeatherEditor/property_integer_values_value_reference_getter.hpp +++ b/src/editors/xrWeatherEditor/property_integer_values_value_reference_getter.hpp @@ -17,7 +17,7 @@ ref class property_integer_values_value_reference_getter : public property_integ public property_integer_values_value_base { public: - typedef editor::property_holder property_holder; + typedef editor::property_holder_base property_holder; typedef property_holder::integer_getter_type integer_getter_type; typedef property_holder::integer_setter_type integer_setter_type; typedef property_holder::string_collection_getter_type string_collection_getter_type; diff --git a/src/editors/xrWeatherEditor/property_string.hpp b/src/editors/xrWeatherEditor/property_string.hpp index 6f5208c719e..0313d660d29 100644 --- a/src/editors/xrWeatherEditor/property_string.hpp +++ b/src/editors/xrWeatherEditor/property_string.hpp @@ -15,8 +15,8 @@ public ref class property_string : public XRay::SdkControls::IProperty { public: - typedef editor::property_holder::string_getter_type string_getter_type; - typedef editor::property_holder::string_setter_type string_setter_type; + typedef editor::property_holder_base::string_getter_type string_getter_type; + typedef editor::property_holder_base::string_setter_type string_setter_type; public: property_string(string_getter_type const& getter, string_setter_type const& setter); diff --git a/src/editors/xrWeatherEditor/property_string_values_value.hpp b/src/editors/xrWeatherEditor/property_string_values_value.hpp index 5c135cff0ef..f8778020e5e 100644 --- a/src/editors/xrWeatherEditor/property_string_values_value.hpp +++ b/src/editors/xrWeatherEditor/property_string_values_value.hpp @@ -20,8 +20,8 @@ ref class property_string_values_value : public property_string, public property typedef property_string_values_value_base::collection_type collection_type; public: - typedef editor::property_holder::string_getter_type string_getter_type; - typedef editor::property_holder::string_setter_type string_setter_type; + typedef editor::property_holder_base::string_getter_type string_getter_type; + typedef editor::property_holder_base::string_setter_type string_setter_type; public: property_string_values_value(string_getter_type const& getter, string_setter_type const& setter, diff --git a/src/editors/xrWeatherEditor/property_string_values_value_getter.hpp b/src/editors/xrWeatherEditor/property_string_values_value_getter.hpp index 44650e2a202..894ed0d3127 100644 --- a/src/editors/xrWeatherEditor/property_string_values_value_getter.hpp +++ b/src/editors/xrWeatherEditor/property_string_values_value_getter.hpp @@ -20,10 +20,10 @@ ref class property_string_values_value_getter : public property_string, public p public: typedef property_string_values_value_base::collection_type collection_type; - typedef editor::property_holder::string_getter_type string_getter_type; - typedef editor::property_holder::string_setter_type string_setter_type; - typedef editor::property_holder::string_collection_getter_type string_collection_getter_type; - typedef editor::property_holder::string_collection_size_getter_type string_collection_size_getter_type; + typedef editor::property_holder_base::string_getter_type string_getter_type; + typedef editor::property_holder_base::string_setter_type string_setter_type; + typedef editor::property_holder_base::string_collection_getter_type string_collection_getter_type; + typedef editor::property_holder_base::string_collection_size_getter_type string_collection_size_getter_type; public: property_string_values_value_getter(string_getter_type const& getter, string_setter_type const& setter, diff --git a/src/editors/xrWeatherEditor/property_string_values_value_shared_str_getter.hpp b/src/editors/xrWeatherEditor/property_string_values_value_shared_str_getter.hpp index 25ee895a6f9..58cca04c222 100644 --- a/src/editors/xrWeatherEditor/property_string_values_value_shared_str_getter.hpp +++ b/src/editors/xrWeatherEditor/property_string_values_value_shared_str_getter.hpp @@ -21,10 +21,10 @@ ref class property_string_values_value_shared_str_getter : public property_strin public: typedef property_string_values_value_base::collection_type collection_type; - typedef editor::property_holder::string_getter_type string_getter_type; - typedef editor::property_holder::string_setter_type string_setter_type; - typedef editor::property_holder::string_collection_getter_type string_collection_getter_type; - typedef editor::property_holder::string_collection_size_getter_type string_collection_size_getter_type; + typedef editor::property_holder_base::string_getter_type string_getter_type; + typedef editor::property_holder_base::string_setter_type string_setter_type; + typedef editor::property_holder_base::string_collection_getter_type string_collection_getter_type; + typedef editor::property_holder_base::string_collection_size_getter_type string_collection_size_getter_type; public: property_string_values_value_shared_str_getter(editor::engine* engine, shared_str& value, diff --git a/src/editors/xrWeatherEditor/property_vec3f.hpp b/src/editors/xrWeatherEditor/property_vec3f.hpp index d0f6551b494..a6afc26d380 100644 --- a/src/editors/xrWeatherEditor/property_vec3f.hpp +++ b/src/editors/xrWeatherEditor/property_vec3f.hpp @@ -15,8 +15,8 @@ public ref class property_vec3f : public property_vec3f_base { public: - typedef editor::property_holder::vec3f_getter_type vec3f_getter_type; - typedef editor::property_holder::vec3f_setter_type vec3f_setter_type; + typedef editor::property_holder_base::vec3f_getter_type vec3f_getter_type; + typedef editor::property_holder_base::vec3f_setter_type vec3f_setter_type; typedef property_vec3f_base inherited; public: diff --git a/src/editors/xrWeatherEditor/property_vec3f_base.cpp b/src/editors/xrWeatherEditor/property_vec3f_base.cpp index 1f7ffd830f3..c8f1d4e8bc8 100644 --- a/src/editors/xrWeatherEditor/property_vec3f_base.cpp +++ b/src/editors/xrWeatherEditor/property_vec3f_base.cpp @@ -30,8 +30,8 @@ property_vec3f_base::property_vec3f_base(editor::vec3f const % vec3f) m_container = gcnew property_container(nullptr, this); m_components = new vec3f_components(this); - typedef editor::property_holder::float_getter_type float_getter_type; - typedef editor::property_holder::float_setter_type float_setter_type; + typedef editor::property_holder_base::float_getter_type float_getter_type; + typedef editor::property_holder_base::float_setter_type float_setter_type; float_getter_type getter; float_setter_type setter; diff --git a/src/editors/xrWeatherEditor/xrWeatherEditor.vcxproj b/src/editors/xrWeatherEditor/xrWeatherEditor.vcxproj index e787102ffb4..8ddefba1dea 100644 --- a/src/editors/xrWeatherEditor/xrWeatherEditor.vcxproj +++ b/src/editors/xrWeatherEditor/xrWeatherEditor.vcxproj @@ -361,7 +361,7 @@ - + diff --git a/src/editors/xrWeatherEditor/xrWeatherEditor.vcxproj.filters b/src/editors/xrWeatherEditor/xrWeatherEditor.vcxproj.filters index 8e11d28df79..18cc857fc4e 100644 --- a/src/editors/xrWeatherEditor/xrWeatherEditor.vcxproj.filters +++ b/src/editors/xrWeatherEditor/xrWeatherEditor.vcxproj.filters @@ -740,7 +740,7 @@ interfaces - + interfaces diff --git a/src/xrEngine/editor_environment_ambients_ambient.cpp b/src/xrEngine/editor_environment_ambients_ambient.cpp index e28f23225cf..5307582eea3 100644 --- a/src/xrEngine/editor_environment_ambients_ambient.cpp +++ b/src/xrEngine/editor_environment_ambients_ambient.cpp @@ -33,7 +33,7 @@ void property_collection::display_name( } template <> -editor::property_holder* property_collection::create() +editor::property_holder_base* property_collection::create() { effect_id* object = new effect_id(m_holder.effects_manager(), ""); object->fill(this); @@ -48,7 +48,7 @@ void property_collection::display_name( } template <> -editor::property_holder* property_collection::create() +editor::property_holder_base* property_collection::create() { sound_id* object = new sound_id(m_holder.sounds_manager(), ""); object->fill(this); @@ -176,11 +176,11 @@ void ambient::fill(editor::property_holder_collection* collection) VERIFY(!m_property_holder); m_property_holder = ::ide().create_property_holder(m_load_section.c_str(), collection, this); - typedef editor::property_holder::string_getter_type string_getter_type; + typedef editor::property_holder_base::string_getter_type string_getter_type; string_getter_type string_getter; string_getter.bind(this, &ambient::id_getter); - typedef editor::property_holder::string_setter_type string_setter_type; + typedef editor::property_holder_base::string_setter_type string_setter_type; string_setter_type string_setter; string_setter.bind(this, &ambient::id_setter); diff --git a/src/xrEngine/editor_environment_ambients_ambient.hpp b/src/xrEngine/editor_environment_ambients_ambient.hpp index 7a435922c93..3190c3f0fb7 100644 --- a/src/xrEngine/editor_environment_ambients_ambient.hpp +++ b/src/xrEngine/editor_environment_ambients_ambient.hpp @@ -12,7 +12,7 @@ #ifdef INGAME_EDITOR #include "Common/Noncopyable.hpp" -#include "Include/editor/property_holder.hpp" +#include "Include/editor/property_holder_base.hpp" #include "property_collection_forward.hpp" #include "Environment.h" @@ -71,7 +71,7 @@ class ambient : public CEnvAmbient, public editor::property_holder_holder, priva typedef property_collection sound_collection_type; private: - typedef editor::property_holder property_holder_type; + typedef editor::property_holder_base property_holder_type; public: virtual property_holder_type* object(); diff --git a/src/xrEngine/editor_environment_ambients_effect_id.cpp b/src/xrEngine/editor_environment_ambients_effect_id.cpp index 3af7d5937ee..b7bb1f9b45d 100644 --- a/src/xrEngine/editor_environment_ambients_effect_id.cpp +++ b/src/xrEngine/editor_environment_ambients_effect_id.cpp @@ -35,17 +35,17 @@ void effect_id::fill(editor::property_holder_collection* collection) VERIFY(!m_property_holder); m_property_holder = ::ide().create_property_holder(m_id.c_str(), collection, this); - typedef editor::property_holder::string_collection_getter_type collection_getter_type; + typedef editor::property_holder_base::string_collection_getter_type collection_getter_type; collection_getter_type collection_getter; collection_getter.bind(this, &effect_id::collection); - typedef editor::property_holder::string_collection_size_getter_type collection_size_getter_type; + typedef editor::property_holder_base::string_collection_size_getter_type collection_size_getter_type; collection_size_getter_type collection_size_getter; collection_size_getter.bind(this, &effect_id::collection_size); m_property_holder->add_property("effect", "properties", "this option is resposible for effect", m_id.c_str(), m_id, - collection_getter, collection_size_getter, editor::property_holder::value_editor_combo_box, - editor::property_holder::cannot_enter_text); + collection_getter, collection_size_getter, editor::property_holder_base::value_editor_combo_box, + editor::property_holder_base::cannot_enter_text); } effect_id::property_holder_type* effect_id::object() { return (m_property_holder); } diff --git a/src/xrEngine/editor_environment_ambients_effect_id.hpp b/src/xrEngine/editor_environment_ambients_effect_id.hpp index 52dba63d0b5..025860165e7 100644 --- a/src/xrEngine/editor_environment_ambients_effect_id.hpp +++ b/src/xrEngine/editor_environment_ambients_effect_id.hpp @@ -12,7 +12,7 @@ #ifdef INGAME_EDITOR #include "Common/Noncopyable.hpp" -#include "Include/editor/property_holder.hpp" +#include "Include/editor/property_holder_base.hpp" namespace editor { @@ -35,7 +35,7 @@ class effect_id : public editor::property_holder_holder, private Noncopyable void fill(editor::property_holder_collection* collection); inline shared_str const& id() const { return m_id; } private: - typedef editor::property_holder property_holder_type; + typedef editor::property_holder_base property_holder_type; public: virtual property_holder_type* object(); diff --git a/src/xrEngine/editor_environment_ambients_manager.cpp b/src/xrEngine/editor_environment_ambients_manager.cpp index 34858fdbc3f..dca5375e879 100644 --- a/src/xrEngine/editor_environment_ambients_manager.cpp +++ b/src/xrEngine/editor_environment_ambients_manager.cpp @@ -28,7 +28,7 @@ void property_collection::display_name } template <> -editor::property_holder* property_collection::create() +editor::property_holder_base* property_collection::create() { ambient* object = new ambient(m_holder, generate_unique_id("ambient_unique_id_").c_str()); object->fill(this); @@ -86,7 +86,7 @@ void manager::save() xr_delete(config); } -void manager::fill(editor::property_holder* holder) +void manager::fill(editor::property_holder_base* holder) { VERIFY(holder); holder->add_property("ambients", "ambients", "this option is resposible for ambients", m_collection); diff --git a/src/xrEngine/editor_environment_ambients_manager.hpp b/src/xrEngine/editor_environment_ambients_manager.hpp index d0fa96dc7d8..731388d0a60 100644 --- a/src/xrEngine/editor_environment_ambients_manager.hpp +++ b/src/xrEngine/editor_environment_ambients_manager.hpp @@ -16,7 +16,7 @@ namespace editor { -class property_holder; +class property_holder_base; namespace environment { @@ -43,7 +43,7 @@ class manager : private Noncopyable ~manager(); void load(); void save(); - void fill(editor::property_holder* holder); + void fill(editor::property_holder_base* holder); shared_str unique_id(shared_str const& id) const; ambient* get_ambient(shared_str const& id) const; @@ -59,7 +59,7 @@ class manager : private Noncopyable ambients_ids_type const& ambients_ids() const; private: - typedef editor::property_holder property_holder_type; + typedef editor::property_holder_base property_holder_type; typedef property_collection collection_type; private: diff --git a/src/xrEngine/editor_environment_ambients_sound_id.cpp b/src/xrEngine/editor_environment_ambients_sound_id.cpp index 464b9bf7619..e5aff776061 100644 --- a/src/xrEngine/editor_environment_ambients_sound_id.cpp +++ b/src/xrEngine/editor_environment_ambients_sound_id.cpp @@ -32,17 +32,17 @@ void sound_id::fill(editor::property_holder_collection* collection) VERIFY(!m_property_holder); m_property_holder = ::ide().create_property_holder(m_id.c_str(), collection, this); - typedef editor::property_holder::string_collection_getter_type collection_getter_type; + typedef editor::property_holder_base::string_collection_getter_type collection_getter_type; collection_getter_type collection_getter; collection_getter.bind(this, &sound_id::collection); - typedef editor::property_holder::string_collection_size_getter_type collection_size_getter_type; + typedef editor::property_holder_base::string_collection_size_getter_type collection_size_getter_type; collection_size_getter_type collection_size_getter; collection_size_getter.bind(this, &sound_id::collection_size); m_property_holder->add_property("sound channel", "properties", "this option is resposible for sound", m_id.c_str(), - m_id, collection_getter, collection_size_getter, editor::property_holder::value_editor_combo_box, - editor::property_holder::cannot_enter_text); + m_id, collection_getter, collection_size_getter, editor::property_holder_base::value_editor_combo_box, + editor::property_holder_base::cannot_enter_text); } sound_id::property_holder_type* sound_id::object() { return (m_property_holder); } diff --git a/src/xrEngine/editor_environment_ambients_sound_id.hpp b/src/xrEngine/editor_environment_ambients_sound_id.hpp index fffe96b4f6c..a8cc8b7169d 100644 --- a/src/xrEngine/editor_environment_ambients_sound_id.hpp +++ b/src/xrEngine/editor_environment_ambients_sound_id.hpp @@ -12,7 +12,7 @@ #ifdef INGAME_EDITOR #include "Common/Noncopyable.hpp" -#include "Include/editor/property_holder.hpp" +#include "Include/editor/property_holder_base.hpp" namespace editor { @@ -35,7 +35,7 @@ class sound_id : public editor::property_holder_holder, private Noncopyable void fill(editor::property_holder_collection* collection); inline shared_str const& id() const { return m_id; } private: - typedef editor::property_holder property_holder_type; + typedef editor::property_holder_base property_holder_type; public: virtual property_holder_type* object(); diff --git a/src/xrEngine/editor_environment_effects_effect.cpp b/src/xrEngine/editor_environment_effects_effect.cpp index 2905d599dba..6934f9e7471 100644 --- a/src/xrEngine/editor_environment_effects_effect.cpp +++ b/src/xrEngine/editor_environment_effects_effect.cpp @@ -11,7 +11,7 @@ #ifdef INGAME_EDITOR #include "editor_environment_effects_effect.hpp" -#include "Include/editor/property_holder.hpp" +#include "Include/editor/property_holder_base.hpp" #include "editor_environment_manager.hpp" #include "ide.hpp" #include "editor_environment_effects_manager.hpp" @@ -87,11 +87,11 @@ void effect::fill(editor::property_holder_collection* collection) VERIFY(!m_property_holder); m_property_holder = ::ide().create_property_holder(m_id.c_str(), collection, this); - typedef editor::property_holder::string_getter_type string_getter_type; + typedef editor::property_holder_base::string_getter_type string_getter_type; string_getter_type string_getter; string_getter.bind(this, &effect::id_getter); - typedef editor::property_holder::string_setter_type string_setter_type; + typedef editor::property_holder_base::string_setter_type string_setter_type; string_setter_type string_setter; string_setter.bind(this, &effect::id_setter); @@ -103,15 +103,15 @@ void effect::fill(editor::property_holder_collection* collection) (vec3f const&)offset, (vec3f&)offset); m_property_holder->add_property("particles", "properties", "this option is resposible for effect particles", particles.c_str(), particles, &*m_manager.environment().particle_ids().begin(), - m_manager.environment().particle_ids().size(), editor::property_holder::value_editor_tree_view, - editor::property_holder::cannot_enter_text); + m_manager.environment().particle_ids().size(), editor::property_holder_base::value_editor_tree_view, + editor::property_holder_base::cannot_enter_text); string_getter.bind(this, &effect::sound_getter); string_setter.bind(this, &effect::sound_setter); m_property_holder->add_property("sound", "properties", "this option is resposible for effect sound", m_sound.c_str(), string_getter, string_setter, ".ogg", "Sound files (*.ogg)|*.ogg", - detail::real_path("$game_sounds$", "").c_str(), "Select sound...", editor::property_holder::cannot_enter_text, - editor::property_holder::remove_extension); + detail::real_path("$game_sounds$", "").c_str(), "Select sound...", editor::property_holder_base::cannot_enter_text, + editor::property_holder_base::remove_extension); m_property_holder->add_property("wind gust factor", "properties", "this option is resposible for effect wind gust factor", wind_gust_factor, wind_gust_factor); m_property_holder->add_property("wind blast strength", "properties", @@ -123,10 +123,10 @@ void effect::fill(editor::property_holder_collection* collection) "this option is resposible for effect wind blast stop time", wind_blast_out_time, wind_blast_out_time, 0.f, 1000.f); - typedef ::editor::property_holder::float_getter_type float_getter_type; + typedef ::editor::property_holder_base::float_getter_type float_getter_type; float_getter_type float_getter; - typedef ::editor::property_holder::float_setter_type float_setter_type; + typedef ::editor::property_holder_base::float_setter_type float_setter_type; float_setter_type float_setter; float_getter.bind(this, &effect::wind_blast_longitude_getter); @@ -136,5 +136,5 @@ void effect::fill(editor::property_holder_collection* collection) 360.f); } -editor::property_holder* effect::object() { return (m_property_holder); } +editor::property_holder_base* effect::object() { return (m_property_holder); } #endif // #ifdef INGAME_EDITOR diff --git a/src/xrEngine/editor_environment_effects_effect.hpp b/src/xrEngine/editor_environment_effects_effect.hpp index de26f2800e8..3b0b0fb0470 100644 --- a/src/xrEngine/editor_environment_effects_effect.hpp +++ b/src/xrEngine/editor_environment_effects_effect.hpp @@ -12,7 +12,7 @@ #ifdef INGAME_EDITOR #include "Common/Noncopyable.hpp" -#include "Include/editor/property_holder.hpp" +#include "Include/editor/property_holder_base.hpp" #include "Environment.h" namespace editor @@ -45,7 +45,7 @@ class effect : public CEnvAmbient::SEffect, public editor::property_holder_holde void xr_stdcall sound_setter(LPCSTR value); private: - typedef editor::property_holder property_holder_type; + typedef editor::property_holder_base property_holder_type; public: virtual property_holder_type* object(); diff --git a/src/xrEngine/editor_environment_effects_manager.cpp b/src/xrEngine/editor_environment_effects_manager.cpp index f88a1ae8d59..aecb750eae2 100644 --- a/src/xrEngine/editor_environment_effects_manager.cpp +++ b/src/xrEngine/editor_environment_effects_manager.cpp @@ -2,7 +2,7 @@ #ifdef INGAME_EDITOR #include "editor_environment_effects_manager.hpp" -#include "Include/editor/property_holder.hpp" +#include "Include/editor/property_holder_base.hpp" #include "property_collection.hpp" #include "editor_environment_effects_effect.hpp" #include "editor_environment_detail.hpp" @@ -19,7 +19,7 @@ void property_collection::display_name( } template <> -editor::property_holder* property_collection::create() +editor::property_holder_base* property_collection::create() { effect* object = new effect(m_holder, generate_unique_id("effect_unique_id_").c_str()); object->fill(this); @@ -76,7 +76,7 @@ void manager::save() xr_delete(config); } -void manager::fill(editor::property_holder* holder) +void manager::fill(editor::property_holder_base* holder) { VERIFY(holder); holder->add_property("effects", "ambients", "this option is resposible for effects", m_collection); diff --git a/src/xrEngine/editor_environment_effects_manager.hpp b/src/xrEngine/editor_environment_effects_manager.hpp index 648a873137b..573df1803f9 100644 --- a/src/xrEngine/editor_environment_effects_manager.hpp +++ b/src/xrEngine/editor_environment_effects_manager.hpp @@ -16,7 +16,7 @@ namespace editor { -class property_holder; +class property_holder_base; namespace environment { @@ -33,7 +33,7 @@ class manager : private Noncopyable ~manager(); void load(); void save(); - void fill(editor::property_holder* holder); + void fill(editor::property_holder_base* holder); shared_str unique_id(shared_str const& id) const; public: @@ -46,7 +46,7 @@ class manager : private Noncopyable effects_ids_type const& effects_ids() const; private: - typedef editor::property_holder property_holder_type; + typedef editor::property_holder_base property_holder_type; typedef property_collection collection_type; private: diff --git a/src/xrEngine/editor_environment_levels_manager.cpp b/src/xrEngine/editor_environment_levels_manager.cpp index 683a1eea10b..2b823baed7d 100644 --- a/src/xrEngine/editor_environment_levels_manager.cpp +++ b/src/xrEngine/editor_environment_levels_manager.cpp @@ -12,7 +12,7 @@ #include "editor_environment_levels_manager.hpp" #include "editor_environment_weathers_manager.hpp" -#include "Include/editor/property_holder.hpp" +#include "Include/editor/property_holder_base.hpp" #include "Include/editor/ide.hpp" #include "ide.hpp" @@ -84,11 +84,11 @@ void manager::fill() VERIFY(!m_property_holder); m_property_holder = ::ide().create_property_holder("levels"); - typedef editor::property_holder::string_collection_getter_type collection_getter_type; + typedef editor::property_holder_base::string_collection_getter_type collection_getter_type; collection_getter_type collection_getter; collection_getter.bind(this, &manager::collection); - typedef editor::property_holder::string_collection_size_getter_type collection_size_getter_type; + typedef editor::property_holder_base::string_collection_size_getter_type collection_size_getter_type; collection_size_getter_type collection_size_getter; collection_size_getter.bind(this, &manager::collection_size); @@ -101,7 +101,7 @@ void manager::fill() xr_strcat(description, (*i).first.c_str()); m_property_holder->add_property((*i).first.c_str(), (*i).second.first, description, (*i).second.second.c_str(), (*i).second.second, collection_getter, collection_size_getter, - editor::property_holder::value_editor_combo_box, editor::property_holder::cannot_enter_text); + editor::property_holder_base::value_editor_combo_box, editor::property_holder_base::cannot_enter_text); } ::ide().environment_levels(m_property_holder); diff --git a/src/xrEngine/editor_environment_levels_manager.hpp b/src/xrEngine/editor_environment_levels_manager.hpp index 24377a571b0..d1018cebc0e 100644 --- a/src/xrEngine/editor_environment_levels_manager.hpp +++ b/src/xrEngine/editor_environment_levels_manager.hpp @@ -16,7 +16,7 @@ namespace editor { -class property_holder; +class property_holder_base; namespace environment { @@ -59,7 +59,7 @@ class manager : private Noncopyable ::editor::environment::weathers::manager& m_weathers; CInifile* m_config_single; CInifile* m_config_mp; - editor::property_holder* m_property_holder; + editor::property_holder_base* m_property_holder; }; // class levels_manager } // namespace levels diff --git a/src/xrEngine/editor_environment_manager.hpp b/src/xrEngine/editor_environment_manager.hpp index f40488f263b..6653adfbcf7 100644 --- a/src/xrEngine/editor_environment_manager.hpp +++ b/src/xrEngine/editor_environment_manager.hpp @@ -15,7 +15,7 @@ namespace editor { -class property_holder; +class property_holder_base; namespace environment { @@ -84,7 +84,7 @@ class manager : public ::CEnvironment light_animator_ids_type const& light_animator_ids() const; public: - typedef editor::property_holder property_holder_type; + typedef editor::property_holder_base property_holder_type; typedef editor::environment::suns::manager suns_manager_type; typedef editor::environment::levels::manager levels_manager_type; typedef editor::environment::effects::manager effects_manager_type; diff --git a/src/xrEngine/editor_environment_manager_properties.cpp b/src/xrEngine/editor_environment_manager_properties.cpp index 452a2395da6..0780a23539e 100644 --- a/src/xrEngine/editor_environment_manager_properties.cpp +++ b/src/xrEngine/editor_environment_manager_properties.cpp @@ -96,7 +96,7 @@ manager::manager() return; editor::ide& ide = *Device.editor(); - editor::property_holder* holder = ide.create_property_holder(); + editor::property_holder_base* holder = ide.create_property_holder(); ide.active(holder); { @@ -104,8 +104,8 @@ manager::manager() } { - editor::property_holder::integer_getter_type getter; - editor::property_holder::integer_setter_type setter; + editor::property_holder_base::integer_getter_type getter; + editor::property_holder_base::integer_setter_type setter; getter.bind(&s_test_property, &test_property::getter); setter.bind(&s_test_property, &test_property::setter); @@ -113,8 +113,8 @@ manager::manager() } { - editor::property_holder::integer_getter_type getter; - editor::property_holder::integer_setter_type setter; + editor::property_holder_base::integer_getter_type getter; + editor::property_holder_base::integer_setter_type setter; getter.bind(&s_test_property_limited, &test_property::getter); setter.bind(&s_test_property_limited, &test_property::setter); @@ -123,8 +123,8 @@ manager::manager() } { - editor::property_holder::integer_getter_type getter; - editor::property_holder::integer_setter_type setter; + editor::property_holder_base::integer_getter_type getter; + editor::property_holder_base::integer_setter_type setter; getter.bind(&s_test_property_values, &test_property::getter); setter.bind(&s_test_property_values, &test_property::setter); @@ -133,8 +133,8 @@ manager::manager() } { - editor::property_holder::integer_getter_type getter; - editor::property_holder::integer_setter_type setter; + editor::property_holder_base::integer_getter_type getter; + editor::property_holder_base::integer_setter_type setter; getter.bind(&s_test_property_enum, &test_property::getter); setter.bind(&s_test_property_enum, &test_property::setter); @@ -143,8 +143,8 @@ manager::manager() } { - editor::property_holder::string_getter_type getter; - editor::property_holder::string_setter_type setter; + editor::property_holder_base::string_getter_type getter; + editor::property_holder_base::string_setter_type setter; getter.bind(&s_test_property2, &test_property2::getter); setter.bind(&s_test_property2, &test_property2::setter); @@ -154,8 +154,8 @@ manager::manager() } { - editor::property_holder::string_getter_type getter; - editor::property_holder::string_setter_type setter; + editor::property_holder_base::string_getter_type getter; + editor::property_holder_base::string_setter_type setter; getter.bind(&s_test_property3, &test_property2::getter); setter.bind(&s_test_property3, &test_property2::setter); @@ -164,8 +164,8 @@ manager::manager() } { - editor::property_holder::boolean_getter_type getter; - editor::property_holder::boolean_setter_type setter; + editor::property_holder_base::boolean_getter_type getter; + editor::property_holder_base::boolean_setter_type setter; getter.bind(&s_test_property4, &test_property4::getter); setter.bind(&s_test_property4, &test_property4::setter); @@ -173,8 +173,8 @@ manager::manager() } { - editor::property_holder::boolean_getter_type getter; - editor::property_holder::boolean_setter_type setter; + editor::property_holder_base::boolean_getter_type getter; + editor::property_holder_base::boolean_setter_type setter; getter.bind(&s_test_property5, &test_property4::getter); setter.bind(&s_test_property5, &test_property4::setter); @@ -183,8 +183,8 @@ manager::manager() } { - editor::property_holder::color_getter_type getter; - editor::property_holder::color_setter_type setter; + editor::property_holder_base::color_getter_type getter; + editor::property_holder_base::color_setter_type setter; getter.bind(&s_test_property6, &test_property6::getter); setter.bind(&s_test_property6, &test_property6::setter); @@ -192,8 +192,8 @@ manager::manager() } { - editor::property_holder::float_getter_type getter; - editor::property_holder::float_setter_type setter; + editor::property_holder_base::float_getter_type getter; + editor::property_holder_base::float_setter_type setter; getter.bind(&s_test_property7_limited, &test_property7::getter); setter.bind(&s_test_property7_limited, &test_property7::setter); @@ -201,8 +201,8 @@ manager::manager() } { - editor::property_holder::float_getter_type getter; - editor::property_holder::float_setter_type setter; + editor::property_holder_base::float_getter_type getter; + editor::property_holder_base::float_setter_type setter; getter.bind(&s_test_property7, &test_property7::getter); setter.bind(&s_test_property7, &test_property7::setter); @@ -211,8 +211,8 @@ manager::manager() } { - editor::property_holder::float_getter_type getter; - editor::property_holder::float_setter_type setter; + editor::property_holder_base::float_getter_type getter; + editor::property_holder_base::float_setter_type setter; getter.bind(&s_test_property7_values_enum, &test_property7::getter); setter.bind(&s_test_property7_values_enum, &test_property7::setter); diff --git a/src/xrEngine/editor_environment_sound_channels_channel.cpp b/src/xrEngine/editor_environment_sound_channels_channel.cpp index 9588eaa7435..8da25e5b412 100644 --- a/src/xrEngine/editor_environment_sound_channels_channel.cpp +++ b/src/xrEngine/editor_environment_sound_channels_channel.cpp @@ -27,7 +27,7 @@ void property_collection::display_name( } template <> -editor::property_holder* property_collection::create() +editor::property_holder_base* property_collection::create() { source* object = new source(""); object->fill(this); @@ -116,11 +116,11 @@ void channel::fill(editor::property_holder_collection* collection) VERIFY(!m_property_holder); m_property_holder = ::ide().create_property_holder(m_load_section.c_str(), collection, this); - typedef editor::property_holder::string_getter_type string_getter_type; + typedef editor::property_holder_base::string_getter_type string_getter_type; string_getter_type string_getter; string_getter.bind(this, &channel::id_getter); - typedef editor::property_holder::string_setter_type string_setter_type; + typedef editor::property_holder_base::string_setter_type string_setter_type; string_setter_type string_setter; string_setter.bind(this, &channel::id_setter); diff --git a/src/xrEngine/editor_environment_sound_channels_channel.hpp b/src/xrEngine/editor_environment_sound_channels_channel.hpp index 0bae0d3bc04..d695d3a9c11 100644 --- a/src/xrEngine/editor_environment_sound_channels_channel.hpp +++ b/src/xrEngine/editor_environment_sound_channels_channel.hpp @@ -12,7 +12,7 @@ #ifdef INGAME_EDITOR #include "Common/Noncopyable.hpp" -#include "Include/editor/property_holder.hpp" +#include "Include/editor/property_holder_base.hpp" #include "property_collection_forward.hpp" #include "Environment.h" @@ -49,7 +49,7 @@ class channel : public CEnvAmbient::SSndChannel, public editor::property_holder_ typedef xr_vector sound_container_type; private: - typedef editor::property_holder property_holder_type; + typedef editor::property_holder_base property_holder_type; typedef property_collection collection_type; public: diff --git a/src/xrEngine/editor_environment_sound_channels_manager.cpp b/src/xrEngine/editor_environment_sound_channels_manager.cpp index 68a6246b814..859ff9f5b0a 100644 --- a/src/xrEngine/editor_environment_sound_channels_manager.cpp +++ b/src/xrEngine/editor_environment_sound_channels_manager.cpp @@ -26,7 +26,7 @@ void property_collection::display_name } template <> -editor::property_holder* property_collection::create() +editor::property_holder_base* property_collection::create() { channel* object = new channel(m_holder, generate_unique_id("sound_channel_unique_id_").c_str()); object->fill(this); @@ -83,7 +83,7 @@ void manager::save() xr_delete(config); } -void manager::fill(editor::property_holder* holder) +void manager::fill(editor::property_holder_base* holder) { VERIFY(holder); holder->add_property("sound channels", "ambients", "this option is resposible for sound channels", m_collection); diff --git a/src/xrEngine/editor_environment_sound_channels_manager.hpp b/src/xrEngine/editor_environment_sound_channels_manager.hpp index 4de93793773..c0af0ad1219 100644 --- a/src/xrEngine/editor_environment_sound_channels_manager.hpp +++ b/src/xrEngine/editor_environment_sound_channels_manager.hpp @@ -16,7 +16,7 @@ namespace editor { -class property_holder; +class property_holder_base; namespace environment { @@ -31,7 +31,7 @@ class manager : private Noncopyable ~manager(); void load(); void save(); - void fill(editor::property_holder* holder); + void fill(editor::property_holder_base* holder); shared_str unique_id(shared_str const& id) const; public: @@ -42,7 +42,7 @@ class manager : private Noncopyable channels_ids_type const& channels_ids() const; private: - typedef editor::property_holder property_holder_type; + typedef editor::property_holder_base property_holder_type; typedef property_collection collection_type; private: diff --git a/src/xrEngine/editor_environment_sound_channels_source.cpp b/src/xrEngine/editor_environment_sound_channels_source.cpp index 18c373284d2..3f4c23dfc99 100644 --- a/src/xrEngine/editor_environment_sound_channels_source.cpp +++ b/src/xrEngine/editor_environment_sound_channels_source.cpp @@ -31,7 +31,7 @@ void source::fill(editor::property_holder_collection* collection) m_property_holder->add_property("sound", "properties", "this option is resposible for sound", m_source.c_str(), m_source, ".ogg", "Sound files (*.ogg)|*.ogg", detail::real_path("$game_sounds$", "").c_str(), - "Select sound...", editor::property_holder::cannot_enter_text, editor::property_holder::remove_extension); + "Select sound...", editor::property_holder_base::cannot_enter_text, editor::property_holder_base::remove_extension); } source::property_holder_type* source::object() { return (m_property_holder); } diff --git a/src/xrEngine/editor_environment_sound_channels_source.hpp b/src/xrEngine/editor_environment_sound_channels_source.hpp index a32ecbba0d5..68d8c9c3eec 100644 --- a/src/xrEngine/editor_environment_sound_channels_source.hpp +++ b/src/xrEngine/editor_environment_sound_channels_source.hpp @@ -12,7 +12,7 @@ #ifdef INGAME_EDITOR #include "Common/Noncopyable.hpp" -#include "Include/editor/property_holder.hpp" +#include "Include/editor/property_holder_base.hpp" namespace editor { @@ -30,7 +30,7 @@ class source : public editor::property_holder_holder, private Noncopyable void fill(editor::property_holder_collection* collection); inline LPCSTR id() const { return m_source.c_str(); } private: - typedef editor::property_holder property_holder_type; + typedef editor::property_holder_base property_holder_type; public: virtual property_holder_type* object(); diff --git a/src/xrEngine/editor_environment_suns_blend.cpp b/src/xrEngine/editor_environment_suns_blend.cpp index 64cd3104871..91456dd2801 100644 --- a/src/xrEngine/editor_environment_suns_blend.cpp +++ b/src/xrEngine/editor_environment_suns_blend.cpp @@ -10,7 +10,7 @@ #ifdef INGAME_EDITOR #include "editor_environment_suns_blend.hpp" -#include "Include/editor/property_holder.hpp" +#include "Include/editor/property_holder_base.hpp" using editor::environment::suns::blend; using editor::environment::suns::manager; @@ -24,9 +24,9 @@ void blend::load(CInifile& config, shared_str const& section) } void blend::fill( - manager const& manager, editor::property_holder* holder, editor::property_holder_collection* collection) + manager const& manager, editor::property_holder_base* holder, editor::property_holder_collection* collection) { - editor::property_holder* properties = holder; + editor::property_holder_base* properties = holder; VERIFY(properties); properties->add_property( diff --git a/src/xrEngine/editor_environment_suns_blend.hpp b/src/xrEngine/editor_environment_suns_blend.hpp index 5d48d7f1633..84525df84a0 100644 --- a/src/xrEngine/editor_environment_suns_blend.hpp +++ b/src/xrEngine/editor_environment_suns_blend.hpp @@ -15,7 +15,7 @@ namespace editor { -class property_holder; +class property_holder_base; class property_holder_collection; namespace environment @@ -30,7 +30,7 @@ class blend : private Noncopyable blend(); void load(CInifile& config, shared_str const& section); void save(CInifile& config, shared_str const& section); - void fill(manager const& manager, editor::property_holder* holder, editor::property_holder_collection* collection); + void fill(manager const& manager, editor::property_holder_base* holder, editor::property_holder_collection* collection); private: float m_down_time; diff --git a/src/xrEngine/editor_environment_suns_flare.cpp b/src/xrEngine/editor_environment_suns_flare.cpp index 2769f265f55..310b824c3fd 100644 --- a/src/xrEngine/editor_environment_suns_flare.cpp +++ b/src/xrEngine/editor_environment_suns_flare.cpp @@ -15,7 +15,7 @@ #include "editor_environment_detail.hpp" using editor::environment::suns::flare; -using editor::property_holder; +using editor::property_holder_base; flare::flare() : m_property_holder(0), m_opacity(0.f), m_position(0.f), m_radius(0.f), m_texture("") {} flare::~flare() @@ -26,7 +26,7 @@ flare::~flare() ::ide().destroy(m_property_holder); } -editor::property_holder* flare::object() { return (m_property_holder); } +editor::property_holder_base* flare::object() { return (m_property_holder); } void flare::fill(editor::property_holder_collection* collection) { VERIFY(!m_property_holder); @@ -35,7 +35,7 @@ void flare::fill(editor::property_holder_collection* collection) properties->add_property("texture", "flare", "this option is resposible for gradient texture", m_texture.c_str(), m_texture, ".dds", "Texture files (*.dds)|*.dds", detail::real_path("$game_textures$", "").c_str(), - "Select texture...", editor::property_holder::cannot_enter_text, editor::property_holder::remove_extension); + "Select texture...", editor::property_holder_base::cannot_enter_text, editor::property_holder_base::remove_extension); properties->add_property( "opacity", "flare", "this option is resposible for gradient opacity", m_opacity, m_opacity); properties->add_property( diff --git a/src/xrEngine/editor_environment_suns_flare.hpp b/src/xrEngine/editor_environment_suns_flare.hpp index 6b55c63d85a..d9bfd75320c 100644 --- a/src/xrEngine/editor_environment_suns_flare.hpp +++ b/src/xrEngine/editor_environment_suns_flare.hpp @@ -12,7 +12,7 @@ #ifdef INGAME_EDITOR #include "Common/Noncopyable.hpp" -#include "Include/editor/property_holder.hpp" +#include "Include/editor/property_holder_base.hpp" namespace editor { @@ -28,7 +28,7 @@ class flare : public editor::property_holder_holder, private Noncopyable void fill(editor::property_holder_collection* collection); public: - typedef editor::property_holder property_holder; + typedef editor::property_holder_base property_holder; public: virtual property_holder* object(); diff --git a/src/xrEngine/editor_environment_suns_flares.cpp b/src/xrEngine/editor_environment_suns_flares.cpp index 937928652a9..c02dce29738 100644 --- a/src/xrEngine/editor_environment_suns_flares.cpp +++ b/src/xrEngine/editor_environment_suns_flares.cpp @@ -10,7 +10,7 @@ #ifdef INGAME_EDITOR #include "editor_environment_suns_flares.hpp" -#include "Include/editor/property_holder.hpp" +#include "Include/editor/property_holder_base.hpp" #include "property_collection.hpp" #include "editor_environment_suns_flare.hpp" #include "editor_environment_suns_manager.hpp" @@ -29,7 +29,7 @@ void property_collection::display_name( } template <> -editor::property_holder* property_collection::create() +editor::property_holder_base* property_collection::create() { flare* object = new flare(); object->fill(this); @@ -91,15 +91,15 @@ void flares::load(CInifile& config, shared_str const& section) } void flares::fill( - manager const& manager, editor::property_holder* holder, editor::property_holder_collection* collection) + manager const& manager, editor::property_holder_base* holder, editor::property_holder_collection* collection) { - editor::property_holder* properties = holder; + editor::property_holder_base* properties = holder; VERIFY(properties); properties->add_property("use", "flares", "this option is resposible for the flares usage", m_use, m_use); properties->add_property("shader", "flares", "this option is resposible for flares shader", m_shader.c_str(), m_shader, &*manager.m_environment.shader_ids().begin(), manager.m_environment.shader_ids().size(), - editor::property_holder::value_editor_tree_view, editor::property_holder::cannot_enter_text); + editor::property_holder_base::value_editor_tree_view, editor::property_holder_base::cannot_enter_text); properties->add_property("flares", "flares", "this option is resposible for flares", m_collection); } diff --git a/src/xrEngine/editor_environment_suns_flares.hpp b/src/xrEngine/editor_environment_suns_flares.hpp index 2507948735f..8fa43bf5e2e 100644 --- a/src/xrEngine/editor_environment_suns_flares.hpp +++ b/src/xrEngine/editor_environment_suns_flares.hpp @@ -16,7 +16,7 @@ namespace editor { -class property_holder; +class property_holder_base; class property_holder_collection; namespace environment @@ -33,7 +33,7 @@ class flares : private Noncopyable virtual ~flares(); void load(CInifile& config, shared_str const& section); void save(CInifile& config, shared_str const& section); - void fill(manager const& manager, editor::property_holder* holder, editor::property_holder_collection* collection); + void fill(manager const& manager, editor::property_holder_base* holder, editor::property_holder_collection* collection); private: typedef xr_vector flares_type; diff --git a/src/xrEngine/editor_environment_suns_gradient.cpp b/src/xrEngine/editor_environment_suns_gradient.cpp index 30fb1d20c42..f4281fa9b54 100644 --- a/src/xrEngine/editor_environment_suns_gradient.cpp +++ b/src/xrEngine/editor_environment_suns_gradient.cpp @@ -10,13 +10,13 @@ #ifdef INGAME_EDITOR #include "editor_environment_suns_gradient.hpp" -#include "Include/editor/property_holder.hpp" +#include "Include/editor/property_holder_base.hpp" #include "editor_environment_suns_manager.hpp" #include "editor_environment_manager.hpp" #include "editor_environment_detail.hpp" using editor::environment::suns::gradient; -using editor::property_holder; +using editor::property_holder_base; using editor::property_holder_collection; using editor::environment::suns::manager; @@ -41,32 +41,32 @@ void gradient::use_setter(bool value) // fill_internal (); } -void gradient::fill(manager const& manager, property_holder* holder, property_holder_collection* collection) +void gradient::fill(manager const& manager, property_holder_base* holder, property_holder_collection* collection) { - editor::property_holder* properties = holder; + editor::property_holder_base* properties = holder; VERIFY(properties); - typedef editor::property_holder::boolean_getter_type boolean_getter_type; + typedef editor::property_holder_base::boolean_getter_type boolean_getter_type; boolean_getter_type boolean_getter; - typedef editor::property_holder::boolean_setter_type boolean_setter_type; + typedef editor::property_holder_base::boolean_setter_type boolean_setter_type; boolean_setter_type boolean_setter; boolean_getter.bind(this, &gradient::use_getter); boolean_setter.bind(this, &gradient::use_setter); properties->add_property("use", "gradient", "this option is resposible for gradient usage", m_use, boolean_getter, - boolean_setter, property_holder::property_read_write, property_holder::notify_parent_on_change, - property_holder::no_password_char, property_holder::do_not_refresh_grid_on_change); + boolean_setter, property_holder_base::property_read_write, property_holder_base::notify_parent_on_change, + property_holder_base::no_password_char, property_holder_base::do_not_refresh_grid_on_change); properties->add_property( "opacity", "gradient", "this option is resposible for gradient opacity", m_opacity, m_opacity); properties->add_property("radius", "gradient", "this option is resposible for gradient radius", m_radius, m_radius); properties->add_property("shader", "gradient", "this option is resposible for gradient shader", m_shader.c_str(), m_shader, &*manager.m_environment.shader_ids().begin(), manager.m_environment.shader_ids().size(), - editor::property_holder::value_editor_tree_view, editor::property_holder::cannot_enter_text); + editor::property_holder_base::value_editor_tree_view, editor::property_holder_base::cannot_enter_text); properties->add_property("texture", "gradient", "this option is resposible for gradient texture", m_texture.c_str(), m_texture, ".dds", "Texture files (*.dds)|*.dds", detail::real_path("$game_textures$", "").c_str(), - "Select texture...", editor::property_holder::cannot_enter_text, editor::property_holder::remove_extension); + "Select texture...", editor::property_holder_base::cannot_enter_text, editor::property_holder_base::remove_extension); } #endif // #ifdef INGAME_EDITOR diff --git a/src/xrEngine/editor_environment_suns_gradient.hpp b/src/xrEngine/editor_environment_suns_gradient.hpp index ae927cbf427..865c3ce50f7 100644 --- a/src/xrEngine/editor_environment_suns_gradient.hpp +++ b/src/xrEngine/editor_environment_suns_gradient.hpp @@ -15,7 +15,7 @@ namespace editor { -class property_holder; +class property_holder_base; class property_holder_collection; namespace environment @@ -30,7 +30,7 @@ class gradient : private Noncopyable gradient(); void load(CInifile& config, shared_str const& section); void save(CInifile& config, shared_str const& section); - void fill(manager const& manager, editor::property_holder* holder, editor::property_holder_collection* collection); + void fill(manager const& manager, editor::property_holder_base* holder, editor::property_holder_collection* collection); private: bool xr_stdcall use_getter(); diff --git a/src/xrEngine/editor_environment_suns_manager.cpp b/src/xrEngine/editor_environment_suns_manager.cpp index e4847b3c2a9..3b5e94d33cf 100644 --- a/src/xrEngine/editor_environment_suns_manager.cpp +++ b/src/xrEngine/editor_environment_suns_manager.cpp @@ -12,7 +12,7 @@ #include "editor_environment_suns_manager.hpp" #include "editor_environment_suns_sun.hpp" #include "Include/editor/ide.hpp" -#include "Include/editor/property_holder.hpp" +#include "Include/editor/property_holder_base.hpp" #include "Common/object_broker.h" #include "ide.hpp" #include "property_collection.hpp" @@ -30,7 +30,7 @@ void property_collection::display_name( } template <> -editor::property_holder* property_collection::create() +editor::property_holder_base* property_collection::create() { sun* object = new sun(m_holder, generate_unique_id("sun_unique_id_").c_str()); object->fill(this); @@ -100,7 +100,7 @@ void manager::add(CInifile& config, shared_str const& section) m_suns.push_back(object); } -void manager::fill(editor::property_holder* holder) +void manager::fill(editor::property_holder_base* holder) { VERIFY(holder); holder->add_property("suns", "suns", "this option is resposible for sound channels", m_collection); diff --git a/src/xrEngine/editor_environment_suns_manager.hpp b/src/xrEngine/editor_environment_suns_manager.hpp index 637a9d41b8b..db38f62d215 100644 --- a/src/xrEngine/editor_environment_suns_manager.hpp +++ b/src/xrEngine/editor_environment_suns_manager.hpp @@ -18,7 +18,7 @@ class CLensFlareDescriptor; namespace editor { -class property_holder; +class property_holder_base; namespace environment { @@ -35,7 +35,7 @@ class manager : private Noncopyable ~manager(); void load(); void save(); - void fill(editor::property_holder* holder); + void fill(editor::property_holder_base* holder); shared_str unique_id(shared_str const& id) const; CLensFlareDescriptor* get_flare(shared_str const& id) const; diff --git a/src/xrEngine/editor_environment_suns_sun.cpp b/src/xrEngine/editor_environment_suns_sun.cpp index 9b1dab69c51..e63b88e9116 100644 --- a/src/xrEngine/editor_environment_suns_sun.cpp +++ b/src/xrEngine/editor_environment_suns_sun.cpp @@ -19,7 +19,7 @@ using editor::environment::suns::sun; using editor::environment::suns::flare; using editor::environment::suns::manager; -using editor::property_holder; +using editor::property_holder_base; sun::sun(manager const& manager, shared_str const& id) : m_manager(manager), m_id(id), m_use(false), m_ignore_color(false), m_radius(0.f), m_shader(""), m_texture(""), @@ -67,14 +67,14 @@ void sun::fill(editor::property_holder_collection* collection) { VERIFY(!m_property_holder); m_property_holder = ::ide().create_property_holder(m_id.c_str(), collection, this); - editor::property_holder* properties = m_property_holder; + editor::property_holder_base* properties = m_property_holder; VERIFY(properties); - typedef editor::property_holder::string_getter_type string_getter_type; + typedef editor::property_holder_base::string_getter_type string_getter_type; string_getter_type string_getter; string_getter.bind(this, &sun::id_getter); - typedef editor::property_holder::string_setter_type string_setter_type; + typedef editor::property_holder_base::string_setter_type string_setter_type; string_setter_type string_setter; string_setter.bind(this, &sun::id_setter); @@ -86,11 +86,11 @@ void sun::fill(editor::property_holder_collection* collection) properties->add_property("radius", "sun", "this option is resposible for sun radius", m_radius, m_radius); properties->add_property("shader", "sun", "this option is resposible for sun shader", m_shader.c_str(), m_shader, &*m_manager.m_environment.shader_ids().begin(), m_manager.m_environment.shader_ids().size(), - editor::property_holder::value_editor_tree_view, editor::property_holder::cannot_enter_text); + editor::property_holder_base::value_editor_tree_view, editor::property_holder_base::cannot_enter_text); properties->add_property("texture", "sun", "this option is resposible for sun texture", m_texture.c_str(), m_texture, ".dds", "Texture files (*.dds)|*.dds", detail::real_path("$game_textures$", "").c_str(), - "Select texture...", editor::property_holder::cannot_enter_text, editor::property_holder::remove_extension); + "Select texture...", editor::property_holder_base::cannot_enter_text, editor::property_holder_base::remove_extension); } -property_holder* sun::object() { return (m_property_holder); } +property_holder_base* sun::object() { return (m_property_holder); } #endif // #ifdef INGAME_EDITOR diff --git a/src/xrEngine/editor_environment_suns_sun.hpp b/src/xrEngine/editor_environment_suns_sun.hpp index 74a17829987..408f9b10047 100644 --- a/src/xrEngine/editor_environment_suns_sun.hpp +++ b/src/xrEngine/editor_environment_suns_sun.hpp @@ -12,12 +12,12 @@ #ifdef INGAME_EDITOR #include "Common/Noncopyable.hpp" -#include "Include/editor/property_holder.hpp" +#include "Include/editor/property_holder_base.hpp" #include "xr_efflensflare.h" namespace editor { -class property_holder; +class property_holder_base; class property_holder_collection; namespace environment @@ -42,14 +42,14 @@ class sun : public CLensFlare, public editor::property_holder_holder, private No public: inline shared_str const& id() const { return m_id; } - virtual property_holder* object(); + virtual property_holder_base* object(); private: shared_str m_id; shared_str m_shader; shared_str m_texture; manager const& m_manager; - editor::property_holder* m_property_holder; + editor::property_holder_base* m_property_holder; float m_radius; bool m_use; bool m_ignore_color; diff --git a/src/xrEngine/editor_environment_thunderbolts_collection.cpp b/src/xrEngine/editor_environment_thunderbolts_collection.cpp index 2e4ca9a9c08..09de3945299 100644 --- a/src/xrEngine/editor_environment_thunderbolts_collection.cpp +++ b/src/xrEngine/editor_environment_thunderbolts_collection.cpp @@ -18,7 +18,7 @@ using editor::environment::thunderbolts::thunderbolt_id; using editor::environment::thunderbolts::collection; using editor::environment::thunderbolts::manager; -using editor::property_holder; +using editor::property_holder_base; template <> void property_collection::display_name( @@ -28,7 +28,7 @@ void property_collection::display_name( } template <> -editor::property_holder* property_collection::create() +editor::property_holder_base* property_collection::create() { thunderbolt_id* object = new thunderbolt_id(m_holder.m_manager, ""); object->fill(this); @@ -95,11 +95,11 @@ void collection::fill(editor::property_holder_collection* collection) VERIFY(!m_property_holder); m_property_holder = ::ide().create_property_holder(section.c_str()); - typedef editor::property_holder::string_getter_type string_getter_type; + typedef editor::property_holder_base::string_getter_type string_getter_type; string_getter_type string_getter; string_getter.bind(this, &collection::id_getter); - typedef editor::property_holder::string_setter_type string_setter_type; + typedef editor::property_holder_base::string_setter_type string_setter_type; string_setter_type string_setter; string_setter.bind(this, &collection::id_setter); @@ -109,5 +109,5 @@ void collection::fill(editor::property_holder_collection* collection) "thunderbolts", "properties", "this option is resposible for thunderbolts", m_collection); } -property_holder* collection::object() { return (m_property_holder); } +property_holder_base* collection::object() { return (m_property_holder); } #endif // #ifdef INGAME_EDITOR diff --git a/src/xrEngine/editor_environment_thunderbolts_collection.hpp b/src/xrEngine/editor_environment_thunderbolts_collection.hpp index 891f857bab5..da55c1c50f2 100644 --- a/src/xrEngine/editor_environment_thunderbolts_collection.hpp +++ b/src/xrEngine/editor_environment_thunderbolts_collection.hpp @@ -12,7 +12,7 @@ #ifdef INGAME_EDITOR #include "Common/Noncopyable.hpp" -#include "Include/editor/property_holder.hpp" +#include "Include/editor/property_holder_base.hpp" #include "property_collection_forward.hpp" #include "thunderbolt.h" @@ -41,7 +41,7 @@ class collection : public SThunderboltCollection, public editor::property_holder void xr_stdcall id_setter(LPCSTR value); private: - typedef editor::property_holder property_holder_type; + typedef editor::property_holder_base property_holder_type; public: virtual property_holder_type* object(); diff --git a/src/xrEngine/editor_environment_thunderbolts_gradient.cpp b/src/xrEngine/editor_environment_thunderbolts_gradient.cpp index d449c290066..b86218c2629 100644 --- a/src/xrEngine/editor_environment_thunderbolts_gradient.cpp +++ b/src/xrEngine/editor_environment_thunderbolts_gradient.cpp @@ -59,7 +59,7 @@ void gradient::texture_setter(LPCSTR value) } void gradient::fill( - ::editor::environment::manager& environment, LPCSTR name, LPCSTR description, ::editor::property_holder& holder) + ::editor::environment::manager& environment, LPCSTR name, LPCSTR description, ::editor::property_holder_base& holder) { VERIFY(!m_property_holder); m_property_holder = ::ide().create_property_holder(name); @@ -73,24 +73,24 @@ void gradient::fill( m_property_holder->add_property("maximum _radius", "properties", "this option is resposible for thunderbolt gradient maximum radius", fRadius.y, fRadius.y); - typedef ::editor::property_holder::string_getter_type string_getter_type; + typedef ::editor::property_holder_base::string_getter_type string_getter_type; string_getter_type string_getter; string_getter.bind(this, &gradient::shader_getter); - typedef ::editor::property_holder::string_setter_type string_setter_type; + typedef ::editor::property_holder_base::string_setter_type string_setter_type; string_setter_type string_setter; string_setter.bind(this, &gradient::shader_setter); m_property_holder->add_property("shader", "properties", "this option is resposible for thunderbolt gradient shader", shader.c_str(), string_getter, string_setter, &*environment.shader_ids().begin(), - environment.shader_ids().size(), editor::property_holder::value_editor_tree_view, - editor::property_holder::cannot_enter_text); + environment.shader_ids().size(), editor::property_holder_base::value_editor_tree_view, + editor::property_holder_base::cannot_enter_text); string_getter.bind(this, &gradient::texture_getter); string_setter.bind(this, &gradient::texture_setter); m_property_holder->add_property("texture", "", "this option is resposible for thunderbolt gradient texture", texture.c_str(), texture, ".dds", "Texture files (*.dds)|*.dds", detail::real_path("$game_textures$", "").c_str(), "Select texture...", - editor::property_holder::cannot_enter_text, editor::property_holder::remove_extension); + editor::property_holder_base::cannot_enter_text, editor::property_holder_base::remove_extension); } #endif // #ifdef INGAME_EDITOR diff --git a/src/xrEngine/editor_environment_thunderbolts_gradient.hpp b/src/xrEngine/editor_environment_thunderbolts_gradient.hpp index a13c5fe58c6..a34c2d1c09d 100644 --- a/src/xrEngine/editor_environment_thunderbolts_gradient.hpp +++ b/src/xrEngine/editor_environment_thunderbolts_gradient.hpp @@ -12,12 +12,12 @@ #ifdef INGAME_EDITOR #include "Common/Noncopyable.hpp" -#include "Include/editor/property_holder.hpp" +#include "Include/editor/property_holder_base.hpp" #include "thunderbolt.h" namespace editor { -class property_holder; +class property_holder_base; namespace environment { @@ -33,7 +33,7 @@ class gradient : public SThunderboltDesc::SFlare, private Noncopyable void load(CInifile& config, shared_str const& section_id, LPCSTR prefix); void save(CInifile& config, shared_str const& section_id, LPCSTR prefix); void fill( - ::editor::environment::manager& environment, LPCSTR name, LPCSTR description, editor::property_holder& holder); + ::editor::environment::manager& environment, LPCSTR name, LPCSTR description, editor::property_holder_base& holder); private: LPCSTR xr_stdcall shader_getter() const; @@ -43,7 +43,7 @@ class gradient : public SThunderboltDesc::SFlare, private Noncopyable void xr_stdcall texture_setter(LPCSTR value); private: - property_holder* m_property_holder; + property_holder_base* m_property_holder; }; // class gradient } // namespace thunderbolts diff --git a/src/xrEngine/editor_environment_thunderbolts_manager.cpp b/src/xrEngine/editor_environment_thunderbolts_manager.cpp index e846403056c..81751c8a842 100644 --- a/src/xrEngine/editor_environment_thunderbolts_manager.cpp +++ b/src/xrEngine/editor_environment_thunderbolts_manager.cpp @@ -33,7 +33,7 @@ void property_collection::display_ } template <> -editor::property_holder* property_collection::create() +editor::property_holder_base* property_collection::create() { thunderbolt* object = new thunderbolt(&m_holder, generate_unique_id("thunderbolt_unique_id_").c_str()); object->fill(m_holder.environment(), this); @@ -48,7 +48,7 @@ void property_collection::display_n } template <> -editor::property_holder* property_collection::create() +editor::property_holder_base* property_collection::create() { collection* object = new collection(m_holder, generate_unique_id("thunderbolt_collection_unique_id_").c_str()); object->fill(this); @@ -191,14 +191,14 @@ float manager::longitude_getter() const { return (rad2deg(m_environment.p_var_lo void manager::longitude_setter(float value) { m_environment.p_var_long = deg2rad(value); } float manager::tilt_getter() const { return (rad2deg(m_environment.p_tilt)); } void manager::tilt_setter(float value) { m_environment.p_tilt = deg2rad(value); } -void manager::fill(editor::property_holder* holder) +void manager::fill(editor::property_holder_base* holder) { VERIFY(holder); - typedef ::editor::property_holder::float_getter_type float_getter_type; + typedef ::editor::property_holder_base::float_getter_type float_getter_type; float_getter_type float_getter; - typedef ::editor::property_holder::float_setter_type float_setter_type; + typedef ::editor::property_holder_base::float_setter_type float_setter_type; float_setter_type float_setter; float_getter.bind(this, &manager::altitude_getter); diff --git a/src/xrEngine/editor_environment_thunderbolts_manager.hpp b/src/xrEngine/editor_environment_thunderbolts_manager.hpp index f68fde9bcb1..0cb102807a3 100644 --- a/src/xrEngine/editor_environment_thunderbolts_manager.hpp +++ b/src/xrEngine/editor_environment_thunderbolts_manager.hpp @@ -19,7 +19,7 @@ struct SThunderboltCollection; namespace editor { -class property_holder; +class property_holder_base; namespace environment { @@ -38,7 +38,7 @@ class manager : private Noncopyable ~manager(); void load(); void save(); - void fill(editor::property_holder* holder); + void fill(editor::property_holder_base* holder); SThunderboltDesc* description(CInifile& config, shared_str const& section) const; SThunderboltCollection* get_collection(shared_str const& section); @@ -64,7 +64,7 @@ class manager : private Noncopyable void save_collections(); private: - typedef editor::property_holder property_holder_type; + typedef editor::property_holder_base property_holder_type; typedef property_collection thunderbolt_collection_type; typedef property_collection collection_collection_type; diff --git a/src/xrEngine/editor_environment_thunderbolts_thunderbolt.cpp b/src/xrEngine/editor_environment_thunderbolts_thunderbolt.cpp index deb243da005..3f5cb3bad73 100644 --- a/src/xrEngine/editor_environment_thunderbolts_thunderbolt.cpp +++ b/src/xrEngine/editor_environment_thunderbolts_thunderbolt.cpp @@ -79,11 +79,11 @@ void thunderbolt::fill(::editor::environment::manager& environment, ::editor::pr VERIFY(!m_property_holder); m_property_holder = ::ide().create_property_holder(m_id.c_str(), collection, this); - typedef editor::property_holder::string_getter_type string_getter_type; + typedef editor::property_holder_base::string_getter_type string_getter_type; string_getter_type string_getter; string_getter.bind(this, &thunderbolt::id_getter); - typedef editor::property_holder::string_setter_type string_setter_type; + typedef editor::property_holder_base::string_setter_type string_setter_type; string_setter_type string_setter; string_setter.bind(this, &thunderbolt::id_setter); @@ -92,14 +92,14 @@ void thunderbolt::fill(::editor::environment::manager& environment, ::editor::pr m_property_holder->add_property("color animator", "properties", "this option is resposible for thunderbolt color animator", m_color_animator.c_str(), m_color_animator, &*environment.light_animator_ids().begin(), environment.light_animator_ids().size(), - editor::property_holder::value_editor_tree_view, editor::property_holder::cannot_enter_text); + editor::property_holder_base::value_editor_tree_view, editor::property_holder_base::cannot_enter_text); m_property_holder->add_property("lighting model", "properties", "this option is resposible for thunderbolt lighting model", m_lighting_model.c_str(), m_lighting_model, ".dm", "Lighting model files (*.dm)|*.dm", detail::real_path("$game_meshes$", "").c_str(), "Select lighting model...", - editor::property_holder::cannot_enter_text, editor::property_holder::keep_extension); + editor::property_holder_base::cannot_enter_text, editor::property_holder_base::keep_extension); m_property_holder->add_property("sound", "properties", "this option is resposible for thunderbolt sound", m_sound.c_str(), m_sound, ".ogg", "Sound files (*.ogg)|*.ogg", detail::real_path("$game_sounds$", "").c_str(), - "Select sound...", editor::property_holder::cannot_enter_text, editor::property_holder::remove_extension); + "Select sound...", editor::property_holder_base::cannot_enter_text, editor::property_holder_base::remove_extension); m_center->fill( environment, "center", "this option is resposible for thunderbolt gradient center", *m_property_holder); diff --git a/src/xrEngine/editor_environment_thunderbolts_thunderbolt.hpp b/src/xrEngine/editor_environment_thunderbolts_thunderbolt.hpp index 7939ff6fa0d..ae5c25f8c7d 100644 --- a/src/xrEngine/editor_environment_thunderbolts_thunderbolt.hpp +++ b/src/xrEngine/editor_environment_thunderbolts_thunderbolt.hpp @@ -12,7 +12,7 @@ #ifdef INGAME_EDITOR #include "Common/Noncopyable.hpp" -#include "Include/editor/property_holder.hpp" +#include "Include/editor/property_holder_base.hpp" #include "editor_environment_thunderbolts_gradient.hpp" #include "thunderbolt.h" @@ -46,7 +46,7 @@ class thunderbolt : public SThunderboltDesc, public editor::property_holder_hold void xr_stdcall id_setter(LPCSTR value); private: - typedef editor::property_holder property_holder_type; + typedef editor::property_holder_base property_holder_type; public: virtual property_holder_type* object(); diff --git a/src/xrEngine/editor_environment_thunderbolts_thunderbolt_id.cpp b/src/xrEngine/editor_environment_thunderbolts_thunderbolt_id.cpp index 0fdd874b22b..3fbbe6bb535 100644 --- a/src/xrEngine/editor_environment_thunderbolts_thunderbolt_id.cpp +++ b/src/xrEngine/editor_environment_thunderbolts_thunderbolt_id.cpp @@ -36,17 +36,17 @@ void thunderbolt_id::fill(editor::property_holder_collection* collection) VERIFY(!m_property_holder); m_property_holder = ::ide().create_property_holder(m_id.c_str(), collection, this); - typedef editor::property_holder::string_collection_getter_type collection_getter_type; + typedef editor::property_holder_base::string_collection_getter_type collection_getter_type; collection_getter_type collection_getter; collection_getter.bind(this, &thunderbolt_id::collection); - typedef editor::property_holder::string_collection_size_getter_type collection_size_getter_type; + typedef editor::property_holder_base::string_collection_size_getter_type collection_size_getter_type; collection_size_getter_type collection_size_getter; collection_size_getter.bind(this, &thunderbolt_id::collection_size); m_property_holder->add_property("thunderbolt", "properties", "this option is resposible for thunderbolt", - m_id.c_str(), m_id, collection_getter, collection_size_getter, editor::property_holder::value_editor_combo_box, - editor::property_holder::cannot_enter_text); + m_id.c_str(), m_id, collection_getter, collection_size_getter, editor::property_holder_base::value_editor_combo_box, + editor::property_holder_base::cannot_enter_text); } thunderbolt_id::property_holder_type* thunderbolt_id::object() { return (m_property_holder); } diff --git a/src/xrEngine/editor_environment_thunderbolts_thunderbolt_id.hpp b/src/xrEngine/editor_environment_thunderbolts_thunderbolt_id.hpp index 348eb3d27b6..80d3e67a9d5 100644 --- a/src/xrEngine/editor_environment_thunderbolts_thunderbolt_id.hpp +++ b/src/xrEngine/editor_environment_thunderbolts_thunderbolt_id.hpp @@ -12,7 +12,7 @@ #ifdef INGAME_EDITOR #include "Common/Noncopyable.hpp" -#include "Include/editor/property_holder.hpp" +#include "Include/editor/property_holder_base.hpp" namespace editor { @@ -32,7 +32,7 @@ class thunderbolt_id : public editor::property_holder_holder, private Noncopyabl void fill(editor::property_holder_collection* collection); inline LPCSTR id() const { return m_id.c_str(); } private: - typedef editor::property_holder property_holder_type; + typedef editor::property_holder_base property_holder_type; public: virtual property_holder_type* object(); diff --git a/src/xrEngine/editor_environment_weathers_manager.cpp b/src/xrEngine/editor_environment_weathers_manager.cpp index 53bdec73d77..83b9bf25d72 100644 --- a/src/xrEngine/editor_environment_weathers_manager.cpp +++ b/src/xrEngine/editor_environment_weathers_manager.cpp @@ -12,7 +12,7 @@ #include "editor_environment_weathers_manager.hpp" #include "editor_environment_detail.hpp" #include "ide.hpp" -#include "Include/editor/property_holder.hpp" +#include "Include/editor/property_holder_base.hpp" #include "Common/object_broker.h" #include "editor_environment_weathers_weather.hpp" #include "editor_environment_weathers_time.hpp" @@ -31,7 +31,7 @@ void property_collection::display_name } template <> -editor::property_holder* property_collection::create() +editor::property_holder_base* property_collection::create() { weather* object = new weather(&m_holder.m_manager, generate_unique_id("weather_unique_id_").c_str()); object->fill(this); diff --git a/src/xrEngine/editor_environment_weathers_manager.hpp b/src/xrEngine/editor_environment_weathers_manager.hpp index 43801b4cc9c..880d832a627 100644 --- a/src/xrEngine/editor_environment_weathers_manager.hpp +++ b/src/xrEngine/editor_environment_weathers_manager.hpp @@ -16,7 +16,7 @@ namespace editor { -class property_holder; +class property_holder_base; namespace environment { @@ -33,7 +33,7 @@ class manager : private Noncopyable ~manager(); void load(); void save(); - void fill(::editor::property_holder* property_holder); + void fill(::editor::property_holder_base* property_holder); shared_str unique_id(shared_str const& id) const; bool save_current_blend(char* buffer, u32 const& buffer_size); bool paste_current_time_frame(char const* buffer, u32 const& buffer_size); @@ -53,7 +53,7 @@ class manager : private Noncopyable weather_ids_type const& weather_ids() const; private: - typedef editor::property_holder property_holder_type; + typedef editor::property_holder_base property_holder_type; typedef property_collection collection_type; private: diff --git a/src/xrEngine/editor_environment_weathers_time.cpp b/src/xrEngine/editor_environment_weathers_time.cpp index 19ddb8d6d62..030a3a7523b 100644 --- a/src/xrEngine/editor_environment_weathers_time.cpp +++ b/src/xrEngine/editor_environment_weathers_time.cpp @@ -245,11 +245,11 @@ void time::fill(editor::property_holder_collection* collection) VERIFY(!m_property_holder); m_property_holder = ::ide().create_property_holder(m_identifier.c_str(), collection, this); - typedef editor::property_holder::string_getter_type string_getter_type; + typedef editor::property_holder_base::string_getter_type string_getter_type; string_getter_type string_getter; string_getter.bind(this, &time::id_getter); - typedef editor::property_holder::string_setter_type string_setter_type; + typedef editor::property_holder_base::string_setter_type string_setter_type; string_setter_type string_setter; string_setter.bind(this, &time::id_setter); @@ -261,11 +261,11 @@ void time::fill(editor::property_holder_collection* collection) m_property_holder->add_property("shafts intensity", "sun", "this option is resposible for sun shafts intensity", m_fSunShaftsIntensity, m_fSunShaftsIntensity, 0.f, 1.f); - typedef editor::property_holder::float_getter_type float_getter_type; + typedef editor::property_holder_base::float_getter_type float_getter_type; float_getter_type sun_altitude_getter; sun_altitude_getter.bind(this, &time::sun_altitude_getter); - typedef editor::property_holder::float_setter_type float_setter_type; + typedef editor::property_holder_base::float_setter_type float_setter_type; float_setter_type sun_altitude_setter; sun_altitude_setter.bind(this, &time::sun_altitude_setter); @@ -281,17 +281,17 @@ void time::fill(editor::property_holder_collection* collection) m_property_holder->add_property("longitude", "sun", "this option is resposible for sun longitude (in degrees)", sun_longitude_getter(), sun_longitude_getter, sun_longitude_setter, -360.f, 360.f); - typedef editor::property_holder::string_collection_getter_type collection_getter_type; + typedef editor::property_holder_base::string_collection_getter_type collection_getter_type; collection_getter_type collection_getter; - typedef editor::property_holder::string_collection_size_getter_type collection_size_getter_type; + typedef editor::property_holder_base::string_collection_size_getter_type collection_size_getter_type; collection_size_getter_type collection_size_getter; collection_getter.bind(this, &time::suns_collection); collection_size_getter.bind(this, &time::suns_collection_size); m_property_holder->add_property("sun", "sun", "this option is resposible for ambient", m_sun.c_str(), m_sun, - collection_getter, collection_size_getter, editor::property_holder::value_editor_combo_box, - editor::property_holder::cannot_enter_text); + collection_getter, collection_size_getter, editor::property_holder_base::value_editor_combo_box, + editor::property_holder_base::cannot_enter_text); string_getter_type sky_texture_getter; sky_texture_getter.bind(this, &time::sky_texture_getter); @@ -302,7 +302,7 @@ void time::fill(editor::property_holder_collection* collection) m_property_holder->add_property("texture", "hemisphere", "this option is resposible for sky texture", sky_texture_name.c_str(), sky_texture_getter, sky_texture_setter, ".dds", "Texture files (*.dds)|*.dds", detail::real_path("$game_textures$", "").c_str(), "Select texture...", - editor::property_holder::cannot_enter_text, editor::property_holder::remove_extension); + editor::property_holder_base::cannot_enter_text, editor::property_holder_base::remove_extension); m_property_holder->add_property("sky color", "hemisphere", "this option is resposible for sky color", (editor::color const&)sky_color, (editor::color&)sky_color); @@ -310,10 +310,10 @@ void time::fill(editor::property_holder_collection* collection) m_property_holder->add_property("hemi color", "hemisphere", "this option is resposible for hemisphere color", (editor::color const&)hemi_color, (editor::color&)hemi_color); - typedef ::editor::property_holder::float_getter_type float_getter_type; + typedef ::editor::property_holder_base::float_getter_type float_getter_type; float_getter_type float_getter; - typedef ::editor::property_holder::float_setter_type float_setter_type; + typedef ::editor::property_holder_base::float_setter_type float_setter_type; float_setter_type float_setter; float_getter.bind(this, &time::sky_rotation_getter); @@ -326,7 +326,7 @@ void time::fill(editor::property_holder_collection* collection) m_property_holder->add_property("texture", "clouds", "this option is resposible for clouds texture", clouds_texture_name.c_str(), string_getter, string_setter, ".dds", "Texture files (*.dds)|*.dds", detail::real_path("$game_textures$", "").c_str(), "Select texture...", - editor::property_holder::cannot_enter_text, editor::property_holder::remove_extension); + editor::property_holder_base::cannot_enter_text, editor::property_holder_base::remove_extension); m_property_holder->add_property("color", "clouds", "this option is resposible for clouds color", (editor::color const&)clouds_color, (editor::color&)clouds_color); @@ -344,7 +344,7 @@ void time::fill(editor::property_holder_collection* collection) string_setter.bind(this, &time::ambient_setter); m_property_holder->add_property("ambient", "ambient", "this option is resposible for ambient", m_ambient.c_str(), string_getter, string_setter, collection_getter, collection_size_getter, - editor::property_holder::value_editor_combo_box, editor::property_holder::cannot_enter_text); + editor::property_holder_base::value_editor_combo_box, editor::property_holder_base::cannot_enter_text); m_property_holder->add_property("color", "fog", "this option is resposible for fog density (0..1)", (editor::color const&)fog_color, (editor::color&)fog_color); @@ -366,7 +366,7 @@ void time::fill(editor::property_holder_collection* collection) collection_size_getter.bind(this, &time::thunderbolts_collection_size); m_property_holder->add_property("collection", "thunderbolts", "this option is resposible for ambient", m_thunderbolt_collection.c_str(), m_thunderbolt_collection, collection_getter, collection_size_getter, - editor::property_holder::value_editor_combo_box, editor::property_holder::cannot_enter_text); + editor::property_holder_base::value_editor_combo_box, editor::property_holder_base::cannot_enter_text); m_property_holder->add_property( "duration", "thunderbolts", "this option is resposible for thunderbolt duration", bolt_duration, bolt_duration); diff --git a/src/xrEngine/editor_environment_weathers_time.hpp b/src/xrEngine/editor_environment_weathers_time.hpp index d5cc6d94774..d0417c65554 100644 --- a/src/xrEngine/editor_environment_weathers_time.hpp +++ b/src/xrEngine/editor_environment_weathers_time.hpp @@ -12,7 +12,8 @@ #ifdef INGAME_EDITOR #include "Common/Noncopyable.hpp" -#include "Include/editor/property_holder.hpp" +#include "Include/editor/property_holder_base.hpp" +#include "Include/editor/property_holder_base.hpp" #include "Environment.h" namespace editor @@ -31,7 +32,7 @@ class time : public CEnvDescriptorMixer, public editor::property_holder_holder, typedef CEnvDescriptorMixer inherited; public: - typedef editor::property_holder property_holder_type; + typedef editor::property_holder_base property_holder_type; public: time(editor::environment::manager* manager, weather const* weather, shared_str const& id); diff --git a/src/xrEngine/editor_environment_weathers_weather.cpp b/src/xrEngine/editor_environment_weathers_weather.cpp index cd0ed03fd14..4f64c272b50 100644 --- a/src/xrEngine/editor_environment_weathers_weather.cpp +++ b/src/xrEngine/editor_environment_weathers_weather.cpp @@ -28,7 +28,7 @@ void property_collection::display_name( } template <> -editor::property_holder* property_collection::create() +editor::property_holder_base* property_collection::create() { using ::editor::environment::weathers::time; time* object = new time(&m_holder.m_manager, &m_holder, m_holder.generate_unique_id().c_str()); @@ -109,11 +109,11 @@ void weather::fill(editor::property_holder_collection* collection) VERIFY(!m_property_holder); m_property_holder = ::ide().create_property_holder(m_id.c_str(), collection, this); - typedef editor::property_holder::string_getter_type string_getter_type; + typedef editor::property_holder_base::string_getter_type string_getter_type; string_getter_type string_getter; string_getter.bind(this, &weather::id_getter); - typedef editor::property_holder::string_setter_type string_setter_type; + typedef editor::property_holder_base::string_setter_type string_setter_type; string_setter_type string_setter; string_setter.bind(this, &weather::id_setter); diff --git a/src/xrEngine/editor_environment_weathers_weather.hpp b/src/xrEngine/editor_environment_weathers_weather.hpp index df3ce7bf71d..01027dbb6e7 100644 --- a/src/xrEngine/editor_environment_weathers_weather.hpp +++ b/src/xrEngine/editor_environment_weathers_weather.hpp @@ -12,7 +12,7 @@ #ifdef INGAME_EDITOR #include "Common/Noncopyable.hpp" -#include "Include/editor/property_holder.hpp" +#include "Include/editor/property_holder_base.hpp" #include "property_collection_forward.hpp" namespace editor @@ -29,7 +29,7 @@ class time; class weather : public editor::property_holder_holder, private Noncopyable { public: - typedef editor::property_holder property_holder_type; + typedef editor::property_holder_base property_holder_type; public: weather(environment::manager* manager, shared_str const& id); diff --git a/src/xrEngine/engine_impl.cpp b/src/xrEngine/engine_impl.cpp index 710b2293b46..d74b2ca2da5 100644 --- a/src/xrEngine/engine_impl.cpp +++ b/src/xrEngine/engine_impl.cpp @@ -20,7 +20,7 @@ ENGINE_API extern CConsole* Console; -using editor::property_holder; +using editor::property_holder_base; engine_impl::engine_impl() : m_input_receiver(new IInputReceiver()), m_input_captured(false) {} engine_impl::~engine_impl() @@ -226,7 +226,7 @@ void engine_impl::track_weather(float const& time) } float engine_impl::track_weather() { return (g_pGamePersistent->Environment().GetGameTime() / (24 * 60 * 60)); } -property_holder* engine_impl::current_frame_property_holder() +property_holder_base* engine_impl::current_frame_property_holder() { CEnvironment& environment = g_pGamePersistent->Environment(); if (!environment.Current[0]) @@ -235,7 +235,7 @@ property_holder* engine_impl::current_frame_property_holder() return (((editor::environment::weathers::time&)(*environment.Current[0])).object()); } -property_holder* engine_impl::blend_frame_property_holder() +property_holder_base* engine_impl::blend_frame_property_holder() { CEnvironment& environment = g_pGamePersistent->Environment(); if (!environment.CurrentEnv) @@ -244,7 +244,7 @@ property_holder* engine_impl::blend_frame_property_holder() return (((editor::environment::weathers::time&)(*environment.CurrentEnv)).object()); } -property_holder* engine_impl::target_frame_property_holder() +property_holder_base* engine_impl::target_frame_property_holder() { CEnvironment& environment = g_pGamePersistent->Environment(); if (!environment.Current[1]) diff --git a/src/xrEngine/engine_impl.hpp b/src/xrEngine/engine_impl.hpp index 6ceb26d0e53..8c7b580d327 100644 --- a/src/xrEngine/engine_impl.hpp +++ b/src/xrEngine/engine_impl.hpp @@ -44,9 +44,9 @@ class engine_impl : public editor::engine virtual void track_weather(float const& time); virtual float track_weather(); - virtual editor::property_holder* current_frame_property_holder(); - virtual editor::property_holder* blend_frame_property_holder(); - virtual editor::property_holder* target_frame_property_holder(); + virtual editor::property_holder_base* current_frame_property_holder(); + virtual editor::property_holder_base* blend_frame_property_holder(); + virtual editor::property_holder_base* target_frame_property_holder(); virtual void save_weathers(); diff --git a/src/xrEngine/property_collection.hpp b/src/xrEngine/property_collection.hpp index 9966126a12d..3fb9612ef03 100644 --- a/src/xrEngine/property_collection.hpp +++ b/src/xrEngine/property_collection.hpp @@ -9,7 +9,7 @@ #ifndef PROPERTY_COLLECTION_HPP_INCLUDED #define PROPERTY_COLLECTION_HPP_INCLUDED -#include "Include/editor/property_holder.hpp" +#include "Include/editor/property_holder_base.hpp" #include "Common/Noncopyable.hpp" #include "Common/object_broker.h" @@ -17,7 +17,7 @@ template class property_collection : public editor::property_holder_collection, private Noncopyable { public: - typedef editor::property_holder property_holder; + typedef editor::property_holder_base property_holder; public: inline property_collection(container_type* container, holder_type* holder, bool* changed = 0); diff --git a/src/xrEngine/property_collection_inline.hpp b/src/xrEngine/property_collection_inline.hpp index 1bef15dcd37..3ca20098e03 100644 --- a/src/xrEngine/property_collection_inline.hpp +++ b/src/xrEngine/property_collection_inline.hpp @@ -68,7 +68,7 @@ void PROPERTY_COLLECTION::erase(u32 const& position) } SPECIALIZATION -editor::property_holder* PROPERTY_COLLECTION::item(u32 const& position) { return (m_container[position]->object()); } +editor::property_holder_base* PROPERTY_COLLECTION::item(u32 const& position) { return (m_container[position]->object()); } SPECIALIZATION inline PROPERTY_COLLECTION::predicate::predicate(property_holder* holder) : m_holder(holder) {} SPECIALIZATION @@ -89,7 +89,7 @@ int PROPERTY_COLLECTION::index(property_holder* holder) } SPECIALIZATION -void PROPERTY_COLLECTION::destroy(editor::property_holder* holder) { delete_data(holder->holder()); } +void PROPERTY_COLLECTION::destroy(editor::property_holder_base* holder) { delete_data(holder->holder()); } SPECIALIZATION inline PROPERTY_COLLECTION::unique_id_predicate::unique_id_predicate(LPCSTR id) : m_id(id) {} SPECIALIZATION