Changeset 944 for js/sdk


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • js/sdk/js_interface/js_interface.cpp

    r919 r944  
    1717#include <common/loggers/loggers.h>
    1818#include <common/loggers/loggertostdout.h>
     19#include <common/virtfile/stringfile.h>
    1920#include <frams/param/param.h>
    2021#include <frams/param/paramtree.h>
    2122#include <frams/param/mutableparam.h>
    2223#include <frams/_demos/genotypemini.h>
     24#include <frams/_demos/genotypeloader.h>
    2325#include "js_types.h"
    2426#include "js_interface_impl.cpp"
  • js/sdk/js_interface/js_interface.idl

    r918 r944  
    170170        "NeuroClass::EffectorClass",
    171171        "NeuroClass::ReceptorClass",
    172         "NeuroClass::V1BendMuscle",
    173         "NeuroClass::V1RotMuscle",
    174         "NeuroClass::LinearMuscle"
     172        "NeuroClass::IsV1BendMuscle",
     173        "NeuroClass::IsV1RotMuscle",
     174        "NeuroClass::IsLinearMuscle",
     175        "NeuroClass::IsSolidMuscle"
    175176};
    176177
     
    343344};
    344345
    345 interface GenotypeMiniLoader {
    346         void GenotypeMiniLoader([Const] DOMString filename);
     346interface MultiParamLoader {
     347};
     348
     349interface GenotypeMiniLoader : MultiParamLoader {
     350    void GenotypeMiniLoader(VirtFILE f);
    347351        GenotypeMini loadNextGenotype();
    348352};
     
    391395
    392396interface VirtFILE {
     397};
     398
     399interface StringFILE2 : VirtFILE {
     400    void StringFILE2([Const] DOMString s, optional long _pos = 0);
    393401};
    394402
Note: See TracChangeset for help on using the changeset viewer.