minor

Author: sea5kg

source/plugins/Sea5kg/Python3Scripting/src/PythonExecutor.cpp

@@ -24,8 +24,6 @@ std::wstring str2wstr(const std::string& str) {
     return converterX.from_bytes(str);
 }
 
-PyThreadState *mainstate;
-
 PythonExecutor::PythonExecutor(
     const std::string &sExtensionId,
     const std::string &sDirPathWithModules
@@ -38,9 +36,11 @@ PythonExecutor::PythonExecutor(
     for (int i = 0; i < m_vWrappers.size(); i++) {
         m_vWrappers[i]->Call_PyImport_AppendInittab();
     }
+
     Py_Initialize();
+    // Py_SetPythonHome
     // mainstate = PyThreadState_Swap(NULL);
-    // Py_SetProgramName(const wchar_t *name)
+    Py_SetProgramName(L"main.py");
 
     {
         PyObject* pGlobalDict = PyDict_New();
@@ -161,7 +161,6 @@ int PythonExecutor::execCode(const std::string &sScriptContent) {
             if (pPyErrorTraceback != nullptr) {
                 PyException_SetTraceback(pvalue, pPyErrorTraceback);
             }
-            // PyObject* pPyStringExceptionType = PyObject_Str(pyExcType);
 
             PyObject* str_exc_type = PyObject_Repr(ptype);
             PyObject* pyStr = PyUnicode_AsEncodedString(str_exc_type, "utf-8", "Error ~");

source/plugins/Sea5kg/Python3Scripting/src/format_unexpy3/FileUnexpy3.h

@@ -27,7 +27,7 @@ class FileUnexpy3 {
         QVector<QString> getListOfFiles();
 
         // QVector<QString> getDependencies();
-        
+
         QString getId();
         QString getName();
         QString getFor();

source/plugins/Sea5kg/Python3Scripting/src/python3_wrapper/python3_unigine_stderr.cpp

@@ -15,34 +15,27 @@ struct Stderr
     stderr_write_type write;
 };
 
-PyObject* Stderr_write(PyObject* self, PyObject* args)
-{
+PyObject* Stderr_write(PyObject* self, PyObject* args) {
     std::size_t written(0);
     Stderr* selfimpl = reinterpret_cast<Stderr*>(self);
-    if (selfimpl->write)
-    {
+    if (selfimpl->write) {
         char* data;
         if (!PyArg_ParseTuple(args, "s", &data)) {
             return 0;
         }
         std::string sOutputMessage(data);
-        // selfimpl->write(sOutputMessage);
-        // written = sOutputMessage.size();
-        // TODO extension_id
         sOutputMessage = "ERROR. Python3Scripting: " + sOutputMessage;
         Unigine::Log::error("%s", sOutputMessage.c_str());
     }
     return PyLong_FromSize_t(written);
 }
 
-PyObject* Stderr_flush(PyObject* self, PyObject* args)
-{
+PyObject* Stderr_flush(PyObject* self, PyObject* args) {
     // no-op
     return Py_BuildValue("");
 }
 
-PyMethodDef Stderr_methods[] =
-{
+PyMethodDef Stderr_methods[] = {
     {"write", Stderr_write, METH_VARARGS, "sys.stderr.write"},
     {"flush", Stderr_flush, METH_VARARGS, "sys.stderr.flush"},
     {0, 0, 0, 0} // sentinel

source/plugins/Sea5kg/Python3Scripting/src/python3_wrapper/python3_unigine_stdout.cpp

@@ -10,14 +10,12 @@
 typedef std::function<void(std::string)> stdout_write_type;
 
 // Stdout
-struct Stdout
-{
+struct Stdout {
     PyObject_HEAD
     stdout_write_type write;
 };
 
-PyObject* Stdout_write(PyObject* self, PyObject* args)
-{
+PyObject* Stdout_write(PyObject* self, PyObject* args) {
     std::size_t written(0);
     Stdout* selfimpl = reinterpret_cast<Stdout*>(self);
     if (selfimpl->write)
@@ -27,23 +25,18 @@ PyObject* Stdout_write(PyObject* self, PyObject* args)
             return 0;
         }
         std::string sOutputMessage(data);
-        // selfimpl->write(sOutputMessage);
-        // written = sOutputMessage.size();
-        // TODO extension_id
         sOutputMessage = "Python3Scripting: " + sOutputMessage + "\n";
         Unigine::Log::message(sOutputMessage.c_str());
     }
     return PyLong_FromSize_t(written);
 }
 
-PyObject* Stdout_flush(PyObject* self, PyObject* args)
-{
+PyObject* Stdout_flush(PyObject* self, PyObject* args) {
     // no-op
     return Py_BuildValue("");
 }
 
-PyMethodDef Stdout_methods[] =
-{
+PyMethodDef Stdout_methods[] = {
     {"write", Stdout_write, METH_VARARGS, "sys.stdout.write"},
     {"flush", Stdout_flush, METH_VARARGS, "sys.stdout.flush"},
     {0, 0, 0, 0} // sentinel
@@ -131,13 +124,11 @@ void Python3UnigineStdout::Call_PyImport_AppendInittab() {
 
 void Python3UnigineStdout::Call_PyImport_ImportModule() {
     PyImport_ImportModule("unigine_stdout");
-    
+
     std::string buffer;
     stdout_write_type write = [&buffer] (std::string s) { buffer += s; };
 
-    // set_stdout(write);
-    if (!g_stdout)
-    {
+    if (!g_stdout) {
         g_stdout_saved = PySys_GetObject("stdout"); // borrowed
         g_stdout = StdoutType.tp_new(&StdoutType, 0, 0);
     }

source/plugins/Sea5kg/Python3Scripting/src/python3_wrapper/pytypesobjects/python3_unigine_materials.cpp

@@ -261,25 +261,25 @@ static PyObject * unigine_Materials_set_precompile_all_shaders(unigine_Materials
     PyObject *pArg1; // bool shaders;
     PyArg_ParseTuple(args, "O", &pArg1);
 
-    // pArg1
-TODO for bool
-
-
-    class LocalRunner : public Python3Runner {
-        public:
-            virtual void run() override {
-                Unigine::Materials::setPrecompileAllShaders(shaders);
-            };
-            // args
-            bool shaders;
-    };
-    auto *pRunner = new LocalRunner();
-    pRunner->shaders = shaders;
-    Python3Runner::runInMainThread(pRunner);
-    while (!pRunner->mutexAsync.tryLock(5)) {  // milliseconds
-    }
-    pRunner->mutexAsync.unlock();
-    delete pRunner;
+//     // pArg1
+// TODO for bool
+
+
+//     class LocalRunner : public Python3Runner {
+//         public:
+//             virtual void run() override {
+//                 Unigine::Materials::setPrecompileAllShaders(shaders);
+//             };
+//             // args
+//             bool shaders;
+//     };
+//     auto *pRunner = new LocalRunner();
+//     pRunner->shaders = shaders;
+//     Python3Runner::runInMainThread(pRunner);
+//     while (!pRunner->mutexAsync.tryLock(5)) {  // milliseconds
+//     }
+//     pRunner->mutexAsync.unlock();
+//     delete pRunner;
     Py_INCREF(Py_None);
     ret = Py_None;
     assert(!PyErr_Occurred());