diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2011-03-02 22:08:48 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2011-03-02 22:08:48 +0300 |
commit | 0699c21f01df2cd986c579e46a944cf6f76e6c1e (patch) | |
tree | 9da4044e7541e227e7f67e4d1d54eb2226a47a2c /source/blender | |
parent | b8c85abc1c5e1211f7364d90f92f377b8ab945ef (diff) |
Logic UI: reverting back the PROP_ANGLE props
The Logic Bricks that use angles (Radar Sensor and Constraint Actuator) do so in degree.
Reverting for the time being. Ideally we want to make them to use radians internally (that requires at least a doversion and a convert from radians to degree in BGE Converter routine).
If someone feels like helping on that, please go ahead.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/makesrna/intern/rna_actuator.c | 10 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_sensor.c | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/source/blender/makesrna/intern/rna_actuator.c b/source/blender/makesrna/intern/rna_actuator.c index c4eb2ba8af6..3cb693f2033 100644 --- a/source/blender/makesrna/intern/rna_actuator.c +++ b/source/blender/makesrna/intern/rna_actuator.c @@ -1214,16 +1214,18 @@ static void rna_def_constraint_actuator(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Reference Direction", "Reference Direction"); RNA_def_property_update(prop, NC_LOGIC, NULL); - prop= RNA_def_property(srna, "angle_min", PROP_FLOAT, PROP_ANGLE); + //XXX TODO - use radians internally then change to PROP_ANGLE + prop= RNA_def_property(srna, "angle_min", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "minloc[0]"); RNA_def_property_range(prop, 0.0, 180.0); - RNA_def_property_ui_text(prop, "Min Angle", "Minimum angle to maintain with target direction. No correction is done if angle with target direction is between min and max"); + RNA_def_property_ui_text(prop, "Min Angle", "Minimum angle (in degree) to maintain with target direction. No correction is done if angle with target direction is between min and max"); RNA_def_property_update(prop, NC_LOGIC, NULL); - prop= RNA_def_property(srna, "angle_max", PROP_FLOAT, PROP_ANGLE); + //XXX TODO - use radians internally then change to PROP_ANGLE + prop= RNA_def_property(srna, "angle_max", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "maxloc[0]"); RNA_def_property_range(prop, 0.0, 180.0); - RNA_def_property_ui_text(prop, "Max Angle", "Maximum angle allowed with target direction. No correction is done if angle with target direction is between min and max"); + RNA_def_property_ui_text(prop, "Max Angle", "Maximum angle (in degree) allowed with target direction. No correction is done if angle with target direction is between min and max"); RNA_def_property_update(prop, NC_LOGIC, NULL); /* ACT_CONST_TYPE_FH */ diff --git a/source/blender/makesrna/intern/rna_sensor.c b/source/blender/makesrna/intern/rna_sensor.c index 412431d4124..e19816a42f6 100644 --- a/source/blender/makesrna/intern/rna_sensor.c +++ b/source/blender/makesrna/intern/rna_sensor.c @@ -634,9 +634,10 @@ static void rna_def_radar_sensor(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Axis", "Specify along which axis the radar cone is cast"); RNA_def_property_update(prop, NC_LOGIC, NULL); - prop= RNA_def_property(srna, "angle", PROP_FLOAT, PROP_ANGLE); + //XXX TODO - use radians internally then change to PROP_ANGLE + prop= RNA_def_property(srna, "angle", PROP_FLOAT, PROP_NONE); RNA_def_property_range(prop, 0.0, 179.9); - RNA_def_property_ui_text(prop, "Angle", "Opening angle of the radar cone"); + RNA_def_property_ui_text(prop, "Angle", "Opening angle of the radar cone (in degrees)"); RNA_def_property_update(prop, NC_LOGIC, NULL); prop= RNA_def_property(srna, "distance", PROP_FLOAT, PROP_NONE); |