Changeset 952 for cpp/frams/model/modelparts.cpp

Timestamp:

06/20/20 01:09:57 (4 years ago)

Author:

Maciej Komosinski

Message:

Added new receptors (Gp:"gyroscope" on a Part, Tp:Touch-proximity and Tc:Touch-contact) and improved existing ones (T, G)

File:

• cpp/frams/model/modelparts.cpp (modified) (3 diffs)

cpp/frams/model/modelparts.cpp

@@ -22 +22 @@
 #include <frams/util/extvalue.h>
 #include <frams/param/paramobj.h>
+#include <frams/neuro/neuroimpl.h>
 
 #include F0_DEFASSIGN_FILE
@@ -756 +757 @@
         {
 #define FIELDSTRUCT NeuroExt
-                ParamEntry entry = { "class", 2, 0, "neuro class", "s", GETSET(neuroclass) };
+                ParamEntry entries[] = {
+                 { "class", 2, 0, "neuro class", "s", GETSET(neuroclass) },
+                 { "liveNeuro", 2, 1, "live Neuro object", "oNeuro", GETONLY(liveNeuro) }};
 #undef FIELDSTRUCT
-                add(&entry);
+                for(auto& e : entries) add(&e);
 
 #define FIELDSTRUCT Neuro
@@ -797 +800 @@
         setClassName(arg->getString()); return PSET_CHANGED;
 }
+
+void NeuroExt::get_liveNeuro(PARAMGETARGS)
+{
+#ifndef SDK_WITHOUT_FRAMS
+        NeuroNetImpl::getLiveNeuroObject(this,ret);
+#endif
+}