Changeset 1109


Ignore:
Timestamp:
03/15/21 15:58:52 (4 weeks ago)
Author:
Maciej Komosinski
Message:

Follow-up to r1107

Location:
cpp/frams/neuro
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • cpp/frams/neuro/neurocls-f0-SDK-factory.h

    r976 r1109  
    8686ParamEntry NI_BendMuscle_tab []={
    8787{"Bend muscle",1, 2 ,"|",},
    88 {"p",0,0,"power","f 0.01 1.0 0.25",FIELD(power),},
     88{"p",0,0,"power","f 0.0 1.0 0.25",FIELD(power),},
    8989{"r",0,0,"bending range","f 0.0 1.0 1.0",FIELD(bendrange),},
    9090 {0,0,0,},};
     
    9494ParamEntry NI_RotMuscle_tab []={
    9595{"Rotation muscle",1, 1 ,"@",},
    96 {"p",0,0,"power","f 0.01 1.0 1.0",FIELD(power),},
     96{"p",0,0,"power","f 0.0 1.0 1.0",FIELD(power),},
    9797 {0,0,0,},};
    9898#undef FIELDSTRUCT
     
    101101ParamEntry NI_SolidMuscle_tab []={
    102102{"Muscle for solids",1, 2 ,"M",},
    103 {"p",0,0,"power","f 0.01 1.0 1.0",FIELD(power),},
     103{"p",0,0,"power","f 0.0 1.0 1.0",FIELD(power),},
    104104{"a",0,0,"axis","d 0 1 0",FIELD(axis),},
    105105 {0,0,0,},};
     
    131131ParamEntry NI_LinearMuscle_tab []={
    132132{"Linear muscle [EXPERIMENTAL!]",1, 1 ,"LMu",},
    133 {"p",0,0,"power","f 0.01 1.0 1.0",FIELD(power),},
     133{"p",0,0,"power","f 0.0 1.0 1.0",FIELD(power),},
    134134 {0,0,0,},};
    135135#undef FIELDSTRUCT
  • cpp/frams/neuro/neurocls-f0-SDK-library.h

    r1043 r1109  
    6767 
    6868{0,0,0,},};
    69 addClass(new NeuroClass(NI_Touch_tab,"Touch and proximity sensor (Tc+Tp combined)\n-1=no contact\n0=just touching\n>0=pressing, value depends on the force applied (not implemented in ODE mode)",0,1,1, Touch_xy,false, 32, 3, 15));
     69addClass(new NeuroClass(NI_Touch_tab,"Touch and proximity sensor (Tcontact and Tproximity combined)\n-1=no contact\n0=just touching\n>0=pressing, value depends on the force applied (not implemented in ODE mode)",0,1,1, Touch_xy,false, 32, 3, 15));
    7070
    7171       static int TouchC_xy[]={43,2,7,100,50,90,50,90,40,70,40,80,50,70,60,90,60,90,50,11,75,50,65,50,60,55,55,45,50,55,45,45,40,50,35,50,30,45,25,50,30,55,35,50};   
     
    114114
    115115
    116 {"p",0,0,"power","f 0.01 1.0 0.25",},
     116{"p",0,0,"power","f 0.0 1.0 0.25",},
    117117{"r",0,0,"bending range","f 0.0 1.0 1.0",},
    118118 
     
    126126
    127127
    128 {"p",0,0,"power","f 0.01 1.0 1.0",},
     128{"p",0,0,"power","f 0.0 1.0 1.0",},
    129129 
    130130{0,0,0,},};
     
    138138
    139139
    140 {"p",0,0,"power","f 0.01 1.0 1.0",},
     140{"p",0,0,"power","f 0.0 1.0 1.0",},
    141141{"a",0,0,"axis","d 0 1 0",},
    142142 
     
    178178
    179179
    180 {"p",0,0,"power","f 0.01 1.0 1.0",},
     180{"p",0,0,"power","f 0.0 1.0 1.0",},
    181181 
    182182{0,0,0,},};
Note: See TracChangeset for help on using the changeset viewer.