diff --git a/src/editor/editor.vcxproj b/src/editor/editor.vcxproj
index 968c49880a5..13f2a0c4871 100644
--- a/src/editor/editor.vcxproj
+++ b/src/editor/editor.vcxproj
@@ -102,10 +102,13 @@
- ..\..\sdk\binaries\DockPanelSkin.dll
+ $(xrSdkDir)binaries\DockPanelSkin.dll
- ..\..\sdk\binaries\Flobbster.Windows.Forms.PropertyGrid.dll
+ $(xrSdkDir)binaries\Flobbster.Windows.Forms.PropertyGrid.dll
+
+
+ $(xrSdkDir)binaries\WeifenLuo.WinFormsUI.Docking.dll
true
@@ -135,9 +138,6 @@
true
true
-
- ..\..\sdk\binaries\WeifenLuo.WinFormsUI.Docking.dll
-
@@ -345,8 +345,8 @@
{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}
false
-
- {b45374aa-c7ed-42cf-bbd3-deaa2b7acb48}
+
+ {e9dc16a3-d0fa-4924-af6e-f6fdf3ea0661}
diff --git a/src/editor/property_boolean.cpp b/src/editor/property_boolean.cpp
index e6a000f40ec..f05f7f7facd 100644
--- a/src/editor/property_boolean.cpp
+++ b/src/editor/property_boolean.cpp
@@ -29,12 +29,12 @@ property_boolean::!property_boolean ()
delete (m_setter);
}
-System::Object ^property_boolean::get_value ()
+System::Object ^property_boolean::GetValue ()
{
return ((*m_getter)());
}
-void property_boolean::set_value (System::Object ^object)
+void property_boolean::SetValue (System::Object ^object)
{
(*m_setter) (safe_cast(object));
}
\ No newline at end of file
diff --git a/src/editor/property_boolean.hpp b/src/editor/property_boolean.hpp
index a9acadd1c03..9dfaf7f5d24 100644
--- a/src/editor/property_boolean.hpp
+++ b/src/editor/property_boolean.hpp
@@ -10,8 +10,9 @@
#define PROPERTY_BOOLEAN_HPP_INCLUDED
#include "property_holder_include.hpp"
+using XRay::SdkControls::IProperty;
-public ref class property_boolean : public property_value {
+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;
@@ -23,8 +24,8 @@ public ref class property_boolean : public property_value {
);
virtual ~property_boolean ();
!property_boolean ();
- virtual System::Object ^get_value ();
- virtual void set_value (System::Object ^object);
+ virtual System::Object ^GetValue ();
+ virtual void SetValue (System::Object ^object);
private:
boolean_getter_type *m_getter;
diff --git a/src/editor/property_boolean_reference.cpp b/src/editor/property_boolean_reference.cpp
index a3617844e5d..73bce486e6b 100644
--- a/src/editor/property_boolean_reference.cpp
+++ b/src/editor/property_boolean_reference.cpp
@@ -24,12 +24,12 @@ property_boolean_reference::!property_boolean_reference ()
delete (m_value);
}
-System::Object ^property_boolean_reference::get_value ()
+System::Object ^property_boolean_reference::GetValue ()
{
return (m_value->get());
}
-void property_boolean_reference::set_value (System::Object ^object)
+void property_boolean_reference::SetValue (System::Object ^object)
{
bool value = safe_cast(object);
m_value->set (value);
diff --git a/src/editor/property_boolean_reference.hpp b/src/editor/property_boolean_reference.hpp
index 247bf13397d..8552d02711f 100644
--- a/src/editor/property_boolean_reference.hpp
+++ b/src/editor/property_boolean_reference.hpp
@@ -11,13 +11,14 @@
#include "property_holder_include.hpp"
-public ref class property_boolean_reference : public property_value {
+public ref class property_boolean_reference : public XRay::SdkControls::IProperty
+{
public:
property_boolean_reference (bool& value);
virtual ~property_boolean_reference ();
!property_boolean_reference ();
- virtual System::Object ^get_value ();
- virtual void set_value (System::Object ^object);
+ virtual System::Object ^GetValue ();
+ virtual void SetValue (System::Object ^object);
private:
value_holder* m_value;
diff --git a/src/editor/property_boolean_values_value.cpp b/src/editor/property_boolean_values_value.cpp
index fbe98b526e9..9502c06824f 100644
--- a/src/editor/property_boolean_values_value.cpp
+++ b/src/editor/property_boolean_values_value.cpp
@@ -23,11 +23,11 @@ property_boolean_values_value::property_boolean_values_value (
m_collection->Add (to_string(values[i]));
}
-void property_boolean_values_value::set_value (Object ^object)
+void property_boolean_values_value::SetValue (Object ^object)
{
String^ string_value = dynamic_cast(object);
int index = m_collection->IndexOf(string_value);
VERIFY ((index < 2));
VERIFY ((index >= 0));
- inherited::set_value ((index == 1));
+ inherited::SetValue ((index == 1));
}
\ No newline at end of file
diff --git a/src/editor/property_boolean_values_value.hpp b/src/editor/property_boolean_values_value.hpp
index 5702a8fb9a2..9e01b8e01b3 100644
--- a/src/editor/property_boolean_values_value.hpp
+++ b/src/editor/property_boolean_values_value.hpp
@@ -27,7 +27,7 @@ public ref class property_boolean_values_value : public property_boolean {
boolean_setter_type const &setter,
LPCSTR values[2]
);
- virtual void set_value (Object ^object) override;
+ virtual void SetValue (Object ^object) override;
public:
collection_type ^m_collection;
diff --git a/src/editor/property_boolean_values_value_reference.cpp b/src/editor/property_boolean_values_value_reference.cpp
index 6281af89a00..881d5b662dd 100644
--- a/src/editor/property_boolean_values_value_reference.cpp
+++ b/src/editor/property_boolean_values_value_reference.cpp
@@ -22,11 +22,11 @@ property_boolean_values_value_reference::property_boolean_values_value_reference
m_collection->Add (to_string(values[i]));
}
-void property_boolean_values_value_reference::set_value (Object ^object)
+void property_boolean_values_value_reference::SetValue (Object ^object)
{
String^ string_value = dynamic_cast(object);
int index = m_collection->IndexOf(string_value);
VERIFY ((index < 2));
VERIFY ((index >= 0));
- inherited::set_value ((index == 1));
+ inherited::SetValue ((index == 1));
}
\ No newline at end of file
diff --git a/src/editor/property_boolean_values_value_reference.hpp b/src/editor/property_boolean_values_value_reference.hpp
index fc422408a46..5654f015724 100644
--- a/src/editor/property_boolean_values_value_reference.hpp
+++ b/src/editor/property_boolean_values_value_reference.hpp
@@ -23,7 +23,7 @@ public ref class property_boolean_values_value_reference : public property_boole
public:
property_boolean_values_value_reference (bool& value, LPCSTR values[2]);
- virtual void set_value (Object ^object) override;
+ virtual void SetValue (Object ^object) override;
public:
collection_type ^m_collection;
diff --git a/src/editor/property_collection_base.cpp b/src/editor/property_collection_base.cpp
index ef424757f02..f54f03258d6 100644
--- a/src/editor/property_collection_base.cpp
+++ b/src/editor/property_collection_base.cpp
@@ -28,12 +28,12 @@ property_collection_base::!property_collection_base ()
{
}
-Object ^property_collection_base::get_value ()
+Object ^property_collection_base::GetValue ()
{
return (this);
}
-void property_collection_base::set_value (Object ^object)
+void property_collection_base::SetValue (Object ^object)
{
}
diff --git a/src/editor/property_collection_base.hpp b/src/editor/property_collection_base.hpp
index 24e06a5ab24..86c2de744d6 100644
--- a/src/editor/property_collection_base.hpp
+++ b/src/editor/property_collection_base.hpp
@@ -18,7 +18,7 @@ ref class property_collection_converter;
[System::ComponentModel::EditorAttribute(property_collection_editor::typeid,System::Drawing::Design::UITypeEditor::typeid)]
[System::ComponentModel::TypeConverter(property_collection_converter::typeid)]
public ref class property_collection_base abstract :
- public property_value,
+ public XRay::SdkControls::IProperty,
public System::Collections::IList
{
public:
@@ -32,8 +32,8 @@ public ref class property_collection_base abstract :
property_collection_base ();
virtual ~property_collection_base ();
!property_collection_base ();
- virtual Object ^get_value ();
- virtual void set_value (Object ^object);
+ virtual Object ^GetValue ();
+ virtual void SetValue (Object ^object);
public:
virtual void CopyTo (Array^ items, int index);
diff --git a/src/editor/property_collection_editor.cpp b/src/editor/property_collection_editor.cpp
index f0697ebdad9..92b446695ed 100644
--- a/src/editor/property_collection_editor.cpp
+++ b/src/editor/property_collection_editor.cpp
@@ -43,7 +43,7 @@ Object^ property_collection_editor::CreateInstance (Type^ type)
{
property_container^ container = safe_cast(Context->Instance);
PropertySpecDescriptor^ descriptor = safe_cast(Context->PropertyDescriptor);
- property_value^ raw_value = container->value(descriptor->item);
+ IProperty^ raw_value = container->GetProperty(descriptor->item);
property_collection^ collection = safe_cast(raw_value);
return (collection->create());
}
diff --git a/src/editor/property_color_base.cpp b/src/editor/property_color_base.cpp
index d6bebb37962..ec8aeba8430 100644
--- a/src/editor/property_color_base.cpp
+++ b/src/editor/property_color_base.cpp
@@ -173,12 +173,12 @@ property_color_base::!property_color_base ()
delete (m_container);
}
-Object^ property_color_base::get_value ()
+Object^ property_color_base::GetValue ()
{
return (m_container);
}
-void property_color_base::set_value (Object ^object)
+void property_color_base::SetValue (Object ^object)
{
Color color = safe_cast(object);
editor::color value;
@@ -209,7 +209,7 @@ void property_color_base::blue (float value)
set_value_raw (current);
}
-void property_color_base::on_double_click (editor::controls::property_grid^ property_grid)
+void property_color_base::OnDoubleClick (XRay::SdkControls::PropertyGrid^ property_grid)
{
#if 0
ColorDialog ^dialog = gcnew ColorDialog();
@@ -219,7 +219,7 @@ void property_color_base::on_double_click (editor::controls::property_grid^ prop
if (dialog->ShowDialog() == System::Windows::Forms::DialogResult::Cancel)
return;
- set_value (::Color(dialog->Color.R/255.f, dialog->Color.G/255.f, dialog->Color.B/255.f));
+ SetValue (::Color(dialog->Color.R/255.f, dialog->Color.G/255.f, dialog->Color.B/255.f));
property_grid->Refresh ();
#endif // #if 0
}
@@ -236,7 +236,7 @@ static void increment_and_clamp (float& value, float const& increment)
value = 0.f;
}
-void property_color_base::increment (float const% increment)
+void property_color_base::Increment (float increment)
{
float increment_value = increment*s_increment_factor;
editor::color value = get_value_raw();
diff --git a/src/editor/property_color_base.hpp b/src/editor/property_color_base.hpp
index 4c085a24fb0..45b61bf8b48 100644
--- a/src/editor/property_color_base.hpp
+++ b/src/editor/property_color_base.hpp
@@ -47,10 +47,10 @@ public value struct Color {
}; // value struct Color
public ref class property_color_base abstract :
- public property_value,
+ public XRay::SdkControls::IProperty,
public property_container_holder,
- public editor::controls::property_mouse_events,
- public editor::controls::property_incrementable
+ public XRay::SdkControls::IMouseListener,
+ public XRay::SdkControls::IIncrementable
{
public:
typedef System::Attribute Attribute;
@@ -64,10 +64,10 @@ public ref class property_color_base abstract :
void blue (float value);
public:
- virtual System::Object ^get_value ();
- virtual void set_value (System::Object ^object);
- virtual void on_double_click (editor::controls::property_grid^ property_grid);
- virtual void increment (float const% increment);
+ virtual System::Object ^GetValue ();
+ virtual void SetValue (System::Object ^object);
+ virtual void OnDoubleClick (XRay::SdkControls::PropertyGrid^ property_grid);
+ virtual void Increment (float increment);
public:
virtual editor::color get_value_raw () = 0;
diff --git a/src/editor/property_container.cpp b/src/editor/property_container.cpp
index 9ebef562b9e..b78f17c42c4 100644
--- a/src/editor/property_container.cpp
+++ b/src/editor/property_container.cpp
@@ -147,7 +147,7 @@ void property_container::update_names (String^ name)
try_update_name (i, name);
}
-void property_container::add_property (PropertySpec^ description, property_value^ value)
+void property_container::add_property (PropertySpec^ description, IProperty^ value)
{
VERIFY (!m_properties[description]);
@@ -168,10 +168,10 @@ void property_container::add_property (PropertySpec^ description, property_val
m_ordered_properties->Add (description);
}
-property_value^ property_container::value (PropertySpec^ description)
+IProperty^ property_container::GetProperty (PropertySpec^ description)
{
VERIFY (m_properties[description]);
- return (safe_cast(m_properties[description]));
+ return (safe_cast(m_properties[description]));
}
IDictionary% property_container::properties ()
@@ -188,16 +188,16 @@ ArrayList% property_container::ordered_properties ()
void property_container::get_value_handler (Object^ sender, PropertySpecEventArgs^ e)
{
- property_value ^value = safe_cast(m_properties[e->Property]);
+ IProperty ^value = safe_cast(m_properties[e->Property]);
VERIFY (value);
- e->Value = value->get_value();
+ e->Value = value->GetValue();
}
void property_container::set_value_handler (Object^ sender, PropertySpecEventArgs^ e)
{
- property_value ^value = safe_cast(m_properties[e->Property]);
+ IProperty ^value = safe_cast(m_properties[e->Property]);
VERIFY (value);
- value->set_value (e->Value);
+ value->SetValue (e->Value);
}
void property_container::clear ()
diff --git a/src/editor/property_container.hpp b/src/editor/property_container.hpp
index 4da440f169e..2d413c49c0e 100644
--- a/src/editor/property_container.hpp
+++ b/src/editor/property_container.hpp
@@ -8,8 +8,7 @@
#ifndef PROPERTY_CONTAINER_HPP_INCLUDED
#define PROPERTY_CONTAINER_HPP_INCLUDED
-
-interface class property_value;
+using XRay::SdkControls::IProperty;
class property_holder;
ref class property_container_converter;
@@ -18,7 +17,7 @@ interface class property_container_holder;
[System::ComponentModel::TypeConverterAttribute(property_container_converter::typeid)]
public ref class property_container :
public Flobbster::Windows::Forms::PropertyBag,
- public property_container_interface
+ public XRay::SdkControls::IPropertyContainer
{
public:
typedef Flobbster::Windows::Forms::PropertySpec PropertySpec;
@@ -34,8 +33,8 @@ public ref class property_container :
!property_container ();
property_holder& holder ();
property_container_holder% container_holder ();
- void add_property (PropertySpec^ description, property_value^ value);
- virtual property_value^ value (PropertySpec^ description);
+ void add_property (PropertySpec^ description, IProperty^ value);
+ virtual IProperty^ GetProperty (PropertySpec^ description);
IDictionary% properties ();
ArrayList% ordered_properties ();
void clear ();
diff --git a/src/editor/property_converter_boolean_values.cpp b/src/editor/property_converter_boolean_values.cpp
index 0de1f7b9839..2a4ec7cb63f 100644
--- a/src/editor/property_converter_boolean_values.cpp
+++ b/src/editor/property_converter_boolean_values.cpp
@@ -29,7 +29,7 @@ StandardValuesCollection ^property_converter_boolean_values::GetStandardValues (
{
property_container^ container = safe_cast(context->Instance);
PropertySpecDescriptor^ descriptor = safe_cast(context->PropertyDescriptor);
- property_value^ raw_value = container->value(descriptor->item);
+ IProperty^ raw_value = container->GetProperty(descriptor->item);
property_boolean_values_value^ value = safe_cast(raw_value);
return (gcnew StandardValuesCollection(value->m_collection));
}
@@ -58,7 +58,7 @@ Object^ property_converter_boolean_values::ConvertTo (
property_container^ container = safe_cast(context->Instance);
PropertySpecDescriptor^ descriptor = safe_cast(context->PropertyDescriptor);
- property_value^ raw_value = container->value(descriptor->item);
+ IProperty^ raw_value = container->GetProperty(descriptor->item);
property_boolean_values_value^ real_value = safe_cast(raw_value);
bool bool_value = safe_cast(value);
return (real_value->m_collection[bool_value ? 1 : 0]);
diff --git a/src/editor/property_converter_float_enum.cpp b/src/editor/property_converter_float_enum.cpp
index 5872423a332..df79e6bdfd4 100644
--- a/src/editor/property_converter_float_enum.cpp
+++ b/src/editor/property_converter_float_enum.cpp
@@ -29,7 +29,7 @@ StandardValuesCollection ^property_converter_float_enum::GetStandardValues (ITyp
{
property_container^ container = safe_cast(context->Instance);
PropertySpecDescriptor^ descriptor = safe_cast(context->PropertyDescriptor);
- property_value^ raw_value = container->value(descriptor->item);
+ IProperty^ raw_value = container->GetProperty(descriptor->item);
property_float_enum_value^ value = safe_cast(raw_value);
return (gcnew StandardValuesCollection(value->m_collection));
}
@@ -63,7 +63,7 @@ Object^ property_converter_float_enum::ConvertTo (
property_container^ container = safe_cast(context->Instance);
PropertySpecDescriptor^ descriptor = safe_cast(context->PropertyDescriptor);
- property_value^ raw_value = container->value(descriptor->item);
+ IProperty^ raw_value = container->GetProperty(descriptor->item);
property_float_enum_value^ real_value = safe_cast(raw_value);
float float_value = safe_cast(value);
diff --git a/src/editor/property_converter_integer_enum.cpp b/src/editor/property_converter_integer_enum.cpp
index 6ea49eb9798..47946e94c2c 100644
--- a/src/editor/property_converter_integer_enum.cpp
+++ b/src/editor/property_converter_integer_enum.cpp
@@ -29,7 +29,7 @@ StandardValuesCollection ^property_converter_integer_enum::GetStandardValues (IT
{
property_container^ container = safe_cast(context->Instance);
PropertySpecDescriptor^ descriptor = safe_cast(context->PropertyDescriptor);
- property_value^ raw_value = container->value(descriptor->item);
+ IProperty^ raw_value = container->GetProperty(descriptor->item);
property_integer_enum_value^ value = safe_cast(raw_value);
return (gcnew StandardValuesCollection(value->m_collection));
}
@@ -63,7 +63,7 @@ Object^ property_converter_integer_enum::ConvertTo (
property_container^ container = safe_cast(context->Instance);
PropertySpecDescriptor^ descriptor = safe_cast(context->PropertyDescriptor);
- property_value^ raw_value = container->value(descriptor->item);
+ IProperty^ raw_value = container->GetProperty(descriptor->item);
property_integer_enum_value^ real_value = safe_cast(raw_value);
int int_value = safe_cast(value);
diff --git a/src/editor/property_converter_integer_values.cpp b/src/editor/property_converter_integer_values.cpp
index 203fb45411b..33a42220e21 100644
--- a/src/editor/property_converter_integer_values.cpp
+++ b/src/editor/property_converter_integer_values.cpp
@@ -29,7 +29,7 @@ StandardValuesCollection ^property_converter_integer_values::GetStandardValues (
{
property_container^ container = safe_cast(context->Instance);
PropertySpecDescriptor^ descriptor = safe_cast(context->PropertyDescriptor);
- property_value^ raw_value = container->value(descriptor->item);
+ IProperty^ raw_value = container->GetProperty(descriptor->item);
property_integer_values_value_base^ value = safe_cast(raw_value);
return (gcnew StandardValuesCollection(value->collection()));
}
@@ -58,7 +58,7 @@ Object^ property_converter_integer_values::ConvertTo (
property_container^ container = safe_cast(context->Instance);
PropertySpecDescriptor^ descriptor = safe_cast(context->PropertyDescriptor);
- property_value^ raw_value = container->value(descriptor->item);
+ IProperty^ raw_value = container->GetProperty(descriptor->item);
property_integer_values_value_base^ real_value = safe_cast(raw_value);
int int_value = safe_cast(value);
return (real_value->collection()[int_value]);
diff --git a/src/editor/property_converter_string_values.cpp b/src/editor/property_converter_string_values.cpp
index 1de3b669d1f..8cbf343343a 100644
--- a/src/editor/property_converter_string_values.cpp
+++ b/src/editor/property_converter_string_values.cpp
@@ -29,7 +29,7 @@ StandardValuesCollection ^property_converter_string_values::GetStandardValues (I
{
property_container^ container = safe_cast(context->Instance);
PropertySpecDescriptor^ descriptor = safe_cast(context->PropertyDescriptor);
- property_value^ raw_value = container->value(descriptor->item);
+ IProperty^ raw_value = container->GetProperty(descriptor->item);
property_string_values_value_base^ value = safe_cast(raw_value);
return (gcnew StandardValuesCollection(value->values()));
}
diff --git a/src/editor/property_editor_color.cpp b/src/editor/property_editor_color.cpp
index 8c1195b1839..260f80d0fb6 100644
--- a/src/editor/property_editor_color.cpp
+++ b/src/editor/property_editor_color.cpp
@@ -87,7 +87,7 @@ Object^ property_editor_color::EditValue (
property_container^ container = safe_cast(context->Instance);
PropertySpecDescriptor^ descriptor = safe_cast(context->PropertyDescriptor);
- property_value^ raw_value = container->value(descriptor->item);
+ IProperty^ raw_value = container->GetProperty(descriptor->item);
property_color_base^ real_value = safe_cast(raw_value);
ColorDialog ^dialog = gcnew ColorDialog();
@@ -95,7 +95,7 @@ Object^ property_editor_color::EditValue (
editor::color color = real_value->get_value_raw();
dialog->Color = System::Drawing::Color::FromArgb(255, int(255.f*color.r), int(255.f*color.g), int(255.f*color.b));
if (dialog->ShowDialog() != System::Windows::Forms::DialogResult::Cancel)
- real_value->set_value (::Color(dialog->Color.R/255.f, dialog->Color.G/255.f, dialog->Color.B/255.f));
+ real_value->SetValue (::Color(dialog->Color.R/255.f, dialog->Color.G/255.f, dialog->Color.B/255.f));
return (inherited::EditValue(context, provider, value));
}
\ No newline at end of file
diff --git a/src/editor/property_editor_file_name.cpp b/src/editor/property_editor_file_name.cpp
index 05f67009575..5db42df7284 100644
--- a/src/editor/property_editor_file_name.cpp
+++ b/src/editor/property_editor_file_name.cpp
@@ -71,7 +71,7 @@ Object^ property_editor_file_name::EditValue (
property_container^ container = safe_cast(context->Instance);
PropertySpecDescriptor^ descriptor = safe_cast(context->PropertyDescriptor);
- property_value^ raw_value = container->value(descriptor->item);
+ IProperty^ raw_value = container->GetProperty(descriptor->item);
property_file_name_value_base^ real_value = safe_cast(raw_value);
#ifndef USE_CUSTOM_DIALOG
@@ -99,7 +99,7 @@ Object^ property_editor_file_name::EditValue (
if (real_value->remove_extension() && (file_name->EndsWith(default_extension)))
file_name = file_name->Substring(0, file_name->Length - default_extension->Length);
- real_value->set_value (file_name);
+ real_value->SetValue (file_name);
break;
}
}
diff --git a/src/editor/property_editor_tree_values.cpp b/src/editor/property_editor_tree_values.cpp
index 72afa4e28b6..c6ad650e230 100644
--- a/src/editor/property_editor_tree_values.cpp
+++ b/src/editor/property_editor_tree_values.cpp
@@ -53,12 +53,12 @@ Object^ property_editor_tree_values::EditValue (
property_container^ container = safe_cast(context->Instance);
PropertySpecDescriptor^ descriptor = safe_cast(context->PropertyDescriptor);
- property_value^ raw_value = container->value(descriptor->item);
+ IProperty^ raw_value = container->GetProperty(descriptor->item);
property_string_values_value_base^ real_value = safe_cast(raw_value);
- m_dialog->values (real_value->values(), safe_cast(raw_value->get_value()));
+ m_dialog->values (real_value->values(), safe_cast(raw_value->GetValue()));
switch (m_dialog->ShowDialog()) {
case System::Windows::Forms::DialogResult::OK : {
- raw_value->set_value (m_dialog->Result);
+ raw_value->SetValue (m_dialog->Result);
break;
}
}
diff --git a/src/editor/property_file_name_value_base.hpp b/src/editor/property_file_name_value_base.hpp
index c8421c0d8b2..e7138eb01bc 100644
--- a/src/editor/property_file_name_value_base.hpp
+++ b/src/editor/property_file_name_value_base.hpp
@@ -9,7 +9,8 @@
#ifndef PROPERTY_FILE_NAME_VALUE_BASE_HPP_INCLUDED
#define PROPERTY_FILE_NAME_VALUE_BASE_HPP_INCLUDED
-interface class property_file_name_value_base : public property_value {
+interface class property_file_name_value_base : public XRay::SdkControls::IProperty
+{
virtual System::String^ default_extension () = 0;
virtual System::String^ filter () = 0;
virtual System::String^ initial_directory () = 0;
diff --git a/src/editor/property_float.cpp b/src/editor/property_float.cpp
index 2a035822926..896cbc75c77 100644
--- a/src/editor/property_float.cpp
+++ b/src/editor/property_float.cpp
@@ -31,17 +31,17 @@ property_float::!property_float ()
delete (m_setter);
}
-System::Object ^property_float::get_value ()
+System::Object ^property_float::GetValue ()
{
return ((*m_getter)());
}
-void property_float::set_value (System::Object ^object)
+void property_float::SetValue (System::Object ^object)
{
(*m_setter) (safe_cast(object));
}
-void property_float::increment (float const% increment)
+void property_float::Increment (float value)
{
- set_value (safe_cast(get_value()) + increment*m_increment_factor);
+ SetValue (safe_cast(GetValue()) + value*m_increment_factor);
}
\ No newline at end of file
diff --git a/src/editor/property_float.hpp b/src/editor/property_float.hpp
index 4c1557e41b2..f6b60a3b3b6 100644
--- a/src/editor/property_float.hpp
+++ b/src/editor/property_float.hpp
@@ -12,8 +12,8 @@
#include "property_holder_include.hpp"
public ref class property_float :
- public property_value,
- public editor::controls::property_incrementable
+ public XRay::SdkControls::IProperty,
+ public XRay::SdkControls::IIncrementable
{
public:
typedef editor::property_holder::float_getter_type float_getter_type;
@@ -27,9 +27,9 @@ public ref class property_float :
);
virtual ~property_float ();
!property_float ();
- virtual System::Object ^get_value ();
- virtual void set_value (System::Object ^object);
- virtual void increment (float const% increment);
+ virtual System::Object ^GetValue ();
+ virtual void SetValue (System::Object ^object);
+ virtual void Increment (float value);
private:
float_getter_type *m_getter;
diff --git a/src/editor/property_float_enum_value.cpp b/src/editor/property_float_enum_value.cpp
index 1b22ebc4d0e..c53fcf75a3d 100644
--- a/src/editor/property_float_enum_value.cpp
+++ b/src/editor/property_float_enum_value.cpp
@@ -28,9 +28,9 @@ property_float_enum_value::property_float_enum_value (
}
}
-System::Object ^property_float_enum_value::get_value ()
+System::Object ^property_float_enum_value::GetValue ()
{
- float value = safe_cast(inherited::get_value());
+ float value = safe_cast(inherited::GetValue());
for each (ValuePair^ i in m_collection) {
if (i->first != value)
continue;
@@ -41,7 +41,7 @@ System::Object ^property_float_enum_value::get_value ()
return (safe_cast(m_collection[0])->first);
}
-void property_float_enum_value::set_value (Object ^object)
+void property_float_enum_value::SetValue (Object ^object)
{
String^ string_value = dynamic_cast(object);
@@ -49,11 +49,11 @@ void property_float_enum_value::set_value (Object ^object)
if (!i->second->Equals(string_value))
continue;
- inherited::set_value(i->first);
+ inherited::SetValue(i->first);
return;
}
- inherited::set_value (safe_cast(m_collection[0])->first);
+ inherited::SetValue (safe_cast(m_collection[0])->first);
}
void property_float_enum_value::increment (float const% increment)
diff --git a/src/editor/property_float_enum_value.hpp b/src/editor/property_float_enum_value.hpp
index dc049dea2b9..039730c542a 100644
--- a/src/editor/property_float_enum_value.hpp
+++ b/src/editor/property_float_enum_value.hpp
@@ -30,8 +30,8 @@ public ref class property_float_enum_value : public property_float {
pair *values,
u32 const &value_count
);
- virtual Object ^get_value () override;
- virtual void set_value (Object ^object) override;
+ virtual Object ^GetValue () override;
+ virtual void SetValue (Object ^object) override;
virtual void increment (float const% increment) override;
public:
diff --git a/src/editor/property_float_enum_value_reference.cpp b/src/editor/property_float_enum_value_reference.cpp
index a13275fb52b..89eeee76490 100644
--- a/src/editor/property_float_enum_value_reference.cpp
+++ b/src/editor/property_float_enum_value_reference.cpp
@@ -27,9 +27,9 @@ property_float_enum_value_reference::property_float_enum_value_reference (
}
}
-System::Object ^property_float_enum_value_reference::get_value ()
+System::Object ^property_float_enum_value_reference::GetValue ()
{
- float value = safe_cast(inherited::get_value());
+ float value = safe_cast(inherited::GetValue());
for each (ValuePair^ i in m_collection) {
if (i->first != value)
continue;
@@ -40,7 +40,7 @@ System::Object ^property_float_enum_value_reference::get_value ()
return (safe_cast(m_collection[0])->first);
}
-void property_float_enum_value_reference::set_value (Object ^object)
+void property_float_enum_value_reference::SetValue (Object ^object)
{
String^ string_value = dynamic_cast(object);
@@ -48,11 +48,11 @@ void property_float_enum_value_reference::set_value (Object ^object)
if (!i->second->Equals(string_value))
continue;
- inherited::set_value(i->first);
+ inherited::SetValue(i->first);
return;
}
- inherited::set_value (safe_cast(m_collection[0])->first);
+ inherited::SetValue (safe_cast(m_collection[0])->first);
}
void property_float_enum_value_reference::increment (float const% increment)
diff --git a/src/editor/property_float_enum_value_reference.hpp b/src/editor/property_float_enum_value_reference.hpp
index cf3869dc742..cfad87bc9ff 100644
--- a/src/editor/property_float_enum_value_reference.hpp
+++ b/src/editor/property_float_enum_value_reference.hpp
@@ -29,8 +29,8 @@ public ref class property_float_enum_value_reference : public property_float_ref
pair *values,
u32 const &value_count
);
- virtual Object ^get_value () override;
- virtual void set_value (Object ^object) override;
+ virtual Object ^GetValue () override;
+ virtual void SetValue (Object ^object) override;
virtual void increment (float const% increment) override;
public:
diff --git a/src/editor/property_float_limited.cpp b/src/editor/property_float_limited.cpp
index da912fe7fd1..b27c66494db 100644
--- a/src/editor/property_float_limited.cpp
+++ b/src/editor/property_float_limited.cpp
@@ -22,9 +22,9 @@ property_float_limited::property_float_limited (
{
}
-System::Object ^property_float_limited::get_value ()
+System::Object ^property_float_limited::GetValue ()
{
- float value = safe_cast(inherited::get_value());
+ float value = safe_cast(inherited::GetValue());
if (value < m_min)
value = m_min;
@@ -34,7 +34,7 @@ System::Object ^property_float_limited::get_value ()
return (value);
}
-void property_float_limited::set_value (System::Object ^object)
+void property_float_limited::SetValue (System::Object ^object)
{
float new_value = safe_cast(object);
@@ -44,5 +44,5 @@ void property_float_limited::set_value (System::Object ^object)
if (new_value > m_max)
new_value = m_max;
- inherited::set_value (new_value);
+ inherited::SetValue (new_value);
}
\ No newline at end of file
diff --git a/src/editor/property_float_limited.hpp b/src/editor/property_float_limited.hpp
index cb50140eb00..3aee0780787 100644
--- a/src/editor/property_float_limited.hpp
+++ b/src/editor/property_float_limited.hpp
@@ -23,8 +23,8 @@ public ref class property_float_limited : public property_float {
float const %min,
float const %max
);
- virtual Object ^get_value () override;
- virtual void set_value (System::Object ^object) override;
+ virtual Object ^GetValue () override;
+ virtual void SetValue (System::Object ^object) override;
private:
float m_min;
diff --git a/src/editor/property_float_limited_reference.cpp b/src/editor/property_float_limited_reference.cpp
index 7242bea38ee..dc2658ce0ab 100644
--- a/src/editor/property_float_limited_reference.cpp
+++ b/src/editor/property_float_limited_reference.cpp
@@ -21,9 +21,9 @@ property_float_limited_reference::property_float_limited_reference (
{
}
-System::Object ^property_float_limited_reference::get_value ()
+System::Object ^property_float_limited_reference::GetValue ()
{
- float value = safe_cast(inherited::get_value());
+ float value = safe_cast(inherited::GetValue());
if (value < m_min)
value = m_min;
@@ -33,7 +33,7 @@ System::Object ^property_float_limited_reference::get_value ()
return (value);
}
-void property_float_limited_reference::set_value (System::Object ^object)
+void property_float_limited_reference::SetValue (System::Object ^object)
{
float new_value = safe_cast(object);
@@ -43,5 +43,5 @@ void property_float_limited_reference::set_value (System::Object ^object)
if (new_value > m_max)
new_value = m_max;
- inherited::set_value (new_value);
+ inherited::SetValue (new_value);
}
\ No newline at end of file
diff --git a/src/editor/property_float_limited_reference.hpp b/src/editor/property_float_limited_reference.hpp
index ea4516b2ea9..40fa8cfe960 100644
--- a/src/editor/property_float_limited_reference.hpp
+++ b/src/editor/property_float_limited_reference.hpp
@@ -22,8 +22,8 @@ public ref class property_float_limited_reference : public property_float_refere
float const %min,
float const %max
);
- virtual Object ^get_value () override;
- virtual void set_value (System::Object ^object) override;
+ virtual Object ^GetValue () override;
+ virtual void SetValue (System::Object ^object) override;
private:
float m_min;
diff --git a/src/editor/property_float_reference.cpp b/src/editor/property_float_reference.cpp
index 59562e5fa1c..d247d3eb0ed 100644
--- a/src/editor/property_float_reference.cpp
+++ b/src/editor/property_float_reference.cpp
@@ -26,18 +26,18 @@ property_float_reference::!property_float_reference ()
delete (m_value);
}
-System::Object ^property_float_reference::get_value ()
+System::Object ^property_float_reference::GetValue ()
{
return (m_value->get());
}
-void property_float_reference::set_value (System::Object ^object)
+void property_float_reference::SetValue (System::Object ^object)
{
float value = safe_cast(object);
m_value->set (value);
}
-void property_float_reference::increment (float const% increment)
+void property_float_reference::Increment (float value)
{
- set_value (safe_cast(get_value()) + increment*m_increment_factor);
+ SetValue (safe_cast(GetValue()) + value*m_increment_factor);
}
\ No newline at end of file
diff --git a/src/editor/property_float_reference.hpp b/src/editor/property_float_reference.hpp
index 068aabe9ffa..11bb542b791 100644
--- a/src/editor/property_float_reference.hpp
+++ b/src/editor/property_float_reference.hpp
@@ -12,16 +12,16 @@
#include "property_holder_include.hpp"
public ref class property_float_reference :
- public property_value,
- public editor::controls::property_incrementable
+ public XRay::SdkControls::IProperty,
+ public XRay::SdkControls::IIncrementable
{
public:
property_float_reference (float& value, float const% increment_factor);
virtual ~property_float_reference ();
!property_float_reference ();
- virtual System::Object ^get_value ();
- virtual void set_value (System::Object ^object);
- virtual void increment (float const% increment);
+ virtual System::Object ^GetValue ();
+ virtual void SetValue (System::Object ^object);
+ virtual void Increment (float value);
private:
value_holder* m_value;
diff --git a/src/editor/property_integer.cpp b/src/editor/property_integer.cpp
index a079e15cc80..db56e8e36ff 100644
--- a/src/editor/property_integer.cpp
+++ b/src/editor/property_integer.cpp
@@ -29,12 +29,12 @@ property_integer::!property_integer ()
delete (m_setter);
}
-System::Object ^property_integer::get_value ()
+System::Object ^property_integer::GetValue ()
{
return ((*m_getter)());
}
-void property_integer::set_value (System::Object ^object)
+void property_integer::SetValue (System::Object ^object)
{
(*m_setter) (safe_cast(object));
}
\ No newline at end of file
diff --git a/src/editor/property_integer.hpp b/src/editor/property_integer.hpp
index c78840e0ed3..45dcaa3289d 100644
--- a/src/editor/property_integer.hpp
+++ b/src/editor/property_integer.hpp
@@ -11,7 +11,8 @@
#include "property_holder_include.hpp"
-public ref class property_integer : public property_value {
+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;
@@ -23,8 +24,8 @@ public ref class property_integer : public property_value {
);
virtual ~property_integer ();
!property_integer ();
- virtual System::Object ^get_value ();
- virtual void set_value (System::Object ^object);
+ virtual System::Object ^GetValue ();
+ virtual void SetValue (System::Object ^object);
private:
integer_getter_type *m_getter;
diff --git a/src/editor/property_integer_enum_value.cpp b/src/editor/property_integer_enum_value.cpp
index 96b09091862..59da1d9fc44 100644
--- a/src/editor/property_integer_enum_value.cpp
+++ b/src/editor/property_integer_enum_value.cpp
@@ -28,9 +28,9 @@ property_integer_enum_value::property_integer_enum_value (
}
}
-System::Object ^property_integer_enum_value::get_value ()
+System::Object ^property_integer_enum_value::GetValue ()
{
- int value = safe_cast(inherited::get_value());
+ int value = safe_cast(inherited::GetValue());
for each (ValuePair^ i in m_collection) {
if (i->first != value)
continue;
@@ -41,7 +41,7 @@ System::Object ^property_integer_enum_value::get_value ()
return (safe_cast(m_collection[0])->first);
}
-void property_integer_enum_value::set_value (Object ^object)
+void property_integer_enum_value::SetValue (Object ^object)
{
String^ string_value = dynamic_cast(object);
@@ -49,9 +49,9 @@ void property_integer_enum_value::set_value (Object ^object)
if (!i->second->Equals(string_value))
continue;
- inherited::set_value(i->first);
+ inherited::SetValue(i->first);
return;
}
- inherited::set_value (safe_cast(m_collection[0])->first);
+ inherited::SetValue (safe_cast(m_collection[0])->first);
}
\ No newline at end of file
diff --git a/src/editor/property_integer_enum_value.hpp b/src/editor/property_integer_enum_value.hpp
index 8b870286a46..9d019140546 100644
--- a/src/editor/property_integer_enum_value.hpp
+++ b/src/editor/property_integer_enum_value.hpp
@@ -30,8 +30,8 @@ public ref class property_integer_enum_value : public property_integer {
pair *values,
u32 const &value_count
);
- virtual Object ^get_value () override;
- virtual void set_value (Object ^object) override;
+ virtual Object ^GetValue () override;
+ virtual void SetValue (Object ^object) override;
public:
collection_type^m_collection;
diff --git a/src/editor/property_integer_enum_value_reference.cpp b/src/editor/property_integer_enum_value_reference.cpp
index 78a2f8378b6..05ac00acce1 100644
--- a/src/editor/property_integer_enum_value_reference.cpp
+++ b/src/editor/property_integer_enum_value_reference.cpp
@@ -27,9 +27,9 @@ property_integer_enum_value_reference::property_integer_enum_value_reference (
}
}
-System::Object ^property_integer_enum_value_reference::get_value ()
+System::Object ^property_integer_enum_value_reference::GetValue ()
{
- int value = safe_cast(inherited::get_value());
+ int value = safe_cast(inherited::GetValue());
for each (ValuePair^ i in m_collection) {
if (i->first != value)
continue;
@@ -40,7 +40,7 @@ System::Object ^property_integer_enum_value_reference::get_value ()
return (safe_cast(m_collection[0])->first);
}
-void property_integer_enum_value_reference::set_value (Object ^object)
+void property_integer_enum_value_reference::SetValue (Object ^object)
{
String^ string_value = dynamic_cast(object);
@@ -48,9 +48,9 @@ void property_integer_enum_value_reference::set_value (Object ^object)
if (!i->second->Equals(string_value))
continue;
- inherited::set_value(i->first);
+ inherited::SetValue(i->first);
return;
}
- inherited::set_value (safe_cast(m_collection[0])->first);
+ inherited::SetValue (safe_cast(m_collection[0])->first);
}
\ No newline at end of file
diff --git a/src/editor/property_integer_enum_value_reference.hpp b/src/editor/property_integer_enum_value_reference.hpp
index 69a62a5530b..0264d8775b0 100644
--- a/src/editor/property_integer_enum_value_reference.hpp
+++ b/src/editor/property_integer_enum_value_reference.hpp
@@ -27,8 +27,8 @@ public ref class property_integer_enum_value_reference : public property_integer
pair* values,
u32 const& value_count
);
- virtual Object ^get_value () override;
- virtual void set_value (Object ^object) override;
+ virtual Object ^GetValue () override;
+ virtual void SetValue (Object ^object) override;
public:
collection_type^m_collection;
diff --git a/src/editor/property_integer_limited.cpp b/src/editor/property_integer_limited.cpp
index cbea8d749cd..7b0d6ef9ef4 100644
--- a/src/editor/property_integer_limited.cpp
+++ b/src/editor/property_integer_limited.cpp
@@ -21,9 +21,9 @@ property_integer_limited::property_integer_limited (
{
}
-System::Object ^property_integer_limited::get_value ()
+System::Object ^property_integer_limited::GetValue ()
{
- int value = safe_cast(inherited::get_value());
+ int value = safe_cast(inherited::GetValue());
if (value < m_min)
value = m_min;
@@ -33,7 +33,7 @@ System::Object ^property_integer_limited::get_value ()
return (value);
}
-void property_integer_limited::set_value (System::Object ^object)
+void property_integer_limited::SetValue (System::Object ^object)
{
int new_value = safe_cast(object);
@@ -43,5 +43,5 @@ void property_integer_limited::set_value (System::Object ^object)
if (new_value > m_max)
new_value = m_max;
- inherited::set_value (new_value);
+ inherited::SetValue (new_value);
}
\ No newline at end of file
diff --git a/src/editor/property_integer_limited.hpp b/src/editor/property_integer_limited.hpp
index 47e2a276c58..9bd60b10144 100644
--- a/src/editor/property_integer_limited.hpp
+++ b/src/editor/property_integer_limited.hpp
@@ -25,8 +25,8 @@ public ref class property_integer_limited : public property_integer {
int const %min,
int const %max
);
- virtual Object ^get_value () override;
- virtual void set_value (System::Object ^object) override;
+ virtual Object ^GetValue () override;
+ virtual void SetValue (System::Object ^object) override;
private:
int m_min;
diff --git a/src/editor/property_integer_limited_reference.cpp b/src/editor/property_integer_limited_reference.cpp
index 382ff0d7e37..800faaae013 100644
--- a/src/editor/property_integer_limited_reference.cpp
+++ b/src/editor/property_integer_limited_reference.cpp
@@ -20,9 +20,9 @@ property_integer_limited_reference::property_integer_limited_reference (
{
}
-System::Object ^property_integer_limited_reference::get_value ()
+System::Object ^property_integer_limited_reference::GetValue ()
{
- int value = safe_cast(inherited::get_value());
+ int value = safe_cast(inherited::GetValue());
if (value < m_min)
value = m_min;
@@ -32,7 +32,7 @@ System::Object ^property_integer_limited_reference::get_value ()
return (value);
}
-void property_integer_limited_reference::set_value (System::Object ^object)
+void property_integer_limited_reference::SetValue (System::Object ^object)
{
int new_value = safe_cast(object);
@@ -42,5 +42,5 @@ void property_integer_limited_reference::set_value (System::Object ^object)
if (new_value > m_max)
new_value = m_max;
- inherited::set_value (new_value);
+ inherited::SetValue (new_value);
}
\ No newline at end of file
diff --git a/src/editor/property_integer_limited_reference.hpp b/src/editor/property_integer_limited_reference.hpp
index 11ed4b4710e..1543dfce5cf 100644
--- a/src/editor/property_integer_limited_reference.hpp
+++ b/src/editor/property_integer_limited_reference.hpp
@@ -24,8 +24,8 @@ public ref class property_integer_limited_reference : public property_integer_re
int const %min,
int const %max
);
- virtual Object ^get_value () override;
- virtual void set_value (System::Object ^object) override;
+ virtual Object ^GetValue () override;
+ virtual void SetValue (System::Object ^object) override;
private:
int m_min;
diff --git a/src/editor/property_integer_reference.cpp b/src/editor/property_integer_reference.cpp
index 46f652574b5..798d2ed0eaa 100644
--- a/src/editor/property_integer_reference.cpp
+++ b/src/editor/property_integer_reference.cpp
@@ -24,12 +24,12 @@ property_integer_reference::!property_integer_reference ()
delete (m_value);
}
-System::Object ^property_integer_reference::get_value ()
+System::Object ^property_integer_reference::GetValue ()
{
return (m_value->get());
}
-void property_integer_reference::set_value (System::Object ^object)
+void property_integer_reference::SetValue (System::Object ^object)
{
int value = safe_cast(object);
m_value->set(value);
diff --git a/src/editor/property_integer_reference.hpp b/src/editor/property_integer_reference.hpp
index 54327fa056c..963ce141ed1 100644
--- a/src/editor/property_integer_reference.hpp
+++ b/src/editor/property_integer_reference.hpp
@@ -11,13 +11,14 @@
#include "property_holder_include.hpp"
-public ref class property_integer_reference : public property_value {
+public ref class property_integer_reference : public XRay::SdkControls::IProperty
+{
public:
property_integer_reference (int& value);
virtual ~property_integer_reference ();
!property_integer_reference ();
- virtual System::Object ^get_value ();
- virtual void set_value (System::Object ^object);
+ virtual System::Object ^GetValue ();
+ virtual void SetValue (System::Object ^object);
private:
value_holder* m_value;
diff --git a/src/editor/property_integer_values_value.cpp b/src/editor/property_integer_values_value.cpp
index c1f8b35503c..1aa7b855317 100644
--- a/src/editor/property_integer_values_value.cpp
+++ b/src/editor/property_integer_values_value.cpp
@@ -26,9 +26,9 @@ property_integer_values_value::property_integer_values_value (
m_collection->Add (to_string(values[i]));
}
-Object^ property_integer_values_value::get_value ()
+Object^ property_integer_values_value::GetValue ()
{
- int value = safe_cast(inherited::get_value());
+ int value = safe_cast(inherited::GetValue());
if (value < 0)
value = 0;
@@ -38,12 +38,12 @@ Object^ property_integer_values_value::get_value ()
return (value);
}
-void property_integer_values_value::set_value (Object ^object)
+void property_integer_values_value::SetValue (Object ^object)
{
String^ string_value = dynamic_cast(object);
int index = m_collection->IndexOf(string_value);
VERIFY ((index >= 0));
- inherited::set_value (index);
+ inherited::SetValue (index);
}
IList^ property_integer_values_value::collection ()
diff --git a/src/editor/property_integer_values_value.hpp b/src/editor/property_integer_values_value.hpp
index 703ef33a444..2afaf56e75b 100644
--- a/src/editor/property_integer_values_value.hpp
+++ b/src/editor/property_integer_values_value.hpp
@@ -33,8 +33,8 @@ public ref class property_integer_values_value :
LPCSTR const* values,
u32 const &value_count
);
- virtual Object^ get_value () override;
- virtual void set_value (Object ^object) override;
+ virtual Object^ GetValue () override;
+ virtual void SetValue (Object ^object) override;
virtual IList^ collection ();
private:
diff --git a/src/editor/property_integer_values_value_getter.cpp b/src/editor/property_integer_values_value_getter.cpp
index 598ca569ba5..4b51b8161d8 100644
--- a/src/editor/property_integer_values_value_getter.cpp
+++ b/src/editor/property_integer_values_value_getter.cpp
@@ -37,9 +37,9 @@ property_integer_values_value_getter::!property_integer_values_value_getter ()
delete (m_collection_size_getter);
}
-Object ^property_integer_values_value_getter::get_value ()
+Object ^property_integer_values_value_getter::GetValue ()
{
- int value = safe_cast(inherited::get_value());
+ int value = safe_cast(inherited::GetValue());
if (value < 0)
value = 0;
@@ -50,12 +50,12 @@ Object ^property_integer_values_value_getter::get_value ()
return (value);
}
-void property_integer_values_value_getter::set_value (Object ^object)
+void property_integer_values_value_getter::SetValue (Object ^object)
{
String^ string_value = dynamic_cast(object);
int index = collection()->IndexOf(string_value);
VERIFY ((index >= 0));
- inherited::set_value (index);
+ inherited::SetValue (index);
}
IList^ property_integer_values_value_getter::collection ()
diff --git a/src/editor/property_integer_values_value_getter.hpp b/src/editor/property_integer_values_value_getter.hpp
index 5e374b4f6f9..44e532df443 100644
--- a/src/editor/property_integer_values_value_getter.hpp
+++ b/src/editor/property_integer_values_value_getter.hpp
@@ -37,8 +37,8 @@ public ref class property_integer_values_value_getter :
);
virtual ~property_integer_values_value_getter ();
!property_integer_values_value_getter ();
- virtual Object ^get_value () override;
- virtual void set_value (Object ^object) override;
+ virtual Object ^GetValue () override;
+ virtual void SetValue (Object ^object) override;
virtual IList^ collection ();
public:
diff --git a/src/editor/property_integer_values_value_reference.cpp b/src/editor/property_integer_values_value_reference.cpp
index 5262b83542a..c1d58d77a9d 100644
--- a/src/editor/property_integer_values_value_reference.cpp
+++ b/src/editor/property_integer_values_value_reference.cpp
@@ -25,9 +25,9 @@ property_integer_values_value_reference::property_integer_values_value_reference
m_collection->Add (to_string(values[i]));
}
-System::Object ^property_integer_values_value_reference::get_value ()
+System::Object ^property_integer_values_value_reference::GetValue ()
{
- int value = safe_cast(inherited::get_value());
+ int value = safe_cast(inherited::GetValue());
if (value < 0)
value = 0;
@@ -37,12 +37,12 @@ System::Object ^property_integer_values_value_reference::get_value ()
return (value);
}
-void property_integer_values_value_reference::set_value (Object ^object)
+void property_integer_values_value_reference::SetValue (Object ^object)
{
String^ string_value = dynamic_cast(object);
int index = m_collection->IndexOf(string_value);
VERIFY ((index >= 0));
- inherited::set_value (index);
+ inherited::SetValue (index);
}
IList^ property_integer_values_value_reference::collection ()
diff --git a/src/editor/property_integer_values_value_reference.hpp b/src/editor/property_integer_values_value_reference.hpp
index 0388c9746ed..1f5b298592e 100644
--- a/src/editor/property_integer_values_value_reference.hpp
+++ b/src/editor/property_integer_values_value_reference.hpp
@@ -28,8 +28,8 @@ public ref class property_integer_values_value_reference :
LPCSTR const* values,
u32 const &value_count
);
- virtual Object^ get_value () override;
- virtual void set_value (Object ^object) override;
+ virtual Object^ GetValue () override;
+ virtual void SetValue (Object ^object) override;
virtual IList^ collection ();
private:
diff --git a/src/editor/property_integer_values_value_reference_getter.cpp b/src/editor/property_integer_values_value_reference_getter.cpp
index 79aa38f01ea..c6acaa47e13 100644
--- a/src/editor/property_integer_values_value_reference_getter.cpp
+++ b/src/editor/property_integer_values_value_reference_getter.cpp
@@ -36,9 +36,9 @@ property_integer_values_value_reference_getter::!property_integer_values_value_r
delete (m_collection_size_getter);
}
-Object ^property_integer_values_value_reference_getter::get_value ()
+Object ^property_integer_values_value_reference_getter::GetValue ()
{
- int value = safe_cast(inherited::get_value());
+ int value = safe_cast(inherited::GetValue());
if (value < 0)
value = 0;
@@ -49,12 +49,12 @@ Object ^property_integer_values_value_reference_getter::get_value ()
return (value);
}
-void property_integer_values_value_reference_getter::set_value (Object ^object)
+void property_integer_values_value_reference_getter::SetValue (Object ^object)
{
String^ string_value = dynamic_cast(object);
int index = collection()->IndexOf(string_value);
VERIFY ((index >= 0));
- inherited::set_value (index);
+ inherited::SetValue (index);
}
IList^ property_integer_values_value_reference_getter::collection ()
diff --git a/src/editor/property_integer_values_value_reference_getter.hpp b/src/editor/property_integer_values_value_reference_getter.hpp
index 68c6de4b185..be63cf06ea0 100644
--- a/src/editor/property_integer_values_value_reference_getter.hpp
+++ b/src/editor/property_integer_values_value_reference_getter.hpp
@@ -36,8 +36,8 @@ public ref class property_integer_values_value_reference_getter :
);
virtual ~property_integer_values_value_reference_getter ();
!property_integer_values_value_reference_getter ();
- virtual Object ^get_value () override;
- virtual void set_value (Object ^object) override;
+ virtual Object ^GetValue () override;
+ virtual void SetValue (Object ^object) override;
virtual IList^ collection ();
public:
diff --git a/src/editor/property_property_container.cpp b/src/editor/property_property_container.cpp
index ebb54b88fe3..48cb47c139f 100644
--- a/src/editor/property_property_container.cpp
+++ b/src/editor/property_property_container.cpp
@@ -17,12 +17,12 @@ property_property_container::property_property_container(property_holder* object
{
}
-Object^ property_property_container::get_value ()
+Object^ property_property_container::GetValue ()
{
return (m_object->container());
}
-void property_property_container::set_value (Object ^object)
+void property_property_container::SetValue (Object ^object)
{
NODEFAULT;
}
\ No newline at end of file
diff --git a/src/editor/property_property_container.hpp b/src/editor/property_property_container.hpp
index 4ef9972f227..a7d142d77c8 100644
--- a/src/editor/property_property_container.hpp
+++ b/src/editor/property_property_container.hpp
@@ -11,11 +11,12 @@
class property_holder;
-public ref class property_property_container : public property_value {
+public ref class property_property_container : public XRay::SdkControls::IProperty
+{
public:
property_property_container (property_holder* object);
- virtual System::Object ^get_value ();
- virtual void set_value (System::Object ^object);
+ virtual System::Object ^GetValue ();
+ virtual void SetValue (System::Object ^object);
private:
property_holder* m_object;
diff --git a/src/editor/property_string.cpp b/src/editor/property_string.cpp
index 97f664c88e5..011da369295 100644
--- a/src/editor/property_string.cpp
+++ b/src/editor/property_string.cpp
@@ -29,12 +29,12 @@ property_string::!property_string ()
delete (m_setter);
}
-System::Object ^property_string::get_value ()
+System::Object ^property_string::GetValue ()
{
return (to_string((*m_getter)()));
}
-void property_string::set_value (System::Object ^object)
+void property_string::SetValue (System::Object ^object)
{
LPSTR result = to_string(safe_cast(object));
(*m_setter) (result);
diff --git a/src/editor/property_string.hpp b/src/editor/property_string.hpp
index f2a20d9ecc8..65b425b8ab1 100644
--- a/src/editor/property_string.hpp
+++ b/src/editor/property_string.hpp
@@ -11,7 +11,8 @@
#include "property_holder_include.hpp"
-public ref class property_string : public property_value {
+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;
@@ -23,8 +24,8 @@ public ref class property_string : public property_value {
);
virtual ~property_string();
!property_string();
- virtual System::Object ^get_value ();
- virtual void set_value (System::Object ^object);
+ virtual System::Object ^GetValue ();
+ virtual void SetValue (System::Object ^object);
private:
string_getter_type *m_getter;
diff --git a/src/editor/property_string_shared_str.cpp b/src/editor/property_string_shared_str.cpp
index 5b30fe32182..6f7038d3953 100644
--- a/src/editor/property_string_shared_str.cpp
+++ b/src/editor/property_string_shared_str.cpp
@@ -25,12 +25,12 @@ property_string_shared_str::!property_string_shared_str ()
{
}
-System::Object ^property_string_shared_str::get_value ()
+System::Object ^property_string_shared_str::GetValue ()
{
return (to_string(m_engine->value(*m_value)));
}
-void property_string_shared_str::set_value (System::Object ^object)
+void property_string_shared_str::SetValue (System::Object ^object)
{
LPSTR result = to_string(safe_cast(object));
m_engine->value (result, *m_value);
diff --git a/src/editor/property_string_shared_str.hpp b/src/editor/property_string_shared_str.hpp
index 3be9c932e66..9ee341b74e5 100644
--- a/src/editor/property_string_shared_str.hpp
+++ b/src/editor/property_string_shared_str.hpp
@@ -15,13 +15,14 @@ namespace editor {
class engine;
} // namespace editor
-public ref class property_string_shared_str : public property_value {
+public ref class property_string_shared_str : public XRay::SdkControls::IProperty
+{
public:
property_string_shared_str (editor::engine* engine, shared_str& value);
virtual ~property_string_shared_str ();
!property_string_shared_str ();
- virtual System::Object ^get_value ();
- virtual void set_value (System::Object ^object);
+ virtual System::Object ^GetValue ();
+ virtual void SetValue (System::Object ^object);
private:
editor::engine* m_engine;
diff --git a/src/editor/property_vec3f_base.cpp b/src/editor/property_vec3f_base.cpp
index 3f950884d6d..8892e6e8709 100644
--- a/src/editor/property_vec3f_base.cpp
+++ b/src/editor/property_vec3f_base.cpp
@@ -132,12 +132,12 @@ property_vec3f_base::!property_vec3f_base ()
delete (m_container);
}
-Object^ property_vec3f_base::get_value ()
+Object^ property_vec3f_base::GetValue ()
{
return (m_container);
}
-void property_vec3f_base::set_value (Object ^object)
+void property_vec3f_base::SetValue (Object ^object)
{
Vec3f vec3f = safe_cast(object);
editor::vec3f value;
diff --git a/src/editor/property_vec3f_base.hpp b/src/editor/property_vec3f_base.hpp
index 2b94b751ce7..2b112e4ae5c 100644
--- a/src/editor/property_vec3f_base.hpp
+++ b/src/editor/property_vec3f_base.hpp
@@ -47,7 +47,7 @@ public value struct Vec3f {
}; // value struct Vec3f
public ref class property_vec3f_base abstract :
- public property_value,
+ public XRay::SdkControls::IProperty,
public property_container_holder
{
public:
@@ -59,8 +59,8 @@ public ref class property_vec3f_base abstract :
void z (float value);
public:
- virtual System::Object ^get_value ();
- virtual void set_value (System::Object ^object);
+ virtual System::Object ^GetValue ();
+ virtual void SetValue (System::Object ^object);
public:
virtual editor::vec3f get_value_raw () = 0;
diff --git a/src/editor/window_levels.h b/src/editor/window_levels.h
index 84558ff2970..e2081d0bcb9 100644
--- a/src/editor/window_levels.h
+++ b/src/editor/window_levels.h
@@ -43,7 +43,7 @@ namespace editor {
delete components;
}
}
- private: editor::controls::property_grid^ PropertyGrid;
+ private: XRay::SdkControls::PropertyGrid^ PropertyGrid;
protected:
protected:
@@ -63,7 +63,7 @@ namespace editor {
///
void InitializeComponent(void)
{
- this->PropertyGrid = (gcnew editor::controls::property_grid());
+ this->PropertyGrid = (gcnew XRay::SdkControls::PropertyGrid());
this->SuspendLayout();
//
// PropertyGrid
diff --git a/src/editor/window_view.cpp b/src/editor/window_view.cpp
index ad3d96276aa..5961e142823 100644
--- a/src/editor/window_view.cpp
+++ b/src/editor/window_view.cpp
@@ -12,7 +12,7 @@
using editor::window_ide;
using editor::window_view;
-using editor::controls::property_incrementable;
+using XRay::SdkControls::IIncrementable;
using System::Windows::Forms::GridItem;
using Flobbster::Windows::Forms::PropertyBag;
@@ -216,14 +216,14 @@ Void window_view::ViewPanel_MouseMove (System::Object^ sender, System::Window
PropertySpecDescriptor^ descriptor = safe_cast(descriptor_raw);
property_container^ container = safe_cast(descriptor->bag);
- ::property_value^ raw_value = container->value(descriptor->item);
+ ::IProperty^ raw_value = container->GetProperty(descriptor->item);
VERIFY (raw_value);
- property_incrementable^ incrementable = dynamic_cast(raw_value);
+ IIncrementable^ incrementable = dynamic_cast(raw_value);
if (!incrementable)
return;
- incrementable->increment (float(e->Location.X - m_previous_location.X));
+ incrementable->Increment (float(e->Location.X - m_previous_location.X));
m_previous_location = e->Location;
}
@@ -255,7 +255,7 @@ Void window_view::ViewPanel_MouseClick (Object^ sender, MouseEventArgs^ e)
VERIFY (descriptor_raw);
PropertySpecDescriptor^ descriptor = safe_cast(descriptor_raw);
property_container^ container = safe_cast(descriptor->bag);
- ::property_value^ raw_value = container->value(descriptor->item);
+ ::IProperty^ raw_value = container->GetProperty(descriptor->item);
VERIFY (raw_value);
property_color_base^ color = dynamic_cast(raw_value);
@@ -317,7 +317,7 @@ bool window_view::pick_color_cursor ()
VERIFY (descriptor_raw);
PropertySpecDescriptor^ descriptor = safe_cast(descriptor_raw);
property_container^ container = safe_cast(descriptor->bag);
- ::property_value^ raw_value = container->value(descriptor->item);
+ ::IProperty^ raw_value = container->GetProperty(descriptor->item);
VERIFY (raw_value);
property_color_base^ color = dynamic_cast(raw_value);
diff --git a/src/editor/window_weather.h b/src/editor/window_weather.h
index 89dd5f5c6e4..c64c9246d6f 100644
--- a/src/editor/window_weather.h
+++ b/src/editor/window_weather.h
@@ -46,7 +46,7 @@ namespace editor {
private: System::Windows::Forms::ToolStrip^ toolStrip1;
private: System::Windows::Forms::ToolStripButton^ SaveButton;
- private: editor::controls::property_grid^ PropertyGrid;
+ private: XRay::SdkControls::PropertyGrid^ PropertyGrid;
private: System::Windows::Forms::ToolStripButton^ ReloadWeatherButton;
private: System::Windows::Forms::ToolStripButton^ ReloadAllWeathersButton;
protected:
@@ -71,7 +71,7 @@ namespace editor {
this->SaveButton = (gcnew System::Windows::Forms::ToolStripButton());
this->ReloadWeatherButton = (gcnew System::Windows::Forms::ToolStripButton());
this->ReloadAllWeathersButton = (gcnew System::Windows::Forms::ToolStripButton());
- this->PropertyGrid = (gcnew editor::controls::property_grid());
+ this->PropertyGrid = (gcnew XRay::SdkControls::PropertyGrid());
this->toolStrip1->SuspendLayout();
this->SuspendLayout();
//
diff --git a/src/editor/window_weather_editor.h b/src/editor/window_weather_editor.h
index 3b8bf5276f1..7efe402aeac 100644
--- a/src/editor/window_weather_editor.h
+++ b/src/editor/window_weather_editor.h
@@ -197,7 +197,7 @@ private: System::Windows::Forms::Label^ label7;
private: System::Windows::Forms::Panel^ panel2;
private: System::Windows::Forms::Panel^ panel13;
-private: editor::controls::property_grid^ blend;
+private: XRay::SdkControls::PropertyGrid^ blend;
private: System::Windows::Forms::Panel^ panel15;
private: System::Windows::Forms::Label^ label6;
private: System::Windows::Forms::Panel^ panel22;
@@ -206,7 +206,7 @@ private: System::Windows::Forms::Panel^ panel11;
private: System::Windows::Forms::Button^ CreateFromButton;
private: System::Windows::Forms::Splitter^ splitter2;
private: System::Windows::Forms::Panel^ panel14;
-private: editor::controls::property_grid^ target;
+private: XRay::SdkControls::PropertyGrid^ target;
private: System::Windows::Forms::Panel^ panel20;
private: System::Windows::Forms::Panel^ panel17;
private: System::Windows::Forms::Label^ label5;
@@ -214,7 +214,7 @@ private: System::Windows::Forms::Panel^ panel18;
private: System::Windows::Forms::Button^ PasteTargetButton;
private: System::Windows::Forms::Splitter^ splitter1;
private: System::Windows::Forms::Panel^ panel12;
-private: editor::controls::property_grid^ current;
+private: XRay::SdkControls::PropertyGrid^ current;
private: System::Windows::Forms::Panel^ panel19;
private: System::Windows::Forms::Panel^ panel16;
private: System::Windows::Forms::Label^ label4;
@@ -286,7 +286,7 @@ private: System::Windows::Forms::Button^ ReloadCurrentButton;
this->FramesComboBox = (gcnew System::Windows::Forms::ComboBox());
this->panel2 = (gcnew System::Windows::Forms::Panel());
this->panel13 = (gcnew System::Windows::Forms::Panel());
- this->blend = (gcnew editor::controls::property_grid());
+ this->blend = (gcnew XRay::SdkControls::PropertyGrid());
this->panel15 = (gcnew System::Windows::Forms::Panel());
this->label6 = (gcnew System::Windows::Forms::Label());
this->panel22 = (gcnew System::Windows::Forms::Panel());
@@ -295,7 +295,7 @@ private: System::Windows::Forms::Button^ ReloadCurrentButton;
this->CreateFromButton = (gcnew System::Windows::Forms::Button());
this->splitter2 = (gcnew System::Windows::Forms::Splitter());
this->panel14 = (gcnew System::Windows::Forms::Panel());
- this->target = (gcnew editor::controls::property_grid());
+ this->target = (gcnew XRay::SdkControls::PropertyGrid());
this->panel20 = (gcnew System::Windows::Forms::Panel());
this->panel17 = (gcnew System::Windows::Forms::Panel());
this->label5 = (gcnew System::Windows::Forms::Label());
@@ -303,7 +303,7 @@ private: System::Windows::Forms::Button^ ReloadCurrentButton;
this->PasteTargetButton = (gcnew System::Windows::Forms::Button());
this->splitter1 = (gcnew System::Windows::Forms::Splitter());
this->panel12 = (gcnew System::Windows::Forms::Panel());
- this->current = (gcnew editor::controls::property_grid());
+ this->current = (gcnew XRay::SdkControls::PropertyGrid());
this->panel19 = (gcnew System::Windows::Forms::Panel());
this->panel16 = (gcnew System::Windows::Forms::Panel());
this->label4 = (gcnew System::Windows::Forms::Label());
diff --git a/src/editor_controls/AssemblyInfo.cpp b/src/editor_controls/AssemblyInfo.cpp
deleted file mode 100644
index 223ffb17b59..00000000000
--- a/src/editor_controls/AssemblyInfo.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "pch.hpp"
-
-using namespace System;
-using namespace System::Reflection;
-using namespace System::Runtime::CompilerServices;
-using namespace System::Runtime::InteropServices;
-using namespace System::Security::Permissions;
-
-//
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-//
-[assembly:AssemblyTitleAttribute("editor_controls")];
-[assembly:AssemblyDescriptionAttribute("")];
-[assembly:AssemblyConfigurationAttribute("")];
-[assembly:AssemblyCompanyAttribute("GSC Game World")];
-[assembly:AssemblyProductAttribute("editor_controls")];
-[assembly:AssemblyCopyrightAttribute("Copyright (c) GSC Game World 2008")];
-[assembly:AssemblyTrademarkAttribute("")];
-[assembly:AssemblyCultureAttribute("")];
-
-//
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the value or you can default the Revision and Build Numbers
-// by using the '*' as shown below:
-
-[assembly:AssemblyVersionAttribute("1.0.*")];
-
-[assembly:ComVisible(false)];
-
-[assembly:CLSCompliantAttribute(true)];
-
-[assembly:SecurityPermission(SecurityAction::RequestMinimum, UnmanagedCode = true)];
diff --git a/src/editor_controls/editor_controls.vcxproj b/src/editor_controls/editor_controls.vcxproj
deleted file mode 100644
index 896e8a9ef78..00000000000
--- a/src/editor_controls/editor_controls.vcxproj
+++ /dev/null
@@ -1,147 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Release
- Win32
-
-
-
- {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48}
- editor_controls
- ManagedCProj
-
-
-
- DynamicLibrary
- v120
- Unicode
- true
- true
-
-
- DynamicLibrary
- v120
- Unicode
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>12.0.30501.0
-
-
- $(xrBinDir)
- $(xrIntDir)$(ProjectName)\
- true
-
-
- $(xrBinDir)
- $(xrIntDir)$(ProjectName)\
- false
-
-
-
- Disabled
- $(xrSdkDir)include;%(AdditionalIncludeDirectories)
- WIN32;DEBUG;EDITOR_CONTROLS_LIBRARY;%(PreprocessorDefinitions)
-
- MultiThreadedDLL
- Fast
- Use
- pch.hpp
- Level4
- ProgramDatabase
-
-
-
- $(xrSdkDir)libraries;%(AdditionalLibraryDirectories)
- true
- true
- false
- $(xrLibDir)$(TargetName).lib
- MachineX86
-
-
-
-
- $(xrSdkDir)include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;EDITOR_CONTROLS_LIBRARY;%(PreprocessorDefinitions)
-
- MultiThreadedDLL
- Fast
- Use
- pch.hpp
- Level4
- ProgramDatabase
-
-
-
- $(xrSdkDir)libraries;%(AdditionalLibraryDirectories)
- true
- true
- true
- false
- $(xrLibDir)$(TargetName).lib
- MachineX86
-
-
-
-
- $(xrSdkDir)binaries\Flobbster.Windows.Forms.PropertyGrid.dll
-
-
- true
- true
-
-
- true
- true
-
-
- true
- true
-
-
- true
- true
-
-
- true
- true
-
-
-
-
-
- Create
- Create
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/editor_controls/editor_controls.vcxproj.filters b/src/editor_controls/editor_controls.vcxproj.filters
deleted file mode 100644
index 351dd95af6d..00000000000
--- a/src/editor_controls/editor_controls.vcxproj.filters
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
- {faecb6e8-f53f-4206-9ec9-b225c401729f}
-
-
- {7236fada-bdfa-46f3-a7c3-d03f26fb600d}
-
-
- {561183d8-a957-4390-8020-172086556a70}
-
-
- {d5f620b4-4f86-4005-ad64-29d1758b0d51}
-
-
-
-
- core
-
-
- core
-
-
- controls\property_grid
-
-
-
-
- core
-
-
- controls\property_grid
-
-
- interfaces
-
-
- interfaces
-
-
- interfaces
-
-
- interfaces
-
-
-
\ No newline at end of file
diff --git a/src/editor_controls/pch.cpp b/src/editor_controls/pch.cpp
deleted file mode 100644
index 9a8e597e69f..00000000000
--- a/src/editor_controls/pch.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Module : pch.cpp
-// Created : 23.01.2008
-// Modified : 23.01.2008
-// Author : Dmitriy Iassenev
-// Description : preocmpiled header creator for editor controls library
-////////////////////////////////////////////////////////////////////////////
-
-#include "pch.hpp"
diff --git a/src/editor_controls/pch.hpp b/src/editor_controls/pch.hpp
deleted file mode 100644
index f02fd4120a1..00000000000
--- a/src/editor_controls/pch.hpp
+++ /dev/null
@@ -1,67 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Module : pch.cpp
-// Created : 23.01.2008
-// Modified : 23.01.2008
-// Author : Dmitriy Iassenev
-// Description : preocmpiled header creator for editor controls library
-////////////////////////////////////////////////////////////////////////////
-
-#ifndef PCH_HPP_INCLUDED
-#define PCH_HPP_INCLUDED
-
-#ifdef DEBUG
-# define VERIFY(expression) do { if (!(expression)) throw; } while (0)
-# define NODEFAULT do { __debugbreak(); } while (0)
-#else // #ifdef DEBUG
-# define VERIFY(expression) do {} while (0)
-# define NODEFAULT __assume(0)
-#endif // #ifdef DEBUG
-
-typedef unsigned int u32;
-typedef char const * LPCSTR;
-typedef char * LPSTR;
-
-#pragma unmanaged
-#include
-#pragma managed
-
-#include
-#include
-
-#pragma warning(disable:4127)
-#pragma warning(disable:4100)
-
-// do not forget to call
-// 'cs_free'
-// on the block of memory being returned
-inline LPSTR to_string (System::String ^string)
-{
- // Pin memory so GC can't move it while native function is called
- pin_ptr wch = PtrToStringChars(string);
-
- size_t convertedChars = 0;
- size_t sizeInBytes = ((string->Length + 1) * 2);
- errno_t err = 0;
- LPSTR result = (LPSTR)malloc(sizeInBytes);
-
- err =
- wcstombs_s (
- &convertedChars,
- result,
- sizeInBytes,
- wch,
- sizeInBytes
- );
-
- if (err)
- VERIFY (!"[tostring][failed] : wcstombs_s failed");
-
- return (result);
-}
-
-inline System::String ^to_string (LPCSTR string)
-{
- return (gcnew System::String(string));
-}
-
-#endif // #ifndef PCH_HPP_INCLUDED
\ No newline at end of file
diff --git a/src/editor_controls/property_container_interface.hpp b/src/editor_controls/property_container_interface.hpp
deleted file mode 100644
index a6bcbfe5864..00000000000
--- a/src/editor_controls/property_container_interface.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Module : property_container_interface.hpp
-// Created : 23.01.2008
-// Modified : 23.01.2008
-// Author : Dmitriy Iassenev
-// Description : property container interface class
-////////////////////////////////////////////////////////////////////////////
-
-#ifndef PROPERTY_CONTAINER_INTERFACE_HPP_INCLUDED
-#define PROPERTY_CONTAINER_INTERFACE_HPP_INCLUDED
-
-interface class property_value;
-
-public interface class property_container_interface {
-public:
- typedef Flobbster::Windows::Forms::PropertySpec PropertySpec;
-
-public:
- virtual property_value^ value (PropertySpec^ description) = 0;
-}; // interface class property_container_interface
-
-#endif // ifndef PROPERTY_CONTAINER_INTERFACE_HPP_INCLUDED
\ No newline at end of file
diff --git a/src/editor_controls/property_grid.cpp b/src/editor_controls/property_grid.cpp
deleted file mode 100644
index 52ba0333057..00000000000
--- a/src/editor_controls/property_grid.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Module : property_grid.cpp
-// Created : 23.01.2008
-// Modified : 23.01.2008
-// Author : Dmitriy Iassenev
-// Description : engine interface class
-////////////////////////////////////////////////////////////////////////////
-
-#include "pch.hpp"
-#include "property_grid.hpp"
-#include "property_container_interface.hpp"
-#include "property_incrementable.hpp"
-
-ref class property_container;
-
-using editor::controls::property_grid;
-
-using System::Windows::Forms::GridItem;
-using System::Windows::Forms::MouseEventHandler;
-using System::ComponentModel::PropertyDescriptor;
-using System::Type;
-using System::Reflection::FieldInfo;
-using System::Reflection::BindingFlags;
-using Microsoft::Win32::RegistryKey;
-using System::String;
-
-using Flobbster::Windows::Forms::PropertyBag;
-typedef PropertyBag::PropertySpecDescriptor PropertySpecDescriptor;
-
-template
-inline static T registry_value (RegistryKey ^key, String ^value_id, T const %default_value)
-{
- System::Object^ object = key->GetValue(value_id);
- if (!object)
- return (default_value);
-
- return ((T)object);
-}
-
-property_grid::property_grid ()
-{
- initialize_grid_view ();
- setup_event_handlers ();
-}
-
-void property_grid::initialize_grid_view ()
-{
- for each (Control^ i in Controls)
- if (i->GetType()->Name->ToUpper() == "PROPERTYGRIDVIEW") {
- m_property_grid_view = i;
- break;
- }
-}
-
-void property_grid::OnChildControlMouseDoubleClick (Object^ object, System::Windows::Forms::MouseEventArgs^ e)
-{
- if (!SelectedObject)
- return;
-
- if (!SelectedGridItem)
- return;
-
- PropertyDescriptor^ descriptor_raw = SelectedGridItem->PropertyDescriptor;
- VERIFY (descriptor_raw);
- PropertySpecDescriptor^ descriptor = safe_cast(descriptor_raw);
- property_container_interface^ container = safe_cast(descriptor->bag);
- property_value^ value = container->value(descriptor->item);
- property_mouse_events^ value_mouse_events = dynamic_cast(value);
- if (!value_mouse_events)
- return;
-
- value_mouse_events->on_double_click (this);
-}
-
-void property_grid::setup_event_handlers ()
-{
- for each (Control^ i in Controls) {
- i->MouseDoubleClick += gcnew MouseEventHandler(this, &property_grid::OnChildControlMouseDoubleClick);
- i->MouseMove += gcnew MouseEventHandler(this, &property_grid::OnChildControlMouseMove);
- i->MouseDown += gcnew MouseEventHandler(this, &property_grid::OnChildControlMouseDown);
- }
-}
-
-int property_grid::splitter_width ()
-{
- Type^ grid_type = m_property_grid_view->GetType();
- FieldInfo^ field = grid_type->GetField("labelWidth", BindingFlags::NonPublic | BindingFlags::Instance);
- Object^ value = field->GetValue(m_property_grid_view);
- return (*safe_cast(value));
-}
-
-void property_grid::save (RegistryKey^ root, String^ key)
-{
- RegistryKey ^grid = root->CreateSubKey(key);
- grid->SetValue ("Splitter", (int)splitter_width());
- grid->Close ();
-}
-
-void property_grid::load (RegistryKey^ root, String^ key)
-{
- RegistryKey ^grid = root->OpenSubKey(key);
- if (!grid)
- return;
-
- int position = registry_value(grid, "Splitter", splitter_width());
- grid->Close ();
-
- Type^ grid_type = m_property_grid_view->GetType();
- FieldInfo^ field = grid_type->GetField("labelWidth", BindingFlags::NonPublic | BindingFlags::Instance);
- field->SetValue (m_property_grid_view, position);
-}
-
-void property_grid::OnChildControlMouseDown (Object^ object, System::Windows::Forms::MouseEventArgs^ e)
-{
- if (e->Button != System::Windows::Forms::MouseButtons::Middle)
- return;
-
- m_previous_location = e->Location;
-}
-
-void property_grid::OnChildControlMouseMove (Object^ object, System::Windows::Forms::MouseEventArgs^ e)
-{
- if (e->Button != System::Windows::Forms::MouseButtons::Middle) {
- m_previous_location = e->Location;
- return;
- }
-
- if (e->Location.X == m_previous_location.X)
- return;
-
- if (!SelectedObject)
- return;
-
- if (!SelectedGridItem)
- return;
-
- PropertyDescriptor^ descriptor_raw = SelectedGridItem->PropertyDescriptor;
- if (!descriptor_raw)
- return;
-
- PropertySpecDescriptor^ descriptor = safe_cast(descriptor_raw);
- property_container_interface^ container = safe_cast(descriptor->bag);
- property_value^ raw_value = container->value(descriptor->item);
- VERIFY (raw_value);
-
- property_incrementable^ incrementable = dynamic_cast(raw_value);
- if (!incrementable)
- return;
-
- incrementable->increment (float(e->Location.X - m_previous_location.X));
- Refresh ();
- m_previous_location = e->Location;
-}
\ No newline at end of file
diff --git a/src/editor_controls/property_grid.hpp b/src/editor_controls/property_grid.hpp
deleted file mode 100644
index 30476af2129..00000000000
--- a/src/editor_controls/property_grid.hpp
+++ /dev/null
@@ -1,48 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Module : property_grid.hpp
-// Created : 23.01.2008
-// Modified : 23.01.2008
-// Author : Dmitriy Iassenev
-// Description : engine interface class
-////////////////////////////////////////////////////////////////////////////
-
-#ifndef PROPERTY_GRID_HPP_INCLUDED
-#define PROPERTY_GRID_HPP_INCLUDED
-
-#include "property_value.hpp"
-#include "property_mouse_events.hpp"
-
-namespace editor {
-namespace controls {
-
-public ref class property_grid : public System::Windows::Forms::PropertyGrid
-{
-private:
- typedef System::Windows::Forms::Control Control;
- typedef System::Object Object;
- typedef Microsoft::Win32::RegistryKey RegistryKey;
- typedef System::String String;
- typedef System::Drawing::Point Point;
-
-public:
- property_grid ();
- void initialize_grid_view ();
- void OnChildControlMouseDoubleClick (Object^ object, System::Windows::Forms::MouseEventArgs^ e);
- void OnChildControlMouseMove (Object^ object, System::Windows::Forms::MouseEventArgs^ e);
- void OnChildControlMouseDown (Object^ object, System::Windows::Forms::MouseEventArgs^ e);
- void setup_event_handlers ();
- void save (RegistryKey^ root, String^ key);
- void load (RegistryKey^ root, String^ key);
-
-private:
- int splitter_width ();
-
-private:
- Control^ m_property_grid_view;
- Point m_previous_location;
-}; // ref class property_grid
-
-} // namespace controls
-} // namespace editor
-
-#endif // #define PROPERTY_GRID_HPP_INCLUDED
\ No newline at end of file
diff --git a/src/editor_controls/property_incrementable.hpp b/src/editor_controls/property_incrementable.hpp
deleted file mode 100644
index 77a7a53764f..00000000000
--- a/src/editor_controls/property_incrementable.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Module : property_incrementable.hpp
-// Created : 26.12.2007
-// Modified : 26.12.2007
-// Author : Dmitriy Iassenev
-// Description : property incrementable
-////////////////////////////////////////////////////////////////////////////
-
-#ifndef PROPERTY_INCREMENTABLE_HPP_INCLUDED
-#define PROPERTY_INCREMENTABLE_HPP_INCLUDED
-
-namespace editor {
-namespace controls {
-
-public interface class property_incrementable {
-public:
- virtual void increment (float const% increment) = 0;
-}; // interface class property_value
-
-} // namespace controls
-} // namespace editor
-
-#endif // ifndef PROPERTY_INCREMENTABLE_HPP_INCLUDED
\ No newline at end of file
diff --git a/src/editor_controls/property_mouse_events.hpp b/src/editor_controls/property_mouse_events.hpp
deleted file mode 100644
index 7f8c9cbf871..00000000000
--- a/src/editor_controls/property_mouse_events.hpp
+++ /dev/null
@@ -1,25 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Module : property_mouse_events.hpp
-// Created : 23.01.2008
-// Modified : 23.01.2008
-// Author : Dmitriy Iassenev
-// Description : property mouse events
-////////////////////////////////////////////////////////////////////////////
-
-#ifndef PROPERTY_MOUSE_EVENTS_HPP_INCLUDED
-#define PROPERTY_MOUSE_EVENTS_HPP_INCLUDED
-
-namespace editor {
-namespace controls {
-
-ref class property_grid;
-
-public interface class property_mouse_events {
-public:
- virtual void on_double_click (property_grid^ property_grid) = 0;
-}; // interface class property_mouse_events
-
-} // namespace controls
-} // namespace editor
-
-#endif // ifndef PROPERTY_MOUSE_EVENTS_HPP_INCLUDED
\ No newline at end of file
diff --git a/src/editor_controls/property_value.hpp b/src/editor_controls/property_value.hpp
deleted file mode 100644
index b56c3c7fc45..00000000000
--- a/src/editor_controls/property_value.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Module : property_value.hpp
-// Created : 07.12.2007
-// Modified : 07.12.2007
-// Author : Dmitriy Iassenev
-// Description : property value
-////////////////////////////////////////////////////////////////////////////
-
-#ifndef PROPERTY_VALUE_HPP_INCLUDED
-#define PROPERTY_VALUE_HPP_INCLUDED
-
-public interface class property_value {
-public:
- virtual System::Object ^get_value () = 0;
- virtual void set_value (System::Object ^object) = 0;
-}; // interface class property_value
-
-#endif // ifndef PROPERTY_VALUE_HPP_INCLUDED
\ No newline at end of file
diff --git a/src/engine.sln b/src/engine.sln
index 20bbfec05fc..011bfb625ef 100644
--- a/src/engine.sln
+++ b/src/engine.sln
@@ -101,8 +101,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrRender_R3", "Layers\xrRen
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editor", "editor\editor.vcxproj", "{492D3DFE-9068-4E7E-A008-7C2420A651C0}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editor_controls", "editor_controls\editor_controls.vcxproj", "{B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrEngine", "xrEngine\xrEngine.vcxproj", "{2578C6D8-660D-48AE-9322-7422F8664F06}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luabind.beta7-devel.rc4", "3rd party\luabind\luabind.beta7-devel.rc4.vcxproj", "{CC52E0B3-CC35-4934-9302-035B748F3F2C}"
@@ -1146,33 +1144,6 @@ Global
{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Release|Mixed Platforms.Build.0 = Release|Win32
{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Release|Win32.ActiveCfg = Release|Win32
{492D3DFE-9068-4E7E-A008-7C2420A651C0}.Release|Win32.Build.0 = Release|Win32
- {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48}.Debug_Dedicated|Any CPU.ActiveCfg = Debug|Win32
- {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32
- {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug|Win32
- {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
- {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48}.Debug|Any CPU.ActiveCfg = Debug|Win32
- {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
- {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48}.Debug|Mixed Platforms.Build.0 = Debug|Win32
- {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48}.Debug|Win32.ActiveCfg = Debug|Win32
- {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48}.Debug|Win32.Build.0 = Debug|Win32
- {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48}.Mixed_Dedicated|Any CPU.ActiveCfg = Release|Win32
- {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48}.Mixed_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
- {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48}.Mixed_Dedicated|Mixed Platforms.Build.0 = Release|Win32
- {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32
- {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48}.Mixed|Any CPU.ActiveCfg = Release|Win32
- {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48}.Mixed|Mixed Platforms.ActiveCfg = Release|Win32
- {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48}.Mixed|Mixed Platforms.Build.0 = Release|Win32
- {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48}.Mixed|Win32.ActiveCfg = Debug|Win32
- {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48}.Mixed|Win32.Build.0 = Debug|Win32
- {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48}.Release_Dedicated|Any CPU.ActiveCfg = Release|Win32
- {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48}.Release_Dedicated|Mixed Platforms.ActiveCfg = Release|Win32
- {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48}.Release_Dedicated|Mixed Platforms.Build.0 = Release|Win32
- {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48}.Release_Dedicated|Win32.ActiveCfg = Release|Win32
- {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48}.Release|Any CPU.ActiveCfg = Release|Win32
- {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48}.Release|Mixed Platforms.ActiveCfg = Release|Win32
- {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48}.Release|Mixed Platforms.Build.0 = Release|Win32
- {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48}.Release|Win32.ActiveCfg = Release|Win32
- {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48}.Release|Win32.Build.0 = Release|Win32
{2578C6D8-660D-48AE-9322-7422F8664F06}.Debug_Dedicated|Any CPU.ActiveCfg = Debug_Dedicated|Win32
{2578C6D8-660D-48AE-9322-7422F8664F06}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug_Dedicated|Win32
{2578C6D8-660D-48AE-9322-7422F8664F06}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug_Dedicated|Win32
@@ -1627,7 +1598,6 @@ Global
{C928FBB1-EDD8-4198-90DC-170A54C2AD72} = {68CB7CEC-F907-47AD-B624-B8432F53AAE3}
{84D91673-C1A1-47FF-9A75-4E73F31F4C63} = {68CB7CEC-F907-47AD-B624-B8432F53AAE3}
{492D3DFE-9068-4E7E-A008-7C2420A651C0} = {2DDE8FE4-6490-4AC5-B020-7E6A203F6318}
- {B45374AA-C7ED-42CF-BBD3-DEAA2B7ACB48} = {2DDE8FE4-6490-4AC5-B020-7E6A203F6318}
{CC52E0B3-CC35-4934-9302-035B748F3F2C} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
{F6C4F74A-152C-4612-9E3B-D02346234855} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
{EFB76D6F-0092-439C-A783-C0BE10BD17C9} = {89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}