Changeset 944 for js/sdk

Timestamp:

06/05/20 17:27:32 (4 years ago)

Author:

Maciej Komosinski

Message:

Loads genotypes properly using Framsticks SDK methods instead of ad-hoc js parsing

Location:

js/sdk/js_interface

Files:

• js_interface.cpp (modified) (1 diff)
• js_interface.idl (modified) (3 diffs)

js/sdk/js_interface/js_interface.cpp

@@ -17 +17 @@
 #include <common/loggers/loggers.h>
 #include <common/loggers/loggertostdout.h>
+#include <common/virtfile/stringfile.h>
 #include <frams/param/param.h>
 #include <frams/param/paramtree.h>
 #include <frams/param/mutableparam.h>
 #include <frams/_demos/genotypemini.h>
+#include <frams/_demos/genotypeloader.h>
 #include "js_types.h"
 #include "js_interface_impl.cpp"

js/sdk/js_interface/js_interface.idl

@@ -170 +170 @@
         "NeuroClass::EffectorClass",
         "NeuroClass::ReceptorClass",
-        "NeuroClass::V1BendMuscle",
-        "NeuroClass::V1RotMuscle",
-        "NeuroClass::LinearMuscle"
+        "NeuroClass::IsV1BendMuscle",
+        "NeuroClass::IsV1RotMuscle",
+        "NeuroClass::IsLinearMuscle",
+        "NeuroClass::IsSolidMuscle"
 };
 
@@ -343 +344 @@
 };
 
-interface GenotypeMiniLoader {
-        void GenotypeMiniLoader([Const] DOMString filename);
+interface MultiParamLoader {
+};
+
+interface GenotypeMiniLoader : MultiParamLoader {
+    void GenotypeMiniLoader(VirtFILE f);
         GenotypeMini loadNextGenotype();
 };
@@ -391 +395 @@
 
 interface VirtFILE {
+};
+
+interface StringFILE2 : VirtFILE {
+    void StringFILE2([Const] DOMString s, optional long _pos = 0);
 };