Changeset 952 for cpp/frams/neuro/neuroimpl.cpp

Timestamp:

06/20/20 01:09:57 (5 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/neuro/neuroimpl.cpp (modified) (5 diffs)

cpp/frams/neuro/neuroimpl.cpp

@@ -13 +13 @@
 #include <frams/simul/simul.h>
 #endif
+#include <frams/vm/classes/3dobject.h>
 
 const int NeuroImpl::ENDDRAWING = -9999;
@@ -153 +154 @@
 }
 
+void NeuroNetImpl::getLiveNeuroObject(Neuro *n, ExtValue *ret)
+{
+        NeuroImpl *ni = getImpl(n);
+        if (ni)
+                ret->setObject(ExtObject(&NeuroImpl::getStaticParam(), ni));
+        else
+                ret->setEmpty();
+}
+
 ///////////////////////////////////////////////
 
@@ -301 +311 @@
 ParamEntry neuroimpl_tab[] =
 {
-        { "Neuro", 1, 27 + NEUROIMPL_SIGNAL_PROPS, "Neuro", "Live Neuron object." },
+        { "Neuro", 1, 29 + NEUROIMPL_SIGNAL_PROPS, "Neuro", "Live Neuron object." },
 
         { "getInputState", 0, 0, "Get input signal", "p f(d input)", PROCEDURE(p_get), },
@@ -324 +334 @@
         { "position_y", 0, PARAM_READONLY, "Position y", "f", GETONLY(position_y), },
         { "position_z", 0, PARAM_READONLY, "Position z", "f", GETONLY(position_z), },
+        { "relative_pos", 0, PARAM_READONLY, "Relative position", "oXYZ", GETONLY(relative_pos), },
+        { "relative_orient", 0, PARAM_READONLY, "Relative orientation", "oOrient", GETONLY(relative_orient), },
         { "creature", 0, PARAM_READONLY, "Gets owner creature", "oCreature", GETONLY(creature), },
-        { "part", 0, PARAM_READONLY, "The Part object where this neuron is located", "oMechPart", GETONLY(part), },
-        { "joint", 0, PARAM_READONLY, "The Joint object where this neuron is located", "oMechJoint", GETONLY(joint), },
+        { "mechpart", 0, PARAM_READONLY, "MechPart object", "oMechPart", GETONLY(part), "The MechPart object where this neuron is located" },
+        { "mechjoint", 0, PARAM_READONLY, "MechJoint object" , "oMechJoint", GETONLY(joint), "The MechJoint object where this neuron is located" },
         { "neuroproperties", 0, PARAM_READONLY, "Custom neuron fields", "oNeuroProperties", GETONLY(fields),
         "Neurons can have different fields depending on their class. Script neurons have their fields defined using the \"property:\" syntax. If you develop a custom neuron script you should use the NeuroProperties object for accessing your own neuron fields. The Neuro.neuroproperties property is meant for accessing the neuron fields from the outside script.\n"
@@ -549 +561 @@
 }
 
+void NeuroImpl::get_relative_pos(ExtValue *ret)
+{
+        ret->setObject(Pt3D_Ext::makeDynamicObject(getRelativePosition()));
+}
+
+void NeuroImpl::get_relative_orient(ExtValue *ret)
+{
+        ret->setObject(Orient_Ext::makeDynamicObject(new Orient_Ext(getRelativeOrientation())));
+}
 
 void NeuroImpl::createFieldsObject()