implemented add_property(), another step for 20tab#5

Roberto De Ioris · Roberto De Ioris · commit 439f2c186a52 · 2016-08-30T11:08:22.000+02:00
diff --git a/Source/PythonConsole/Private/SPythonLog.cpp b/Source/PythonConsole/Private/SPythonLog.cpp
@@ -264,12 +264,6 @@ void SPythonConsoleInputBox::OnTextCommitted(const FText& InText, ETextCommit::T
 }
 
 
-void SPythonConsoleInputBox::OnFocusLost(const FFocusEvent& InFocusEvent)
-{
-	//	SuggestionBox->SetIsOpen(false);
-}
-
-
 TSharedRef< FPythonLogTextLayoutMarshaller > FPythonLogTextLayoutMarshaller::Create(TArray< TSharedPtr<FLogMessage> > InMessages)
 {
 	return MakeShareable(new FPythonLogTextLayoutMarshaller(MoveTemp(InMessages)));
diff --git a/Source/PythonConsole/Private/SPythonLog.h b/Source/PythonConsole/Private/SPythonLog.h
@@ -62,8 +62,6 @@ class SPythonConsoleInputBox
 
 	virtual bool SupportsKeyboardFocus() const override { return true; }
 
-	void OnFocusLost( const FFocusEvent& InFocusEvent ) override;
-
 	/** Handles entering in a command */
 	void OnTextCommitted(const FText& InText, ETextCommit::Type CommitInfo);
 
diff --git a/Source/UnrealEnginePython/Private/UEPyEngine.cpp b/Source/UnrealEnginePython/Private/UEPyEngine.cpp
@@ -476,7 +476,7 @@ PyObject *py_unreal_engine_new_object(PyObject * self, PyObject * args) {
 		outer = py_outer_obj->ue_object;
 	}
 
-	UObject *new_object = NewObject<UObject>(outer, obj_class, f_name);
+	UObject *new_object = NewObject<UObject>(outer, obj_class, f_name, RF_Public| RF_Standalone);
 	if (!new_object)
 		return PyErr_Format(PyExc_Exception, "unable to create object");
 
@@ -487,8 +487,6 @@ PyObject *py_unreal_engine_new_object(PyObject * self, PyObject * args) {
 	return (PyObject *)ret;
 }
 
-
-
 PyObject *py_unreal_engine_new_blueprint_class(PyObject * self, PyObject * args) {
 
 	PyObject *py_parent;
diff --git a/Source/UnrealEnginePython/Private/UEPyModule.cpp b/Source/UnrealEnginePython/Private/UEPyModule.cpp
@@ -273,6 +273,7 @@ static PyMethodDef ue_PyUObject_methods[] = {
 	{ "set_timer", (PyCFunction)py_ue_set_timer, METH_VARARGS, "" },
 
 	{ "add_function", (PyCFunction)py_ue_add_function, METH_VARARGS, "" },
+	{ "add_property", (PyCFunction)py_ue_add_property, METH_VARARGS, "" },
 	{ "as_dict", (PyCFunction)py_ue_as_dict, METH_VARARGS, "" },
 	{ NULL }  /* Sentinel */
 };
diff --git a/Source/UnrealEnginePython/Private/UEPyObject.cpp b/Source/UnrealEnginePython/Private/UEPyObject.cpp
@@ -334,6 +334,53 @@ PyObject *py_ue_add_function(ue_PyUObject * self, PyObject * args) {
 	return Py_None;
 }
 
+PyObject *py_ue_add_property(ue_PyUObject * self, PyObject * args) {
+
+	ue_py_check(self);
+
+	PyObject *obj;
+	char *name;
+	PyObject *replicate = nullptr;
+	if (!PyArg_ParseTuple(args, "Os|O:add_property", &obj, &name, &replicate)) {
+		return NULL;
+	}
+
+	if (!self->ue_object->IsA<UStruct>())
+		return PyErr_Format(PyExc_Exception, "uobject is not a UStruct");
+
+	if (!ue_is_pyuobject(obj)) {
+		return PyErr_Format(PyExc_Exception, "argument is not a UObject");
+	}
+
+	ue_PyUObject *py_obj = (ue_PyUObject *)obj;
+
+	if (!py_obj->ue_object->IsA<UClass>()) {
+		return PyErr_Format(PyExc_Exception, "uobject is not a UClass");
+	}
+
+	UProperty *u_property = NewObject<UProperty>(self->ue_object, (UClass *)py_obj->ue_object, UTF8_TO_TCHAR(name));
+	if (!u_property)
+		return PyErr_Format(PyExc_Exception, "unable to allocate new UProperty");
+
+	uint64 flags = CPF_Edit;
+	if (replicate && PyObject_IsTrue(replicate)) {
+		flags |= CPF_Net;
+	}
+
+	u_property->SetPropertyFlags(flags);
+
+	UStruct *u_struct = (UStruct *)self->ue_object;
+
+	u_struct->AddCppProperty(u_property);
+
+	ue_PyUObject *ret = ue_get_python_wrapper(u_property);
+	if (!ret)
+		return PyErr_Format(PyExc_Exception, "PyUObject is in invalid state");
+	Py_INCREF(ret);
+	return (PyObject *)ret;
+	
+}
+
 PyObject *py_ue_as_dict(ue_PyUObject * self, PyObject * args) {
 
 	ue_py_check(self);
@@ -370,6 +417,8 @@ PyObject *py_ue_save_package(ue_PyUObject * self, PyObject * args) {
 		return NULL;
 	}
 
+	// NOTE maybe we should check for transient object, to avoid crashes
+
 	if (UPackage::SavePackage(GetTransientPackage(), self->ue_object, EObjectFlags::RF_NoFlags, UTF8_TO_TCHAR(filename))) {
 		Py_INCREF(Py_True);
 		return Py_True;
diff --git a/Source/UnrealEnginePython/Private/UEPyObject.h b/Source/UnrealEnginePython/Private/UEPyObject.h
@@ -20,6 +20,7 @@ PyObject *py_ue_remove_from_root(ue_PyUObject *, PyObject *);
 
 PyObject *py_ue_bind_event(ue_PyUObject *, PyObject *);
 PyObject *py_ue_add_function(ue_PyUObject *, PyObject *);
+PyObject *py_ue_add_property(ue_PyUObject *, PyObject *);
 
 PyObject *py_ue_as_dict(ue_PyUObject *, PyObject *);
 
diff --git a/Source/UnrealEnginePython/Private/UnrealEnginePython.cpp b/Source/UnrealEnginePython/Private/UnrealEnginePython.cpp
@@ -33,6 +33,13 @@ void FUnrealEnginePythonModule::StartupModule()
 
 	UE_LOG(LogPython, Log , TEXT("Python VM initialized: %s"), UTF8_TO_TCHAR(Py_GetVersion()));
 	UE_LOG(LogPython, Log, TEXT("Python Scripts search path: %s"), UTF8_TO_TCHAR(scripts_path));
+
+	if (PyImport_ImportModule("ue_site")) {
+		UE_LOG(LogPython, Log, TEXT("ue_site Python module successfully imported"));
+	}
+	else {
+		unreal_engine_py_log_error();
+	}
 }
 
 void FUnrealEnginePythonModule::ShutdownModule()

Original file line number	Diff line number	Diff line change
`@@ -264,12 +264,6 @@ void SPythonConsoleInputBox::OnTextCommitted(const FText& InText, ETextCommit::T`
`264`	`264`	`}`
`265`	`265`
`266`	`266`
`267`		`-void SPythonConsoleInputBox::OnFocusLost(const FFocusEvent& InFocusEvent)`
`268`		`-{`
`269`		`- // SuggestionBox->SetIsOpen(false);`
`270`		`-}`
`271`		`-`
`272`		`-`
`273`	`267`	`TSharedRef< FPythonLogTextLayoutMarshaller > FPythonLogTextLayoutMarshaller::Create(TArray< TSharedPtr<FLogMessage> > InMessages)`
`274`	`268`	`{`
`275`	`269`	`return MakeShareable(new FPythonLogTextLayoutMarshaller(MoveTemp(InMessages)));`
Original file line number	Diff line number	Diff line change
`@@ -476,7 +476,7 @@ PyObject py_unreal_engine_new_object(PyObject self, PyObject * args) {`
`476`	`476`	`outer = py_outer_obj->ue_object;`
`477`	`477`	`}`
`478`	`478`
`479`		`- UObject *new_object = NewObject<UObject>(outer, obj_class, f_name);`
	`479`	`+ UObject *new_object = NewObject<UObject>(outer, obj_class, f_name, RF_Public\| RF_Standalone);`
`480`	`480`	`if (!new_object)`
`481`	`481`	`return PyErr_Format(PyExc_Exception, "unable to create object");`
`482`	`482`
`@@ -487,8 +487,6 @@ PyObject py_unreal_engine_new_object(PyObject self, PyObject * args) {`
`487`	`487`	`return (PyObject *)ret;`
`488`	`488`	`}`
`489`	`489`
`490`		`-`
`491`		`-`
`492`	`490`	`PyObject py_unreal_engine_new_blueprint_class(PyObject self, PyObject * args) {`
`493`	`491`
`494`	`492`	`PyObject *py_parent;`