Changeset 932 for cpp/frams/config

Timestamp:

05/28/20 18:00:45 (4 years ago)

Author:

Maciej Komosinski

Message:

Neuron classes now have a property (a bit field) that says whether each neuron class supports model shape BALL_AND_STICK, SOLIDS, or both

Location:

cpp/frams/config

Files:

• f0-SDK.def (modified) (5 diffs)
• f0.def (modified) (4 diffs)

cpp/frams/config/f0-SDK.def

@@ -106 +106 @@
 PROP(Vstyle,2,0,vis_style,s,0,0,neuro,vis_style)
 PROP(getInputCount,0,1+2,`input count',d,,,,inputCount,GETONLY)
-PROP(getInputNeuroDef,0,1+2,`get input neuron',p oNeuroDef(d),,,,p_getInputNeuroDef,PROCEDURE)
-PROP(getInputNeuroIndex,0,1+2,`get input neuron index',p d(d),,,,p_getInputNeuroIndex,PROCEDURE)
-PROP(getInputWeight,0,1+2,`get input weight',p f(d),,,,p_getInputWeight,PROCEDURE)
+PROP(getInputNeuroDef,0,0,`get input neuron',p oNeuroDef(d),,,,p_getInputNeuroDef,PROCEDURE)
+PROP(getInputNeuroIndex,0,0,`get input neuron index',p d(d),,,,p_getInputNeuroIndex,PROCEDURE)
+PROP(getInputWeight,0,0,`get input weight',p f(d),,,,p_getInputWeight,PROCEDURE)
 PROP(classObject,0,1+2,`neuron class',oNeuroClass,,,,classObject,GETONLY)
 ENDCLASS
@@ -158 +158 @@
 
 NEUROCLASS(BendMuscle,|,Bend muscle,,1,0,2)
+SHAPETYPE(BallAndStickShapeType)
 VISUALHINTS(DontShowClass+EffectorClass+V1BendMuscle+AtFirstPart)
 SYMBOL(`6,5,25,40,35,40,45,50,35,60,25,60,25,40,4,65,85,65,50,75,50,75,85,65,85,3,65,56,49,29,57,24,72,50,4,68,53,70,53,70,55,68,55,68,53,5,50,21,60,15,70,14,79,15,87,20,81,10,1,86,20,77,21')
@@ -165 +166 @@
 
 NEUROCLASS(RotMuscle,@,Rotation muscle,,1,0,2)
+SHAPETYPE(BallAndStickShapeType)
 VISUALHINTS(DontShowClass+EffectorClass+V1RotMuscle+AtFirstPart)
 SYMBOL(`5,5,25,40,35,40,45,50,35,60,25,60,25,40,4,65,85,65,50,75,50,75,85,65,85,1,69,10,77,17,10,59,15,57,17,57,22,60,26,69,27,78,26,82,21,82,16,79,12,69,10,80,6,3,65,50,65,20,75,20,75,50')
@@ -171 +173 @@
 
 NEUROCLASS(SolidMuscle,M,Muscle,,1,0,2)
+SHAPETYPE(SolidsShapeType)
 VISUALHINTS(EffectorClass+AtFirstPart+SolidMuscleFlag)
 SYMBOL(`6,5,25,40,35,40,45,50,35,60,25,60,25,40,4,65,85,65,50,75,50,75,85,65,85,3,65,56,49,29,57,24,72,50,4,68,53,70,53,70,55,68,55,68,53,5,50,21,60,15,70,14,79,15,87,20,81,10,1,86,20,77,21')
@@ -190 +193 @@
 
 NEUROCLASS(Sticky,Sti,Sticky [EXPERIMENTAL!],,1,0,1)
+SHAPETYPE(BallAndStickShapeType)
 VISUALHINTS(EffectorClass)
 ENDNEUROCLASS
 
 NEUROCLASS(LinearMuscle,LMu,Linear muscle [EXPERIMENTAL!],,1,0,2)
-VISUALHINTS(EffectorClass)
+SHAPETYPE(BallAndStickShapeType)
+VISUALHINTS(EffectorClass+LinearMuscleFlag)
 NEUROPROP(p,0,0,power,f,0.01,1.0,1.0,power)
 ENDNEUROCLASS

cpp/frams/config/f0.def

@@ -158 +158 @@
 
 NEUROCLASS(BendMuscle,|,Bend muscle,,1,0,2)
+SHAPETYPE(BallAndStickShapeType)
 VISUALHINTS(DontShowClass+EffectorClass+V1BendMuscle+AtFirstPart)
 SYMBOL(`6,5,25,40,35,40,45,50,35,60,25,60,25,40,4,65,85,65,50,75,50,75,85,65,85,3,65,56,49,29,57,24,72,50,4,68,53,70,53,70,55,68,55,68,53,5,50,21,60,15,70,14,79,15,87,20,81,10,1,86,20,77,21')
@@ -165 +166 @@
 
 NEUROCLASS(RotMuscle,@,Rotation muscle,,1,0,2)
+SHAPETYPE(BallAndStickShapeType)
 VISUALHINTS(DontShowClass+EffectorClass+V1RotMuscle+AtFirstPart)
 SYMBOL(`5,5,25,40,35,40,45,50,35,60,25,60,25,40,4,65,85,65,50,75,50,75,85,65,85,1,69,10,77,17,10,59,15,57,17,57,22,60,26,69,27,78,26,82,21,82,16,79,12,69,10,80,6,3,65,50,65,20,75,20,75,50')
@@ -171 +173 @@
 
 NEUROCLASS(SolidMuscle,M,Muscle,,1,0,2)
+SHAPETYPE(SolidsShapeType)
 VISUALHINTS(EffectorClass+AtFirstPart+SolidMuscleFlag)
 SYMBOL(`6,5,25,40,35,40,45,50,35,60,25,60,25,40,4,65,85,65,50,75,50,75,85,65,85,3,65,56,49,29,57,24,72,50,4,68,53,70,53,70,55,68,55,68,53,5,50,21,60,15,70,14,79,15,87,20,81,10,1,86,20,77,21')
@@ -209 +212 @@
 
 NEUROCLASS(Sticky,Sti,Sticky [EXPERIMENTAL!],,1,0,1)
+SHAPETYPE(BallAndStickShapeType)
 VISUALHINTS(EffectorClass)
 ENDNEUROCLASS
 
 NEUROCLASS(LinearMuscle,LMu,Linear muscle [EXPERIMENTAL!],,1,0,2)
+SHAPETYPE(BallAndStickShapeType)
 VISUALHINTS(EffectorClass+LinearMuscleFlag)
 NEUROPROP(p,0,0,power,f,0.01,1.0,1.0,power)