Changeset 976


Ignore:
Timestamp:
07/06/20 23:36:46 (10 months ago)
Author:
Maciej Komosinski
Message:

Renamed three "solid-compatible" receptors to have more informative names

Location:
cpp/frams
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • cpp/frams/config/f0-SDK.def

    r975 r976  
    147147ENDNEUROCLASS
    148148
    149 NEUROCLASS(GyroP,Gp,Part Gyroscope,`Tilt sensor. Signal is directly proportional to the tilt angle.\n0=the part X axis is horizontal\n+1/-1=the axis is vertical',0,1,1)
     149NEUROCLASS(GyroP,Gpart,Part Gyroscope,`Tilt sensor. Signal is directly proportional to the tilt angle.\n0=the part X axis is horizontal\n+1/-1=the axis is vertical',0,1,1)
    150150VISUALHINTS(ReceptorClass)
    151151SYMBOL(`8,7,100,50,90,50,90,40,70,40,80,50,70,60,90,60,90,50,12,43,24,48,24,48,19,38,19,38,24,43,24,43,54,48,54,48,64,43,69,38,64,38,54,43,54,5,63,69,58,74,48,79,38,79,28,74,23,69,1,43,79,43,74,1,23,69,26,66,1,63,69,60,66,1,55,76,53,73,1,31,75,33,72')
     
    162162ENDNEUROCLASS
    163163
    164 NEUROCLASS(TouchC,Tc,Touch contact,`Touch sensor.\n-1=no contact\n0=the Part is touching the obstacle\n>0=pressing, value depends on the force applied (not implemented in ODE mode)',0,1,1)
     164NEUROCLASS(TouchC,Tcontact,Touch contact,`Touch sensor.\n-1=no contact\n0=the Part is touching the obstacle\n>0=pressing, value depends on the force applied (not implemented in ODE mode)',0,1,1)
    165165VISUALHINTS(ReceptorClass)
    166166SYMBOL(`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')
    167167ENDNEUROCLASS
    168168
    169 NEUROCLASS(TouchP,Tp,Touch proximity,`Proximity sensor detecting obstacles along the X axis.\n-1=distance is \'r\' or more\n0=zero distance',0,1,1)
     169NEUROCLASS(TouchP,Tproximity,Touch proximity,`Proximity sensor detecting obstacles along the X axis.\n-1=distance is \'r\' or more\n0=zero distance',0,1,1)
    170170VISUALHINTS(ReceptorClass)
    171171SYMBOL(`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')
  • cpp/frams/config/f0.def

    r975 r976  
    147147ENDNEUROCLASS
    148148
    149 NEUROCLASS(GyroP,Gp,Part Gyroscope,`Tilt sensor. Signal is directly proportional to the tilt angle.\n0=the part X axis is horizontal\n+1/-1=the axis is vertical',0,1,1)
     149NEUROCLASS(GyroP,Gpart,Part Gyroscope,`Tilt sensor. Signal is directly proportional to the tilt angle.\n0=the part X axis is horizontal\n+1/-1=the axis is vertical',0,1,1)
    150150VISUALHINTS(ReceptorClass)
    151151SYMBOL(`8,7,100,50,90,50,90,40,70,40,80,50,70,60,90,60,90,50,12,43,24,48,24,48,19,38,19,38,24,43,24,43,54,48,54,48,64,43,69,38,64,38,54,43,54,5,63,69,58,74,48,79,38,79,28,74,23,69,1,43,79,43,74,1,23,69,26,66,1,63,69,60,66,1,55,76,53,73,1,31,75,33,72')
     
    162162ENDNEUROCLASS
    163163
    164 NEUROCLASS(TouchC,Tc,Touch contact,`Touch sensor.\n-1=no contact\n0=the Part is touching the obstacle\n>0=pressing, value depends on the force applied (not implemented in ODE mode)',0,1,1)
     164NEUROCLASS(TouchC,Tcontact,Touch contact,`Touch sensor.\n-1=no contact\n0=the Part is touching the obstacle\n>0=pressing, value depends on the force applied (not implemented in ODE mode)',0,1,1)
    165165VISUALHINTS(ReceptorClass)
    166166SYMBOL(`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')
    167167ENDNEUROCLASS
    168168
    169 NEUROCLASS(TouchP,Tp,Touch proximity,`Proximity sensor detecting obstacles along the X axis.\n-1=distance is \'r\' or more\n0=zero distance',0,1,1)
     169NEUROCLASS(TouchP,Tproximity,Touch proximity,`Proximity sensor detecting obstacles along the X axis.\n-1=distance is \'r\' or more\n0=zero distance',0,1,1)
    170170VISUALHINTS(ReceptorClass)
    171171SYMBOL(`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')
  • cpp/frams/genetics/preconfigured.h

    r952 r976  
    2828                if (Geno::useValidators(&validators) != NULL)
    2929                        logPrintf("PreconfiguredGenetics", "init", LOG_WARN, "Geno validators already configured");
    30                 static const char* genactive_classes[] = { "N", "G", "Gp", "T", "S", "*", "|", "@", "M", NULL };
     30                static const char* genactive_classes[] = { "N", "G", "Gpart", "T", "S", "*", "|", "@", "M", NULL };
    3131                NeuroClass::resetActive();
    3232                NeuroClass::setGenActive(genactive_classes);
  • cpp/frams/neuro/neurocls-f0-SDK-factory.h

    r952 r976  
    4141#define FIELDSTRUCT NI_GyroP
    4242ParamEntry NI_GyroP_tab []={
    43 {"Part Gyroscope",1, 2 ,"Gp",},
     43{"Part Gyroscope",1, 2 ,"Gpart",},
    4444{"ry",1,0,"rotation.y","f -6.282 6.282 0",FIELD(ry),},
    4545{"rz",1,0,"rotation.z","f -6.282 6.282 0",FIELD(rz),},
     
    5858#define FIELDSTRUCT NI_TouchC
    5959ParamEntry NI_TouchC_tab []={
    60 {"Touch contact",1, 0 ,"Tc",},
     60{"Touch contact",1, 0 ,"Tcontact",},
    6161 {0,0,0,},};
    6262#undef FIELDSTRUCT
     
    6464#define FIELDSTRUCT NI_TouchP
    6565ParamEntry NI_TouchP_tab []={
    66 {"Touch proximity",1, 3 ,"Tp",},
     66{"Touch proximity",1, 3 ,"Tproximity",},
    6767{"r",1,0,"Range","f 0.0 1.0 1.0",FIELD(range),},
    6868{"ry",1,0,"rotation.y","f -6.282 6.282 0",FIELD(ry),},
     
    184184setImplementation("Nu",new NI_StdUNeuron); \
    185185setImplementation("G",new NI_Gyro); \
    186 setImplementation("Gp",new NI_GyroP); \
     186setImplementation("Gpart",new NI_GyroP); \
    187187setImplementation("T",new NI_Touch); \
    188 setImplementation("Tc",new NI_TouchC); \
    189 setImplementation("Tp",new NI_TouchP); \
     188setImplementation("Tcontact",new NI_TouchC); \
     189setImplementation("Tproximity",new NI_TouchP); \
    190190setImplementation("S",new NI_Smell); \
    191191setImplementation("*",new NI_Const); \
  • cpp/frams/neuro/neurocls-f0-SDK-library.h

    r975 r976  
    4848       static int GyroP_xy[]={83,8,7,100,50,90,50,90,40,70,40,80,50,70,60,90,60,90,50,12,43,24,48,24,48,19,38,19,38,24,43,24,43,54,48,54,48,64,43,69,38,64,38,54,43,54,5,63,69,58,74,48,79,38,79,28,74,23,69,1,43,79,43,74,1,23,69,26,66,1,63,69,60,66,1,55,76,53,73,1,31,75,33,72};   
    4949static ParamEntry NI_GyroP_tab[]={
    50 {"Part Gyroscope",1, 2 ,"Gp",},
     50{"Part Gyroscope",1, 2 ,"Gpart",},
    5151
    5252
     
    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};   
    7272static ParamEntry NI_TouchC_tab[]={
    73 {"Touch contact",1, 0 ,"Tc",},
     73{"Touch contact",1, 0 ,"Tcontact",},
    7474
    7575
     
    8080       static int TouchP_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};   
    8181static ParamEntry NI_TouchP_tab[]={
    82 {"Touch proximity",1, 3 ,"Tp",},
     82{"Touch proximity",1, 3 ,"Tproximity",},
    8383
    8484
Note: See TracChangeset for help on using the changeset viewer.